Author: schubi2
Date: Mon Sep 3 13:56:27 2007
New Revision: 7083
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7083&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=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/af.po (original)
+++ trunk/libzypp/po/af.po Mon Sep 3 13:56:27 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-03 12:03\n"
"Last-Translator: Novell Language \n"
"Language-Team: Novell Language \n"
@@ -13,77 +13,77 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url-skema laat nie ân %s toe nie"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ongeldige %s komponent '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ongeldige %s komponent"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Padparameter-ontleding nie vir hierdie URL ondersteun nie"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Navraagstring-ontleding nie vir hierdie URL ondersteun nie"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url-skema is ân vereiste komponent"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ongeldige Url-skema '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url-skema laat nie ân gebruikernaam toe nie"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url-skema laat nie ân wagwoord toe nie"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url-skema vereis ân gasheerkomponent"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url-skema laat nie ân gasheerkomponent toe nie"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ongeldige gasheerkomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url-skema laat nie ân poort toe nie"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ongeldige poortkomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url-skema vereis padnaam"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relatiewe pad nie toegelaat indien magtiging bestaan nie"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Padparameter-ontleding nie vir hierdie URL ondersteun nie"
@@ -2730,7 +2730,7 @@
msgstr "%s vervang deur %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2738,19 +2738,19 @@
"Hierdie oplossings sal uit die stelsel geskrap word."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2758,38 +2758,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ongeldige inligting"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2799,7 +2799,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s verkeer in konflik met ander oplossings"
@@ -2808,14 +2808,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2825,24 +2825,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s uitgediendes %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s uitgediendes:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2851,7 +2851,7 @@
"Hierdie oplossings sal uit die stelsel geskrap word."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s hang van ander oplossings af"
@@ -2859,38 +2859,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s hang af van:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Kind van"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Kan %s nie installeer nie"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Geen voorsiening %s nie"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2899,32 +2899,32 @@
"\n"
"Daar is geen hulpbron wat hierdie vereiste ondersteun, beskikbaar nie."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, 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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2932,8 +2932,8 @@
msgstr "skrap %s?"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2941,119 +2941,131 @@
msgstr "moenie %s installeer nie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignoreer dié vereiste net hier"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Ignoreer dié vereiste net hier"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installeer %s, hoewel dit die argitektuur kan verander"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s voorsien hierdie afhanklikheid, maar sal die argitektuur van die geïnstalleerde item wysig"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Installeer %s, hoewel dit die argitektuur kan verander"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s voorsien hierdie afhanklikheid, maar sal die argitektuur van die geïnstalleerde item wysig"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignoreer hierdie konflik van %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignoreer die uitgediende %s in %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignoreer dat %s reeds gestel is om te installeer"
@@ -3064,7 +3076,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "om %s vir %s te vereis tydens bywerk van %s"
@@ -3315,8 +3327,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s voorsien %s, maar dit het ân ander argitektuur."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s voorsien %s, maar dit het ân ander argitektuur."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Kan nie aan vereiste %s vir %s voldoen nie"
@@ -3328,7 +3346,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s word vereis deur ân ander geïnstalleerde oplossing; gevolglik sal dit nie ontkoppel word nie."
@@ -3340,7 +3358,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s word vereis deur ân ander geïnstalleerde oplossing; gevolglik sal dit nie ontkoppel word nie."
@@ -3352,7 +3370,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s is gesluit en kan nie ongeïnstalleer word nie."
@@ -3363,7 +3381,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "ân Konflik oor %s (%s) vereis die verwydering van om-geïnstalleer-te-word-%s"
@@ -3374,23 +3392,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Merk van %s as oninstalleerbaar vanweë konflikte oor %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "vanaf %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Fout!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Belangrik!"
@@ -3447,9 +3465,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s word benodig deur %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4768,6 +4786,10 @@
"Verwag %s, kry %s\n"
" Gebruik die lêer in elk geval?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s word benodig deur %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Kan Url-magtiging nie ontleed nie"
Modified: trunk/libzypp/po/ar.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ar.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/ar.po (original)
+++ trunk/libzypp/po/ar.po Mon Sep 3 13:56:27 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-09-27 09:57+0200\n"
"Last-Translator: Novell Language \n"
"Language-Team: Novell Language \n"
@@ -18,77 +18,77 @@
"X-Language-Local: Arabic*\n"
"X-Generator: poTranslator\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Ùا ÙسÙ
Ø Ù
خطط Url ب٠%s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ù
ÙÙÙ %s غÙر صاÙØ '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ù
ÙÙÙ %s غÙر صاÙØ"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "تØÙÙÙ Ù
عÙÙ
Ø© اÙÙ
سار غÙر Ù
دعÙÙ
ÙعÙÙا٠URL Ùذا"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "تØÙÙ٠سÙسÙØ© اÙاستعÙاÙ
غÙر Ù
دعÙÙ
ÙعÙÙا٠URL Ùذا"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Ùعتبر Ù
خطط Url Ù
ÙÙÙÙا Ù
Ø·ÙÙبÙا"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ù
خطط Url غÙر صاÙØ '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Ùا ÙسÙ
Ø Ù
خطط Url بإدخا٠اسÙ
Ù
ستخدÙ
"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Ùا ÙسÙ
Ø Ù
خطط Url بإدخا٠ÙÙÙ
ة سر"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "ÙتطÙب Ù
خطط Url ÙجÙد Ù
ÙÙÙ Ù
ضÙÙ"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Ùا ÙسÙ
Ø Ù
خطط Url بÙجÙد Ù
ÙÙÙ Ù
ضÙÙ"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ù
ÙÙ٠اÙÙ
ضÙÙ '%s' غÙر صاÙØ"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Ùا ÙسÙ
Ø Ù
خطط Url بإدخا٠Ù
ÙÙØ°"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ù
ÙÙ٠اÙÙ
ÙÙØ° '%s' غÙر صاÙØ"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "ÙتطÙب Ù
خطط Url ÙجÙد Ù
سار اسÙ
"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "غÙر Ù
سÙ
ÙØ Ø¨Ø§ÙÙ
سار اÙÙسب٠ÙÙ ØاÙØ© ÙجÙد سÙطة"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "تØÙÙÙ Ù
عÙÙ
Ø© اÙÙ
سار غÙر Ù
دعÙÙ
ÙعÙÙا٠URL Ùذا"
@@ -2736,7 +2736,7 @@
msgstr "%s تÙ
استبداÙ٠ب٠%s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2744,19 +2744,19 @@
"سÙتÙ
ØØ°Ù Ùذ٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙÙ Ù
٠اÙÙظاÙ
."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2764,38 +2764,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "اÙÙ
عÙÙÙ
ات غÙر صاÙØØ©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2805,7 +2805,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "Ùتعارض %s Ù
ع اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙأخرÙ"
@@ -2814,14 +2814,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2831,24 +2831,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s Ùجع٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙأخر٠ÙدÙÙ
Ø©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s Ùجع٠اÙعÙصر اÙتاÙÙ ÙدÙÙ
Ùا %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s Ùجع٠اÙعÙصر اÙتاÙÙ ÙدÙÙ
Ùا:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2857,7 +2857,7 @@
"سÙتÙ
ØØ°Ù Ùذ٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙÙ Ù
٠اÙÙظاÙ
."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ÙعتÙ
د عÙ٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙأخرÙ"
@@ -2865,38 +2865,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ÙعتÙ
د عÙÙ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "عÙصر Ùرع٠ÙÙ"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "تعذر تثبÙت %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Ùا ÙÙجد Ø£Ù Ø´ÙØ¡ ÙÙÙر %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2905,32 +2905,32 @@
"\n"
"Ùا ÙتÙÙر Ø£Ù Ù
Ùرد ÙدعÙ
Ùذا اÙÙ
تطÙب."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ÙتÙجة ÙÙÙ
Ø´ÙÙات اÙÙ
ÙضØØ© أعÙاÙ/أدÙاÙØ ÙÙ ÙÙÙÙ
Ùذا اÙتØدÙد بØÙ ÙاÙØ© اÙتبعÙات"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2938,8 +2938,8 @@
msgstr "ØØ°Ù %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2947,119 +2947,131 @@
msgstr "عدÙ
تثبÙت %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "ÙÙ
ÙتÙ
استÙÙاء Ù
تطÙبات %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "تÙ
ÙÙد تبعÙات %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Ùا داع٠ÙتثبÙت %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ÙÙ
Ù٠إÙغاء تثبÙت٠ÙØ£ÙÙ Ùتعارض Ù
ع %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "تجاÙÙ Ùذا اÙÙ
تطÙب ÙÙا ÙÙØ·"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "تجاÙÙ Ùذا اÙÙ
تطÙب ÙÙا ÙÙØ·"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ÙÙ
بتثبÙت %s باÙرغÙ
Ù
٠أÙÙ Ùد Ùؤد٠إÙ٠تغÙÙر اÙÙÙÙÙ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "ÙÙÙر %s Ùذ٠اÙتبعÙØ©Ø ÙÙÙ٠سÙؤد٠إÙ٠تغÙÙر ÙÙÙ٠اÙعÙصر اÙÙ
ثبÙÙت"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "ÙÙÙر %s Ùذ٠اÙتبعÙØ©Ø ÙÙÙ٠سÙؤد٠إÙ٠تغÙÙر ÙÙÙ٠اÙعÙصر اÙÙ
ثبÙÙت"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "تجاÙ٠تعارض %s Ùذا"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "تجاÙÙ %s اÙÙدÙÙ
ÙÙ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "تجاÙ٠أÙ٠تÙ
تعÙÙÙ %s باÙÙع٠ÙتثبÙتÙ"
@@ -3070,7 +3082,7 @@
msgstr "عدÙ
تثبÙت اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙÙ
تعÙÙØ© Ø£Ù ØØ°ÙÙا"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ÙØ·Ùب %s ÙÙ %s عÙد تØدÙØ« %s"
@@ -3321,8 +3333,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s ÙÙÙر %sØ ÙÙÙ ÙÙ ÙÙÙ٠آخر."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s ÙÙÙر %sØ ÙÙÙ ÙÙ ÙÙÙ٠آخر."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "تعذر استÙÙاء Ù
تطÙب %s ÙÙ %s"
@@ -3334,7 +3352,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s Ù
Ø·ÙÙب بÙاسطة تبعÙØ© ÙابÙØ© ÙÙتØÙÙÙ Ù
ثبÙÙتة أخرÙØ Ùذا ÙÙ ÙتÙ
Ø¥Ùغاء اÙارتباط."
@@ -3346,7 +3364,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s Ù
Ø·ÙÙب بÙاسطة تبعÙØ© ÙابÙØ© ÙÙتØÙÙÙ Ù
ثبÙÙتة أخرÙØ Ùذا ÙÙ ÙتÙ
Ø¥Ùغاء اÙارتباط."
@@ -3358,7 +3376,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s Ù
ÙÙÙ ÙÙتعذر Ø¥Ùغاء تثبÙتÙ."
@@ -3369,7 +3387,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "ÙتطÙب تعارض %s (%s) إزاÙØ© %s اÙÙ
Ø·ÙÙب تثبÙتÙ"
@@ -3380,23 +3398,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "تعÙÙÙ
%s باعتبار٠Ùاب٠ÙØ¥Ùغاء اÙتثبÙت بسبب ÙجÙد تعارضات عÙÙ %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "Ù
Ù %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "خطأ!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "ÙاÙ
!"
@@ -3453,9 +3471,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s Ù
Ø·ÙÙب بÙاسطة %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4774,6 +4792,10 @@
"Ù
تÙÙع %sØ ØªÙ
اÙعثÙر عÙÙ %s\n"
" Ù٠ترÙد استخداÙ
اÙÙ
Ù٠عÙ٠أ٠ØاÙØ"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s Ù
Ø·ÙÙب بÙاسطة %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "تعذر تØÙÙ٠سÙطة Url"
Modified: trunk/libzypp/po/bg.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bg.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/bg.po (original)
+++ trunk/libzypp/po/bg.po Mon Sep 3 13:56:27 2007
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: zypp.bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-09 18:05+0200\n"
"Last-Translator: Borislav Mitev \n"
"Language-Team: Bulgarian \n"
@@ -22,77 +22,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10.2\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "невалидно име на ÑÑлÑга '%1'."
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Ðевалидна инÑоÑмаÑиÑ"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "невалидно име на ÑÑлÑга '%1'."
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2838,7 +2838,7 @@
msgstr "%s е заменен Ð¾Ñ %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2846,19 +2846,19 @@
"Тези пакеÑи Ñе бÑÐ´Ð°Ñ Ð¸Ð·ÑÑиÑи Ð¾Ñ ÑиÑÑемаÑа."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2866,38 +2866,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ðевалидна инÑоÑмаÑиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2907,7 +2907,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s е в конÑÐ»Ð¸ÐºÑ Ñ Ð´ÑÑги пакеÑи"
@@ -2916,14 +2916,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2933,24 +2933,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s пÑави ненÑжни дÑÑги пакеÑи"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s пÑави ненÑжно %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s пÑави ненÑжно: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2959,7 +2959,7 @@
"Тези пакеÑи Ñе бÑÐ´Ð°Ñ Ð¸Ð·ÑÑиÑи Ð¾Ñ ÑиÑÑемаÑа."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s завиÑи Ð¾Ñ Ð´ÑÑги пакеÑи"
@@ -2967,38 +2967,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s завиÑи оÑ: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "ÐеÑе на"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s не може да бÑде инÑÑалиÑан"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Ðикой не доÑÑÐ°Ð²Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -3007,32 +3007,32 @@
"\n"
"ÐÑма налиÑен ÑеÑÑÑÑ Ð·Ð° поддÑÑжкаÑа на Ñова изиÑкване."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ÐоÑади пÑоблемиÑе, коиÑо Ñа показани по-долÑ/гоÑе Ñега нÑма да Ð¼Ð¾Ð³Ð°Ñ Ð´Ð° ÑеÑдовлеÑвоÑÑÑ Ð²ÑиÑки завиÑимоÑÑи."
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3040,8 +3040,8 @@
msgstr "изÑÑиване на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3049,119 +3049,131 @@
msgstr "без инÑÑалиÑане на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s има незадоволени изиÑканиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s има липÑваÑи завиÑимоÑÑи"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "ÐÑма нÑжда Ð¾Ñ Ð¸Ð½ÑÑалиÑане на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s е недеинÑÑалиÑÑем поÑади конÑликÑа Ñ %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ÐÑенебÑегване на Ñова изиÑкване Ñамо ÑÑк"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ÐÑенебÑегване на Ñова изиÑкване Ñамо ÑÑк"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ÐнÑÑалиÑане на %s, вÑпÑеки Ñе Ñе пÑомени аÑÑ
иÑекÑÑÑаÑа"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s задоволÑва Ñази завиÑимоÑÑ, но Ñе пÑомени аÑÑ
иÑекÑÑÑаÑа на инÑÑалиÑÐ°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s задоволÑва Ñази завиÑимоÑÑ, но Ñе пÑомени аÑÑ
иÑекÑÑÑаÑа на инÑÑалиÑÐ°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "ÐÑенебÑегване на конÑликÑа на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "ÐÑенебÑегване на оÑÑаÑелиÑе %s в %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "ÐÑенебÑегване на Ñова, Ñе %s е зададен веÑе за инÑÑалиÑане"
@@ -3172,7 +3184,7 @@
msgstr "Ðез инÑÑалиÑане или пÑемаÑ
ване на конÑликÑниÑе пакеÑи"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "за изиÑканоÑо %s за %s, когаÑо Ñе обновÑва %s"
@@ -3423,8 +3435,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s доÑÑÐ°Ð²Ñ %s, но има дÑÑга аÑÑ
иÑекÑÑÑа."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s доÑÑÐ°Ð²Ñ %s, но има дÑÑга аÑÑ
иÑекÑÑÑа."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ðе Ð¼Ð¾Ð³Ð°Ñ Ð´Ð° Ñе ÑдовлеÑвоÑÑÑ Ð¸Ð·Ð¸ÑкваниÑÑа на %s за %s"
@@ -3436,7 +3454,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s Ñе изиÑква Ð¾Ñ Ð´ÑÑг инÑÑалиÑан Ð¿Ð°ÐºÐµÑ Ð¸ нÑма да бÑде пÑемаÑ
наÑ."
@@ -3448,7 +3466,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s Ñе изиÑква Ð¾Ñ Ð´ÑÑг инÑÑалиÑан Ð¿Ð°ÐºÐµÑ Ð¸ нÑма да бÑде пÑемаÑ
наÑ."
@@ -3460,7 +3478,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s е заклÑÑен и не може да бÑде деинÑÑалиÑан."
@@ -3471,7 +3489,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "ÐонÑликÑÑÑ Ñ %s (%s) изиÑква пÑемаÑ
ванеÑо на %s, коеÑо е било подгоÑвено за инÑÑалиÑане"
@@ -3482,23 +3500,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "ÐаÑкиÑане на %s каÑо деинÑÑалиÑÑем поÑади конÑликÑа Ñ %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "Ð¾Ñ %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " ÐÑеÑка!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Ðажно!"
@@ -3555,9 +3573,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s е необÑ
одим на %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -5004,6 +5022,10 @@
"Use the file anyway?"
msgstr ""
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s е необÑ
одим на %s"
+
#~ msgid "Ignore this requirement generally"
#~ msgstr "ÐÑенебÑегване на Ñова изиÑкване"
Modified: trunk/libzypp/po/bn.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bn.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/bn.po (original)
+++ trunk/libzypp/po/bn.po Mon Sep 3 13:56:27 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: Priyavert Sharma\n"
"Language-Team: AgreeYa Solutions \n"
@@ -12,77 +12,77 @@
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url যà§à¦à¦¨à¦¾ %s à¦à¦° à¦
নà§à¦®à¦¤à¦¿ দà§à§ না"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "à¦
বà§à¦§ %s à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦ %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "à¦
বà§à¦§ %s à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "à¦à¦ URL à¦à¦° à¦à¦¨à§à¦¯à§ পথ পà§à¦¯à¦¾à¦°à¦¾à¦®à¦¿à¦à¦¾à¦° পারà§à¦¸à¦¿à¦ সমরà§à¦¥à¦¿à¦¤ নà§"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "à¦à¦ URL à¦à¦° à¦à¦¨à§à¦¯à§ সà§à¦à§à¦°à¦¿à¦ পারà§à¦¸à¦¿à¦ সমরà§à¦¥à¦¿à¦¤ নà§"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url যà§à¦à¦¨à¦¾ à¦à¦à¦à¦¿ à¦à¦¬à¦¶à§à¦¯à¦¿à¦ à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "à¦
বà§à¦§ Url যà§à¦à¦¨à¦¾ %s"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url যà§à¦à¦¨à¦¾ বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦à¦¾à¦°à§à¦° নামà§à¦° à¦
নà§à¦®à¦¤à¦¿ দà§à§ না"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url যà§à¦à¦¨à¦¾ পাসà¦à§à¦¾à¦°à§à¦¡à§à¦° à¦
নà§à¦®à¦¤à¦¿ দà§à§ না"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url যà§à¦à¦¨à¦¾à¦° à¦à¦¨à§à¦¯ হà§à¦¸à§à¦ à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url যà§à¦à¦¨à¦¾ হà§à¦¸à§à¦ à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦-à¦à¦° à¦
নà§à¦®à¦¤à¦¿ দà§à§ না"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "à¦
বà§à¦§ হà§à¦¸à§à¦ à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦ '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url যà§à¦à¦¨à¦¾ পà§à¦°à§à¦à§à¦° à¦
নà§à¦®à¦¤à¦¿ দà§à§ না"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "à¦
বà§à¦§ পà§à¦°à§à¦ à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦ '%s' "
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url যà§à¦à¦¨à¦¾à¦° à¦à¦¨à§à¦¯ পথà§à¦° নাম দরà¦à¦¾à¦°"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "à¦
থরিà¦à¦¿ বিদà§à¦¯à¦®à¦¾à¦¨ থাà¦à¦²à§ রিলà§à¦à¦¿à¦ পথà§à¦° à¦
নà§à¦®à¦¤à¦¿ নà§à¦"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "à¦à¦ URL à¦à¦° à¦à¦¨à§à¦¯à§ পথ পà§à¦¯à¦¾à¦°à¦¾à¦®à¦¿à¦à¦¾à¦° পারà§à¦¸à¦¿à¦ সমরà§à¦¥à¦¿à¦¤ নà§"
@@ -2729,7 +2729,7 @@
msgstr "%s পà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ হà§à§à¦à§ %s দà§à¦¬à¦¾à¦°à¦¾"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2737,19 +2737,19 @@
"à¦à¦ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿ সিসà§à¦à§à¦® থà§à¦à§ মà§à¦à§ দà§à¦à§à¦¾ হবà§à¥¤"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2757,38 +2757,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "à¦
বà§à¦§ তথà§à¦¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2798,7 +2798,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ বিশà§à¦²à§à¦·à§à¦¯à¦à§à¦²à¦¿à¦° সà¦à§à¦à§ %s à¦à¦° দà§à¦¬à¦¨à§à¦¦à§à¦¬"
@@ -2807,14 +2807,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2824,24 +2824,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿à¦à§ পà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ দিà§à§à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s %sà¦à§ পà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ দিà§à§à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s পà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ দিà§à§à¦à§: %sà¦à§"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2850,7 +2850,7 @@
"à¦à¦ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿ সিসà§à¦à§à¦® থà§à¦à§ মà§à¦à§ দà§à¦à§à¦¾ হবà§à¥¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s à¦
নà§à¦¯ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿à¦° à¦à¦ªà¦°à§ নিরà§à¦à¦° à¦à¦°à§"
@@ -2858,38 +2858,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s নিরà§à¦à¦° à¦à¦°à§ à¦à¦° à¦à¦ªà¦°à§: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "à¦à¦° সনà§à¦¤à¦¾à¦¨"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "in/ssTklà¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾ যাবৠনা"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "à¦à§à¦¨à¦à¦à¦¾à¦ %s পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§ না"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2898,32 +2898,32 @@
"\n"
"à¦à¦®à¦¨ à¦à§à¦¨à¦ সà¦à¦¸à§à¦¥à¦¾à¦¨ à¦à¦ªà¦²à¦¬à§à¦§ নà§à¦ যা à¦à¦ পà§à¦°à§à§à¦à¦¨à¦à¦¿à¦à§ সমরà§à¦¥à¦¨ à¦à¦°à§"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "à¦à¦ রà§à¦à¦²à¦¿à¦à¦¶à¦¨à§à¦° à¦à¦ªà¦°à§/নিà¦à§ বরà§à¦£à¦¿à¦¤ সমসà§à¦¯à¦¾à¦à§à¦²à¦¿ সমসà§à¦¤ নিরà§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿à¦° সমাধান à¦à¦°à¦¬à§ না"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2931,8 +2931,8 @@
msgstr "%s মà§à¦à§ ফà§à¦²à§à¦¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2940,119 +2940,131 @@
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à§ না"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s à¦à¦° à¦
পà§à¦°à§à¦£ পà§à¦°à§à§à¦à¦¨ à¦à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s à¦à¦° হারিà§à§ যাà¦à§à¦¾ নিরà§à¦à¦°à¦¶à§à¦²à¦à§à¦²à¦¿ à¦à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾à¦° পà§à¦°à§à§à¦à¦¨ নà§à¦"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s à¦à¦° সà¦à§à¦à§ দà§à¦¬à¦¨à§à¦¦à§à¦¬à§à¦° à¦à¦¨à§à¦¯ %s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾à¦° à¦
যà§à¦à§à¦¯"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "à¦à¦¿à¦à§ à¦
মà§à¦®à¦¾à¦à¦¸à¦¿à¦¤ à¦à¦¬à¦¶à§à¦¯à¦à¦¤à¦¾ à¦à¦à§..."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "à¦à¦¿à¦à§ à¦
মà§à¦®à¦¾à¦à¦¸à¦¿à¦¤ à¦à¦¬à¦¶à§à¦¯à¦à¦¤à¦¾ à¦à¦à§..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à§à¦¨ যদিঠà¦à¦à¦¾ à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° পালà¦à§ দà§à¦¬à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s à¦à¦ নিরà§à¦à¦°à¦¤à¦¾ পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§ à¦à¦¿à¦¨à§à¦¤à§ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦à¦à¦à§à¦®à§à¦° à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° পালà¦à§ দà§à¦¬à§ "
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s à¦à¦ নিরà§à¦à¦°à¦¤à¦¾ পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§ à¦à¦¿à¦¨à§à¦¤à§ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦à¦à¦à§à¦®à§à¦° à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° পালà¦à§ দà§à¦¬à§ "
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s à¦à¦° দà§à¦¬à¦¨à§à¦¦à§à¦¬ à¦
à¦à§à¦°à¦¾à¦¹à§à¦¯ à¦à¦°à§à¦¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%s-ঠà¦
পà§à¦°à¦à¦²à¦¿à¦¤ %s à¦
à¦à§à¦°à¦¾à¦¹à§à¦¯ à¦à¦°à§à¦¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "%s à¦à¦¤à§à¦®à¦§à§à¦¯à§à¦ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ হà¦à§à¦¾ নিরà§à¦¦à¦¿à¦·à§à¦ রà§à§à¦à§, à¦à¦ বিষà§à¦à¦¿ à¦à¦ªà§à¦à§à¦·à¦¾ à¦à¦°à§à¦¨"
@@ -3063,7 +3075,7 @@
msgstr "%1 à¦à¦° দà§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° সাথà§"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s à¦à¦¨à§à¦¨à§à¦¤ à¦à¦°à¦¾à¦° সমà§à§ %s à¦à¦° à¦à¦¨à§à¦¯à§ %s à¦à¦° পà§à¦°à§à§à¦à¦¨à§à¦° à¦à¦¨à§à¦¯à§"
@@ -3314,8 +3326,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s %s পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§, à¦à¦¿à¦¨à§à¦¤à§ à¦à¦à¦¾à¦° à¦
নà§à¦¯ à¦à¦à¦à¦¾ à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° à¦à¦à§à¥¤"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s %s পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§, à¦à¦¿à¦¨à§à¦¤à§ à¦à¦à¦¾à¦° à¦
নà§à¦¯ à¦à¦à¦à¦¾ à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° à¦à¦à§à¥¤"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s à¦à¦° à¦à¦¨à§à¦¯ %s à¦à¦° পà§à¦°à§à§à¦à¦¨ পà§à¦°à¦£ à¦à¦°à¦¤à§ পারৠনা"
@@ -3327,7 +3345,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ রিà¦à¦²à¦à§à¦¬à¦²à§à¦° à¦à¦¨à§à¦¯ %s দরà¦à¦¾à¦°, তাঠà¦à¦à¦¾ à¦à¦¨à¦²à¦¿à¦à§à¦à¦¡ হবৠনা। "
@@ -3339,7 +3357,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ রিà¦à¦²à¦à§à¦¬à¦²à§à¦° à¦à¦¨à§à¦¯ %s দরà¦à¦¾à¦°, তাঠà¦à¦à¦¾ à¦à¦¨à¦²à¦¿à¦à§à¦à¦¡ হবৠনা। "
@@ -3351,7 +3369,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s লঠà¦à¦°à¦¾ à¦à¦à§ à¦à¦¬à¦ à¦à¦¨à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾ যাবৠনা ।"
@@ -3362,7 +3380,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) নিà§à§ বিবাদà§à¦° à¦à¦¨à§à¦¯à§ à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ হতৠà¦à¦²à¦¾ %s à¦
পসারণà§à¦° পà§à¦°à§à§à¦à¦¨"
@@ -3373,23 +3391,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s নিà§à§ বিবাদà§à¦° à¦à¦¾à¦°à¦£à§ %s à¦à§ বিসà§à¦¥à¦¾à¦ªà¦¨à§à¦° à¦
যà§à¦à§à¦¯ রà§à¦ªà§ à¦à¦¿à¦¹à§à¦¨à¦¿à¦¤ à¦à¦°à¦¾ হà¦à§à¦à§"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s থà§à¦à§"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "তà§à¦°à§à¦à¦¿"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "à¦à¦°à§à¦°à¦¿!"
@@ -3446,9 +3464,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s à¦à¦° %s দরà¦à¦¾à¦°"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4766,6 +4784,10 @@
"%s ফাà¦à¦²à§à¦° à¦à¦à¦à¦¿ à¦
বà§à¦§ à¦à§à¦à¦¸à¦¾à¦® à¦à¦à§à¥¤\n"
"%s পà§à¦°à¦¤à§à¦¯à¦¾à¦¶à¦¿à¦¤ à¦à¦¿à¦², পাà¦à§à¦¾ à¦à§à¦à§ %sতবà§à¦ ফাà¦à¦²à¦à¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦° à¦à¦°à¦¤à§ à¦à¦¾à¦¨?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s à¦à¦° %s দরà¦à¦¾à¦°"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Url à¦
থরিà¦à¦¿ পারà§à¦¸ à¦à¦°à¦¤à§ à¦
à¦à§à¦·à¦®"
Modified: trunk/libzypp/po/bs.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bs.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/bs.po (original)
+++ trunk/libzypp/po/bs.po Mon Sep 3 13:56:27 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2002-07-23 18:27+0200\n"
"Last-Translator: Damir Bjelobradic \n"
"Language-Team: Bosnian \n"
@@ -18,77 +18,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3066,25 +3066,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3092,38 +3092,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3131,7 +3131,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3140,14 +3140,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3155,31 +3155,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3187,68 +3187,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instaliram driver..."
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3256,8 +3256,8 @@
msgstr "Izbrii"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3265,118 +3265,130 @@
msgstr "Instaliram driver..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3387,7 +3399,7 @@
msgstr "Instaliram driver..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3639,9 +3651,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3652,7 +3670,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3664,7 +3682,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3676,7 +3694,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3687,7 +3705,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3698,24 +3716,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Greška"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3775,7 +3793,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/ca.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ca.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/ca.po (original)
+++ trunk/libzypp/po/ca.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-02-26 19:15+0100\n"
"Last-Translator: Olga López\n"
"Language-Team: Catalan\n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "L'esquema de l'URL no permet un %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "El component de %s '%s' no és và lid"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Component de %s no và lid"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "No s'admet l'anà lisi de parà metres de camà per a aquesta URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "No s'admet l'anà lisi de cadenes de consulta per a aquesta URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "L'esquema de l'URL és un component necessari"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "L'esquema de l'URL '%s' no és và lid"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "L'esquema de l'URL no permet un nom d'usuari"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "L'esquema de l'URL no permet una contrasenya"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "L'esquema de l'URL requereix un component d'ordinador central"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "L'esquema de l'URL no permet un component d'ordinador central"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "El component de l'ordinador central '%s' no és và lid"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "L'esquema de l'URL no permet un port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "El component de port '%s' no és và lid"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "L'esquema de l'URL requereix un nom de camÃ"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "No es permet un camà relatiu si existeix una autoritat"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "No s'admet l'anà lisi de parà metres de camà per a aquesta URL"
@@ -2877,7 +2877,7 @@
msgstr "%s ha estat reemplaçat per %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2885,19 +2885,19 @@
"Aquests Ãtems amb dependències es suprimiran del sistema."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2905,38 +2905,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "La informació no és và lida"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2946,7 +2946,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s entra en conflicte amb altres Ãtems amb dependències"
@@ -2955,14 +2955,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2972,24 +2972,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s desactualitza %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s desactualitza:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2998,7 +2998,7 @@
"Aquests Ãtems amb dependències es suprimiran del sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depèn d'altres Ãtems amb dependències"
@@ -3006,38 +3006,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s depèn de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Fill de"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "No es pot instal·lar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "No es proporciona %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -3046,32 +3046,32 @@
"\n"
"No hi ha cap recurs disponible que admeti aquest requisit."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, 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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3079,8 +3079,8 @@
msgstr "suprimeix %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3088,119 +3088,131 @@
msgstr "no instal·lis %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignora aquest requisit només en aquest cas"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Ignora aquest requisit només en aquest cas"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Instal·la %s, encara que canviï l'arquitectura"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s proporciona aquesta dependència però canviaria l'arquitectura de l'element instal·lat"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Instal·la %s, encara que canviï l'arquitectura"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s proporciona aquesta dependència però canviaria l'arquitectura de l'element instal·lat"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignora aquest conflicte de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignora l'obsolet %s a %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignora que %s ja s'ha definit per a instal·lar-se"
@@ -3211,7 +3223,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "per a requerir %s per a %s en actualitzar %s"
@@ -3462,8 +3474,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s proporciona %s, però té una altra arquitectura."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s proporciona %s, però té una altra arquitectura."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "No es pot satisfer el requisit %s per a %s"
@@ -3475,7 +3493,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "Un altre Ãtem amb dependències instal·lat necessita %s, de manera que no es desenllaçarà ."
@@ -3487,7 +3505,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "Un altre Ãtem amb dependències instal·lat necessita %s, de manera que no es desenllaçarà ."
@@ -3499,7 +3517,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s està bloquejat i no es pot desinstal·lar."
@@ -3510,7 +3528,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Per causa d'un conflicte relacionat amb %s (%s), cal suprimir el %s que s'ha d'instal·lar"
@@ -3521,23 +3539,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "A causa de conflictes relacionats amb %s, es marcarà %s com a no instal·lable"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "de %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Error"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Important"
@@ -3595,9 +3613,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s requereix %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -5172,6 +5190,10 @@
"S'esperava %s, i s'ha trobat %s\n"
"Voleu utilitzar aquest fitxer de tota manera?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s requereix %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "No es pot analitzar l'autoritat de l'URL"
Modified: trunk/libzypp/po/cs.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/cs.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/cs.po (original)
+++ trunk/libzypp/po/cs.po Mon Sep 3 13:56:27 2007
@@ -1,4 +1,4 @@
-# translation of zypp.po to cs_CZ
+# translation of zypp.po to
# Czech message file for YaST2 (@memory@).
# Copyright (C) 2005 SUSE Linux Products GmbH.
# Copyright (C) 2002 SuSE Linux AG.
@@ -6,91 +6,92 @@
#
# Petr Pavlik , 1999, 2000, 2001.
# Klara Cihlarova , 2006.
+# Jakub Hegenbart , 2007.
msgid ""
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2006-06-07 12:21+0200\n"
-"Last-Translator: Novell Language \n"
-"Language-Team: Novell Language \n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 18:25+0200\n"
+"Last-Translator: Jakub Hegenbart \n"
+"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Schéma URL nepovoluje %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Neplatná %s souÄást %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Neplatná %s souÄást"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Pro toto URL nenà podporována analýza parametru cesty."
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Pro toto URL nenà podporována analýza ÅetÄzce dotazu."
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "URL schéma je vyžadovanou souÄástÃ"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Neplatné schéma URL %s"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Schéma URL nepovoluje uživatelské jméno."
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Schéma URL nepovoluje heslo."
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Schéma URL vyžaduje souÄást hostitele."
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Schéma URL nepovoluje souÄást hostitele."
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Neplatná souÄást hostitele %s"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Schéma URL nepovoluje port."
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Neplatná souÄást portu %s"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Schéma URL vyžaduje název cesty."
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relativnà cesta nenà povolena, pokud existuje autorita"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Pro toto URL nenà podporována analýza parametru cesty."
@@ -112,9 +113,8 @@
#. TranslatorExplanation followed by the list of error messages that lead to this exception
#: ../zypp/base/Exception.cc:89
-#, fuzzy
msgid "History:"
-msgstr "XF86History"
+msgstr "Historie:"
#: ../zypp/repo/PackageProvider.cc:222
msgid "applydeltarpm check failed."
@@ -126,30 +126,29 @@
#. TranslatorExplanation %s = package being checked for integrity
#: ../zypp/repo/PackageProvider.cc:303
-#, fuzzy, c-format
+#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
-msgstr "Kontrola integrity balÃÄku %s se nezdaÅila. Chcete jej stáhnout znovu?"
+msgstr "Kontrola integrity balÃÄku %s se nezdaÅila. Chcete pokus opakovat?"
#: ../zypp/repo/RepoProvideFile.cc:205
-#, fuzzy
msgid "No url in repository."
-msgstr "Soubor '%1' nebyl nalezen v repozitáÅi."
+msgstr "Adresa URL nebyla nalezena v repozitáÅi."
#. iteration over urls
#: ../zypp/repo/RepoProvideFile.cc:267
-#, fuzzy, c-format
+#, c-format
msgid "Can't provide file %s from repository %s"
-msgstr "Nelze poskytnout %s ze %s"
+msgstr "Nelze poskytnout soubor %s z repozitáÅe %s"
#: ../zypp/repo/cached/RepoImpl.cc:78
#, c-format
msgid "Reading '%s' repository cache"
-msgstr ""
+msgstr "NaÄÃtá se vyrovnávacà pamÄÅ¥ repozitáÅe '%s'"
#: ../zypp/repo/cached/RepoImpl.cc:199
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
-msgstr ""
+msgstr "NaÄÃtajà se balÃÄky oprav RPM a delta RPM z vyrovnávacà pamÄti repozitáÅe '%s'"
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
@@ -168,32 +167,32 @@
#: ../zypp/RepoManager.cc:115
#, c-format
msgid "Cleaning repository '%s' cache"
-msgstr ""
+msgstr "ProbÃhá ÄistÄnà vyrovnávacà pamÄti repozitáÅe '%s'."
#: ../zypp/RepoManager.cc:614
msgid "Valid metadata not found at specified URL(s)"
-msgstr ""
+msgstr "Na zadané adrese nebo adresách URL nebyla nalezena platná metadata"
#: ../zypp/RepoManager.cc:664
#, c-format
msgid "Building repository '%s' cache"
-msgstr ""
+msgstr "VytváÅà se vyrovnávacà pamÄÅ¥ repozitáÅe '%s'"
#. progress.sendTo( progressrcv );
#: ../zypp/RepoManager.cc:809
#, c-format
msgid "Reading repository '%s' cache"
-msgstr ""
+msgstr "NaÄÃtá se vyrovnávacà pamÄÅ¥ repozitáÅe '%s'"
#: ../zypp/RepoManager.cc:899
-#, fuzzy, c-format
+#, c-format
msgid "Adding repository '%s'"
-msgstr "Vkládánà zdrojů"
+msgstr "PÅidává se repozitáŠ'%s'"
#: ../zypp/RepoManager.cc:1004
-#, fuzzy, c-format
+#, c-format
msgid "Removing repository '%s'"
-msgstr "Vkládánà zdrojů"
+msgstr "OdebÃrá se repozitáŠ'%s'"
#: ../zypp/Url.cc:112
msgid "Invalid LDAP URL query string"
@@ -314,7 +313,7 @@
#. language code: ang
#: ../zypp/LanguageCode.cc:274
msgid "English, Old (ca.450-1100)"
-msgstr "AngliÄtina, stará (cca 450-1100)"
+msgstr "AngliÄtina, stará (cca. 450-1100)"
#. language code: apa
#: ../zypp/LanguageCode.cc:276
@@ -711,7 +710,7 @@
#. language code: crh
#: ../zypp/LanguageCode.cc:438
msgid "Crimean Tatar"
-msgstr "Crimean Tatar"
+msgstr "Krymská tatarština"
#. language code: crp
#: ../zypp/LanguageCode.cc:440
@@ -837,7 +836,7 @@
#. language code: elx
#: ../zypp/LanguageCode.cc:492
msgid "Elamite"
-msgstr "Elamite"
+msgstr "Elamština"
#. language code: eng en
#: ../zypp/LanguageCode.cc:494
@@ -1048,7 +1047,7 @@
#. language code: guj gu
#: ../zypp/LanguageCode.cc:584
msgid "Gujarati"
-msgstr "Gudžarádština"
+msgstr "Gudžarátština"
#. language code: gwi
#: ../zypp/LanguageCode.cc:586
@@ -1094,7 +1093,7 @@
#. language code: him
#: ../zypp/LanguageCode.cc:602
msgid "Himachali"
-msgstr "Himachali"
+msgstr "HimáÄalÃ"
#. language code: hin hi
#: ../zypp/LanguageCode.cc:604
@@ -1105,7 +1104,7 @@
#. language code: hit
#: ../zypp/LanguageCode.cc:606
msgid "Hittite"
-msgstr "Hittite"
+msgstr "Chetitština"
#. language code: hmn
#: ../zypp/LanguageCode.cc:608
@@ -1148,7 +1147,7 @@
#. language code: ice isl is
#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624
msgid "Icelandic"
-msgstr "Islandské"
+msgstr "Islandština"
#. language code: ido io
#: ../zypp/LanguageCode.cc:626
@@ -1223,7 +1222,7 @@
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
-msgstr "Italské"
+msgstr "Italština"
#. language code: jav jv
#: ../zypp/LanguageCode.cc:656
@@ -1238,7 +1237,7 @@
#. language code: jpn ja
#: ../zypp/LanguageCode.cc:660
msgid "Japanese"
-msgstr "Japonské"
+msgstr "Japonština"
#. language code: jpr
#: ../zypp/LanguageCode.cc:662
@@ -1909,7 +1908,7 @@
#. language code: oto
#: ../zypp/LanguageCode.cc:920
msgid "Otomian Languages"
-msgstr "Otomianské jazyky"
+msgstr "Osmanské jazyky"
#. language code: paa
#: ../zypp/LanguageCode.cc:922
@@ -2665,7 +2664,7 @@
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
-msgstr ""
+msgstr "Chybà vyžadovaný soubor: "
#: ../zypp/target/hal/HalContext.cc:96
msgid "HalContext not connected"
@@ -2713,9 +2712,9 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1913
-#, fuzzy, c-format
+#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
-msgstr "rpm uložil %s jako %s, ale nebylo možné zjistit rozdÃl"
+msgstr "Program rpm uložil %s jako %s, ale nebylo možné zjistit rozdÃl"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1915
@@ -2724,14 +2723,14 @@
"rpm saved %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""
-"rpm uložil %s jako %s.\n"
+"Program rpm uložil %s jako %s.\n"
"PrvnÃch 25 Åádek rozdÃlů:\n"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1918
-#, fuzzy, c-format
+#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
-msgstr "rpm vytvoÅil %s jako %s, ale nebylo možné zjistit rozdÃly"
+msgstr "Program rpm vytvoÅil %s jako %s, ale nebylo možné zjistit rozdÃl"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1920
@@ -2740,7 +2739,7 @@
"rpm created %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""
-"rpm vytvoÅil %s jako %s.\n"
+"Program rpm vytvoÅil %s jako %s.\n"
"PrvnÃch odliÅ¡ných 25 Åádek:\n"
#. %s = filename of rpm package
@@ -2752,7 +2751,7 @@
#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
msgid "rpm output:"
-msgstr "rpm výstup:"
+msgstr "Výstup programu rpm:"
#
#. %s = filename of rpm package
@@ -2764,14 +2763,14 @@
#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
msgid "Additional rpm output:"
-msgstr "Dalšà rpm výstup:"
+msgstr "Dalšà výstup programu rpm:"
#. %s = name of rpm package
#. timestamp
#: ../zypp/target/rpm/RpmDb.cc:2044
#, c-format
msgid "%s remove failed"
-msgstr "OdstranÄné %s selhalo"
+msgstr "OdstranÄnà %s se nezdaÅilo"
#. timestamp
#: ../zypp/target/rpm/RpmDb.cc:2050
@@ -2803,66 +2802,64 @@
msgstr "%s nahrazen %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:262
+#, c-format
msgid "%s will be deleted by the user.\n"
-msgstr ""
-"\n"
-"Tyto balÃÄky budou smazány."
+msgstr "%s bude odstranÄn uživatelem.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
-msgstr ""
+msgstr "%s bude odstranÄn jinou aplikacÃ. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:273
+#, c-format
msgid "%s will be installed by the user.\n"
-msgstr "%s nebude odinstalován, protože je stále vyžadován"
+msgstr "%s bude nainstalován uživatelem.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
-msgstr ""
+msgstr "%s bude nainstalován jinou aplikacÃ. (ApplLow/ApplHigh)\n"
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
-msgstr ""
+msgstr "Nebylo nalezeno žádné platné ÅeÅ¡enà se závislostmi pouze nejlepÅ¡Ã architektury."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
-msgstr ""
+msgstr "PÅi této operaci byly vzaty v úvahu pouze závislosti s nejlepÅ¡Ã architekturou.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
-msgstr ""
+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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Chybná informace"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2872,7 +2869,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s koliduje"
@@ -2881,14 +2878,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2898,24 +2895,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, 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:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s je novÄjÅ¡Ã než: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2924,7 +2921,7 @@
"Tyto balÃÄky budou smazány."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s závislà na jiných balÃÄcÃch"
@@ -2932,72 +2929,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s závisà na: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Potomek"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Nelze nainstalovat %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Žádný balÃÄek neposkytuje %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
"\n"
-"Požadavky nelze uspokojit z žádného zdroje."
+"Požadavky nelze uspokojit z žádného dostupného zdroje."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
-msgstr "Kvůli problémům nÞe toto ÅeÅ¡enà nevyÅeÅ¡Ã vÅ¡echny problémy se závislostmi"
+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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
+#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
-msgstr "Nelze nainstalovat %s, protože koliduje s %s"
+msgstr "Nelze nainstalovat %s, protože způsobuje konflikt s %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3005,8 +3000,8 @@
msgstr "smazat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3014,139 +3009,149 @@
msgstr "neinstalovat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:714
+#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
-msgstr "%s bude kvůli závislosti s %s oddinstalován"
+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:701
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:724
+#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
-msgstr "%s splÅuje závislosti %s, ale zůstane ponechán v systému."
+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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:742
+#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
+#, 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:803
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:826
+#, 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 smazat, protože je uzamÄený."
+msgstr "%s je novÄjÅ¡Ã než %s, ale %s nelze odstranit, protože je uzamÄený."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:858
+#, c-format
msgid "Cannot install %s, because it is conflicting"
-msgstr "Nelze nainstalovat %s, protože koliduje"
+msgstr "Nelze nainstalovat %s, protože způsobuje konflikt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
-msgstr ""
+msgstr "Požadavek %s nelze splnit."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorovat požadavky pouze nynÃ"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
-#, fuzzy
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
-msgstr "Ignorovat požadavky pouze nynÃ"
+msgstr "ObecnÄ ignorovat tento požadavek"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Instalovat %s i pÅes zmÄnu architektury"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
+#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
-msgstr "%s obsahuje závislosti, ale zmÄnà architekturu nainstalované položky"
+msgstr "%s poskytuje tuto závislost, ale zmÄnà architekturu nainstalované položky"
+
+#. 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 "Instalovat %s i pÅes zmÄnu dodavatele"
+
+#. 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 poskytuje tuto závislost, ale zmÄnà dodavatele nainstalované položky"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorovat konflikt %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorovat zastaralé %s v %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorovat nastavenà %s k instalaci"
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
msgid "Do not install or delete the resolvables concerned"
-msgstr "Neinstalovat nebo nemazat závisejÃcà balÃÄky"
+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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "vyžadujÃcà %s pro %s pÅi aktualizaci %s"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency
#: ../zypp/solver/detail/ResolverInfoMissingReq.cc:64
-#, fuzzy, c-format
+#, c-format
msgid "%s is lacking the requirement %s"
-msgstr "%s nesplÅuje požadavky %s"
+msgstr "Pro %s nenà splnÄn požadavek %s"
#: ../zypp/solver/detail/ResolverInfoMisc.cc:56
msgid ", Action: "
@@ -3221,16 +3226,16 @@
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
-#, fuzzy, c-format
+#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
-msgstr "%s Äeká na instalaci, ale nelze ho nainstalovat kvůli problémům se závislostmi."
+msgstr "%s Äeká na instalaci, ale instalaci nelze provést kvůli problémům se závislostmi."
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:167
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s since it is already marked as needed to be uninstalled"
-msgstr "Nelze nainstalovat %s, je již oznaÄen k odinstalovánÃ"
+msgstr "Nelze nainstalovat %s, je již oznaÄen jako urÄený k odinstalovánÃ"
#. Translator: %s = name of patch
#. TranslatorExplanation: A patch which is not needed (does not apply) cant be installed
@@ -3239,9 +3244,9 @@
#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed
#. TranslatorExplanation: package is not installed.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:179
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because it does not apply to this system."
-msgstr "Nelze nainstalovat %s, protože nelze aplikovat na systém."
+msgstr "Nelze nainstalovat %s, protože ho nelze použÃt pro tento systém."
#. affected() = item 1 which has to be installed
#. _capability =
@@ -3249,9 +3254,9 @@
#. other_capability() =
#. Translator: %s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoMisc.cc:190
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because %s is already marked as needed to for installation"
-msgstr "Nelze nainstalovat %s, protože %s již oznaÄen jako potÅebný k instalaci"
+msgstr "Nelze nainstalovat %s, protože %s je již oznaÄen jako potÅebný k instalaci"
#. Translator: %s = name of patch,product
#: ../zypp/solver/detail/ResolverInfoMisc.cc:198
@@ -3317,9 +3322,9 @@
#. TranslatorExplanation: removal of this resolvable would therefore break dependency
#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled
#: ../zypp/solver/detail/ResolverInfoMisc.cc:292
-#, fuzzy, c-format
+#, c-format
msgid "There are no alternative providers of %s installed"
-msgstr "Nenà žádný alternativnà zdroj %s"
+msgstr "Neexistuje žádný alternativnà poskytovatel nainstalované závislosti %s"
#. Translator: 1.%s = name of package,patch....
#. TranslatorExample: for bar
@@ -3348,9 +3353,9 @@
#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible
#. TranslatorExplanation: bar requires something from foo
#: ../zypp/solver/detail/ResolverInfoMisc.cc:341
-#, fuzzy, c-format
+#, c-format
msgid "Upgrading to %s to avoid removing %s is not possible."
-msgstr "Aktualizace %s nenà vzhledem k možnému odstranÄnà %s možná."
+msgstr "Aktualizaci %s s cÃlem vyhnout se odinstalovánà %s nelze provést."
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:359
@@ -3388,9 +3393,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s poskytuje %s, ale je urÄen pro jinou architekturu."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 poskytuje %s, poskytuje ho však jiný dodavatel (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Nelze splnit požadavky %s pro %s"
@@ -3401,10 +3412,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
+#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
-msgstr "%s je požadován jinými nainstalovanými závislostmi a nelze odlinkovat."
+msgstr "%s je požadován jinou závislostà urÄenou k instalaci, proto na nÄj nebude zruÅ¡en odkaz."
#. affected() = provider of cap
#. _capability =
@@ -3413,10 +3424,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
+#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
-msgstr "%s je požadován jinými nainstalovanými závislostmi a nelze odlinkovat."
+msgstr "%s je požadován jinou nainstalovanou závislostÃ, proto na nÄj nebude zruÅ¡en odkaz."
#. affected() = to-be-uninstalled resolvable which is locked
#. _capability =
@@ -3425,7 +3436,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s je uzamÄen a nelze odinstalovat."
@@ -3436,10 +3447,10 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
-msgstr "Konflikt s %s (%s) vyžaduje odstranÄnà instalovaného %s"
+msgstr "Konflikt s %s (%s) vyžaduje odstranÄnà závislosti %s, která Äeká na instalaci"
#. affected() = provider of capability
#. _capability = provided by provider
@@ -3447,23 +3458,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s oznaÄen jako neinstalovatelný kvůli konfliktu s %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "z %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Chyba!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Důležité!"
@@ -3491,11 +3502,11 @@
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
msgid "Make a solver run with ALL possibilities."
-msgstr ""
+msgstr "Spustà ÅeÅ¡itel se zváženÃm VÅ ECH možnostÃ"
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
msgid "Regarding all resolvables with a compatible architecture."
-msgstr ""
+msgstr "V úvahu jsou brány všechny závislosti s kompatibilnà architekturou."
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
@@ -3506,23 +3517,23 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:60
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:110
-#, fuzzy, c-format
+#, c-format
msgid "%s is recommended by %s"
-msgstr "%s je požadován pro %s"
+msgstr "%s je doporuÄen závislostà %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:66
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:116
-#, fuzzy, c-format
+#, c-format
msgid "%s is suggested by %s"
-msgstr "%s je požadován pro %s"
+msgstr "%s je navrhován závislostà %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s je požadován pro %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -3605,7 +3616,7 @@
#. :AFG:004:
#: ../zypp/CountryCode.cc:220
msgid "Antigua and Barbuda"
-msgstr "Antigua and Barbuda"
+msgstr "Antigua a Barbuda"
# AI
#. :ATG:028:
@@ -3628,7 +3639,7 @@
#. :ARM:051:
#: ../zypp/CountryCode.cc:224
msgid "Netherlands Antilles"
-msgstr "Netherlands Antilles"
+msgstr "Nizozemské Antily"
# AO
#. :ANT:530:
@@ -3640,7 +3651,7 @@
#. :AGO:024:
#: ../zypp/CountryCode.cc:226
msgid "Antarctica"
-msgstr "Antarctica"
+msgstr "Antarktida"
#. :ATA:010:
#: ../zypp/CountryCode.cc:227
@@ -3651,7 +3662,7 @@
#. :ARG:032:
#: ../zypp/CountryCode.cc:228
msgid "American Samoa"
-msgstr "American Samoa"
+msgstr "Americká Samoa"
#. :ASM:016:
#: ../zypp/CountryCode.cc:229
@@ -3954,7 +3965,7 @@
#. :ESP:724:
#: ../zypp/CountryCode.cc:284
msgid "Ethiopia"
-msgstr "Ethiopia"
+msgstr "Etiopie"
#. :ETH:231:
#: ../zypp/CountryCode.cc:285
@@ -3970,7 +3981,7 @@
#. :FJI:242:
#: ../zypp/CountryCode.cc:287
msgid "Falkland Islands (Malvinas)"
-msgstr "Falkland Islands (Malvinas)"
+msgstr "Falklandské ostrovy (MalvÃny)"
#. :FLK:238:
#: ../zypp/CountryCode.cc:288
@@ -4057,7 +4068,7 @@
#. :GLP:312:
#: ../zypp/CountryCode.cc:303
msgid "Equatorial Guinea"
-msgstr "Equatorial Guinea"
+msgstr "RovnÃková Guinea"
#. :GNQ:226:
#: ../zypp/CountryCode.cc:304
@@ -4600,7 +4611,7 @@
#. :ROU:642:
#: ../zypp/CountryCode.cc:401
msgid "Russian Federation"
-msgstr "Russian Federation"
+msgstr "Ruská Federace"
# RW
#. :RUS:643:
@@ -4697,7 +4708,7 @@
#. :SUR:740:
#: ../zypp/CountryCode.cc:418
msgid "Sao Tome and Principe"
-msgstr "Sao Tome and Principe"
+msgstr "Svatý Tomáš a Princův ostrov"
#. :STP:678:
#: ../zypp/CountryCode.cc:419
@@ -4709,7 +4720,7 @@
#. :SLV:222:
#: ../zypp/CountryCode.cc:420
msgid "Syria"
-msgstr "Suriname"
+msgstr "Sýrie"
# SZ
#. :SYR:760:
@@ -4985,85 +4996,3 @@
"OÄekáváno %s, nalezeno %s\n"
"Chcete soubor pÅesto použÃt?"
-#~ msgid "Unable to parse Url authority"
-#~ msgstr "Nelze analyzovat autoritu URL."
-
-#~ msgid "Ignore this requirement generally"
-#~ msgstr "Ignorovat požadavky"
-
-#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
-#~ msgstr "%s je požadován jinými instalovanými závislostmi a nelze odlinkovat."
-
-# 53583 AttribValues/description
-#~ msgid "Cannot create a file needed to perform update installation."
-#~ msgstr "Nelze vytvoÅit soubor potÅebný k provedenà instalace aktualizace."
-
-#~ msgid "Unable to restore all sources."
-#~ msgstr "Nelze obnovit všechny zdroje."
-
-#~ msgid "At least one source already registered, stored sources cannot be restored."
-#~ msgstr "Již je registrován nejménÄ jeden zdroj, uložené zdroje nelze obnovit."
-
-#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
-#~ msgstr "Nelze nainstalovat %s ke splnÄnà závislostà %s"
-
-#~ msgid "%s dependend on %s"
-#~ msgstr "%s závisà na %s"
-
-# 27557 AttribValues/label
-#~ msgid "Reading index files"
-#~ msgstr "Ätou se soubory indexu"
-
-#~ msgid "The signed repomd.xml file failed the signature check."
-#~ msgstr "NezdaÅila se kontrola podpisu podepsaného souboru repomd.xml."
-
-#~ msgid "Reading product from %s"
-#~ msgstr "Äte se produkt z %s"
-
-#~ msgid "Reading filelist from %s"
-#~ msgstr "Äte se seznam souborů z %s"
-
-#~ msgid "Reading packages from %s"
-#~ msgstr "Ätou se balÃky z %s"
-
-#~ msgid "Reading selection from %s"
-#~ msgstr "Äte se výbÄr z %s."
-
-#~ msgid "Reading pattern from %s"
-#~ msgstr "Äte se profil z %s."
-
-# 27557 AttribValues/label
-#~ msgid "Reading patches index %s"
-#~ msgstr "Äte se index oprav %s"
-
-#~ msgid "Reading patch %s"
-#~ msgstr "Äte se oprava %s"
-
-#~ msgid "The script file failed the checksum test."
-#~ msgstr "Kontrolnà souÄet souboru skriptu je chybný."
-
-#~ msgid "Reading packages file"
-#~ msgstr "Äte se soubor balÃku"
-
-# 33390 AttribValues/label
-#~ msgid "Reading translation: %s"
-#~ msgstr "Äte se pÅeklad: %s"
-
-#, fuzzy
-#~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?"
-#~ msgstr "Kontrola integrity balÃÄku %s se nezdaÅila. Chcete jej stáhnout znovu nebo zruÅ¡it instalaci?"
-
-#~ msgid " miss checksum."
-#~ msgstr " chybÄjÃcà kontrolnà souÄet."
-
-#~ msgid " fails checksum verification."
-#~ msgstr " selhala kontrola kontrolnÃho souÄtu."
-
-#~ msgid "Downloading %s"
-#~ msgstr "Stahuje se %s"
-
-#~ msgid "Downloaded %s from %s"
-#~ msgstr "Staženo %s z %s"
-
-#~ msgid "%s needed by %s"
-#~ msgstr "%s je vyžadován %s"
Modified: trunk/libzypp/po/cy.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/cy.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/cy.po (original)
+++ trunk/libzypp/po/cy.po Mon Sep 3 13:56:27 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2003-09-23 10:33+0200\n"
"Last-Translator: Kevin Donnelly \n"
"Language-Team: Welsh \n"
@@ -16,77 +16,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=5; plural=(n == 0 ? 0 : n == 1 ? 1 : n < 6 ? 2 : n == 6 ? 3 : 4);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2949,25 +2949,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2975,38 +2975,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3014,7 +3014,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3023,14 +3023,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3038,31 +3038,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3070,68 +3070,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Arsefydlu %s: \"%s\""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3139,8 +3139,8 @@
msgstr "&Dileu"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3148,118 +3148,130 @@
msgstr "Arsefydlu %s: \"%s\""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3270,7 +3282,7 @@
msgstr "Gosod gyrrydd..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3522,9 +3534,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3535,7 +3553,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3547,7 +3565,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3559,7 +3577,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Rhaid arsefydlu'r pecynnau yma:"
@@ -3570,7 +3588,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3581,24 +3599,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Gwall"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3658,7 +3676,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/da.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/da.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/da.po (original)
+++ trunk/libzypp/po/da.po Mon Sep 3 13:56:27 2007
@@ -11,8 +11,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 16:41+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 15:16+0200\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,77 +21,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "URL-oversigt tillader ikke %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ugyldig %s-komponent '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ugyldig %s-komponent"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Fortolkning af stiparameter er ikke understøttet af denne URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Fortolkning af forespørgselsstreng er ikke understøttet af denne URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url-oversigt er en påkrævet komponent"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ugyldig URL-oversigt '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "URL-oversigt tillader ikke et brugernavn"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "URL-oversigt tillader ikke en adgangskode"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "URL-oversigt kræver en værtskomponent"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "URL-oversigt tillader ikke en værtskomponent"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ugyldig værtskomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "URL-oversigt tillader ikke en port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ugyldig portkomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "URL-oversigt kræver et stinavn"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relativ sti er ikke tilladt hvis autoritet eksisterer"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Fortolkning af stiparameter er ikke understøttet af denne URL"
@@ -2812,25 +2812,25 @@
msgstr "%s erstattet af %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, 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"
@@ -2838,38 +2838,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
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:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
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:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ugyldig information"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2879,7 +2879,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s konflikter med andre ændringer"
@@ -2888,14 +2888,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2905,24 +2905,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s forælder %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s forælder %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2931,7 +2931,7 @@
"Disse resolvables vil blive slettet fra systemet."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s afhænger af andre resolvables"
@@ -2939,38 +2939,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s afhænger af %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Barn af"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s kan ikke installeres"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Ingen tilbyder %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2978,31 +2978,31 @@
"\n"
"Der er ingen tilgængelige ressourcer, der understøtter dette krav."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3010,8 +3010,8 @@
msgstr "slet %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3019,120 +3019,132 @@
msgstr "installér ikke %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Kravet %s kan ikke opfyldes."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorér dette krav her"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Ignorér dette krav generelt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installér %s selvom det ændrer arkitekturen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s giver denne afhængighed, men ændrer arkitekturen i det installerede element"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Installér %s selvom det ændrer 'leverandør'"
+
+#. 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 giver denne afhængighed, men ændrer 'leverandør' for det installerede element"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorer denne konflikt med %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorér forældede %s i %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorér, at %s allerede er angivet til installation"
@@ -3142,7 +3154,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "for at kræve %s til %s når du opgraderer %s"
@@ -3394,9 +3406,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s tilbyder %s, men har en anden arkitektur."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 tilbyder %s, men har en anden 'leverandør' (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Kan ikke tilfredsstille kravet %s for %s"
@@ -3407,7 +3425,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s er krævet af anden installeret resolvable, så den bliver ikke linket fra."
@@ -3419,7 +3437,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s er krævet af anden installeret resolvable, så den bliver ikke linket fra."
@@ -3431,7 +3449,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s er låst og kan ikke afinstalleres."
@@ -3442,7 +3460,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "En konflikt over %s (%s) kræver at %s, der er sat til installering, bliver fjernet."
@@ -3453,23 +3471,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Markerer %s som ikke-installerbar grundet konflikter over %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "fra %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Fejl!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Vigtigt!"
@@ -3529,8 +3547,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s opfriskes af %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s vil blive evalueret til installation (genopfrisket) af %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/de.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/de.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/de.po (original)
+++ trunk/libzypp/po/de.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2005-03-09 13:54+0100\n"
"Last-Translator: Novell Language \n"
"Language-Team: Novell Language \n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "%s laut URL-Schema nicht zulässig"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Unzulässige %s-Komponente: '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Unzulässige %s-Komponente"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Die Analyse von Pfadparametern wird für diese URL nicht unterstützt"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Die Analyse von Abfragezeichenketten wird für diese URL nicht unterstützt"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Das URL-Schema ist eine erforderliche Komponente"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "'%s' ist ein unzulässiges URL-Schema"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Benutzername laut URL-Schema nicht zulässig"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Passwort laut URL-Schema nicht zulässig"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Für das URL-Schema ist eine Host-Komponente erforderlich"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Host-Komponente laut URL-Schema nicht zulässig"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Unzulässige Host-Komponente: '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Port laut URL-Schema nicht zulässig"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Unzulässige Portkomponente: '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Für das URL-Schema ist ein Pfadname erforderlich"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Die Angabe des relativen Pfads ist nicht erlaubt, wenn die Zertifizierungsstelle vorhanden ist"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Die Analyse von Pfadparametern wird für diese URL nicht unterstützt"
@@ -2732,25 +2732,25 @@
msgstr "%s ersetzt durch %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s wird durch ein andere Programm installiert.\n"
@@ -2758,41 +2758,41 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
#, 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:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
#, 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:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
#, 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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ungültige Informationen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2802,7 +2802,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s steht in Konflikt mit anderen auflösbaren Objekten"
@@ -2811,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2828,24 +2828,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s ersetzt %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s ersetzt:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2854,7 +2854,7 @@
"Diese auflösbaren Objekte werden aus dem System gelöscht."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s hängt von anderen auflösbaren Objekten ab"
@@ -2862,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, 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:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Untergeordnetes Element von"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Installation von %s nicht möglich"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Kein Objekt stellt %s bereit."
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2902,32 +2902,32 @@
"\n"
"Es ist keine Ressource verfügbar, die diese Anforderung unterstützt."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, 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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2935,8 +2935,8 @@
msgstr "%s löschen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2944,119 +2944,131 @@
msgstr "%s nicht installieren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Anforderung wird hier ignoriert"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Anforderung wird hier ignoriert"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s installieren, auch wenn sich die Architektur dadurch ändert"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s stellt diese Abhängigkeit zur Verfügung, ändert aber die Architektur des installierten Elements"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "%s installieren, auch wenn sich die Architektur dadurch ändert"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s stellt diese Abhängigkeit zur Verfügung, ändert aber die Architektur des installierten Elements"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Diesen Konflikt von %s ignorieren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Veraltete %s in %s ignorieren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorieren, dass %s bereits für die Installation festgelegt wurde"
@@ -3067,7 +3079,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, 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"
@@ -3318,8 +3330,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s stellt %s zur Verfügung, hat aber eine andere Architektur"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s stellt %s zur Verfügung, hat aber eine andere Architektur"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Anforderung %s für %s kann nicht erfüllt werden"
@@ -3331,7 +3349,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s wird von anderem installierten auflösbaren Objekt benötigt. Demzufolge wird Verbindung nicht aufgehoben."
@@ -3343,7 +3361,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s wird von anderem installierten auflösbaren Objekt benötigt. Demzufolge wird Verbindung nicht aufgehoben."
@@ -3355,7 +3373,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s ist gesperrt und kann nicht deinstalliert werden."
@@ -3366,7 +3384,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Aufgrund eines Konflikts mit %s (%s) muss das zu installierende %s entfernt werden"
@@ -3377,23 +3395,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s wird aufgrund von Konflikten mit %s als nicht installierbar gekennzeichnet"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "von %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Fehler!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Wichtig!"
@@ -3452,8 +3470,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s wird aufgefrischt von %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4770,6 +4788,9 @@
"Erwartet: %s, gefunden: %s\n"
" Datei trotzdem verwenden?"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s wird aufgefrischt von %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Die Zertifizierungsstelle der URL kann nicht analysiert werden"
Modified: trunk/libzypp/po/el.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/el.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/el.po (original)
+++ trunk/libzypp/po/el.po Mon Sep 3 13:56:27 2007
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: zypp.el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-08-16 18:04+0300\n"
"Last-Translator: Vasileios Giannakopoulos \n"
"Language-Team: Îλληνικά\n"
@@ -21,77 +21,77 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Το Url ÏÏήμα δεν εÏιÏÏÎÏει Îνα %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "ÎανθαÏμÎνο %s ÏÏ
ÏÏαÏÎ¹ÎºÏ '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "ÎανθαÏμÎνο %s ÏÏ
ÏÏαÏικÏ"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "ΠανάλÏ
Ïη ÏαÏαμÎÏÏοÏ
διαδÏÎ¿Î¼Î®Ï Î´ÎµÎ½ Ï
ÏοÏÏηÏίζεÏαι αÏÏ Î±Ï
ÏÏ Ïο URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "ΠανάλÏ
Ïη γÏÎ±Î¼Î¼Î®Ï Î±Î½Î±Î¶Î®ÏηÏÎ·Ï Î´ÎµÎ½ Ï
ÏοÏÏηÏίζεÏαι αÏÏ Î±Ï
ÏÏ Ïο URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Το ÏÏήμα Url είναι Îνα αÏαιÏοÏμενο ÏÏ
ÏÏαÏικÏ"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "ÎανθαÏμÎνο ÏÏήμα Url '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Το ÏÏήμα Url δεν εÏιÏÏÎÏει Ïνομα ÏÏήÏÏη"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Το ÏÏήμα Url δεν εÏιÏÏÎÏει ÏÏ
νθημαÏικÏ"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Το ÏÏήμα Url αÏαιÏεί Îνα ÏÏ
ÏÏαÏÎ¹ÎºÏ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏή"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Το ÏÏήμα Url δεν εÏιÏÏÎÏει Îνα ÏÏ
ÏÏαÏÎ¹ÎºÏ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏή"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "ÎανθαÏμÎνο ÏÏ
ÏÏαÏÎ¹ÎºÏ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏή '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Το ÏÏήμα Url δεν ÏÎ±Ï ÎµÏιÏÏÎÏει μια θÏÏα"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "ÎανθαÏμÎνο ÏÏ
ÏÏαÏÎ¹ÎºÏ Î¸ÏÏÎ±Ï '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Το ÏÏήμα Url αÏαιÏεί Ïνομα διαδÏομήÏ"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "ΣÏεÏική διαδÏομή δεν εÏιÏÏÎÏεÏαι εαν Ï
ÏάÏÏει αÏÏή"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "ΠανάλÏ
Ïη ΠαÏαμÎÏÏοÏ
ÎιαδÏÎ¿Î¼Î®Ï Î´ÎµÎ½ Ï
ÏοÏÏηÏίζεÏαι αÏÏ Î±Ï
ÏÏ Ïο URL"
@@ -2741,7 +2741,7 @@
msgstr "%s ανÏικαÏαÏÏάθηκε αÏÏ %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2749,19 +2749,19 @@
"ÎÏ
Ïά Ïα εÏιλÏÏιμα θα διαγÏαÏοÏν αÏÏ Ïο ÏÏÏÏημα."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2769,41 +2769,41 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
#, fuzzy
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Îεν βÏÎθηκε ÎγκÏ
Ïη λÏÏη με μοναδικά εÏιλÏÏιμα ÏÎ·Ï ÎºÎ±Î»ÏÏεÏÎ·Ï Î±ÏÏιÏεκÏονικήÏ"
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
#, fuzzy
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Îε αÏ
ÏÏ ÎµÎºÏελείÏε μÏνο εÏιλÏÏιμα με Ïην καλÏÏεÏη θεÏÏοÏμενη αÏÏιÏεκÏονική.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
#, fuzzy
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "ÎÏον αÏοÏά Ïλα Ïα Ïιθανά εÏιλÏÏιμα, ÏαίÏνει ÏÏÏνο αλλά μÏοÏεί να Ï
ÏάÏξει ÎγκÏ
Ïο αÏοÏÎλεÏμα."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "ÎανθαÏμÎνη ÏληÏοÏοÏία"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2813,7 +2813,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "Το %s ÏÏ
γκÏοÏεÏαι με άλλα εÏιλÏÏιμα"
@@ -2822,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2839,24 +2839,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "Το %s ÏεÏαλαιÏνει άλλα εÏιλÏÏιμα"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "Το %s ÏεÏαλαιÏνει %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "Το %s ÏεÏαλαιÏνει: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2865,7 +2865,7 @@
"ÎÏ
Ïά Ïα εÏιλÏÏιμα θα διαγÏαÏοÏν αÏÏ Ïο ÏÏÏÏημα."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "Το %s εξαÏÏάÏαι αÏÏ Î¬Î»Î»Î± εÏιλÏÏιμα"
@@ -2873,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "Το %s εξαÏÏάÏαι αÏÏ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Παιδί ÏοÏ
"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "ÎανÎÎ½Î±Ï Î´ÎµÎ½ ÏαÏÎÏει Ïο %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2913,32 +2913,32 @@
"\n"
"Îεν Ï
ÏάÏÏει διαθÎÏÎ¹Î¼Î¿Ï ÏÏÏÎ¿Ï ÏοÏ
να Ï
ÏοÏÏηÏίζει αÏ
Ïή Ïην αÏαίÏηÏη."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ÎξαιÏÎ¯Î±Ï ÏÏοβλημάÏÏν ÏοÏ
ÏεÏιγÏάÏονÏαι ÏαÏαÏάνÏ/ÏαÏακάÏÏ Î±Ï
Ïή η εÏίλÏ
Ïη δεν θα λÏÏει ÏÎ»ÎµÏ ÏÎ¹Ï ÎµÎ¾Î±ÏÏήÏειÏ"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2946,8 +2946,8 @@
msgstr "διαγÏαÏή %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2955,119 +2955,131 @@
msgstr "να μην εγκαÏαÏÏαθεί Ïο %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "Ïο %s ÎÏει μη εκÏληÏÏμÎÎ½ÎµÏ Î±ÏαιÏήÏειÏ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "Ïο %s ÎÏει ελλειÏÎµÎ¯Ï ÎµÎ¾Î±ÏÏήÏειÏ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Îαμια ανάγκη για εγκαÏάÏÏαÏη %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "Το %s είναι μη εγκαÏαÏÏήÏιμο εξαιÏÎ¯Î±Ï ÏÏ
γκÏοÏÏεÏν με Ïο %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ÎγνÏηÏη αÏ
ÏÎ®Ï ÏÎ·Ï Î±ÏαίÏηÏÎ·Ï Î¼Ïνο εδÏ"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ÎγνÏηÏη αÏ
ÏÎ®Ï ÏÎ·Ï Î±ÏαίÏηÏÎ·Ï Î¼Ïνο εδÏ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ÎγκαÏάÏÏαÏη %s ÏαÏÏλο ÏοÏ
θα αλλάξει Ïην αÏÏιÏεκÏονική"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "Το %s ÏαÏÎÏει αÏ
Ïή Ïην εξάÏÏηÏη αλλά θα αλλάξει Ïην αÏÏιÏεκÏονική ÏοÏ
εγκαÏεÏÏημÎνοÏ
ανÏικειμÎνοÏ
"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "Το %s ÏαÏÎÏει αÏ
Ïή Ïην εξάÏÏηÏη αλλά θα αλλάξει Ïην αÏÏιÏεκÏονική ÏοÏ
εγκαÏεÏÏημÎνοÏ
ανÏικειμÎνοÏ
"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "ÎγνÏηÏη αÏ
ÏÎ®Ï ÏÎ·Ï ÏÏγκÏοÏ
ÏÎ·Ï ÏοÏ
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "ÎγνÏηÏη ÏοÏ
ÏεÏαλαιÏμÎνοÏ
%s ÏÏο %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "ÎγνÏηÏη οÏι Ïο %s είναι ήδη ÎÏοιμο για εγκαÏάÏÏαÏη"
@@ -3078,7 +3090,7 @@
msgstr "Îα μην γίνει εγκαÏάÏÏαÏη ή διαγÏαÏή ÏοÏ
αÏοÏά εÏιλÏÏιμα"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "για Ïην αÏαίÏηÏη %s για %s ÏÏαν αναβαθμίζεÏαι Ïο %s"
@@ -3329,8 +3341,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "Το %s ÏαÏÎÏει Ïο %s, αλλά ÎÏει διαÏοÏεÏική αÏÏιÏεκÏονική."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "Το %s ÏαÏÎÏει Ïο %s, αλλά ÎÏει διαÏοÏεÏική αÏÏιÏεκÏονική."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "ÎδÏ
ναμία ικανοÏοίηÏÎ·Ï Î±Î¯ÏηÏÎ·Ï %s για %s"
@@ -3342,7 +3360,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "Το %s αÏαιÏείÏαι αÏÏ Î¬Î»Î»Î¿ εγκαÏεÏÏημÎνο εÏιλÏÏιμο, εÏομÎνÏÏ Î´ÎµÎ½ θα αÏοεÏιλεÏθεί."
@@ -3354,7 +3372,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "Το %s αÏαιÏείÏαι αÏÏ Î¬Î»Î»Î¿ εγκαÏεÏÏημÎνο εÏιλÏÏιμο, εÏομÎνÏÏ Î´ÎµÎ½ θα αÏοεÏιλεÏθεί."
@@ -3366,7 +3384,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Το %s είναι κλειδÏμÎνο και δε μÏοÏεί να αÏεγκαÏαÏÏαθεί."
@@ -3377,7 +3395,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Îια διαμάÏη ÏÏο %s (%s) αÏαιÏεί Ïην αÏαίÏεÏη ÏοÏ
ÏÏÎ¿Ï ÎµÎ³ÎºÎ±ÏάÏÏαÏη %s"
@@ -3388,23 +3406,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "ΣημειÏνονÏÎ±Ï Ïο %s ÏÏ Î¼Î· εγκαÏαÏÏήÏιμο λÏÎ³Ï ÏÏν διαμαÏÏν ÏÏο %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "αÏÏ Ïο %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "ΣÏάλμα!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "ΣημανÏικÏ!"
@@ -3462,9 +3480,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "Το %s ÏÏειάζεÏαι αÏÏ %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4784,6 +4802,10 @@
"ÎναμενÏÏαν %s, βÏÎθηκε %s\n"
"ΧÏήÏη αÏ
ÏÎ¿Ï ÏοÏ
αÏÏείοÏ
ÏαÏ' αÏ
Ïά;"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "Το %s ÏÏειάζεÏαι αÏÏ %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "ÎδÏ
ναμία ανάλÏ
ÏηÏÏ ÏÎ·Ï Î±ÏÏÎ®Ï Url"
Modified: trunk/libzypp/po/en_GB.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/en_GB.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/en_GB.po (original)
+++ trunk/libzypp/po/en_GB.po Mon Sep 3 13:56:27 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-08-19 16:20+0100\n"
"Last-Translator: Benjamin Weber \n"
"Language-Team: \n"
@@ -20,77 +20,77 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url scheme does not allow a %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Invalid %s component '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Invalid %s component"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Path parameter parsing not supported for this URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Query string parsing not supported for this URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url scheme is a required component"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Invalid Url scheme '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url scheme does not allow a username"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url scheme does not allow a password"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url scheme requires a host component"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url scheme does not allow a host component"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Invalid host component '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url scheme does not allow a port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Invalid port component '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url scheme requires path name"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relative path not allowed if authority exists"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Path Parameter parsing not supported for this URL"
@@ -2735,25 +2735,25 @@
msgstr "%s replaced by %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s will be installed by another application. (ApplLow/ApplHigh)\n"
@@ -2761,38 +2761,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
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:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
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:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Invalid information"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2802,7 +2802,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s conflicts with other resolvables"
@@ -2811,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2828,24 +2828,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s obsoletes %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s obsoletes:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2854,7 +2854,7 @@
"These resolvables will be deleted from the system."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depends on other resolvables"
@@ -2862,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s depends on:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Child of"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Cannot install %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "None provides %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2901,31 +2901,31 @@
"\n"
"There is no resource available which supports this requirement."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2933,8 +2933,8 @@
msgstr "delete %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2942,118 +2942,130 @@
msgstr "do not install %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Requirement %s cannot be fulfilled."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignore this requirement just here"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Generally ignore this requirement"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Install %s although it would change the architecture"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s provides this dependency, but would change the architecture of the installed item"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Install %s although it would change the architecture"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s provides this dependency, but would change the architecture of the installed item"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignore this conflict of %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignore the obsolete %s in %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignore that %s is already set to install"
@@ -3063,7 +3075,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "for requiring %s for %s when upgrading %s"
@@ -3314,8 +3326,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s provides %s, but has another architecture."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s provides %s, but has another architecture."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Can't satisfy requirement %s for %s"
@@ -3327,7 +3345,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s is required by another resolvable selected for installation, so it won't be unlinked."
@@ -3339,7 +3357,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s is required by another installed resolvable, so it won't be unlinked."
@@ -3351,7 +3369,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s is locked and cannot be uninstalled."
@@ -3362,7 +3380,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
@@ -3373,23 +3391,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Marking %s as not installable due to conflicts over %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "from %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Error!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Important!"
@@ -3447,8 +3465,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4767,3 +4785,5 @@
"Expected %s, found %s\n"
"Use the file anyway?"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s is freshened by %s"
Modified: trunk/libzypp/po/en_US.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/en_US.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/en_US.po (original)
+++ trunk/libzypp/po/en_US.po Mon Sep 3 13:56:27 2007
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2002-07-18 14:04+0200\n"
+"POT-Creation-Date: 2007-08-28 11:53+0200\n"
+"PO-Revision-Date: 2007-08-22 14:13+0200\n"
"Last-Translator: proofreader \n"
"Language-Team: English \n"
"MIME-Version: 1.0\n"
@@ -15,77 +15,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "Invalid component URI: "
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Invalid component URI: "
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Invalid privilege '{0}'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Invalid component URI: "
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Invalid component URI: "
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2734,25 +2734,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2760,38 +2760,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2799,7 +2799,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2808,14 +2808,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2823,31 +2823,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2855,68 +2855,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2924,8 +2924,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2933,118 +2933,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Requirement %s cannot be fulfilled."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3054,7 +3066,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3305,9 +3317,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3318,7 +3336,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3330,7 +3348,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3342,7 +3360,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3353,7 +3371,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3364,23 +3382,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3438,7 +3456,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/es.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/es.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/es.po (original)
+++ trunk/libzypp/po/es.po Mon Sep 3 13:56:27 2007
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-05-31 13:42\n"
"Last-Translator: Novell Language \n"
"Language-Team: Novell Language \n"
@@ -20,77 +20,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "El esquema de URL no permite un elemento %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Componente %s incorrecto %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Componente %s incorrecto"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "El análisis de parámetros de vÃa no es compatible con esta dirección URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "El análisis de cadenas de consulta no es compatible con esta dirección URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "El esquema de url es un componente obligatorio"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Esquema de URL incorrecto %s."
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "El esquema de URL no permite un nombre de usuario"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "El esquema de URL no permite una contraseña"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "El esquema de URL requiere un componente host"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "El esquema de URL no permite un componente host"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Componente host incorrecto %s"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "El esquema de URL no permite un puerto"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Componente de puerto incorrecto %s"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "El esquema URL requiere un nombre de vÃa"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "No se permiten vÃas relativas si existe una autoridad"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "El análisis de parámetros de vÃa no es compatible con esta dirección URL"
@@ -2753,7 +2753,7 @@
msgstr "%s es sustituido por %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2761,19 +2761,19 @@
"Estas resoluciones se suprimirán del sistema."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2781,38 +2781,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Información no válida"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2822,7 +2822,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s entra en conflicto con otras resoluciones"
@@ -2831,14 +2831,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2848,24 +2848,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, 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:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s deja obsoleto a:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2874,7 +2874,7 @@
"Estas resoluciones se suprimirán del sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depende de otras resoluciones"
@@ -2882,20 +2882,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s depende de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Elemento secundario de"
@@ -2904,19 +2904,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:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "No es posible instalar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "No se proporciona %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2925,32 +2925,32 @@
"\n"
"No hay ningún recurso disponible que cumpla este requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, 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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2961,8 +2961,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:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2970,114 +2970,126 @@
msgstr "no instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Omitir este requisito sólo aquÃ"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Omitir este requisito sólo aquÃ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Instalar %s aunque cambie la arquitectura"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s proporciona esta dependencia, pero cambiará la arquitectura del elemento instalado"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Instalar %s aunque cambie la arquitectura"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s proporciona esta dependencia, pero cambiará la arquitectura del elemento instalado"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Omitir este conflicto de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Omitir el %s obsoleto de %s"
@@ -3086,7 +3098,7 @@
# include/scanner/scanner_start.ycp:180
# include/scanner/scanner_start.ycp:180
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Omitir que %s ya está configurado para la instalación"
@@ -3097,7 +3109,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "para requerir %s para %s al actualizar %s"
@@ -3357,8 +3369,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s proporciona %s, pero tiene otra arquitectura."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s proporciona %s, pero tiene otra arquitectura."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "No es posible cumplir el requisito %s para %s"
@@ -3370,7 +3388,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "Otra resolución instalada requiere %s, por lo que no se anulará el enlace."
@@ -3382,7 +3400,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "Otra resolución instalada requiere %s, por lo que no se anulará el enlace."
@@ -3394,7 +3412,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s está bloqueado y no es posible desinstalarlo."
@@ -3405,7 +3423,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Un conflicto en %s (%s) requiere eliminar la resolución %s incluida para la instalación"
@@ -3416,25 +3434,25 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Marcando %s como no instalable debido a conflictos en %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "de %s"
# include/ui/common_messages.ycp:95
# include/ui/common_messages.ycp:99
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Error"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Importante"
@@ -3491,9 +3509,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s es necesario para %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4812,6 +4830,10 @@
"Se esperaba %s, se ha encontrado %s\n"
" ¿Desea utilizar el archivo de todos modos?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s es necesario para %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "No es posible analizar la dirección URL de autoridad"
Modified: trunk/libzypp/po/et.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/et.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/et.po (original)
+++ trunk/libzypp/po/et.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: zypp.et\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-05-04 13:39+0300\n"
"Last-Translator: Ain Vagula \n"
"Language-Team: Estonian \n"
@@ -18,77 +18,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "Vigane komponendi URI: "
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Vigane komponendi URI: "
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "vigane teenuse nimi '%1'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Vigane komponendi URI: "
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Vigane komponendi URI: "
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2741,25 +2741,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2767,38 +2767,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Vigane teave"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2806,7 +2806,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2815,14 +2815,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2830,31 +2830,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2862,68 +2862,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2931,8 +2931,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2940,118 +2940,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3061,7 +3073,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3312,9 +3324,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3325,7 +3343,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3337,7 +3355,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3349,7 +3367,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3360,7 +3378,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3371,23 +3389,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Viga!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Oluline!"
@@ -3445,7 +3463,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/fi.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/fi.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/fi.po (original)
+++ trunk/libzypp/po/fi.po Mon Sep 3 13:56:27 2007
@@ -13,9 +13,9 @@
msgstr ""
"Project-Id-Version: zypp.fi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-16 00:30+0300\n"
-"Last-Translator: Sami Vento \n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 21:18+0300\n"
+"Last-Translator: Jyri Palokangas \n"
"Language-Team: Suomi \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,77 +23,77 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Ei sallittu URL-mallissa: %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Virheellinen %s-komponentti '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Virheellinen %s-komponentti"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Tämän URL-osoitteen jäsentäminen parametreihin ei ole tuettu"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Tämän URL-osoitteen jäsentäminen kyselyksi ei ole tuettu"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url-malli on pakollinen"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Virheellinen URL-muoto '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "URL-malli ei salli käyttäjänimeä"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "URL-malli ei salli salasanaa"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url-malli edellyttää konenimen"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "URL-malli ei salli konenimeä"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Virheellinen konenimen komponentti '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "URL-malli ei salli portin määritystä"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Virheellinen komponentti porttimäärityksessä '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "URL-malli edellyttää polun nimen määrittämisen"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Suhteellisen polun määrittäminen ei ole sallittua, jos valtuuttaja on määritetty"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Tämä URL-osoite ei tue polun jäsentämistä"
@@ -2865,25 +2865,25 @@
msgstr "%s korvataan osalla %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s asennetaan toisen ohjelman mukana. (ApplLow/ApplHigh)\n"
@@ -2891,38 +2891,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
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:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
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:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Epäkelvot tiedot"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2932,7 +2932,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s on ristiriidassa muiden osien kanssa"
@@ -2941,14 +2941,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2958,24 +2958,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s vanhentaa %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s vanhentaa:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2984,7 +2984,7 @@
"Nämä osat poistetaan järjestelmästä."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s on riippuvainen muista osista"
@@ -2992,38 +2992,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s riippuu osasta:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Lapsi"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Ei voida asentaa %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Mikään ei tarjoa %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -3031,31 +3031,31 @@
"\n"
"Ei ole saatavilla osaa, joka täyttäisi tämän riippuvuuden."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3063,8 +3063,8 @@
msgstr "poista %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3072,118 +3072,130 @@
msgstr "älä asenna %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Tarvetta %s ei voida täyttää."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Jätä tämä vaatimus huomiotta vain tässä"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Jätä tämä vaatimus huomiotta"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Asenna %s vaikka se muuttaisi arkkitehtuuria"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s tarjoaa tämän riippuvuuden, mutta vaihtaa asennetun kohteen arkkitehtuurin"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Asenna %s vaikka se muuttaisi valmistajan"
+
+#. 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 tarjoaa tämän riippuvuuden, mutta vaihtaa asennetun kohteen valmistajan"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Jätä osan %s ristiriitaa huomiotta"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Jätä osan %s vanhentuminen %s huomiotta"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Jätä huomiotta, että %s on jo asetettu asennettavaksi"
@@ -3193,7 +3205,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "tarvitaan %s osaa %s varten, kun päivitetään %s"
@@ -3444,9 +3456,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "Osa %s tarjoaa %s, mutta se on eri arkkitehtuuria."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 "Osa %s tarjoaa %s, mutta sillä on eri valmistaja (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ei voida tyydyttää vaatimusta %s osalle %s"
@@ -3457,7 +3475,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "Jokin asennettavaksi merkitty paketti vaatii osan %s, joten sitä ei poisteta."
@@ -3469,7 +3487,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "Muu asennettu osa vaatii %s, joten sitä ei poisteta."
@@ -3481,7 +3499,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s on lukittu ja sitä ei voida poistaa."
@@ -3492,7 +3510,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Ristiriita osasta %s (%s) vaatii asennettavaksi määritellyn %s poistamista"
@@ -3503,23 +3521,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Merkitään %s poistettavaksi %s olevan ristiriidan vuoksi"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s:sta"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Virhe!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Tärkeä!"
@@ -3577,8 +3595,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%2$s päivittää osan %1$s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s on määritelty asennettavaksi (päivitettäväksi) %s takia"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -5100,11 +5118,3 @@
"Odotettiin arvoa %s, saatiin %s\n"
"Käytetäänkö tiedostoa silti?"
-#~ msgid "Unable to parse Url authority"
-#~ msgstr "URL-valtuuttajaa ei voitu jäsentää"
-
-#~ msgid "Ignore this requirement generally"
-#~ msgstr "Jätä tämä vaatimus huomiotta yleisesti"
-
-#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
-#~ msgstr "Muut asennettavat osat vaativat %s, joten sitä ei poisteta."
Modified: trunk/libzypp/po/fr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/fr.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/fr.po (original)
+++ trunk/libzypp/po/fr.po Mon Sep 3 13:56:27 2007
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-16 14:14+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-29 17:29+0200\n"
"Last-Translator: Guillaume GARDET \n"
"Language-Team: French Team \n"
"MIME-Version: 1.0\n"
@@ -19,77 +19,79 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Le schéma de l'Url n'autorise pas de %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Composant '%s' non valide %s "
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Composant %s non valide"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
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:778 ../zypp/url/UrlBase.cc:1225
+#: ../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"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Le modèle URL est un composant requis"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Schéma d'Url '%s' non valide"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Le schéma de l'Url n'autorise pas de nom d'utilisateur"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Le schéma de l'Url n'autorise pas de mot de passe"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Le schéma de l'Url nécessite un composant d'hôte"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Le schéma de l'Url n'autorise pas de composant d'hôte"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Composant d'hôte non valide '%s' "
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Le schéma de l'Url n'autorise pas de port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Composant de port non valide '%s' "
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Le schéma de l'Url requiert un nom de chemin"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../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é"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Analyse du paramètre de chemin non prise en charge pour cette URL"
@@ -153,11 +155,13 @@
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'"
@@ -209,7 +213,8 @@
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"
@@ -219,7 +224,8 @@
#. Defined LanguageCode constants
#. Defined CountryCode constants
-#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215
+#: ../zypp/LanguageCode.cc:225
+#: ../zypp/CountryCode.cc:215
msgid "No Code"
msgstr "Pas de code"
@@ -284,7 +290,8 @@
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"
@@ -334,7 +341,8 @@
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"
@@ -434,7 +442,8 @@
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"
@@ -544,7 +553,8 @@
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"
@@ -609,7 +619,8 @@
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"
@@ -719,7 +730,8 @@
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"
@@ -794,7 +806,8 @@
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"
@@ -899,7 +912,8 @@
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"
@@ -949,12 +963,14 @@
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"
@@ -1024,7 +1040,8 @@
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)"
@@ -1129,7 +1146,8 @@
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"
@@ -1500,7 +1518,8 @@
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"
@@ -1540,7 +1559,8 @@
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"
@@ -1560,7 +1580,8 @@
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"
@@ -1701,7 +1722,8 @@
#. 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"
@@ -1901,7 +1923,8 @@
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"
@@ -1986,7 +2009,8 @@
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"
@@ -2046,7 +2070,8 @@
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"
@@ -2061,7 +2086,8 @@
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"
@@ -2116,7 +2142,8 @@
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"
@@ -2311,7 +2338,8 @@
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"
@@ -2332,7 +2360,8 @@
#. 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"
@@ -2408,7 +2437,8 @@
#. 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"
@@ -2508,7 +2538,8 @@
msgstr "Washo"
#. language code: wel cym cy
-#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194
+#: ../zypp/LanguageCode.cc:1192
+#: ../zypp/LanguageCode.cc:1194
msgid "Welsh"
msgstr "Gallois"
@@ -2592,7 +2623,8 @@
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."
@@ -2633,7 +2665,8 @@
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"
@@ -2687,7 +2720,8 @@
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:1927
+#: ../zypp/target/rpm/RpmDb.cc:2045
msgid "rpm output:"
msgstr "Sortie rpm :"
@@ -2700,7 +2734,8 @@
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:1936
+#: ../zypp/target/rpm/RpmDb.cc:2053
msgid "Additional rpm output:"
msgstr "Sortie rpm supplémentaire :"
@@ -2743,25 +2778,25 @@
msgstr "%s remplacé par %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s sera installé par une autre application. (ApplLow/ApplHigh)\n"
@@ -2769,41 +2804,41 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
#, 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:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
#, 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:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
#, 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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Informations incorrectes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2813,7 +2848,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s est en conflit avec d'autres correctifs"
@@ -2822,14 +2857,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2839,24 +2874,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, 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:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s rend obsolète :%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2865,7 +2900,7 @@
"Ces correctifs seront supprimés du système."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s dépend d'autres correctifs"
@@ -2873,39 +2908,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s dépend de :%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
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:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Impossible d'installer %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Aucun ne fournit %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2914,34 +2949,34 @@
"\n"
"Aucune ressource disponible qui prenne en charge cette exigence."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, 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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2950,8 +2985,8 @@
# TLABEL partitioning_2002_01_04_0147__180
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2959,121 +2994,133 @@
msgstr "ne pas installer %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorer cette exigence cette fois uniquement"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Ignorer cette exigence cette fois uniquement"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installer %s bien que cela modifie l'architecture"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s offre cette dépendance, mais changerait l'architecture de l'élément installé"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Installer %s bien que cela modifie l'architecture"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s offre cette dépendance, mais changerait l'architecture de l'élément installé"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorer ce conflit de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorer le %s obsolète dans %s"
# TLABEL scanner_2002_01_04_0147__15
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorer que %s est déjà prêt(e) à être installé"
@@ -3084,7 +3131,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, 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"
@@ -3339,9 +3386,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s offre %s, mais a une autre architecture."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 fournit %s, mais a un autre créateur (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Impossible de satisfaire l'exigence %s pour %s"
@@ -3352,7 +3405,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s est nécessaire à un autre correctif installé pour éviter l'absence de liaison."
@@ -3364,7 +3417,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s est nécessaire à un autre correctif installé pour éviter l'absence de liaison."
@@ -3377,7 +3430,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s est verrouillé et ne peut pas être désinstallé."
@@ -3388,7 +3441,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Un conflit sur %s (%s) nécessite le retrait de %s à installer."
@@ -3399,25 +3452,25 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Marquage de %s comme non installable en raison de conflits sur %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "Ã partir de %s"
# TLABEL wizard_2002_01_04_0147__40
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Erreur !"
# TLABEL autoinst_2002_08_07_0216__135
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Important !"
@@ -3477,8 +3530,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s est rafraichis par %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -3732,7 +3785,8 @@
#. :CCK:166:
#. :CAF:140:
-#: ../zypp/CountryCode.cc:255 ../zypp/CountryCode.cc:257
+#: ../zypp/CountryCode.cc:255
+#: ../zypp/CountryCode.cc:257
msgid "Congo"
msgstr "Congo"
@@ -4797,88 +4851,67 @@
"%s attendu, %s trouvé\n"
" Voulez-vous utiliser ce fichier malgré tout ?"
+#~ 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=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/gl.po (original)
+++ trunk/libzypp/po/gl.po Mon Sep 3 13:56:27 2007
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2002-07-23 11:51+0200\n"
"Last-Translator: Jesús Bravo Ãlvarez \n"
"Language-Team: Galician \n"
@@ -20,77 +20,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3108,25 +3108,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3134,38 +3134,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3173,7 +3173,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3182,14 +3182,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3197,31 +3197,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3229,68 +3229,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instalando en:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3298,8 +3298,8 @@
msgstr "Eliminar"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3307,118 +3307,130 @@
msgstr "Instalando en:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3429,7 +3441,7 @@
msgstr "Instalando o controlador..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3680,9 +3692,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3693,7 +3711,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3705,7 +3723,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3717,7 +3735,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3728,7 +3746,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3739,24 +3757,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Erro"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3816,7 +3834,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/gu.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/gu.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/gu.po (original)
+++ trunk/libzypp/po/gu.po Mon Sep 3 13:56:27 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: nis\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-11 18:41+0530\n"
"Last-Translator: Priyavert Sharma\n"
"Language-Team: AgreeYa Solutions\n"
@@ -11,77 +11,77 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10.2\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url યà«àªàª¨àª¾ %s નૠમàªàªà«àª°à« àªàªªàª¤à« નથà«"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "àª
માનà«àª¯ %s àªàªàª '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "àª
માનà«àª¯ %s àªàªàª"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "ઠURL માàªà« મારà«àª પારમિતિ પારà«àª¸àª¿àªàª સહાયિત નથà«"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "ઠURL માàªà« àªà«àªµà«àª°àª¿ સà«àªà«àª°à«àªàª પારà«àª¸àª¿àªàª સહાયિત નથà«"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url યà«àªàª¨àª¾àª¨à« àªàªàª àªàª°à«àª°à« àªà«"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "àª
માનà«àª¯ Url યà«àªàª¨àª¾ '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url યà«àªàª¨àª¾ વપરાશàªàª°à«àª¤àª¾àª¨à« મàªàªà«àª°à« àªàªªàª¤à«àª નથà«"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url યà«àªàª¨àª¾ પાસવરà«àª¡àª¨à« મàªàªà«àª°à« àªàªªàª¤à«àª નથà«"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url યà«àªàª¨àª¾àª¨à« હà«àª¸à«àª àªàªàª àªàª°à«àª°à« àªà«"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url યà«àªàª¨àª¾ હà«àª¸à«àª àªàªàªàª¨à« મàªàªà«àª°à« àªàªªàª¤à«àª નથà«"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "àª
માનà«àª¯ હà«àª¸à«àª àªàªàª '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url યà«àªàª¨àª¾àª¨à« પà«àª°à«àªàª¨à« મàªàªà«àª°à« àªàªªàª¤à«àª નથà«"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "àª
માનà«àª¯ પà«àª°à«àª àªàªàª '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url યà«àªàª¨àª¾àª¨à« મારà«àª નામ àªàª°à«àª°à« àªà«"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "હૠàª
ધિàªà«àª¤àª¿ હાàªàª° હà«àª¯ તૠરિલà«àªàª¿àªµ મારà«àªàª¨à« મàªàªà«àª°à« નથà«"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "ઠURL માàªà« મારà«àª પારમિતિ પારà«àª¸àª¿àªàª સહાયિત નથà«"
@@ -2728,7 +2728,7 @@
msgstr "%s દà«àªµàª¾àª°àª¾ %s નૠàªàªà«àª¯àª¾àª મà«àªàª¾àª¯à«àª"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2736,19 +2736,19 @@
"ઠરિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સિસà«àªàª®àª®àª¾àªàª¥à« àªàª¾àª¢à« નાàªàªµàª¾àª®àª¾àª àªàªµàª¶à«."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2756,38 +2756,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "àª
માનà«àª¯ માહિતà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2797,7 +2797,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s, àª
નà«àª¯ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સાથૠવિસàªàªàª¤ àªà«"
@@ -2806,14 +2806,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2823,24 +2823,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s àª
નà«àª¯ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ àª
લઠપાડૠàªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s àª
લઠપાડવà«àª %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s àª
લઠપાડવà«àª : %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2849,7 +2849,7 @@
"ઠરિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સિસà«àªàª®àª®àª¾àªàª¥à« àªàª¾àª¢à« નાàªàªµàª¾àª®àª¾àª àªàªµàª¶à«."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s àª
નà«àª¯ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ પર àªàª§àª¾àª° રાàªà« àªà«"
@@ -2857,38 +2857,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s પર àªàª§àª¾àª° રાàªà« àªà« : %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "નà«àª àªàª¾àªàª²à«àª¡"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s સà«àª¥àª¾àªªàª¿ શàªàª¾àª¶à« નહà«àª"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "%s àªà«àª àªàªªàª¤à«àª નથà«"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2897,32 +2897,32 @@
"\n"
"àªà«àª સà«àª¤à«àª°à«àª¤ પà«àª°àª¾àªªà«àª¯ નથૠàªà« ઠàªàª°à«àª°àª¿àª¯àª¾àª¤àª¨à« સહાય àªàª°à«."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ઠરિàªà«àª²à«àª¯à«àª¶àª¨àª¨à« àªàªªàª°/નà«àªà« દરà«àª¶àª¾àªµà«àª² બાàªà« નિàªàª³àª¤à« મà«àª¶à«àªà«àª²à«àª બધૠપરાધિનતાàªàª¨à« àªàªà«àª²àª²àª¾àªµà« શàªàª¶à« નહà«àª"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2930,8 +2930,8 @@
msgstr "%s àªàª¾àª¢à« નાàªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2939,119 +2939,131 @@
msgstr "%s સà«àª¥àª¾àªªàª¶à« નહà«àª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s પાસૠàª
પà«àª°à«àª£ àªàª°à«àª°àª¿àª¯àª¾àª¤à« àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s પાસૠàªà«àªà« àªàª¯à«àª²à« પરાધિનતા àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s સà«àª¥àª¾àªªàªµàª¾àª¨à« àªàª°à«àª° નથà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s સાથૠવિસàªàªàª¤ હà«àªµàª¾àª¥à« %s àª
સà«àª¥àª¾àªªàª¿àª¤ àªà«"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ઠàªàª°à«àª°àª¿àª¯àª¾àª¤ àª
હà«àª માતà«àª° àª
વàªàª£à«"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ઠàªàª°à«àª°àª¿àª¯àª¾àª¤ àª
હà«àª માતà«àª° àª
વàªàª£à«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s સà«àª¥àª¾àªªà« àªà« àªà« તૠસàªàª°àªàª¨àª¾ બદલૠશàªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s ઠપરાધિનતા પà«àª°à« પાડૠàªà« પરàªàª¤à« સà«àª¥àª¾àªªà«àª² બાબતનà«àª¸àªàª°àªàª¨àª¾ àªàª¦àª¾àª બદલૠશàªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s ઠપરાધિનતા પà«àª°à« પાડૠàªà« પરàªàª¤à« સà«àª¥àª¾àªªà«àª² બાબતનà«àª¸àªàª°àªàª¨àª¾ àªàª¦àª¾àª બદલૠશàªà«"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s નૠઠવિસàªàªàª¤àª¤àª¾ àª
વàªàª£à«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%s માઠàª
લઠપાડà«àª²àª¾ %s નૠàª
વàªàª£à«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "પહà«àª²à«àª¥à« સà«àª¥àª¾àªªàªµàª¾ સà«àª àªàª°à«àª² તૠ%s àª
વàªàª£à«"
@@ -3062,7 +3074,7 @@
msgstr "સàªàª¬àªàª§àª¿àª¤ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સà«àª¥àª¾àªªà« àªà« àªàª¾àª¢à« નહà«àª"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "àªà«àª¯àª¾àª°à« %s àª
દà«àª¯àª¤àª¨ àªàª°àª¤àª¾ હà«àªµ તà«àª¯àª¾àª°à« %s માàªà« %s àªàª°à«àª°à« àªà«"
@@ -3313,8 +3325,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s, %s પà«àª°à«àª પાડૠàªà«, પરàªàª¤à« તà«àª¨à« પાસૠબà«àªà« સàªàª°àªàª¨àª¾ àªà«."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s, %s પà«àª°à«àª પાડૠàªà«, પરàªàª¤à« તà«àª¨à« પાસૠબà«àªà« સàªàª°àªàª¨àª¾ àªà«."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s માàªà« %s àªàª°à«àª°àª¿àª¯àª¾àª¤ સàªàª¤à«àª·à«àª àªàª°à« શàªàª¤à«àª નથà«"
@@ -3326,7 +3344,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s, àª
નà«àª¯ સà«àª¥àª¾àªªàª¿àª¤ àªà« તૠરિàªà«àª²à«àªµà«àª¬àª² દà«àªµàª¾àª°àª¾ àªàª°à«àª°à« àªà«, તà«àª¥à« તૠàª
નલિàªàª થઠશàªàª¶à«àª¨àª¹à«àª."
@@ -3338,7 +3356,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s, àª
નà«àª¯ સà«àª¥àª¾àªªàª¿àª¤ àªà« તૠરિàªà«àª²à«àªµà«àª¬àª² દà«àªµàª¾àª°àª¾ àªàª°à«àª°à« àªà«, તà«àª¥à« તૠàª
નલિàªàª થઠશàªàª¶à«àª¨àª¹à«àª."
@@ -3350,7 +3368,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s લà«àª àªà« àª
નૠàª
સà«àª¥àª¾àªªàª¿àª¤ થઠશàªàª¶à« નહà«àª"
@@ -3361,7 +3379,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) નૠવિસàªàªàª¤àª¤àª¾ સà«àª¥àª¾àªªàª¿àª¤ àªàª°àªµàª¾àª¨à«àª àªà« તૠ%s નૠદà«àª° àªàª°àªµàª¾àª¨à«àª àªàª°à«àª°à« બનાવૠàªà«"
@@ -3372,23 +3390,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s નૠવિસàªàªàª¤àª¤àª¾àª¨àª¾ àªàª¾àª°àª£à« %s નૠàª
સà«àª¥àª¾àªªàª¿àª¤ તરà«àªà« àªàª¿àª¹àª¿àª¤ àªàª°à«"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s માàªàª¥à«"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "àªà«àª²!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "àª
àªàª¤à«àª¯àª¨à«àª!"
@@ -3445,9 +3463,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s દà«àªµàª¾àª°àª¾ %s àªàª°à«àª°à« હતà«àª"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4766,6 +4784,10 @@
"%s નૠસàªàªàª¾àªµàª¨àª¾ હતà«, %s મળૠ\n"
"àªà«àª પણ રà«àª¤à« ફાàªàª² વાપરવૠàªà«?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s દà«àªµàª¾àª°àª¾ %s àªàª°à«àª°à« હતà«àª"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Url àª
ધિàªà«àª¤àª¿ પારà«àª¸ àªàª°àªµàª¾ àª
àªà«àª·àª®"
Modified: trunk/libzypp/po/he.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/he.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/he.po (original)
+++ trunk/libzypp/po/he.po Mon Sep 3 13:56:27 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2004-08-09 10:24+0200\n"
"Last-Translator: xxx \n"
"Language-Team: Hebrew \n"
@@ -15,77 +15,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3046,25 +3046,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3072,38 +3072,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3111,7 +3111,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3120,14 +3120,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3135,31 +3135,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3167,70 +3167,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
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:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "×תק×× ×¢×:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3239,8 +3239,8 @@
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3248,118 +3248,130 @@
msgstr "×תק×× ×¢×:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "&××× ×ער×ת ק×××ת"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3370,7 +3382,7 @@
msgstr "×תק×× ×ר××ר..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3624,9 +3636,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3637,7 +3655,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3649,7 +3667,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3661,7 +3679,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3672,7 +3690,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3683,24 +3701,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "ש××××"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3761,7 +3779,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/hi.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hi.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/hi.po (original)
+++ trunk/libzypp/po/hi.po Mon Sep 3 13:56:27 2007
@@ -1,87 +1,90 @@
+# translation of zypp.hi.po to Hindi
+# Sangeeta Kumari , 2007.
msgid ""
msgstr ""
-"Project-Id-Version: NetworkManager-vpnc\n"
+"Project-Id-Version: zypp.hi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2006-01-26 15:19+0100\n"
-"Last-Translator: Priyavert Sharma \n"
-"Language-Team: AgreeYa Solutions \n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 22:33+0530\n"
+"Last-Translator: Sangeeta Kumari \n"
+"Language-Team: Hindi \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url सà¥à¤à¥à¤® à¤à¤¿à¤¸à¥ %s à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ दà¥à¤¤à¥ हà¥"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "à¤
मानà¥à¤¯ %s à¤
वयव '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "à¤
मानà¥à¤¯ %s à¤
वयव"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "पथ मानठपारà¥à¤à¤¿à¤à¤ à¤à¤¸ URL à¤à¥ लिठसमरà¥à¤¥à¤¿à¤¤ नहà¥à¤ हà¥"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "à¤à¤¸ URL à¤à¥ लिठà¤à¥à¤µà¥à¤°à¥ सà¥à¤à¥à¤°à¤¿à¤à¤ पारà¥à¤à¤¿à¤à¤ समरà¥à¤¥à¤¿à¤¤ नहà¥à¤ हà¥"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url सà¥à¤à¥à¤® à¤à¤ à¤à¤µà¤¶à¥à¤¯à¤ à¤
वयव हà¥"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "à¤
मानà¥à¤¯ Url सà¥à¤à¥à¤® '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url सà¥à¤à¥à¤® à¤à¤¿à¤¸à¥ à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ नाम à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ दà¥à¤¤à¥ हà¥"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url सà¥à¤à¥à¤® à¤à¤¿à¤¸à¥ पासवरà¥à¤¡ à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ दà¥à¤¤à¥ हà¥"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url सà¥à¤à¥à¤® à¤à¥ à¤à¤ हà¥à¤¸à¥à¤ à¤
वयव à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url सà¥à¤à¥à¤® à¤à¤¿à¤¸à¥ हà¥à¤¸à¥à¤ à¤
वयव à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ दà¥à¤¤à¥ हॠ"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "à¤
मानà¥à¤¯ हà¥à¤¸à¥à¤ à¤
वयव '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url सà¥à¤à¥à¤® à¤à¤¿à¤¸à¥ पà¥à¤°à¥à¤ à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ दà¥à¤¤à¥ हॠ"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "à¤
मानà¥à¤¯ पà¥à¤°à¥à¤ à¤
वयव '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url सà¥à¤à¥à¤® à¤à¥ पथ नाम à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "यदि पà¥à¤°à¤¾à¤§à¤¿à¤à¤°à¤£ मà¥à¤à¥à¤¦ हॠतॠसापà¥à¤à¥à¤· पथ à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ हà¥"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "à¤à¤¸ URL à¤à¥ लिठपथ मानठपारà¥à¤à¤¿à¤à¤ समरà¥à¤¥à¤¿à¤¤ नहà¥à¤ हà¥"
@@ -104,7 +107,7 @@
#. TranslatorExplanation followed by the list of error messages that lead to this exception
#: ../zypp/base/Exception.cc:89
msgid "History:"
-msgstr ""
+msgstr "à¤à¤¤à¤¿à¤¹à¤¾à¤¸:"
#: ../zypp/repo/PackageProvider.cc:222
msgid "applydeltarpm check failed."
@@ -2728,7 +2731,7 @@
msgstr "%s सॠ%s à¤à¥ पà¥à¤°à¤¤à¤¿à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2736,19 +2739,19 @@
"यॠरिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ सिसà¥à¤à¤® सॠमिà¤à¤¾ दिठà¤à¤¾à¤à¤à¤à¥à¥¤"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2756,38 +2759,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "à¤
मानà¥à¤¯ सà¥à¤à¤¨à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2795,7 +2798,7 @@
msgstr "%s à¤à¥ à¤à¤¨à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हॠ:%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s à¤à¤¾ à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ सॠà¤à¤à¤°à¤¾à¤µ हà¥"
@@ -2804,14 +2807,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2821,24 +2824,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤à¥ पà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° दà¥à¤¤à¤¾ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s à¤à¥ %s पà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° दà¥à¤¤à¤¾ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s पà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° दà¥à¤¤à¤¾ हॠ: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2847,7 +2850,7 @@
"यॠरिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ सिसà¥à¤à¤® सॠमिà¤à¤¾ दिठà¤à¤¾à¤à¤à¤à¥à¥¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ पर निरà¥à¤à¤° à¤à¤°à¤¤à¤¾ हà¥"
@@ -2855,38 +2858,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s à¤à¤¨ पर निरà¥à¤à¤° à¤à¤°à¤¤à¤¾ हॠ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "à¤à¥ सà¤à¤¤à¤¤à¤¿"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s à¤à¤¾ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "à¤à¥à¤ नहà¥à¤ %s पà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2895,32 +2898,32 @@
"\n"
"à¤à¥à¤ सà¥à¤°à¥à¤¤ à¤à¤ªà¤²à¤¬à¥à¤§ नहà¥à¤ हॠà¤à¥ à¤à¤¸ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ समरà¥à¤¥à¤¨ दà¥à¥¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "à¤à¤¸ रिà¤à¥à¤²à¥à¤¯à¥à¤¶à¤¨ à¤à¥ à¤à¤ªà¤°/नà¥à¤à¥ वरà¥à¤£à¤¿à¤¤ शà¥à¤· समसà¥à¤¯à¤¾à¤à¤ सà¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¤¾à¤¸à¤®à¤¾à¤§à¤¾à¤¨ नहà¥à¤ à¤à¤°à¥à¤à¤à¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2928,8 +2931,8 @@
msgstr "%s मिà¤à¤¾à¤à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2937,119 +2940,131 @@
msgstr "%s सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ न à¤à¤°à¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s à¤à¥ पास à¤à¤¸à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾à¤à¤ हà¥à¤ à¤à¥ सà¤à¤¤à¥à¤·à¥à¤ नहà¥à¤ हà¥à¤ हà¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s à¤à¥ à¤à¥à¤à¥ हà¥à¤ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ हà¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¨à¥ à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ नहà¥à¤ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¥à¤¯ हॠà¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¤¾ %s à¤à¥ साथ à¤à¤à¤°à¤¾à¤µ हà¥"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "सिरà¥à¤« यहाठपर à¤à¤¸ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ à¤
नदà¥à¤à¥ à¤à¤° दà¥à¤"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "सिरà¥à¤« यहाठपर à¤à¤¸ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ à¤
नदà¥à¤à¥ à¤à¤° दà¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤ यदà¥à¤¯à¤ªà¤¿ यह सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ à¤à¥ बदल दà¥à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "यह निरà¥à¤à¤°à¤¤à¤¾ %s पà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾ हॠलà¥à¤à¤¿à¤¨ यह सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ वसà¥à¤¤à¥ à¤à¥à¤¸à¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ à¤à¥ बदल दà¥à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "यह निरà¥à¤à¤°à¤¤à¤¾ %s पà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾ हॠलà¥à¤à¤¿à¤¨ यह सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ वसà¥à¤¤à¥ à¤à¥à¤¸à¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ à¤à¥ बदल दà¥à¤à¤¾"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s à¤à¥ à¤à¤¸ à¤à¤à¤°à¤¾à¤µ à¤à¥ à¤
नदà¥à¤à¥ à¤à¤° दà¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%s à¤à¥ %s मà¥à¤ हà¤à¤¾à¤ à¤à¤¾à¤¨à¥ à¤à¥ à¤
नदà¥à¤à¤¾ à¤à¤°à¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "%s सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤¨à¥ à¤à¥ तà¥à¤¯à¤¾à¤° हॠà¤à¤¸à¤à¥ à¤
नदà¥à¤à¤¾ à¤à¤°à¥à¤"
@@ -3060,7 +3075,7 @@
msgstr "सà¤à¤¬à¤à¤§à¤¿à¤¤ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤² à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ या मिà¤à¤¾à¤à¤ नहà¥à¤"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s à¤à¥ à¤
पà¤à¥à¤°à¥à¤¡ à¤à¤°à¤¤à¥ समय %s हà¥à¤¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ लिà¤"
@@ -3311,8 +3326,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s हॠ%s पà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾ हà¥, लà¥à¤à¤¿à¤¨ à¤à¤¸à¤à¥ पास à¤à¥à¤ à¤à¤° सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ हà¥à¥¤"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s हॠ%s पà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾ हà¥, लà¥à¤à¤¿à¤¨ à¤à¤¸à¤à¥ पास à¤à¥à¤ à¤à¤° सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ हà¥à¥¤"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s à¤à¥ लिठ%s à¤à¤µà¤¾à¤¶à¥à¤¯à¤à¤¤à¤¾à¤à¤ सà¤à¤¤à¥à¤·à¥à¤ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
@@ -3324,7 +3345,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ हॠà¤à¥à¤à¥ à¤à¤¿à¤¸à¥ à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤² à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥, à¤
तठयह à¤
नलिà¤à¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ सà¤à¤¤à¤¾à¥¤"
@@ -3336,7 +3357,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ हॠà¤à¥à¤à¥ à¤à¤¿à¤¸à¥ à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤² à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥, à¤
तठयह à¤
नलिà¤à¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ सà¤à¤¤à¤¾à¥¤"
@@ -3348,7 +3369,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s लà¥à¤ हॠà¤à¤¯à¤¾ हॠà¤à¤° à¤à¤¸à¥ à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ सà¤à¤¤à¤¾à¥¤"
@@ -3359,7 +3380,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) पर à¤à¤à¤°à¤¾à¤µ à¤à¥ लिठसà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤¨à¥ वालॠ%s à¤à¥ हà¤à¤¾à¤ à¤à¤¾à¤¨à¥ à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
@@ -3370,23 +3391,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s पर à¤à¤à¤°à¤¾à¤µ हà¥à¤¨à¥ à¤à¥ à¤à¤¾à¤°à¤£ %s à¤à¥ à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¥à¤¯ à¤à¥ रà¥à¤ª मà¥à¤ à¤à¤¿à¤¨à¥à¤¹à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ रहा हà¥"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s सà¥"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "तà¥à¤°à¥à¤à¤¿!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "महतà¥à¤µà¤ªà¥à¤°à¥à¤£!"
@@ -3443,9 +3464,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4764,78 +4785,3 @@
"%s à¤à¥ à¤à¤®à¥à¤®à¥à¤¦ थà¥, %s मिला\n"
"फिर à¤à¥ फाà¤à¤² à¤à¤¾ पà¥à¤°à¤¯à¥à¤ à¤à¤°à¥à¤?"
-#~ 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 "पà¥à¤à¥à¤ फाà¤à¤² à¤à¥ पढ़ रहा हà¥"
-
-#~ msgid "Reading translation: %s"
-#~ msgstr "à¤
नà¥à¤µà¤¾à¤¦ à¤à¥ पढ़ रहा हॠ: %s"
-
-#, fuzzy
-#~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?"
-#~ msgstr " पà¥à¤à¥à¤ %s नॠà¤à¤à¥à¤à¤°à¤£ à¤à¤¾à¤à¤ à¤à¥ नाà¤à¤¾à¤® à¤à¤¿à¤¯à¤¾à¥¤ à¤à¥à¤¯à¤¾ à¤à¤ª पà¥à¤¨à¤ à¤à¤¸à¤à¥ डाà¤à¤¨à¤²à¥à¤¡à¤¿à¤à¤ या सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ रदà¥à¤¦ à¤à¤°à¤¨à¥ à¤à¤¾ पà¥à¤°à¤¯à¤¾à¤¸ à¤à¤°à¤¨à¤¾ à¤à¤¾à¤¹à¤¤à¥ हà¥à¤?"
-
-#~ msgid " miss checksum."
-#~ msgstr " à¤à¥à¤à¤¾ à¤à¥à¤à¤¸à¤®à¥¤"
-
-#~ msgid " fails checksum verification."
-#~ msgstr " à¤à¥à¤à¤¸à¤® पà¥à¤°à¤®à¤¾à¤£à¥à¤à¤°à¤£ नाà¤à¤¾à¤® रहा।"
-
-#~ msgid "Downloading %s"
-#~ msgstr "%s à¤à¥ डाà¤à¤¨à¤²à¥à¤¡ à¤à¤° रहा हà¥"
-
-#~ msgid "Downloaded %s from %s"
-#~ msgstr "%s सॠ%s डाà¤à¤¨à¤²à¥à¤¡ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾"
Modified: trunk/libzypp/po/hr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hr.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/hr.po (original)
+++ trunk/libzypp/po/hr.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2001-07-17 16:22+0200\n"
"Last-Translator: Vlatko Kosturjak \n"
"Language-Team: Croatian \n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "Neispravan URI komponente: "
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Neispravan URI komponente: "
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "URL shema je obavezna komponenta"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "neispravno ime servisa '%1'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Neispravan URI komponente: "
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Neispravan URI komponente: "
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relativna putanja nije dozvoljena ako postoji autoritet"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3060,25 +3060,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3086,38 +3086,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3125,7 +3125,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3134,14 +3134,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3149,31 +3149,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3181,68 +3181,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instaliram na:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3250,8 +3250,8 @@
msgstr "&Obriši"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3259,118 +3259,130 @@
msgstr "Instaliram na:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "Direktorij %1 je veÄ na listi."
@@ -3381,7 +3393,7 @@
msgstr "Postaviti konfiguracijske vrijednosti."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3633,9 +3645,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3646,7 +3664,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3658,7 +3676,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3670,7 +3688,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Ovi paketi trebaju biti instalirani:"
@@ -3681,7 +3699,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3692,24 +3710,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Greška"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "Uvoz podataka"
@@ -3770,7 +3788,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/hu.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hu.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/hu.po (original)
+++ trunk/libzypp/po/hu.po Mon Sep 3 13:56:27 2007
@@ -15,87 +15,87 @@
msgstr ""
"Project-Id-Version: zypp.hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 16:56+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-25 16:50+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: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Az URI séma nem engedélyezi a(z) %s használatát"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ãrvénytelen %s url komponens: '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Hibás URI komponens: %s"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Az elérési út feldolgazása ehhez az URI-hez nem támogatott"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "A lekérdezés feldolgozása ehhez az URI-hez nem támogatott"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Az url-séma megadása szükséges"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ãrvénytelen URI-séma: '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Az URI séma nem engedélyezi a felhasználónevet"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Az URI séma nem engedélyezi a jelszót"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Az URI sémában a gépkomponenst (host) megadása kötelezÅ"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Az URI séma megadása nem engedélyezi a gépkomponenst (host)"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Hibás gépkomponens (host): '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Az URI séma nem engedélyezi a portot"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ãrvénytelen port komponens: '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Az URI sémában az elérési útvonal megadása szükséges"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Megadott hitelesÃtÅ esetén a relatÃv elérési útvonal megadása nem támogatott"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Az elérési útvonal feldolgozása ehhez az URI-hez nem támogatott"
@@ -2867,25 +2867,25 @@
msgstr "A(z) %s csomagot felváltja %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, 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"
@@ -2893,38 +2893,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
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:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
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:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ãrvénytelen információ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2934,7 +2934,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ütközik más feloldhatókkal"
@@ -2943,14 +2943,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2960,24 +2960,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, 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:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s elavulttá teszi: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2986,7 +2986,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:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s függ más feloldhatóktól"
@@ -2994,39 +2994,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, 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:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
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:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s nem telepÃthetÅ"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "A(z) %s képességet semmi nem biztosÃtja"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -3034,31 +3034,31 @@
"\n"
"Nem áll rendelkezésre ezt a követelményt kielégÃtÅ erÅforrás."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3067,8 +3067,8 @@
# modules/inst_target_part.ycp:676
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3076,118 +3076,130 @@
msgstr "%s nem telepÃthetÅ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "A(z) %s követelmény nem teljesÃthetÅ."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Követelmény figyelmen kÃvül hagyása csak itt"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Követelmény figyelmen kÃvül hagyása csak itt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s telepÃtése, habár ez megváltoztatja az architektúrát"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s biztosÃtja a kÃvánt függÅséget, de megváltoztatja a telepÃtett egység architektúráját"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "%s telepÃtése, habár ennek más a gyártója"
+
+#. 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 biztosÃtja a kÃvánt függÅséget, de ennek más a gyártója"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s ezen ütközése figyelmen kÃvül marad"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%s elavulásának (%s miatt) figyelmen kÃvül hagyása"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "%s telepÃtésre megjelölése figyelmen kÃvül marad"
@@ -3197,7 +3209,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "mert %s szükséges %s esetén, %s frissÃtésekor"
@@ -3450,9 +3462,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s biztosÃtja %s-t, de más architektúrával rendelkezik."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 biztosÃtja %s-t, de más gyártótól (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s %s követelménye nem elégÃthetÅ ki"
@@ -3463,7 +3481,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "A(z) %s csomagot egy másik telepÃtett feloldható igényli, ezért a csatolása nem lesz megszüntetve."
@@ -3475,7 +3493,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "A(z) %s csomagot egy másik telepÃtett feloldható igényli, ezért a csatolása nem lesz megszüntetve."
@@ -3487,7 +3505,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s zárolva van, ezért nem távolÃtható el."
@@ -3498,7 +3516,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s ütközése (%s) a telepÃtendÅ %s eltávolÃtását igényli"
@@ -3509,23 +3527,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s nem telepÃthetÅnek lesz jelölve, mert ütközik a(z) %s csomaggal"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s csomagból"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Hiba!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Fontos!"
@@ -3583,8 +3601,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "A(z) %s csomagot frissÃti a(z) %s csomag"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "A(z) %s csomag frissebb verziója kerül telepÃtésre a(z) %s csomag telepÃtése miatt."
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/id.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/id.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/id.po (original)
+++ trunk/libzypp/po/id.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2002-10-08 13:38+0200\n"
"Last-Translator: I Made Wiryana \n"
"Language-Team: Indonesian \n"
@@ -17,82 +17,82 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "Data komponen url '%2' tidak valid %1"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Data tidak valid dalam komponen url %1"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
#, fuzzy
msgid "Path parameter parsing not supported for this URL"
msgstr "Parsing parameter path tidak didukung untuk url ini"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
#, fuzzy
msgid "Query string parsing not supported for this URL"
msgstr "Parsing string query tidak didukung untuk url ini"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Skema url merupakan komponen yang dibutuhkan"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Skema url '%1' tidak valid"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
#, fuzzy
msgid "Url scheme requires a host component"
msgstr "Skema url merupakan komponen yang dibutuhkan"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
#, fuzzy
msgid "Url scheme does not allow a host component"
msgstr "Skema url merupakan komponen yang dibutuhkan"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Data komponen url nama host '%1' tidak valid"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Data komponen url '%2' tidak valid %1"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
#, fuzzy
msgid "Url scheme requires path name"
msgstr "Skema url membutuhkan nama path"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Path relatif tidak dibolehkan bila otorita ada"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
#, fuzzy
msgid "Path Parameter parsing not supported for this URL"
msgstr "Parsing Parameter Path tidak didukung untuk url ini"
@@ -3137,25 +3137,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3163,38 +3163,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3202,7 +3202,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3211,14 +3211,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3226,31 +3226,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3258,68 +3258,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Italia"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3327,8 +3327,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3336,118 +3336,130 @@
msgstr "Italia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3457,7 +3469,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3708,9 +3720,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3721,7 +3739,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3733,7 +3751,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3745,7 +3763,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3756,7 +3774,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3767,23 +3785,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3842,7 +3860,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/it.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/it.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/it.po (original)
+++ trunk/libzypp/po/it.po Mon Sep 3 13:56:27 2007
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 16:34+0100\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 20:01+0100\n"
"Last-Translator: Alberto Passalacqua \n"
"Language-Team: Novell Language \n"
"MIME-Version: 1.0\n"
@@ -20,79 +20,79 @@
"X-Poedit-Language: Italian\n"
"X-Poedit-Country: ITALY\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Lo schema dell'url non consente alcun %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "%s componente '%s' non valido"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Componente %s non valido"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Analisi sintattica del parametro del percorso non supportata per questo URL"
-#: ../zypp/url/UrlBase.cc:778
-#: ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782
+#: ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Analisi sintattica della stringa di interrogazione non supportata per questo URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Lo schema url è un componente obbligatorio"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Schema dell'url '%s' non valido"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Lo schema dell'url non consente alcun nome utente"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Lo schema dell'url non consente alcuna password"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Per lo schema dell'url è necessario un componente host"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Lo schema dell'url non consente alcun componente host"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Componente dell'host '%s' non valido"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Lo schema dell'url non consente alcuna porta"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Componente della porta '%s' non valido"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Lo schema dell'url necessita di un nome di percorso"
-#: ../zypp/url/UrlBase.cc:1113
-#: ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117
+#: ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Percorso relativo non consentito se l'autorità esiste già "
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Analisi sintattica del parametro del percorso non supportata per questo URL"
@@ -2772,25 +2772,25 @@
msgstr "%s sostituito da %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s verrà installato da un'altra applicazione. (ApplLow/ApplHigh)\n"
@@ -2798,38 +2798,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
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:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
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:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Informazioni non valide"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2839,7 +2839,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s è in conflitto con altri risolvibili"
@@ -2848,14 +2848,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2865,24 +2865,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, 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:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s non più utilizzato:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2891,7 +2891,7 @@
"Questi risolvibili verranno eliminati dal sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s dipende da altri risolvibili"
@@ -2899,39 +2899,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s dipende da:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
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:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Impossibile installare %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Nessun componente fornisce %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2939,31 +2939,31 @@
"\n"
"Nessuna risorsa disponibile che supporta questo requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2972,8 +2972,8 @@
# TLABEL modules/inst_target_part.ycp:680
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2981,118 +2981,130 @@
msgstr "non installare %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Il requisito %s non può essere soddisfatto."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignora questo requisito solo qui"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Ignora questo requisito globalmente"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installa %s anche se l'architettura viene modificata"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s fornisce questa dipendenza ma modifica l'architettura dell'elemento installato"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Installa %s benché ciò cambi il rivenditore"
+
+#. 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 fornisce questa dipendenza ma modifica il rivenditore dell'elemento installato"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignora questo conflitto di %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignora %s obsoleto in %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignora che %s è già impostato per l'installazione"
@@ -3102,7 +3114,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "affinché %s richieda %s durante l'aggiornamento di %s"
@@ -3355,9 +3367,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s fornisce %s, ma presenta un'altra architettura."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 fornisce %s, ma presenta un'altro rivenditore (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Impossibile soddisfare i requisiti %s per %s"
@@ -3368,7 +3386,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s è richiesto da un altro risolubione selezionato per l'installazione, pertanto non sarà scollegato."
@@ -3380,7 +3398,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s è richiesto da un altro risolubile installato, pertanto non sarà scollegato."
@@ -3392,7 +3410,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s è bloccato e non può essere disinstallato."
@@ -3403,7 +3421,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Un conflitto su %s (%s) richiede la rimozione di %s che è pianificato per l'installazione"
@@ -3414,23 +3432,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Contrassegno in corso di %s come disinstallabile a causa di conflitti su %s."
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "da %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Errore"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Importante"
@@ -3489,8 +3507,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s è aggiornato da %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s sarà considerato per l'intallazione (aggiornato) da %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4808,6 +4826,8 @@
"Previsto %s, trovato %s\n"
"Utilizzarlo?"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s è aggiornato da %s"
#~ msgid "Unable to parse Url authority"
#~ msgstr "Impossibile analizzare sintatticamente l'autorità url"
#~ msgid "Ignore this requirement generally"
Modified: trunk/libzypp/po/ja.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ja.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/ja.po (original)
+++ trunk/libzypp/po/ja.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-06-16 14:06\n"
"Last-Translator: Novell Language \n"
"Language-Team: Novell Language \n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "URLã¹ãã¼ãã¯ã%s ãç¦æ¢ãã¦ãã¾ã"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "ç¡å¹ãª %s ã³ã³ãã¼ãã³ãã%sã"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "ç¡å¹ãª %s ã³ã³ãã¼ãã³ã"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "ãã®URLã«å¯¾ãã¦ããã¹ãã©ã¡ã¼ã¿è§£æã¯ãµãã¼ãããã¦ãã¾ãã"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "ãã®URLã«å¯¾ãã¦ãã¯ã¨ãªæåå解æã¯ãµãã¼ãããã¦ãã¾ãã"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Urlã¹ãã¼ã ã¯å¿
é ã®ã³ã³ãã¼ãã³ãã§ã"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "ç¡å¹ãªURLã¹ãã¼ãã%sã"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "URLã¹ãã¼ãã¯ãã¦ã¼ã¶åãç¦æ¢ãã¦ãã¾ã"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "URLã¹ãã¼ãã¯ããã¹ã¯ã¼ããç¦æ¢ãã¦ãã¾ã"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "URLã¹ãã¼ãã«ã¯ããã¹ãã³ã³ãã¼ãã³ããå¿
è¦ã§ã"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "URLã¹ãã¼ãã¯ããã¹ãã³ã³ãã¼ãã³ããç¦æ¢ãã¦ãã¾ã"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "ç¡å¹ãªãã¹ãã³ã³ãã¼ãã³ãã%sã"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "URLã¹ãã¼ãã¯ããã¼ããç¦æ¢ãã¦ãã¾ã"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "ç¡å¹ãªãã¼ãã³ã³ãã¼ãã³ãã%sã"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "URLã¹ãã¼ãã«ã¯ããã¹åãå¿
è¦ã§ã"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "æ©é¢ãåå¨ããå ´åãç¸å¯¾ãã¹ã¯è¨±å¯ããã¾ããã "
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "ãã®URLã«å¯¾ãã¦ããã¹ãã©ã¡ã¼ã¿è§£æã¯ãµãã¼ãããã¦ãã¾ãã"
@@ -2735,7 +2735,7 @@
msgstr "%s 㯠%s ã«ç½®ãæãããã¾ã"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2743,19 +2743,19 @@
"ãããã®resolvableã¯ã·ã¹ãã ããåé¤ããã¾ãã"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2763,38 +2763,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "ç¡å¹ãªæ
å ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2804,7 +2804,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ã¯ä»ã®resolvableã¨ç«¶åãã¦ãã¾ã"
@@ -2813,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2830,24 +2830,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s ã¯ä»ã®resolvableãå»æ¢ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s 㯠%s ãå»æ¢ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s å»æ¢:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2856,7 +2856,7 @@
"ãããã®resolvableã¯ã·ã¹ãã ããåé¤ããã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ã¯ä»ã®resolvableã«ä¾åãã¾ã"
@@ -2864,38 +2864,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ã¯ä»¥ä¸ã«ä¾åãã¾ã:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "ã®å"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "ãããã %s ãæä¾ãã¾ãã"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2904,32 +2904,32 @@
"\n"
"ãã®è¦æ±ããµãã¼ããã¦ãã使ç¨å¯è½ãªãªã½ã¼ã¹ãããã¾ããã"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ä¸è¨/ä¸è¨ã®åé¡ã«ããããã®è©¦ã¿ã§ã¯ãã¹ã¦ã®ä¾åé¢ä¿ã解決ããã¾ããã"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2937,8 +2937,8 @@
msgstr "%s ãåé¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2946,119 +2946,131 @@
msgstr "%s ãã¤ã³ã¹ãã¼ã«ããªã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s ã«ã¯æºãããã¦ããªãè¦ä»¶ãããã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s ã¯ä¾åé¢ä¿ãä¸è¶³ãã¦ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ããå¿
è¦ã¯ããã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ã¯æ¬¡ã¨ç«¶åãã¦ãããããã¢ã³ã¤ã³ã¹ãã¼ã«ã§ãã¾ã: %s "
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ãã®è¦æ±ãããã§ã ãç¡è¦ãã¾ã"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ãã®è¦æ±ãããã§ã ãç¡è¦ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ã¢ã¼ããã¯ãã£ãå¤æ´ããã¾ããã%s ãã¤ã³ã¹ãã¼ã«ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s ã¯ãã®ä¾åé¢ä¿ãä¸ãã¾ãããã¤ã³ã¹ãã¼ã«ããã¢ã¤ãã ã®ã¢ã¼ããã¯ãã£ã¯å¤æ´ããã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s ã¯ãã®ä¾åé¢ä¿ãä¸ãã¾ãããã¤ã³ã¹ãã¼ã«ããã¢ã¤ãã ã®ã¢ã¼ããã¯ãã£ã¯å¤æ´ããã¾ã"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s ã®ãã®ç«¶åãç¡è¦ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "å»æ¢ %s ã %s ã§ç¡è¦ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ããããã«æ¢ã«è¨å®ããã¦ããã®ãç¡è¦ãã¾ã"
@@ -3069,7 +3081,7 @@
msgstr "é¢é£ããresolavlesãã¤ã³ã¹ãã¼ã«ãã¾ãã¯åé¤ããªã"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s ã® %s åãã®ãã®ãè¦æ±ãããã(%s ãæ´æ°)"
@@ -3320,8 +3332,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s 㯠%s ãä¸ãã¾ãããã¢ã¼ããã¯ãã£ã¯ç°ãªãã¾ãã"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s 㯠%s ãä¸ãã¾ãããã¢ã¼ããã¯ãã£ã¯ç°ãªãã¾ãã"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s ã®è¦æ± %s ãæºãããã¨ãã§ãã¾ãã"
@@ -3333,7 +3351,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s ã¯ã¤ã³ã¹ãã¼ã«ãããä»ã®resolvableãå¿
è¦ã¨ãããã®ãªã®ã§ãã¢ã³ãªã³ã¯ã§ãã¾ããã"
@@ -3345,7 +3363,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s ã¯ã¤ã³ã¹ãã¼ã«ãããä»ã®resolvableãå¿
è¦ã¨ãããã®ãªã®ã§ãã¢ã³ãªã³ã¯ã§ãã¾ããã"
@@ -3357,7 +3375,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s ã¯ããã¯ããã¦ãããã¢ã³ã¤ã³ã¹ãã¼ã«ã§ãã¾ããã"
@@ -3368,7 +3386,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s)ã«é¢ãã競åã«ãããã¤ã³ã¹ãã¼ã«äºå®ã® %s ãåé¤ããå¿
è¦ãããã¾ã"
@@ -3379,23 +3397,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ä¸å¯ã«ãã¾ã(%s ã«é¢ãã競åã®ãã)"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s ãã"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "ã¨ã©ã¼!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "éè¦!"
@@ -3452,9 +3470,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s 㯠%s ãå¿
è¦ã¨ãã¦ãã¾ã"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4773,6 +4791,10 @@
"äºæããã¦ããã®ã¯ %sãè¦ã¤ãã£ãã®ã¯ %s\n"
"ãã®ãã¡ã¤ã«ã使ç¨ãã¾ãã?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s 㯠%s ãå¿
è¦ã¨ãã¦ãã¾ã"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "URLæ©é¢ã解æã§ãã¾ãã"
Modified: trunk/libzypp/po/ka.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ka.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/ka.po (original)
+++ trunk/libzypp/po/ka.po Mon Sep 3 13:56:27 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2005-05-18 10:33+0200\n"
"Last-Translator: Aiet Kolkhi \n"
"Language-Team: Georgian \n"
@@ -16,77 +16,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2727,25 +2727,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2753,38 +2753,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2792,7 +2792,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2801,14 +2801,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2816,31 +2816,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2848,68 +2848,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2917,8 +2917,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2926,118 +2926,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3047,7 +3059,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3298,9 +3310,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3311,7 +3329,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3323,7 +3341,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3335,7 +3353,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3346,7 +3364,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3357,23 +3375,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3431,7 +3449,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/km.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/km.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/km.po (original)
+++ trunk/libzypp/po/km.po Mon Sep 3 13:56:27 2007
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: zypp.km\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-18 15:46+0700\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 02:30+0700\n"
"Last-Translator: Khoem Sokhem \n"
"Language-Team: Khmer \n"
"MIME-Version: 1.0\n"
@@ -19,77 +19,77 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: 0\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "ááááááá¶ááá Url áá·áâá¢áá»áááá¶á %s áá"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "ááá¶ááá¶á %s áá·áâáááá¹ááááá¼á '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "ááá¶ááá¶á %s áá·áâáááá¹ááááá¼á"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "áá·ááá¶áâáá¶ááááâáá¶ááááâááá¶ááá¶ááááááâáááá¼áâááááá¶áá URL áááâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "áá·ááá¶áâáá¶ááááâáá¶ááááâááááá¢ááááâáááá½áâááááá¶áá URL áááâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "ááááááá¶ááá Url áá·ááááâáá¶âááá¶ááá¶áâáááâáá¶áâáá¶ááá¶áâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "ááááááá¶ááá Url áá·áâáááá¹ááááá¼á '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "ááááááá¶ááá Url áá·áâá¢áá»áááá¶áâáááááâá¢ááááááá¾âá¡á¾á"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "ááááááá¶ááá Url áá·áâá¢áá»áááá¶áâáá¶áááâááááá¶ááâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "ááááááá¶ááá Url áá¶ááá¶áâááá¶ááá¶áâááááâááá¶ááá¸á"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "ááááááá¶ááá Url áá·áá¢áá»áááá¶áâááá¶ááá¶áâááááâááá¶ááá¸áâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "ááá¶ááá¶áâááááâááá¶ááá¸áâáá·áâáááá¹ááááá¼á '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "ááááááá¶ááá Url áá·áâá¢áá»áááá¶áâá
áááâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "ááá¶ááá¶áâá
áááâáá·áâáááá¹ááááá¼á '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "ááááááá¶ááá Url áá¶ááá¶áâáááááâáááá¼á"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "áá·ááá¶áâá¢áá»áááá¶áâáááá¼áâáááâáá¶ááááâáá ááááá·áâáá¾âáá¶áâá¢á¶áááá¶áá"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "áá·ááá¶áâáá¶ááááâáá¶áâáááâááá¶ááá¶ááááááâáááá¼áâááááá¶áá URL áááâá¡á¾á"
@@ -2647,9 +2647,9 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1913
-#, fuzzy, c-format
+#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
-msgstr "rpm áá¶áâááááá¶áá»á %s áᶠ%s ááá»ááááâáá¶âáá·áâá¢á¶á
âáááááâáá¶áâáá»ááááá¶âáá¶á"
+msgstr "rpm áá¶ááâáááá¶âáá»á %s áᶠ%s ááá»ááááâáá¶âá¢á¶á
âáááááâáá¶áâáá»áâáááá¶"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1915
@@ -2663,7 +2663,7 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1918
-#, fuzzy, c-format
+#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm áá¶áâááááá¾á %s áᶠ%s ááá»ááááâáá¶âáá·áâá¢á¶á
âáááááâáá¶áâáá»áâáááá¶"
@@ -2736,25 +2736,25 @@
msgstr "%s áá¶áâáááá½áâááá %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s áá¹áâáááá¼áâáá¶áâááá¡á¾áâáááâáááááá·áá¸âááááá á (ApplLow/ApplHigh)\n"
@@ -2762,41 +2762,38 @@
#. 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:322
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
-msgstr "ááâáá·ááá¾áâáááááâáááá¶áâáááá¹ááááá¼áâ ááááááá¾âááâáááá
ááâááááááááá¶áâááâáááá¶ááááááááâááá¢ááááá»áâáááâáá á"
+msgstr "ááâáá·áâáá¾áâáááááâáááá¶áâ áááâáá·áâá¢á¶á
âááááááá¶áâááâáááá¶ááááááááâááâááá¢âáááá»á á"
-#: ../zypp/solver/detail/Resolver_problems.cc:323
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "áááâá²áááá¶âáááâááááá¶ááâááâá¢ááá¸âá¢á¶á
âááááááá¶áâáá¶áâáá¶âáá½áâáááá¶ááááááááâááâááá¢âáááá»áâáááá¼áâáá¶áâááâáá·á
á¶ááá¶Â á\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
-msgstr "á
ááááââá¢ááá¸âá¢á¶á
âááááááá¶áâáá¶ááááâá¢á¶á
âáá¾áâá¡á¾áâáá¶ááá¢ááââáááá¼ááá¶áâááááááᶠááá»ááááâááá½áâáá¶áâááááááâáááááá¹ááááá¼á á"
+msgstr "áááâáá¶ááááâáá
âáá¹áâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áâáá¶ááâá¢ááâáááá¼áâáá¶áâááááááá¶â ááá»ááááâá¢á¶á
âááá½áâáá¶áááááááâáááá¹ááááá¼á á"
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "áááááá¶áâáá·áâáááá¹ááááá¼á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2806,7 +2803,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s áááááááá·á
âáá¶áá½áâáááá
ááááááááá¶áâáááááá"
@@ -2815,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2832,24 +2829,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s áááâáááá¾âáááá
ááááááááá¶áâáááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s áááâáááá¾ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s áááâáááá¾Â  á %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2858,7 +2855,7 @@
"áááá
ááááááááá¶ááá¶áááááâáá¹áâáááá¼áâáá¶áâáá»áâá
ááâáá¸âáááááááá á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ááá¢ááâáá¾áááá
ááááááááá¶áâáááááá"
@@ -2866,72 +2863,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ááá¢áááá¾Â á %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "áá¼áâáááá"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "áááá¶áâáááá
ááâáá¶âááááá %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
"\n"
-"áá·áâáá¶áâáááá¶áâáá¶âáááâáá¶ááááâááááá¼ááá¶áâááá á"
+"áá·ááá¶áâáááá¶áâáááâáá¶ááááâááááá¼áâáá¶áâááá á"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
-msgstr "áááâáá¶áâááâáá¶áâáááá á¶âáá¼á
âáááâáá·ááááá¶âáá¶ááá¾/áá¶áááááá ááááááááá¶áâáááâáá·áâá¢á¶á
âááááááá¶áâáááá
ááâáááâáááá¼ááá¶áâáá¶áâá¡á¾á"
+msgstr "áááâáá¶áâááâáá¶áâáááá á¶ââáá¼á
âáá¶áâáá·ááááá¶âáá¶áâáá¾/áá¶áâááááá ááááááááá¶áâáááâáá¹áâáá·áâá¢á¶á
âááááááá¶áâáá¶áâá¢á¶áááááâáá¶ááá¢ááâáá¶áâáá"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
+#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
-msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸áááááâáá¶âáááá»áâáááâááááá·á
âáá¶áá½ááá¹á %s"
+msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸áááááâáá¶âáááááááá·á
âáá¶âáá½á %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2939,8 +2934,8 @@
msgstr "áá»á %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2948,139 +2943,149 @@
msgstr "áá»áâááá¡á¾á %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s áá¶áâááááá¼áâáá¶áâáááâáá·áâáá¶áâááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s áá¶áâáá¶áâá¢á¶áááááâáááâáá¶áá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:714
+#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
-msgstr "%s áááááâáááá
ááâááááá¼ááá¶ááááá %s ááá»áááááá¹áâáááá¼áâáá¶áâáá»á"
+msgstr "%s áááááâáá¶áâá¢á¶áááááâáááá %s ááá»ááááâáá¹áâáááá¼áâáá¶ááá»á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:724
+#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
-msgstr "%s áááááâáá¶áâá¢á¶áááááâáááá %s ááá»ááááâáá¹áâáááá¼áâáá¶áâáá»áâáá
âáá¾âááááááááâááááâá¢ááá"
+msgstr "%s áááááâáá¶áá¢á¶áááááâáááá %s ááá»ááááâáá¹áâáááá¼áâáá¶áâááááá¶áá»áâáá
âáááá»áâááááááááâááááâá¢ááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "áá·áâá
á¶ááá¶á
áâááá¡á¾á %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:742
+#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
-msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¾áááá¸âááááááááá
ááâááááá¼ááá¶áâáááá %s"
+msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¾áááá¸âáááááâáá¶áâá¢á¶áááááâáááá %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
+#, c-format
msgid "%s will not be uninstalled, because it is still required"
-msgstr "áá·áâá¢á¶á
âáá»á %s áá¶á áá¸áááááâáá
âáááá¼ááá¶áâáá¶âáá
âá¡á¾á"
+msgstr "%s áá¹áâáá·áâáááá¼áâáá¶áâáá»áâáá áá¸áááááâáá¶âáá
âááâáááá¼áâáá¶á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:826
+#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
-msgstr "%s áááâáááá¾ %s á ááá»ááááâáá·áâá¢á¶á
âáá»á %s áá¶ááá áá¸áááááâáá¶âáá¶ááâááá á"
+msgstr "%s ááááááá¾ %s á ááá»áááá %s áá·áâá¢á¶á
âáááá¼áâáá¶ááá»á áá¸áááááâáá¶âáá¶áááá á"
-#: ../zypp/solver/detail/Resolver_problems.cc:835
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:858
+#, c-format
msgid "Cannot install %s, because it is conflicting"
-msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¶ááá áá¸áááááâáá¶âáááá»áâáááâááááá·á
"
+msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸áááááâáá¶âáááá»áâáááááááá·á
"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "áá·áâá¢á¶á
âáá»á %s áá¶áááâ áááááâáá¶âáááááááá·á
âáá¶âáá½áâáá¹á %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "áá·áâá¢á¶á
âáááááâááááá¼áâáá¶á %s"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "áá·áâá¢á¾áá¾âáá¹áâááááá¼áâáá¶áâáááâáááá
âáá¸ááá"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
-#, fuzzy
+#: ../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:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ááá¡á¾á %s áááâáá¸áá¶âáá¶âáá¹áâáááá¶áááááá¼áâáááá¶ááááááááâááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
+#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
-msgstr "%s áááááâáá¶áâá¢á¶áááááâááá ááá»ááááâáá¹áâáááá¶áááááá¼áâáááá¶ááááááááâááááâáá¶áá»âááááá¶áâááá¡á¾á"
+msgstr "%s áááááâáá¼áâáá¶áâá¢á¶áááááâááá ááá»ááááâáá¹áâáááá¶áááááá¼áâáááá¶áááááááááâááááâáá¶áá»âáááâáá¶áâááá¡á¾á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../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 áááááâáá¶áâá¢á¶áááááâáááâ ááá»ááááâáá¹áâáááá¶áááááá¼áâáááá»áá áá»áâáááâááááâáá¶áá»âáááâáá¶áâááá¡á¾á"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "áá·áâá¢á¾áá¾âáá¹áâáá¶áâáááâááááá·á
âáá %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "áá·áâá¢á¾áá¾âáá¹áâáá¶áâáááâáááá¾ %s áá
âáááá»á %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "áá·áâá¢á¾áá¾áá¶âáá¶áâááááá %s áá¾áááá¸âááá¡á¾áâáá½á
á á¾á"
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
msgid "Do not install or delete the resolvables concerned"
-msgstr "áá»áâááá¡á¾á á¬âáá»áâáááá
ááâááááááá¶áâááááá"
+msgstr "áá»áâááá¡á¾á á¬âáá»áâá¢ááá¸âáááá¢á¶á
âááááááá¶áâáá¶áâáááâáá¶áááá"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ááááá¶ááâáá¶ááá¶ááá¶á %s á
áááá %s ááááááâáááá¾âá²áá %s áá¶ááâáááá"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency
#: ../zypp/solver/detail/ResolverInfoMissingReq.cc:64
-#, fuzzy, c-format
+#, c-format
msgid "%s is lacking the requirement %s"
-msgstr "%s áá¶ááâááááá¼ááá¶á %s"
+msgstr "%s ááááâááááá¼áâáá¶á %s"
#: ../zypp/solver/detail/ResolverInfoMisc.cc:56
msgid ", Action: "
@@ -3155,16 +3160,16 @@
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
-#, fuzzy, c-format
+#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
-msgstr "%s áááá¼áâáá¶áâááááááááâá²ááâááá¡á¾á ááá»ááááâáá¶âáá·áâá¢á¶á
âáá
âáá½á
áááâáá¶áâááâáá¶áâáááá á¶âáááá
ááâáááâáááá¼ááá¶á á"
+msgstr "%s áááá¼áâáá¶áâáááááâááááááá¶âááá¡á¾á ááá»ááááâáá¶âáá·áá¢á¶á
â ááááá¶áâááâáááá á¶âáá¶áâá¢á¶ááááá á"
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:167
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s since it is already marked as needed to be uninstalled"
-msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áááááâáá¶âáá¶áâááááá¶áááᶠáá»á"
+msgstr "áá·áá¢á¶á
âááá¡á¾á %s ááááááá¶âáá¶âáááá¼áâáá¶áâááááá¶ááâáá¶âá
á¶ááá¶á
áâáááá¼áâáá»á"
#. Translator: %s = name of patch
#. TranslatorExplanation: A patch which is not needed (does not apply) cant be installed
@@ -3173,9 +3178,9 @@
#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed
#. TranslatorExplanation: package is not installed.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:179
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because it does not apply to this system."
-msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áááááâáá¶âáá·áâá¢áá»ááááâáá
âááááááááâááá á"
+msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸áááááâáá¶âáá·áâá¢áá»ááááâááááááááâááá á"
#. affected() = item 1 which has to be installed
#. _capability =
@@ -3183,9 +3188,9 @@
#. other_capability() =
#. Translator: %s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoMisc.cc:190
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because %s is already marked as needed to for installation"
-msgstr "áá·áá¢á¶á
âááá¡á¾áâ %s á
á¶ááâáá¶áááá¸âáá¶áâááááá¶ááâáá¶âáááá¼áâá²ááâááá¡á¾á %s ááâááááá"
+msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸ááááá %s áááá¼áâáá¶áâááááá¶ááâáá¶âá
á¶ááá¶á
áââááááá¶ááâááá¡á¾á"
#. Translator: %s = name of patch,product
#: ../zypp/solver/detail/ResolverInfoMisc.cc:198
@@ -3251,9 +3256,9 @@
#. TranslatorExplanation: removal of this resolvable would therefore break dependency
#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled
#: ../zypp/solver/detail/ResolverInfoMisc.cc:292
-#, fuzzy, c-format
+#, c-format
msgid "There are no alternative providers of %s installed"
-msgstr "áá·áâáá¶áâá¢ááááááááâáá½áâáááááâáááâáá¶áááá¡á¾ááááá %s"
+msgstr "áááá¶áâáááá»áá áá»áâáááááâáá¶âáááá½áââáááá %s áá¶áâááá¡á¾á"
#. Translator: 1.%s = name of package,patch....
#. TranslatorExample: for bar
@@ -3282,9 +3287,9 @@
#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible
#. TranslatorExplanation: bar requires something from foo
#: ../zypp/solver/detail/ResolverInfoMisc.cc:341
-#, fuzzy, c-format
+#, c-format
msgid "Upgrading to %s to avoid removing %s is not possible."
-msgstr "áááá¾ %s á²ááâáá¶áááááá áá¾áááá¸âá
áááá¶áâáá %s á
áá áá·áâá¢á¶á
âáá
áá½á
á¡á¾á á"
+msgstr "áá·áâá¢á¶á
âáááá¾âá²áá %s ááááá¾á áá¾áááá¸ááááá¶ááá¶áââáá %s á
ááâ á"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:359
@@ -3322,9 +3327,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s ááááá %s ááá»ááááâáá¶áâáááá¶ááááááááâááááá á"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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) á"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "áá·áâá¢á¶á
âáááááâáá¶áâááááá¼ááá¶á %s ááááá¶áá %s"
@@ -3335,10 +3346,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
+#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
-msgstr "%s áááá¼ááá¶áâáááâáááá
ááâááááááá¶áâáááááá áá¼á
ááááâáá¶âáá·áâá¢á¶á
âáááá¶á
áâá
ááâáá¸áááá¶âáá¶áâá¡á¾á á"
+msgstr "%s áááá¼áâáá¶ááá¶ááá¶áâáááâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áâáááááâáááâáááâáá¶áâáááá¾áâááááá¶ááâááá¡á¾á áá¼á
ááááâáá¶âáá¹áâáá·áâáááá¼ááá¶áâááááá¶áááá á"
#. affected() = provider of cap
#. _capability =
@@ -3347,10 +3358,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
+#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
-msgstr "%s áááá¼ááá¶áâáááâáááá
ááâááááááá¶áâáááááá áá¼á
ááááâáá¶âáá·áâá¢á¶á
âáááá¶á
áâá
ááâáá¸áááá¶âáá¶áâá¡á¾á á"
+msgstr "%s áááá¼áâáá¶áâáá¶ááá¶áâáááâá¢ááá¸âáááâá¢á¶á
âáááâá¢á¶á
âááááááá¶áâáá¶áâááááá áá¼á
ááááâáá¶âáá¹áâáá·áâáááá¼áâáá¶áâááááá¶ááâáá á"
#. affected() = to-be-uninstalled resolvable which is locked
#. _capability =
@@ -3359,7 +3370,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s áá¶áááá áá·áâáá·áâá¢á¶á
âáá»áâáá¶áâá¡á¾á á"
@@ -3370,10 +3381,10 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
-msgstr "áá¶ááááâááááá·á
âáá¾ %s (%s) áááá¼ááá¶áâááâá
áá %s"
+msgstr "áá¶áâáááááááá·á
%s (%s) áá¶ááá¶áâá²ááâáá %s á
áá áááâáááá¼áâáá¶áâáááááâááááááá¶âááááá¶ááâááá¡á¾á"
#. affected() = provider of capability
#. _capability = provided by provider
@@ -3381,23 +3392,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "ááááá¶áá %s áᶠá¢á¶á
âáá»áâáá¶á áááâáá¶áâááâáá¶áâáááááááá·á
áá¾ %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "áḠ%s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " ááá á»á!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " áááá¶áá!"
@@ -3428,9 +3439,8 @@
msgstr "áááá¾á²ááâá¢áááâááááááá¶áâáááâáá¶áá½áâáááááá¶áâáá¶ááá¢áá á"
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
-#, fuzzy
msgid "Regarding all resolvables with a compatible architecture."
-msgstr "á
ááááâáááá
ááâááááááááá¶áâáá¶ááá¢ááâááááá¶áâáááá¶ááááááááâáááâáááááá¶Â á"
+msgstr "áá¶ááááâáá¹áâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áâáá¶ááâá¢ááââáá¶âáá½áâáááá¶ááááâááááâáááâááâáááá¶Â á"
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
@@ -3456,8 +3466,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s áááá¼áâáá¶áâáááá¾âá²ááâáááááâááá %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s áá¹áâáááá¼áâáá¶áâáá¶áâáááááâááááá¶ááâáá¶âáááá¡á¾á (áá¶áâáááá¾âá²ááâááááá) ááá %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/ko.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ko.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/ko.po (original)
+++ trunk/libzypp/po/ko.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2001-07-18 11:05+0200\n"
"Last-Translator: Hwang, Sang-Jin \n"
"Language-Team: Korean \n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3146,25 +3146,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3172,38 +3172,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3211,7 +3211,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1ì %2ì 충ëí©ëë¤"
@@ -3220,14 +3220,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3235,31 +3235,31 @@
msgstr "%1ì %2ì 충ëí©ëë¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3267,69 +3267,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
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:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "ì¤ì¹ì¤:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3338,8 +3338,8 @@
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3347,123 +3347,135 @@
msgstr "ì¤ì¹ì¤:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, fuzzy, c-format
msgid "%s has missing dependencies"
msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "ë¤ì ì¤ì¹í´ì¼ í©ëë¤."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
# text is shown in a column of a package list entry
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "í´ê²°í ì ìë ì구ì¬í..."
# text is shown in a column of a package list entry
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "í´ê²°í ì ìë ì구ì¬í..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1ì %2ì 충ëí©ëë¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1ì %2ì 충ëí©ëë¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "%1 ëë í 리ë ì´ë¯¸ 목ë¡ì ììµëë¤."
@@ -3474,7 +3486,7 @@
msgstr "%1ì %2ì 충ëí©ëë¤"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3728,9 +3740,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3741,7 +3759,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3753,7 +3771,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3765,7 +3783,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "ì´ í¨í¤ì§ë ì´ë¯¸ ì¤ì¹ëì´ ìì´ì ì¤ì¹ê° ëì§ ììµëë¤."
@@ -3776,7 +3794,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3787,24 +3805,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "ìë¬"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "ë°ì´í° ë¶ë¬ì¤ê¸°"
@@ -3865,7 +3883,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/lo.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/lo.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/lo.po (original)
+++ trunk/libzypp/po/lo.po Mon Sep 3 13:56:27 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-01-04 08:58+0100\n"
"Last-Translator: i18n@suse.de\n"
"Language-Team: Lao \n"
@@ -14,77 +14,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2725,25 +2725,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2751,38 +2751,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2790,7 +2790,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2799,14 +2799,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2814,31 +2814,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2846,68 +2846,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2915,8 +2915,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2924,118 +2924,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3045,7 +3057,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3296,9 +3308,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3309,7 +3327,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3321,7 +3339,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3333,7 +3351,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3344,7 +3362,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3355,23 +3373,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3429,7 +3447,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/lt.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/lt.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/lt.po (original)
+++ trunk/libzypp/po/lt.po Mon Sep 3 13:56:27 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-05-01 15:00+0300\n"
"Last-Translator: Andrius Å tikonas \n"
"Language-Team: Lietuvių \n"
@@ -20,77 +20,77 @@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url schema neleidžia %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Klaidingas %s komponentas â%sâ"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Klaidingas %s komponentas"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Užklausos eilutÄs nagrinÄjimas nepalaikomas Å¡iam URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url schema yra reikalingas komponentas"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Klaidingaa Url schema â%sâ"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url schema neleidžia vartotojo vardo"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url schema neleidžia slaptažodžio"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Bloga komanda %1."
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url schema neleidžia prievado"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Klaidingas prievado komponentas â%sâ"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url schema reikalauja kelio pavadinimo"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2977,25 +2977,25 @@
msgstr "%s pakeistas %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3003,38 +3003,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Klaidinga informacija"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3042,7 +3042,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 konfliktuoja su %2"
@@ -3051,14 +3051,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3068,31 +3068,31 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3100,68 +3100,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s priklauso nuo:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Negaliu įdiegti %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Niekas nepateikia %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3169,8 +3169,8 @@
msgstr "pašalinti %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3178,120 +3178,132 @@
msgstr "neįdiegti %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "turi neišsprendžiamų reikalavimų..."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "turi neišsprendžiamų reikalavimų..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1 konfliktuoja su %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1 konfliktuoja su %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "Katalogas %1 jau yra sÄ
raše."
@@ -3302,7 +3314,7 @@
msgstr "%1 konfliktuoja su %2"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3554,8 +3566,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s pateikia %s, bet yra kitos architektūros"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s pateikia %s, bet yra kitos architektūros"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3567,7 +3585,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3579,7 +3597,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3591,7 +3609,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s yra užrakintas ir negali būti pašalintas."
@@ -3602,7 +3620,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3613,23 +3631,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "nuo %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Klaida!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Svarbu!"
@@ -3688,9 +3706,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s reikalingas %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -5095,6 +5113,10 @@
"Vis tiek naudoti bylÄ
?"
#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s reikalingas %s"
+
+#, fuzzy
#~ msgid "Unable to parse Url authority"
#~ msgstr "Neįmanoma pridÄti paslaugos"
Modified: trunk/libzypp/po/mk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/mk.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/mk.po (original)
+++ trunk/libzypp/po/mk.po Mon Sep 3 13:56:27 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2001-07-17 16:12+0200\n"
"Last-Translator: ÐоÑан ÐимовÑки \n"
"Language-Team: Macedonian \n"
@@ -15,77 +15,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2872,25 +2872,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2898,38 +2898,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2937,7 +2937,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2946,14 +2946,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2961,31 +2961,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2993,70 +2993,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
# CL
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
#, fuzzy
msgid "Child of"
msgstr "Чиле"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3064,8 +3064,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3073,118 +3073,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3194,7 +3206,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3445,9 +3457,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3458,7 +3476,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3470,7 +3488,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3482,7 +3500,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3493,7 +3511,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3504,23 +3522,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3578,7 +3596,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/mr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/mr.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/mr.po (original)
+++ trunk/libzypp/po/mr.po Mon Sep 3 13:56:27 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Check hardware-2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-13 12:55+0530\n"
"Last-Translator: Priyavert Sharma \n"
"Language-Team: AgreeYa Solutions \n"
@@ -12,77 +12,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10.2\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url सà¥à¤à¥à¤® %sला à¤
नà¥à¤®à¤¤à¥ दà¥à¤¤ नाहà¥"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "à¤
वà¥à¤§ %s à¤à¥à¤®à¥à¤ªà¥à¤¨à¤¨à¥à¤ %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "à¤
वà¥à¤§ %s à¤à¥à¤®à¥à¤ªà¥à¤¨à¤¨à¥à¤"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "या URL साठॠपाथ पà¥
रामà¥à¤à¤° पारà¥à¤¸à¤¿à¤à¤à¤à¥ समरà¥à¤¥à¤¨ नाहà¥"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "या URL साठॠà¤à¥à¤µà¥à¤°à¥ सà¥à¤à¥à¤°à¤¿à¤à¤ पारà¥à¤¸à¤¿à¤à¤à¤à¥ समरà¥à¤¥à¤¨ नाहà¥"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "URL सà¥à¤à¥à¤® हा à¤à¤ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¤¾à¤ à¤à¤¹à¥"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "à¤
वà¥à¤§ Url सà¥à¤à¥à¤® %s"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url सà¥à¤à¥à¤® à¤à¤ªà¤à¥à¤à¥à¤¤à¥à¤¯à¤¾à¤à¥à¤¯à¤¾ नावाला à¤
नà¥à¤®à¤¤à¥ दà¥à¤¤ नाहà¥"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url सà¥à¤à¥à¤® पासवरà¥à¤¡à¤²à¤¾ à¤
नà¥à¤®à¤¤à¥ दà¥à¤¤ नाहà¥"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url सà¥à¤à¥à¤®à¤²à¤¾ मà¥à¤à¥à¤¯ à¤à¤¾à¤à¤¾à¤à¥ à¤à¤°à¤ à¤
सतà¥"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url सà¥à¤à¥à¤® मà¥à¤à¥à¤¯ à¤à¤¾à¤à¤¾à¤²à¤¾ à¤
नà¥à¤®à¤¤à¥ दà¥à¤¤ नाहà¥"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "à¤
वà¥à¤§ मà¥à¤à¥à¤¯ à¤à¤¾à¤ %s"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url सà¥à¤à¥à¤® पà¥à¤°à¥à¤à¤²à¤¾ à¤
नà¥à¤®à¤¤à¥ दà¥à¤¤ नाहà¥"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "à¤
वà¥à¤§ पà¥à¤°à¥à¤ à¤à¤¾à¤ %s"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url सà¥à¤à¥à¤®à¤²à¤¾ पाथà¤à¥à¤¯à¤¾ नावाà¤à¥ à¤à¤°à¤ à¤
सतà¥"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "à¤
थà¥à¤°à¤¿à¤à¥ à¤à¤ªà¤¸à¥à¤¥à¤¿à¤¤ à¤
सà¥à¤² तर सापà¥à¤à¥à¤· पाथला à¤
नà¥à¤®à¤¤à¥ नाहà¥"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "या URL साठॠपाथ पà¥
रामà¥à¤à¤° पारà¥à¤¸à¤¿à¤à¤à¤à¥ समरà¥à¤¥à¤¨ नाहà¥"
@@ -2724,7 +2724,7 @@
msgstr "%s à¤à¥à¤¯à¤¾ à¤à¤¾à¤à¥ %s "
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2732,19 +2732,19 @@
"हॠरिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ पà¥à¤°à¤£à¤¾à¤²à¥à¤¤à¥à¤¨ पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤²à¥ à¤à¤¾à¤¤à¥à¤²"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2752,38 +2752,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "à¤
वà¥à¤§ माहितà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2791,7 +2791,7 @@
msgstr "%s ला %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥:/n"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s à¤à¥ à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤²à¥à¤¬à¤¶à¥ पà¤à¤¤ नाहà¥"
@@ -2800,14 +2800,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2817,24 +2817,24 @@
"%s शॠपà¤à¤¤ नाहà¥:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸à¤¨à¤¾ बाà¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s %s ला बाà¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s :%s ला बाà¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2843,7 +2843,7 @@
"हॠरिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ पà¥à¤°à¤£à¤¾à¤²à¥à¤¤à¥à¤¨ पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤²à¥ à¤à¤¾à¤¤à¥à¤²"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s à¤à¤¤à¤° रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸à¤µà¤° à¤
वलà¤à¤¬à¥à¤¨"
@@ -2851,38 +2851,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s :%s वर à¤
वलà¤à¤¬à¥à¤¨"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "à¤à¤¾à¤à¤²à¥à¤¡ à¤à¤«"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "à¤à¥à¤£à¤¤à¥à¤¹à¥ à¤à¥à¤·à¥à¤ %s पà¥à¤°à¤µà¤¤ नाहà¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2891,32 +2891,32 @@
"\n"
"à¤
सॠà¤à¥à¤£à¤¤à¥à¤¹à¥ साधन à¤à¤ªà¤²à¤¬à¥à¤§ नाहॠà¤à¥ या à¤à¤°à¤à¥à¤²à¤¾ समरà¥à¤¥à¤¨ दà¥à¤¤à¥."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "यà¥à¤ à¤à¤¾à¤¤à¤²à¥à¤²à¥à¤¯à¤¾ समसà¥à¤¯à¤¾, à¤à¥à¤¯à¤¾ या रिà¤à¥à¤²à¥à¤¯à¥à¤¶à¤¨à¤à¥à¤¯à¤¾ वर/à¤à¤¾à¤²à¥ नमà¥à¤¦ à¤à¥à¤²à¥à¤¯à¤¾ à¤à¤¹à¥à¤¤, तà¥à¤¯à¤¾à¤¸à¤°à¥à¤µ à¤
वलà¤à¤¬à¥à¤¨ à¤à¥à¤·à¥à¤à¥ सà¥à¤¡à¤µà¤£à¤¾à¤° नाहà¥à¤¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2924,8 +2924,8 @@
msgstr "%s पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2933,119 +2933,131 @@
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ नà¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, fuzzy, c-format
msgid "%s has unfulfilled requirements"
msgstr "à¤à¥à¤¯à¤¾ à¤à¤°à¤à¤¾ पà¥à¤°à¥à¤£ न हà¥à¤£à¤¾à¤°à¥à¤¯à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%sà¤à¥à¤¯à¤¾ à¤à¤°à¤à¤¾ पà¥à¤°à¥à¤£ न हà¥à¤£à¤¾à¤°à¥à¤¯à¤¾ à¤à¤¹à¥à¤¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤£à¥à¤¯à¤¾à¤à¥ à¤à¤°à¤ नाहà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¤à¤¾ यà¥à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤°à¤à¥ नाहॠà¤à¤¾à¤°à¤£ तà¥à¤¯à¤¾à¤à¥ %s शॠपà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "या à¤à¤°à¤à¥à¤à¤¡à¥ यà¥à¤¥à¥à¤ दà¥à¤°à¥à¤²à¤à¥à¤· à¤à¤°à¤¾"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "या à¤à¤°à¤à¥à¤à¤¡à¥ यà¥à¤¥à¥à¤ दà¥à¤°à¥à¤²à¤à¥à¤· à¤à¤°à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¾, à¤à¤°à¥ तॠसà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ बदलत à¤
सà¥à¤²"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s हॠडिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥ पà¥à¤°à¤µà¤¤à¥, परà¤à¤¤à¥ तॠसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¯à¤à¥à¤®à¤à¥ सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ बदलà¥à¤²"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s हॠडिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥ पà¥à¤°à¤µà¤¤à¥, परà¤à¤¤à¥ तॠसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¯à¤à¥à¤®à¤à¥ सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ बदलà¥à¤²"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s à¤à¤¾ हा विवाद विसरà¥à¤¨ à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr " %s मधà¥à¤² %s à¤à¤¬à¥à¤¸à¥à¤²à¥à¤à¤à¤¡à¥ दà¥à¤°à¥à¤²à¤à¥à¤· à¤à¤°à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "%s याà¤à¤§à¥à¤ सà¥à¤¥à¤¾à¤ªà¤¨à¥à¤¸à¤¾à¤ ॠसà¤à¥à¤ à¤
सलà¥à¤¯à¤¾à¤à¤¡à¥ दà¥à¤°à¥à¤²à¤à¥à¤· à¤à¤°à¤¾"
@@ -3056,7 +3068,7 @@
msgstr "सà¤à¤¬à¤à¤§à¤¿à¤¤ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¿à¤à¤µà¤¾ पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¥ नà¤à¤¾"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s à¤à¥ à¤
पà¤à¥à¤°à¥à¤¡à¤¿à¤à¤ à¤à¤°à¤¤à¤¾à¤à¤¨à¤¾ %s साठॠ%s à¤à¥ à¤à¤°à¤"
@@ -3307,8 +3319,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s %s पà¥à¤°à¤µà¤¤à¥, परà¤à¤¤à¥ तà¥à¤¯à¤¾à¤à¥ दà¥à¤¸à¤°à¥ सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ à¤à¤¹à¥."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s %s पà¥à¤°à¤µà¤¤à¥, परà¤à¤¤à¥ तà¥à¤¯à¤¾à¤à¥ दà¥à¤¸à¤°à¥ सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ à¤à¤¹à¥."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s साठॠ%s à¤à¥ à¤à¤°à¤ पà¥à¤°à¥à¤£ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
@@ -3320,7 +3338,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "दà¥à¤¸à¤°à¥à¤¯à¤¾ सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤£à¤¾à¤°à¥à¤¯à¤¾ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤²à¥à¤¬à¤²à¤¾ %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥, तà¥à¤¯à¤¾à¤®à¥à¤³à¥ तà¥à¤¯à¤¾à¤à¥ लिà¤à¤ à¤à¤¾à¤£à¤¾à¤° नाहà¥"
@@ -3332,7 +3350,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "दà¥à¤¸à¤°à¥à¤¯à¤¾ सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤£à¤¾à¤°à¥à¤¯à¤¾ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤²à¥à¤¬à¤²à¤¾ %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥, तà¥à¤¯à¤¾à¤®à¥à¤³à¥ तà¥à¤¯à¤¾à¤à¥ लिà¤à¤ à¤à¤¾à¤£à¤¾à¤° नाहà¥"
@@ -3344,7 +3362,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s ला à¤à¥à¤²à¥à¤ª à¤à¤¹à¥ व à¤
सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤ शà¤à¤¤ नाहà¥"
@@ -3355,7 +3373,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) विषयà¥à¤à¥à¤¯à¤¾ वादामà¥à¤³à¥ सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤£à¤¾à¤°à¥ %s à¤à¤¾à¤¢à¥à¤¨ à¤à¤¾à¤à¤£à¥ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¤¹à¥"
@@ -3366,23 +3384,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s वरà¥à¤² विवादावरà¥à¤¨ %s à¤
सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤
सलà¥à¤¯à¤¾à¤à¥ à¤à¥à¤£"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s वरà¥à¤¨"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "à¤à¥à¤!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "महतà¥à¤µà¤¾à¤à¥!"
@@ -3439,9 +3457,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s ला %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4760,6 +4778,10 @@
"à¤
पà¥à¤à¥à¤·à¤¿à¤¤ %s,à¤à¤¢à¤³à¤²à¥ %s\n"
"तरà¥à¤¹à¥ फाà¤à¤² वापरायà¤à¥?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s ला %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Url à¤
थà¥à¤°à¤¿à¤à¥à¤à¤¾ सà¤à¤¬à¤à¤§ साà¤à¤à¤£à¥ à¤
शà¤à¥à¤¯"
Modified: trunk/libzypp/po/nb.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/nb.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/nb.po (original)
+++ trunk/libzypp/po/nb.po Mon Sep 3 13:56:27 2007
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: zypp.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 11:56+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 13:41+0200\n"
"Last-Translator: Rune Nordbøe Skillingstad \n"
"Language-Team: Norwegian\n"
"MIME-Version: 1.0\n"
@@ -20,77 +20,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Adressestrategi tillater ikke %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ugyldig %s komponent %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ugyldig %s komponent"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Analyse av baneparameter støttes ikke for denne URL-en"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Analyse av spørringsstreng støttes ikke for denne URL-en"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Adressestrategi er en obligatorisk komponent"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ugyldig adressestrategi %s"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Adressestrategi tillater ikke brukernavn"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Adressestrategi tillater ikke passord"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Adressestrategi krever en vertskomponent"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Adressestrategi tillater ikke en vertskomponent"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ugyldig vertskomponent %s"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Adressestrategi tillater ikke port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ugyldig portkomponent %s"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Adressestrategi krever banenavn"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relativ sti ikke tillatt hvis autoritet finnes"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Analyse av baneparameter støttes ikke for denne URL-en"
@@ -127,9 +127,7 @@
#: ../zypp/repo/PackageProvider.cc:303
#, 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?"
+msgstr "Pakken %s består ikke integritetskontrollen. Vil du prøve å laste den ned på nytt?"
#: ../zypp/repo/RepoProvideFile.cc:205
msgid "No url in repository."
@@ -2777,25 +2775,25 @@
msgstr "%s erstattet av %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s blir installert av et annet program. (ApplLow/ApplHigh)\n"
@@ -2803,44 +2801,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
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:323
-msgid ""
-"With this run only resolvables with the best architecture have been "
-"regarded.\n"
+#: ../zypp/solver/detail/Resolver_problems.cc:338
+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:324
-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:339
+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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ugyldig informasjon"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2850,7 +2842,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s er i konflikt med andre nødvendige pakker"
@@ -2859,14 +2851,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2876,24 +2868,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s forelder %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s forelder:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2902,7 +2894,7 @@
"Disse nødvendige pakkene vil bli fjernet fra systemet."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s avhenger av andre nødvendige pakker"
@@ -2910,38 +2902,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s avhenger av:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Underordnet"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Kan ikke installere %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Ingen pakker inneholder %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2949,35 +2941,31 @@
"\n"
"Det er ingen tilgjengelig ressurs som støtter dette kravet."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
-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:461
+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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2985,8 +2973,8 @@
msgstr "slett %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2994,122 +2982,130 @@
msgstr "Ikke installer %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Kravet %s kan ikke løses."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorerer dette kravet, men bare her"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Ignorerer dette kravet generelt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installer %s selv om arkitekturen vil bli endret"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
-msgid ""
-"%s provides this dependency, but would change the architecture of the "
-"installed item"
-msgstr ""
-"%s oppfyller denne avhengigheten, men vil endre arkitekturen for det "
-"installerte elementet"
+msgid "%s provides this dependency, but would change the architecture of the installed item"
+msgstr "%s oppfyller denne avhengigheten, men vil endre arkitekturen for det installerte elementet"
+
+#. 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 "Installer %s selv om arkitekturen vil bli endret"
+
+#. 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 oppfyller denne avhengigheten, men vil endre leverandør av det installerte elementet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorerer denne konflikten for %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorer foreldet %s i %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorer at %s allerede er valgt for installasjon"
@@ -3119,7 +3115,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "som krever %s for %s ved oppgradering av %s"
@@ -3204,12 +3200,8 @@
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
#, c-format
-msgid ""
-"%s is scheduled to be installed, but this is impossible due to dependency "
-"problems."
-msgstr ""
-"%s er merket for installasjon, men dette er ikke mulig på grunn av "
-"avhengighetsproblemer."
+msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
+msgstr "%s er merket for installasjon, men dette er ikke mulig på grunn av avhengighetsproblemer."
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
@@ -3353,12 +3345,8 @@
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:396
#, c-format
-msgid ""
-"%s provides %s, but it is uninstallable. Try installing it on its own for "
-"more details."
-msgstr ""
-"%s inneholder %s, men kan ikke installeres. Forsøk å installere bare denne "
-"pakken for å få mer informasjon."
+msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details."
+msgstr "%s inneholder %s, men kan ikke installeres. Forsøk å installere bare denne pakken for å få mer informasjon."
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:414
@@ -3378,9 +3366,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s inneholder %s, men har en annen arkitektur."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 inneholder %s, men har en annen leverandør (%s)"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Kan ikke oppfylle kravet %s for %s"
@@ -3391,14 +3385,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
-msgid ""
-"%s is required by another resolvable selected for installation, so it won't "
-"be unlinked."
-msgstr ""
-"%s kreves av en annen nødvendig pakke som skal installeres, så lenken vil ikke bli "
-"fjernet."
+msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
+msgstr "%s kreves av en annen nødvendig pakke som skal installeres, så lenken vil ikke bli fjernet."
#. affected() = provider of cap
#. _capability =
@@ -3407,12 +3397,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
-msgstr ""
-"%s kreves av en annen installert og nødvendig pakke, så lenken vil ikke bli "
-"fjernet."
+msgstr "%s kreves av en annen installert og nødvendig pakke, så lenken vil ikke bli fjernet."
#. affected() = to-be-uninstalled resolvable which is locked
#. _capability =
@@ -3421,7 +3409,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s er beskyttet, og kan ikke avinstalleres."
@@ -3432,14 +3420,10 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
-msgid ""
-"A conflict over %s (%s) requires the removal of %s which is scheduled for "
-"installation"
-msgstr ""
-"PÃ¥ grunn av en konflikt i forbindelse med %s (%s) vil ikke pakken %s bli "
-"installert"
+msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
+msgstr "PÃ¥ grunn av en konflikt i forbindelse med %s (%s) vil ikke pakken %s bli installert"
#. affected() = provider of capability
#. _capability = provided by provider
@@ -3447,23 +3431,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Merker %s som ikke installerbar på grunn av konflikter i forbindelse med %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "fra %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Feil!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Viktig!"
@@ -3521,8 +3505,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s oppfriskes av %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s vil bli vurder for installasjon (oppdatering) av %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/nl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/nl.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/nl.po (original)
+++ trunk/libzypp/po/nl.po Mon Sep 3 13:56:27 2007
@@ -1,4 +1,4 @@
-# translation of zypp.po to Nederlands
+# translation of zypp.po to Dutch
# Dutch message file for YaST 2 (@memory@).
# Copyright (C) 2005 SUSE Linux Products GmbH.
# Copyright (C) 2002 SuSE Linux AG.
@@ -14,87 +14,87 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-07-31 16:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 13:24+0200\n"
"Last-Translator: Rinse de Vries \n"
-"Language-Team: Nederlands \n"
+"Language-Team: Dutch \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "%s is niet toegestaan in URL-schema "
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ongeldige %s component '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ongeldige %s component"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Parseren van padparameter wordt niet ondersteund voor deze URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Parseren van queryreeks wordt niet ondersteund voor deze URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "URL-schema is een vereist component"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ongeldig URL-schema '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Gebruikersnaam is niet toegestaan in URL-schema "
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Wachtwoord is niet toegestaan in URL-schema "
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "URL-schema vereist hostcomponent"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Hostcomponent is niet toegestaan in URL-schema "
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ongeldige hostcomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Poort is niet toegestaan in URL-schema "
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ongeldige poortcomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "URL-schema vereist padnaam"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relatief pad is niet toegestaan als authority bestaat"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Parseren van padparameter wordt niet ondersteund voor deze URL"
@@ -116,9 +116,8 @@
#. TranslatorExplanation followed by the list of error messages that lead to this exception
#: ../zypp/base/Exception.cc:89
-#, fuzzy
msgid "History:"
-msgstr "XF86History"
+msgstr "Geschiedenis:"
#: ../zypp/repo/PackageProvider.cc:222
msgid "applydeltarpm check failed."
@@ -135,15 +134,14 @@
msgstr "Pakket %s voldoet niet aan integriteitscontrole. Wilt u het opnieuw proberen?"
#: ../zypp/repo/RepoProvideFile.cc:205
-#, fuzzy
msgid "No url in repository."
-msgstr "Probleem bij analyseren van installatiebrongegevens."
+msgstr "Geen url in bron."
#. iteration over urls
#: ../zypp/repo/RepoProvideFile.cc:267
-#, fuzzy, c-format
+#, c-format
msgid "Can't provide file %s from repository %s"
-msgstr "Kan %s niet leveren van %s"
+msgstr "Kan bestand %s niet leveren van bron %s"
#: ../zypp/repo/cached/RepoImpl.cc:78
#, c-format
@@ -176,7 +174,7 @@
#: ../zypp/RepoManager.cc:614
msgid "Valid metadata not found at specified URL(s)"
-msgstr ""
+msgstr "Geen geldige metadata gevonden op opgeven URL('s)"
#: ../zypp/RepoManager.cc:664
#, c-format
@@ -195,9 +193,9 @@
msgstr "Bron '%s' toevoegen"
#: ../zypp/RepoManager.cc:1004
-#, fuzzy, c-format
+#, c-format
msgid "Removing repository '%s'"
-msgstr "Bron '%s' toevoegen"
+msgstr "Bron '%s' verwijderen"
#: ../zypp/Url.cc:112
msgid "Invalid LDAP URL query string"
@@ -2654,7 +2652,7 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1913
-#, fuzzy, c-format
+#, 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"
@@ -2670,9 +2668,9 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1918
-#, fuzzy, c-format
+#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
-msgstr "rpm maakt %s aan als %s, maar het was niet mogelijk om het verschil te achterhalen"
+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
@@ -2744,25 +2742,25 @@
msgstr "%s vervangen door %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, 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"
@@ -2770,41 +2768,38 @@
#. 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:322
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
-msgstr "Geen geldige oplosssing gevonden met alleen oplosbaren van de beste architectuur."
+msgstr "Geen geldige oplossing gevonden met alleen oplosbaren van de beste architectuur."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
-msgstr "Met deze draai zijn alleen oplosbaren met de beste architectuur overwogen.\n"
+msgstr "Bij deze draai zijn alleen oplosbaren met de beste architectuur overwogen.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:339
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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ongeldige informatie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2814,7 +2809,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s is in conflict met andere oplosbaren"
@@ -2823,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2840,24 +2835,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s vervangt %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s vervangt: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2866,7 +2861,7 @@
"Deze oplosbaren zullen worden verwijderd van het systeem."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s is afhankelijk van andere oplosbaren"
@@ -2874,72 +2869,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s is afhankelijk van: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Subonderdeel van"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Kan %s niet installeren"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Niemand levert %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
"\n"
-"Er momenteel geen gegevensbron beschikbaar die deze vereiste aanlevert."
+"Er is momenteel geen gegevensbron beschikbaar die deze vereiste aanlevert."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:461
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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
+#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2947,8 +2940,8 @@
msgstr "%s verwijderen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2956,137 +2949,147 @@
msgstr "%s niet installeren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:714
+#, 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:701
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:724
+#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
-msgstr "%s voldoet aan afhankelijkheden van %s maar blijft op het systeem staan"
+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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:742
+#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
+#, 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:803
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:826
+#, 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:835
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:858
+#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
-msgstr ""
+msgstr "Aan vereiste %s kan niet worden voldaan."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Negeer deze vereiste hier"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
-#, fuzzy
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
-msgstr "Negeer deze vereiste hier"
+msgstr "Negeer deze vereiste normaliter"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s installeren alhoewel het de architectuur zal wijzigen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
+#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s levert deze afhankelijkheid maar zou de architectuur van het geïnstalleerde item wijzigen."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "%s installeren alhoewel het de uitgever zal wijzigen"
+
+#. 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 levert deze afhankelijkheid maar zou de uitgever van het geïnstalleerde item wijzigen."
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Negeer dit conflict van %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Negeer oude %s in %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Negeer dat %s al is ingesteld op installeren"
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
msgid "Do not install or delete the resolvables concerned"
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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "voor het verkrijgen van %s voor %s bij het upgraden van %s"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency
#: ../zypp/solver/detail/ResolverInfoMissingReq.cc:64
-#, fuzzy, c-format
+#, c-format
msgid "%s is lacking the requirement %s"
msgstr "%s mist de vereiste %s"
@@ -3163,16 +3166,16 @@
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
-#, fuzzy, c-format
+#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
msgstr "%s is aangemerkt voor installatie, maar dit is niet mogelijk vanwege afhankelijkheidsproblemen."
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:167
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s since it is already marked as needed to be uninstalled"
-msgstr "Kan %s niet installeren omdat deze al is gemarkeerd als 'moet worden gedeïnstalleerd'"
+msgstr "Kan %s niet installeren omdat deze al is gemarkeerd als 'zal worden gedeïnstalleerd'"
#. Translator: %s = name of patch
#. TranslatorExplanation: A patch which is not needed (does not apply) cant be installed
@@ -3181,7 +3184,7 @@
#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed
#. TranslatorExplanation: package is not installed.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:179
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because it does not apply to this system."
msgstr "Kan %s niet installeren omdat deze niet van toepassing is op dit systeem."
@@ -3191,9 +3194,9 @@
#. other_capability() =
#. Translator: %s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoMisc.cc:190
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because %s is already marked as needed to for installation"
-msgstr "Kan %s niet installeren omdat %s al is gemarkeerd voor installatie"
+msgstr "Kan %s niet installeren omdat %s al is gemarkeerd als 'nodig voor installatie'"
#. Translator: %s = name of patch,product
#: ../zypp/solver/detail/ResolverInfoMisc.cc:198
@@ -3259,9 +3262,9 @@
#. TranslatorExplanation: removal of this resolvable would therefore break dependency
#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled
#: ../zypp/solver/detail/ResolverInfoMisc.cc:292
-#, fuzzy, c-format
+#, c-format
msgid "There are no alternative providers of %s installed"
-msgstr "Er zijn geen alternatieve geïnstalleerde aanbieders van %s"
+msgstr "Er zijn geen alternatieve aanbieders van %s geïnstalleerd"
#. Translator: 1.%s = name of package,patch....
#. TranslatorExample: for bar
@@ -3290,9 +3293,9 @@
#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible
#. TranslatorExplanation: bar requires something from foo
#: ../zypp/solver/detail/ResolverInfoMisc.cc:341
-#, fuzzy, c-format
+#, c-format
msgid "Upgrading to %s to avoid removing %s is not possible."
-msgstr "Upgraden naar %s om het verwijderen van %s te vermijden is niet mogelijk."
+msgstr "Opwaarderen naar %s om de verwijdering van %s te vermijden is niet mogelijk."
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:359
@@ -3330,9 +3333,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s levert %s, maar heeft een andere architectuur."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 levert %s, maar heeft een andere uitgever %s."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Aan de vereiste %s voor %s kan niet worden voldaan"
@@ -3343,10 +3352,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
+#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
-msgstr "%s is nodig voor andere geïnstalleerde oplosbare, dus de koppeling wordt niet ongedaan gemaakt."
+msgstr "%s is nodig voor een andere oplosbare die geselecteerd is voor installatie, dus de koppeling wordt niet ongedaan gemaakt."
#. affected() = provider of cap
#. _capability =
@@ -3355,8 +3364,8 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
+#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s is nodig voor andere geïnstalleerde oplosbare, dus de koppeling wordt niet ongedaan gemaakt."
@@ -3367,7 +3376,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s is vergrendeld en kan niet worden gedeïnstalleerd."
@@ -3378,10 +3387,10 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
-msgstr "Een conflict over %s (%s) vereist het verwijderen van te installeren %s"
+msgstr "Een conflict over %s (%s) vereist het verwijderen %s, welke voor installatie is gepland"
#. affected() = provider of capability
#. _capability = provided by provider
@@ -3389,23 +3398,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Markeert van %s als niet-installeerbaar vanwege conflicten over %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "van %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Fout!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Belangrijk!"
@@ -3436,7 +3445,6 @@
msgstr "Voer een oplosbaarheidsdraai uit met ALLE mogelijkheden."
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
-#, fuzzy
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Alle oplosbaren met geschikte architectuur worden overwogen."
@@ -3464,8 +3472,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s is verversd voor %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s zal opnieuw worden geëvalueerd voor installatie door %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4785,80 +4793,3 @@
"%s verwacht, %s gevonden\n"
"Wilt u het toch gebruiken?"
-#~ msgid "Unable to parse Url authority"
-#~ msgstr "Kan URL-autoriteit niet analyseren"
-
-#~ msgid "Ignore this requirement generally"
-#~ msgstr "Negeer deze vereiste overal"
-
-#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
-#~ msgstr "%s is nodig voor een andere te installeren oplosbare, dus de koppeling wordt niet ongedaan gemaakt."
-
-#~ msgid "Cannot create a file needed to perform update installation."
-#~ msgstr "Kan het bestand dat nodig is voor het installeren van de update niet maken."
-
-#~ msgid "Unable to restore all sources."
-#~ msgstr "Niet alle bronnen konden worden hersteld."
-
-#~ msgid "At least one source already registered, stored sources cannot be restored."
-#~ msgstr "Er is ten minste al één bron geregistreerd, opgeslagen bronnen kunnen niet worden hersteld."
-
-#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
-#~ msgstr "Kan %s niet installeren om de afhankelijkheden van %s op te lossen"
-
-#~ msgid "%s dependend on %s"
-#~ msgstr "%s is afhankelijk van %s"
-
-#~ msgid "Reading index files"
-#~ msgstr "Indexbestanden lezen"
-
-#~ msgid "The signed repomd.xml file failed the signature check."
-#~ msgstr "Het ondertekende bestand repomd.xml voldoet niet aan de handtekeningcontrole."
-
-#~ msgid "Reading product from %s"
-#~ msgstr "Product van %s lezen"
-
-#~ msgid "Reading filelist from %s"
-#~ msgstr "Bestandslijst van %s lezen"
-
-#~ msgid "Reading packages from %s"
-#~ msgstr "Pakketten van %s lezen"
-
-#~ msgid "Reading selection from %s"
-#~ msgstr "Selectie van %s lezen"
-
-#~ msgid "Reading pattern from %s"
-#~ msgstr "Patronen van %s lezen"
-
-#~ msgid "Reading patches index %s"
-#~ msgstr "Patch-index %s lezen"
-
-#~ msgid "Reading patch %s"
-#~ msgstr "Patch %s lezen"
-
-#~ msgid "The script file failed the checksum test."
-#~ msgstr "Het scriptbestand voldoet niet aan de checksumtest."
-
-# workflow: "Software-Auswahl"
-# -ke-
-#~ msgid "Reading packages file"
-#~ msgstr "Pakkettenbestand lezen"
-
-# progress indicator label
-#~ msgid "Reading translation: %s"
-#~ msgstr "Vertaling lezen: %s"
-
-#~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?"
-#~ msgstr "Pakket %s voldoet niet aan integriteitscontrole. Wilt u het opnieuw proberen of de installatie afbreken?"
-
-#~ msgid " miss checksum."
-#~ msgstr " controlesom ontbreekt."
-
-#~ msgid " fails checksum verification."
-#~ msgstr " komt niet door de controlesomverificatie."
-
-#~ msgid "Downloading %s"
-#~ msgstr "%s downloaden "
-
-#~ msgid "Downloaded %s from %s"
-#~ msgstr "%s gedownload van %s"
Modified: trunk/libzypp/po/pa.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pa.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/pa.po (original)
+++ trunk/libzypp/po/pa.po Mon Sep 3 13:56:27 2007
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: zypp.pa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-18 09:44+0530\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 19:28+0530\n"
"Last-Translator: A S Alam \n"
"Language-Team: Panjabi \n"
"MIME-Version: 1.0\n"
@@ -20,77 +20,77 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url ਸà¨à©à¨® ਲਠ%s ਮਨà¨à¨¼à©à¨° ਨਹà©à¨ ਹà©"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "à¨à¨²à¨¤ %s à¨à¨¾à¨ '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "à¨à¨²à¨¤ %s à¨à¨¾à¨"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url ਸà¨à©à¨® ਲਠà¨à©±à¨ ਲà©à©à©à¨¦à¨¾ à¨à¨¾à¨ ਹà©"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "à¨à¨²à¨¤ Url ਸà¨à©à¨® '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url ਸà¨à©à¨® ਲਠà¨à©±à¨ ਯà©à¨à¨¼à¨°-ਨਾਠਮਨà¨à¨¼à©à¨° ਨਹà©à¨ ਹà©"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url ਸà¨à©à¨® ਲਠà¨à©±à¨ ਪਾਸਵਰਪ ਮਨà¨à¨¼à©à¨° ਨਹà©à¨ ਹà©"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url ਲਠà¨à©±à¨ ਹà©à¨¸à¨ à¨à¨¾à¨ ਲà©à©à©à¨¦à¨¾ ਹà©"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url ਸà¨à©à¨® ਲਠà¨à©±à¨ ਹà©à¨¸à¨ à¨à¨¾à¨ ਮਨà¨à¨¼à©à¨° ਨਹà©à¨ ਹà©à¥¤"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "à¨à¨²à¨¤ ਹà©à¨¸à¨ à¨à¨¾à¨ '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url ਸà¨à©à¨® à¨à©±à¨ ਪà©à¨°à¨ ਨਹà©à¨ ਦਿੰਦ੠ਹà©à¥¤"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "à¨à¨²à¨¤ ਪà©à¨°à¨ à¨à¨¾à¨ '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url ਸà¨à©à¨® ਲਠਮਾਰਠਨਾਠਲà©à©à©à¨¦à¨¾ ਹà©"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -817,7 +817,7 @@
#. language code: egy
#: ../zypp/LanguageCode.cc:488
msgid "Egyptian (Ancient)"
-msgstr ""
+msgstr "ਮਿਸਰ (ਪà©à¨°à¨¾à¨¤à¨¨)"
#. language code: eka
#: ../zypp/LanguageCode.cc:490
@@ -1022,12 +1022,12 @@
#. language code: grc
#: ../zypp/LanguageCode.cc:576
msgid "Greek, Ancient (to 1453)"
-msgstr ""
+msgstr "à¨à¨°à©à¨, ਪà©à¨°à¨¾à¨¤à¨¨ (1453 ਤੱà¨)"
#. language code: gre ell el
#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580
msgid "Greek, Modern (1453-)"
-msgstr ""
+msgstr "à¨à¨°à©à¨, ਮਾਡਰਨ (1453-)"
#. language code: grn gn
#: ../zypp/LanguageCode.cc:582
@@ -1738,7 +1738,7 @@
#. language code: new
#: ../zypp/LanguageCode.cc:872
msgid "Nepal Bhasa"
-msgstr "ਨà©à¨ªà¨¾à¨² à¨à¨¾à¨¸à¨¾"
+msgstr "ਨà©à¨ªà¨¾à¨² à¨à¨¾à¨¸à¨¼à¨¾"
#. language code: nia
#: ../zypp/LanguageCode.cc:874
@@ -2635,7 +2635,7 @@
#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55
#: ../zypp/target/hal/HalException.h:64
msgid "Hal Exception"
-msgstr "ਹਾਲ (Hal)à¨
ਪਵਾਦ"
+msgstr "Hal à¨
ਪਵਾਦ"
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
@@ -2715,7 +2715,7 @@
#: ../zypp/target/TargetImpl.cc:730
msgid "Installation has been aborted as directed."
-msgstr ""
+msgstr "à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ ਹਦਾà¨à¨¤à¨¾à¨ ਮà©à¨¤à¨¾à¨¬à¨ à¨
ਧà©à¨°à© à¨à©±à¨¡à© à¨à¨ ਹà©à¥¤"
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoObsoletes.cc:55
@@ -2731,25 +2731,25 @@
msgstr "%s ਨà©à©° %s ਨਾਲ ਬਦਲਿਠà¨à¨¿à¨"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2757,38 +2757,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "à¨à¨²à¨¤ à¨à¨¾à¨£à¨à¨¾à¨°à©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2798,7 +2798,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2807,14 +2807,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2824,24 +2824,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2850,7 +2850,7 @@
"à¨à¨¹ ਹੱਲ-à¨à¨°à¨¨-ਯà©à¨ ਸਿਸà¨à¨® ਤà©à¨ ਹà¨à¨¾à¨ à¨à¨¾à¨£à¨à©à¥¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2858,38 +2858,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ਨਿਰà¨à¨° ਹà©: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "à¨à¨¾à¨à¨²à¨¡"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "%s à¨à©à¨ ਨਹà©à¨ ਦਿੰਦਾ ਹà©"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2897,31 +2897,31 @@
"\n"
"à¨à¨¹ ਲà©à© ਨà©à©° ਪà©à¨°à© à¨à¨°à¨¨ ਲਠà¨à©à¨ ਸਰà©à¨¤ à¨à¨ªà¨²à©±à¨¬à¨§ ਨਹà©à¨ ਹà©à¥¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2929,8 +2929,8 @@
msgstr "%s ਹà¨à¨¾à¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2938,118 +2938,130 @@
msgstr "%s ਨà©à©° ਨਾ ਹà¨à¨¾à¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s ਲਠਨਿਰà¨à¨°à¨¤à¨¾ à¨
ਧà©à¨°à© ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਦ੠ਲà©à© ਨਹà©à¨ ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
-msgstr ""
+msgstr "%s ਲà©à© ਪà©à¨°à© ਨਹà©à¨ à¨à©à¨¤à© à¨à¨¾ ਸà¨à¨¦à© ਹà©à¥¤"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "à¨à¨¹ ਲà©à© à¨à©±à¨¥à© ਹ੠à¨
ਣਡਿੱਠ੠à¨à¨°à©"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "à¨à¨® ਤà©à¨° à¨à©±à¨¤à© à¨à¨¹ ਲà©à© à¨
ਣਡਿੱਠ੠à¨à¨°à©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s ਦਾ à¨à¨¹ à¨
ਪਵਾਦ à¨
ਣਡਿੱਠਾ à¨à¨°à©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਲਠਸà©à©±à¨ à¨à©à¨¤à© à¨à¨¸ %s ਨà©à©° à¨
ਣਡਿੱਠਾ à¨à¨°à©"
@@ -3059,7 +3071,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3145,7 +3157,7 @@
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
-msgstr ""
+msgstr "%s ਨà©à©° à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਲਠਸ਼à©à¨¡à¨¿à¨à¨² à¨à©à¨¤à¨¾ à¨à¨¿à¨ ਹà©, ਪਰ ਨਿਰà¨à¨°à¨¤à¨¾ ਸਮੱਸਿਠà¨à¨°à¨à© ਸੰà¨à¨µ ਨਹà©à¨ ਹà©à¥¤"
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
@@ -3278,19 +3290,19 @@
#: ../zypp/solver/detail/ResolverInfoMisc.cc:359
#, c-format
msgid "%s provides %s, but is scheduled to be uninstalled."
-msgstr ""
+msgstr "%s %s ਦਿੰਦਾ ਹà©, ਪਰ à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਲਠਸ਼à©à¨¡à¨¿à¨à¨² ਹà©à¥¤"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s type (package, patch, ...)
#: ../zypp/solver/detail/ResolverInfoMisc.cc:377
#, c-format
msgid "%s provides %s, but another version of that %s is already installed."
-msgstr ""
+msgstr "%s %s ਦਿੰਦਾ ਹà©, ਪਰ à¨à¨¸ %s ਦਾ ਹà©à¨° ਵਰà¨à¨¨ ਪਹਿਲਾਠਹ੠à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¥¤"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:396
#, c-format
msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details."
-msgstr ""
+msgstr "%s %s ਦਿੰਦਾ ਹà©, ਪਰ à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨²-ਯà©à¨ ਹà©à¥¤ ਹà©à¨° à¨à¨¾à¨£à¨à¨¾à¨°à© ਲਠà¨à©à¨¦ ਹ੠à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਦ੠à¨à©à¨¸à¨¼à¨¿à¨¸à¨¼ à¨à¨°à©à¥¤"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:414
@@ -3308,13 +3320,19 @@
#: ../zypp/solver/detail/ResolverInfoMisc.cc:451
#, c-format
msgid "%s provides %s, but has another architecture."
-msgstr ""
+msgstr "%s %s ਦਿੰਦਾ ਹà©, ਪਰ à¨à¨°à¨à©à¨à©à¨à¨à¨° ਹà©à¨° ਹà©à¥¤"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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) ਹà©à¨° ਹà©à¥¤"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
-msgstr ""
+msgstr "%s ਦ੠ਲà©à© ਨà©à©° %s ਲਠਪà©à¨°à¨¾ ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾ ਹà©"
#. affected() = to-be-installed resolvable which was scheduled to be uninstalled
#. _capability =
@@ -3323,7 +3341,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3335,7 +3353,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3347,7 +3365,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s ਲਾਠਹ੠à¨
ਤ੠à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾à¥¤"
@@ -3358,7 +3376,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3369,23 +3387,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s ਤà©à¨"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " à¨à¨²à¨¤à©!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " à¨à¨¾à¨¸!"
@@ -3413,7 +3431,7 @@
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
msgid "Make a solver run with ALL possibilities."
-msgstr ""
+msgstr "ਸà©à¨²à¨µà¨° ਨà©à©° _ਸà¨_ ਸੰà¨à¨µà¨¾à¨¨à¨¾à¨µà¨¾à¨ ਨਾਲ à¨à¨²à¨¾à¨"
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
msgid "Regarding all resolvables with a compatible architecture."
@@ -3443,15 +3461,15 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s ਨà©à©° %s ਵਲà©à¨ ਤਾà¨à¨¼à¨¾ à¨à©à¨¤à¨¾ à¨à¨¾à¨à¨¦à¨¾ ਹà©"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:128
#, c-format
msgid "%s is enhanced by %s"
-msgstr ""
+msgstr "%s %s ਵਲà©à¨ à¨à©°à¨¹à¨¾à¨à¨¸à¨¡ ਹà©"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:84
@@ -3497,11 +3515,11 @@
#: ../zypp/thread/Mutex.cc:77
msgid "Can't acquire the mutex lock"
-msgstr ""
+msgstr "mutex ਲਾਠਲਿਠਨਹà©à¨ à¨à¨¾ ਸà¨à¨¦à¨¾"
#: ../zypp/thread/Mutex.cc:87
msgid "Can't release the mutex lock"
-msgstr ""
+msgstr "mutex ਲਾਠਰà©à¨²à¨¿à¨à¨¼ ਨਹà©à¨ à¨à¨¾ ਸà¨à¨¦à¨¾"
#: ../zypp/CountryCode.cc:135
msgid "Unknown country: "
@@ -4708,6 +4726,9 @@
"%s|%s|%s\n"
"Use the file anyway?"
msgstr ""
+"ਫਾà¨à¨² %s à¨à©±à¨ à¨
ਣà¨à¨¾à¨£à© à¨à©à©°à¨à© ਨਾਲ ਸਾà¨à¨¨ à¨à©à¨¤à© à¨à¨ ਹà©:\n"
+"%s|%s|%s\n"
+"à¨à© ਫਾà¨à¨² ਵਰਤਣ੠ਹà©?"
#: ../devel/devel.mvidner/installation_sources.cc:75
#, c-format
@@ -4727,6 +4748,9 @@
"%s|%s|%s\n"
"Use the file anyway?"
msgstr ""
+"ਫਾà¨à¨² %s ਹà©à¨ ਦਿੱਤ੠à¨à©à©°à¨à© ਨਾਲ à¨à¨à¨à¨à¨°à©à¨à© à¨à©à©±à¨ ਲਠਫà©à¨²à©à¨¹ ਹà©à¨:\n"
+"%s|%s|%s\n"
+"à¨à© ਫਾà¨à¨² ਵਰਤਣ੠ਹà©?"
#: ../devel/devel.mvidner/installation_sources.cc:99
#, c-format
Modified: trunk/libzypp/po/pl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pl.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/pl.po (original)
+++ trunk/libzypp/po/pl.po Mon Sep 3 13:56:27 2007
@@ -10,88 +10,86 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-18 16:55+0100\n"
-"Last-Translator: wadim dziedzic \n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 08:53+0100\n"
+"Last-Translator: wadim dziedzic \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Schemat URL nie zezwala na %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "NieprawidÅowe %s komponentu '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "NieprawidÅowe %s komponentu"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Analiza parametru Åcieżki nie jest obsÅugiwana dla tego adresu URL"
-#: ../zypp/url/UrlBase.cc:778
-#: ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Analiza zapytania nie jest obsÅugiwana dla tego adresu URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Schemat URL to wymagany komponent"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "NieprawidÅowy schemat URL '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Schemat URL nie zezwala na nazwÄ użytkownika"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Schemat URL nie zezwala na hasÅo"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Schemat URL wymaga komponentu hosta"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Schemat URL nie zezwala na komponent hosta"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "NieprawidÅowy komponent hosta '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Schemat URL nie zezwala na port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "NieprawidÅowy komponent portu '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Schemat URL wymaga Åcieżki"
-#: ../zypp/url/UrlBase.cc:1113
-#: ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "WzglÄdna Åcieżka nie jest dozwolona, jeÅli usÅuga istnieje"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Analiza parametru Åcieżki nie jest obsÅugiwana dla tego URL"
@@ -155,13 +153,11 @@
msgid "Unsupported HTTP authentication method '%s'"
msgstr "NieobsÅugiwana metoda uwierzytelniania 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 "BÅÄdna nazwa użytkownika lub hasÅo."
-#: ../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 "Wymagane uwierzytelnienie dla \"%s\""
@@ -213,8 +209,7 @@
msgid "Invalid empty Url object reference"
msgstr "NieprawidÅowe odwoÅanie pustego adresu URL"
-#: ../zypp/Url.cc:321
-#: ../zypp/Url.cc:335
+#: ../zypp/Url.cc:321 ../zypp/Url.cc:335
msgid "Unable to parse Url components"
msgstr "Analiza komponentów URL nie powiodÅa siÄ"
@@ -224,8 +219,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 "Bez kodu"
@@ -290,8 +284,7 @@
msgstr "akadyjski"
#. language code: alb sqi sq
-#: ../zypp/LanguageCode.cc:262
-#: ../zypp/LanguageCode.cc:264
+#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264
msgid "Albanian"
msgstr "albaÅski"
@@ -342,8 +335,7 @@
# AM
#. language code: arm hye hy
-#: ../zypp/LanguageCode.cc:284
-#: ../zypp/LanguageCode.cc:286
+#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286
msgid "Armenian"
msgstr "ormiaÅski"
@@ -448,8 +440,7 @@
msgstr "balijski"
#. language code: baq eus eu
-#: ../zypp/LanguageCode.cc:326
-#: ../zypp/LanguageCode.cc:328
+#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328
msgid "Basque"
msgstr "baskijski"
@@ -560,8 +551,7 @@
msgstr "buÅgarski"
#. language code: bur mya my
-#: ../zypp/LanguageCode.cc:372
-#: ../zypp/LanguageCode.cc:374
+#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374
msgid "Burmese"
msgstr "birmaÅski"
@@ -626,8 +616,7 @@
msgstr "czagatajski"
#. language code: chi zho zh
-#: ../zypp/LanguageCode.cc:400
-#: ../zypp/LanguageCode.cc:402
+#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402
msgid "Chinese"
msgstr "chiÅski"
@@ -737,8 +726,7 @@
msgstr "kuszyckie (inne)"
#. language code: cze ces cs
-#: ../zypp/LanguageCode.cc:446
-#: ../zypp/LanguageCode.cc:448
+#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448
msgid "Czech"
msgstr "czeski"
@@ -813,8 +801,7 @@
msgstr "Årednioholenderski (ok. 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 "holenderski"
@@ -919,8 +906,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 "francuski"
@@ -970,14 +956,12 @@
msgstr "germaÅskie (inne)"
#. language code: geo kat ka
-#: ../zypp/LanguageCode.cc:544
-#: ../zypp/LanguageCode.cc:546
+#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546
msgid "Georgian"
msgstr "gruziÅski"
#. language code: ger deu de
-#: ../zypp/LanguageCode.cc:548
-#: ../zypp/LanguageCode.cc:550
+#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550
msgid "German"
msgstr "niemiecki"
@@ -1047,8 +1031,7 @@
msgstr "grecki, starożytny (do 1453)"
#. language code: gre ell el
-#: ../zypp/LanguageCode.cc:578
-#: ../zypp/LanguageCode.cc:580
+#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580
msgid "Greek, Modern (1453-)"
msgstr "grecki, wspóÅczesny (1453 -)"
@@ -1153,8 +1136,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 "islandzki"
@@ -1526,8 +1508,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 "macedoÅski"
@@ -1567,8 +1548,7 @@
msgstr "mandingo"
#. language code: mao mri mi
-#: ../zypp/LanguageCode.cc:790
-#: ../zypp/LanguageCode.cc:792
+#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792
msgid "Maori"
msgstr "maoryjski"
@@ -1588,8 +1568,7 @@
msgstr "masajski"
#. language code: may msa ms
-#: ../zypp/LanguageCode.cc:800
-#: ../zypp/LanguageCode.cc:802
+#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802
msgid "Malay"
msgstr "malajski"
@@ -1732,8 +1711,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 "nauru"
@@ -1935,8 +1913,7 @@
msgstr "staroperski (ok. 600 - 400 p.n.e.)"
#. language code: per fas fa
-#: ../zypp/LanguageCode.cc:938
-#: ../zypp/LanguageCode.cc:940
+#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940
msgid "Persian"
msgstr "perski"
@@ -2021,8 +1998,7 @@
msgstr "cygaÅski / romani"
#. language code: rum ron ro
-#: ../zypp/LanguageCode.cc:974
-#: ../zypp/LanguageCode.cc:976
+#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976
msgid "Romanian"
msgstr "rumuÅski"
@@ -2082,8 +2058,7 @@
msgstr "santali"
#. language code: scc srp sr
-#: ../zypp/LanguageCode.cc:1000
-#: ../zypp/LanguageCode.cc:1002
+#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002
msgid "Serbian"
msgstr "serbski"
@@ -2098,8 +2073,7 @@
msgstr "szkocki"
#. language code: scr hrv hr
-#: ../zypp/LanguageCode.cc:1008
-#: ../zypp/LanguageCode.cc:1010
+#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010
msgid "Croatian"
msgstr "chorwacki"
@@ -2154,8 +2128,7 @@
msgstr "sÅowiaÅskie (inne)"
#. language code: slo slk sk
-#: ../zypp/LanguageCode.cc:1032
-#: ../zypp/LanguageCode.cc:1034
+#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034
msgid "Slovak"
msgstr "sÅowacki"
@@ -2355,8 +2328,7 @@
# TW
#. language code: tib bod bo
-#: ../zypp/LanguageCode.cc:1112
-#: ../zypp/LanguageCode.cc:1114
+#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114
msgid "Tibetan"
msgstr "tybetaÅski"
@@ -2379,8 +2351,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"
@@ -2456,8 +2427,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"
@@ -2557,8 +2527,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 "walijski"
@@ -2644,8 +2613,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 "Demon zarzÄ
dzania oprogramowaniem jest już uruchomiony"
@@ -2685,8 +2653,7 @@
msgid "Not a CDROM drive"
msgstr "Nie jest to napÄd 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 "WyjÄ
tek Hal"
@@ -2737,8 +2704,7 @@
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:1927 ../zypp/target/rpm/RpmDb.cc:2045
msgid "rpm output:"
msgstr "WyjÅcie rpm:"
@@ -2749,8 +2715,7 @@
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:1936 ../zypp/target/rpm/RpmDb.cc:2053
msgid "Additional rpm output:"
msgstr "Dodatkowe wyjÅcie rpm:"
@@ -2791,25 +2756,25 @@
msgstr "%s zastÄ
piony przez %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s zostanie zainstalowany przez innÄ
aplikacjÄ. (ApplLow/ApplHigh)\n"
@@ -2817,38 +2782,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
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:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
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:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "NieprawidÅowa informacja"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2858,7 +2823,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s jest w konflikcie z innymi pakietami"
@@ -2867,14 +2832,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2884,24 +2849,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s dezaktualizuje %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s dezaktualizuje:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2910,7 +2875,7 @@
"Te pakiety zostanÄ
usuniÄte z systemu."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s zależy od innych pakietów"
@@ -2918,38 +2883,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s zależy od:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Potomek"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Nie można zainstalowaÄ %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Żaden nie dostarcza %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2957,31 +2922,31 @@
"\n"
"Nie ma dostÄpnego zasobu, który speÅniaÅby te wymaganie."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2989,8 +2954,8 @@
msgstr "usuÅ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2998,118 +2963,130 @@
msgstr "nie instaluj %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Wymaganie %s nie może byÄ speÅnione."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Zignoruj ten wymóg tylko tutaj"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Zignoruj ten wymóg ogólnie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Zainstaluj %s pomimo, że zmieniÅoby to architekturÄ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s dostarcza tÄ zależnoÅÄ, ale zmieniÅby architekturÄ zainstalowanego elementu"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Zainstaluj %s pomimo, że zmieniÅoby to dostawcÄ"
+
+#. 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 dostarcza tÄ zależnoÅÄ, ale zmieniÅby dostawcÄ zainstalowanego elementu"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Zignoruj ten konflikt %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Zignoruj dezaktualizacjÄ %s w %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Zignoruj fakt, że %s jest już zaznaczony do instalacji"
@@ -3119,7 +3096,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "dla wymagania %s dla %s, podczas aktualizacji %s"
@@ -3370,9 +3347,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s dostarcza %s, ale ma innÄ
architekturÄ."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 dostarcza %s, ale ma innego dostawcÄ (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Nie można speÅniÄ wymogu %s dla %s"
@@ -3383,7 +3366,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s jest wymagany przez inny wybrany do instalacji obiekt, wiÄc powiÄ
zanie nie bÄdzie usuniÄte."
@@ -3395,7 +3378,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s jest wymagany przez inny zainstalowany pakiet, wiÄc powiÄ
zanie nie bÄdzie usuniÄte."
@@ -3407,7 +3390,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s jest zablokowany i nie może byÄ odinstalowany."
@@ -3418,7 +3401,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Konflikt dotyczÄ
cy %s (%s) wymaga usuniÄcia pakietu %s planowanego do instalacji"
@@ -3429,23 +3412,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Oznaczanie %s jako nie do usuniÄcia z powodu konfliktów dotyczÄ
cych %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "z %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " BÅÄ
d!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Ważne!"
@@ -3503,8 +3486,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s jest odÅwieżany przez %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -3767,8 +3750,7 @@
#. :CCK:166:
#. :CAF:140:
-#: ../zypp/CountryCode.cc:255
-#: ../zypp/CountryCode.cc:257
+#: ../zypp/CountryCode.cc:255 ../zypp/CountryCode.cc:257
msgid "Congo"
msgstr "Kongo"
@@ -4872,42 +4854,62 @@
"Oczekiwano %s, napotkano %s\n"
"UżyÄ pliku mimo wszystko?"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s jest odÅwieżany przez %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Analiza nadrzÄdnego adresu URL nie powiodÅa siÄ"
+
#~ msgid "Ignore this requirement generally"
#~ msgstr "Zignoruj ten wymóg globalnie"
+
#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
#~ msgstr "%s jest wymagany przez inny pakiet do zainstalowania, wiÄc powiÄ
zanie nie bÄdzie usuniÄte."
+
#~ msgid "Cannot create a file needed to perform update installation."
#~ msgstr "Nie można utworzyÄ pliku wymaganego do instalacji uaktualnienia."
+
#~ msgid "Unable to restore all sources."
#~ msgstr "Nie udaÅo siÄ odtworzyÄ wszystkich źródeÅ."
+
#~ msgid "At least one source already registered, stored sources cannot be restored."
#~ msgstr "Przynajmniej jedno źródÅo jest już zarejestrowane, nie można odtworzyÄ przechowywanych źródeÅ."
+
#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
#~ msgstr "Nie można zainstalowaÄ %s by speÅniÄ zależnoÅci %s"
+
#~ msgid "%s dependend on %s"
#~ msgstr "%s zależny od %s"
+
#~ msgid "Reading index files"
#~ msgstr "Wczytywanie plików indeksu"
+
#~ msgid "The signed repomd.xml file failed the signature check."
#~ msgstr "Weryfikacja podpisu pliku repomd.xml zakoÅczona niepowodzeniem."
+
#~ msgid "Reading product from %s"
#~ msgstr "Wczytywanie produktu z %s"
+
#~ msgid "Reading filelist from %s"
#~ msgstr "Wczytywanie listy plików z %s"
+
#~ msgid "Reading packages from %s"
#~ msgstr "Wczytywanie pakietów z %s"
+
#~ msgid "Reading selection from %s"
#~ msgstr "Wczytywanie wyboru z %s"
+
#~ msgid "Reading pattern from %s"
#~ msgstr "Wczytywanie wzorców z %s"
+
#~ msgid "Reading patches index %s"
#~ msgstr "Wczytywanie indeksu poprawek %s"
+
#~ msgid "Reading patch %s"
#~ msgstr "Wczytywanie poprawki %s"
+
#~ msgid "The script file failed the checksum test."
#~ msgstr "Niepoprawna suma kontrolna pliku skryptu."
+
#~ msgid "Reading packages file"
#~ msgstr "Wczytywanie pliku pakietów"
-
Modified: trunk/libzypp/po/pt.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pt.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/pt.po (original)
+++ trunk/libzypp/po/pt.po Mon Sep 3 13:56:27 2007
@@ -12,8 +12,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 22:41+0100\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 13:47+0100\n"
"Last-Translator: Carlos Gonçalves \n"
"Language-Team: Portuguese \n"
"MIME-Version: 1.0\n"
@@ -22,77 +22,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "O esquema url não permite um %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "componente %s inválido '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Componente %s inválido"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "A interpretação de parâmetros de caminho não são suportados para este URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Interpretação da cadeia de interrogação não é suportado para este URL."
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "O esquema de url é um componente requerido"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Esquema de Url inválido '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "O esquema do Url não permite um nome de utilizador"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "O esquema do Url não permite uma palavra passe"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "O esquema de Url requer um componente de computador (host)"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "O esquema do Url não permite um componente de computador (host)"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Componente de computador inválido '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "O esquema de Url não permite um porto"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Componente de porto inválido '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "O esquema de Url requer um nome de caminho"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Caminho relativo não é permitido se a autoridade existe"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Interpretação de parâmetros de caminho não é suportada para este URL"
@@ -2819,25 +2819,25 @@
msgstr "%s é substituÃdo por %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s será instalado por outra aplicação (ApplLow/ApplHigh)\n"
@@ -2845,38 +2845,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
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:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
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:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
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:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Informação Inválida"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2886,7 +2886,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s conflitua com outros resolúveis"
@@ -2895,14 +2895,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2912,24 +2912,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s obsoleto %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s obsoleto:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2938,7 +2938,7 @@
"Estes resolúveis serão apagados do sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depende de outros resolúveis"
@@ -2946,38 +2946,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s depende de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Filho de"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Não foi possÃvel instalar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Não fornece %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2985,31 +2985,31 @@
"\n"
"Não existe nenhum recurso disponÃvel com suporte para este requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3017,8 +3017,8 @@
msgstr "apagar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3026,118 +3026,130 @@
msgstr "não instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "O requisito %s não pôde ser satisfeito."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorar este requisito apenas aqui"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Ignorar geralmente este requisito"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "instalar %s apesar de alterar a arquitectura"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s fornece esta dependência mas alteraria a arquitectura do item instalado"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Instalar %s apesar de ir alterar o fabricante"
+
+#. 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 fornece esta dependência mas alteraria o fabricante do item instalado"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "A ignorar este conflito de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "A ignorar o %s obsoleto por %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorar que %s já se encontra definido para instalar"
@@ -3147,7 +3159,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "por requerer %s para %s quando esta a actualizar %s"
@@ -3398,9 +3410,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s fornece %s, mas tem outra arquitectura."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 fornece %s, mas tem outro fabricante (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Não foi possÃvel satisfazer os requisitos %s com %s "
@@ -3411,7 +3429,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s é requerido por outro resolúvel seleccionado para instalação, pelo que não será desassociado."
@@ -3423,7 +3441,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s é requerido por outro resolúvel instalado, pelo que não será desassociado."
@@ -3435,7 +3453,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "O pacote %s está bloqueado, não pode ser desinstalado."
@@ -3446,7 +3464,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Um conflicto com %s (%s) requer a remoção de %s em que está agendado para ser instalado"
@@ -3457,24 +3475,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Marcar %s com não instalavél devido a conflictos com %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "de %s"
# /usr/lib/YaST2/clients/logcontrol.ycp:67
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Erro!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Importante!"
@@ -3532,8 +3550,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s é refrescado por %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s irá ser avaliado para instalação (actualizado) por %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/pt_BR.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pt_BR.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/pt_BR.po (original)
+++ trunk/libzypp/po/pt_BR.po Mon Sep 3 13:56:27 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-05-31 14:44\n"
"Last-Translator: Novell Language \n"
"Language-Team: Novell Language \n"
@@ -18,77 +18,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "O esquema de Url não permite %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Componente '%s' inválido %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Componente inválido %s"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "A análise de parâmetros de caminho não é suportada para este URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "A análise de strings de consulta não é suportada para este URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "O esquema de Url é um componente obrigatório"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Esquema de Url '%s' inválido"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "O esquema de Url não permite nome de usuário"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "O esquema de Url não permite senha"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "O esquema de Url requer um componente de host"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "O esquema de Url não permite componente de host"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Componente de host inválido '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "O esquema de Url não permite porta"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Componente de porta inválido '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "O esquema de Url requer nome de caminho"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Caminho relativo não permitido se existir autoridade"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Análise do Parâmetro de Caminho não suportada para este URL"
@@ -2736,7 +2736,7 @@
msgstr "%s substituÃdo por %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2744,19 +2744,19 @@
"Esses resolvÃveis serão apagados do sistema."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2764,38 +2764,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Informações inválidas"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2805,7 +2805,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s está em conflito com outros resolvÃveis"
@@ -2814,14 +2814,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2831,24 +2831,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s torna obsoleto %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s torna obsoleto:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2857,7 +2857,7 @@
"Esses resolvÃveis serão apagados do sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depende de outros resolvÃveis"
@@ -2865,38 +2865,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s depende de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Filho de "
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Não é possÃvel instalar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Nenhum fornece %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2905,32 +2905,32 @@
"\n"
"Não há nenhum recurso disponÃvel que atenda a esse requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, 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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2938,8 +2938,8 @@
msgstr "apagar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2947,119 +2947,131 @@
msgstr "não instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorar este requisito apenas aqui"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Ignorar este requisito apenas aqui"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Instalar %s apesar de ele mudar a arquitetura"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s fornece esta dependência, porém mudaria a arquitetura do item instalado"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Instalar %s apesar de ele mudar a arquitetura"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s fornece esta dependência, porém mudaria a arquitetura do item instalado"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorar este conflito de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorar o(s) %s obsoleto(s) de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorar que %s já está definido para instalação"
@@ -3070,7 +3082,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "para exigir %s para %s ao fazer o upgrade de %s"
@@ -3321,8 +3333,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s fornece %s, mas possui outra arquitetura."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s fornece %s, mas possui outra arquitetura."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Não é possÃvel atender ao requisito %s para %s"
@@ -3334,7 +3352,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s é exigido por outro resolvÃvel instalado, para não ficar desvinculado."
@@ -3346,7 +3364,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s é exigido por outro resolvÃvel instalado, para não ficar desvinculado."
@@ -3358,7 +3376,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s está bloqueado e não pode ser desinstalado."
@@ -3369,7 +3387,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Um conflito por causa de %s (%s) requer a remoção do %s a ser instalado"
@@ -3380,23 +3398,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Marcando %s como não instalável devido a conflitos por causa de %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "de %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Erro!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Importante!"
@@ -3453,9 +3471,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s é necessário a %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4774,6 +4792,10 @@
"Era esperado %s, foi encontrado %s\n"
" Deseja usar o arquivo mesmo assim?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s é necessário a %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "ImpossÃvel analisar a autoridade do Url"
Modified: trunk/libzypp/po/ro.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ro.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/ro.po (original)
+++ trunk/libzypp/po/ro.po Mon Sep 3 13:56:27 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2003-02-25 15:04+0100\n"
"Last-Translator: \n"
"Language-Team: Romanian \n"
@@ -15,77 +15,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2990,25 +2990,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3016,38 +3016,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3055,7 +3055,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 intrÄ Ã®n conflict cu %2"
@@ -3064,14 +3064,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3079,31 +3079,31 @@
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3111,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "InstaleazÄ %1"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3180,8 +3180,8 @@
msgstr "Återge %1"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3189,120 +3189,132 @@
msgstr "InstaleazÄ %1"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "are cerinţe nerezolvate..."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "are cerinţe nerezolvate..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "Directorul %1 se aflÄ deja în listÄ."
@@ -3313,7 +3325,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3565,9 +3577,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3578,7 +3596,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3590,7 +3608,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3602,7 +3620,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Acest pachet nu este instalat Åi nici nu va fi instalat."
@@ -3613,7 +3631,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3624,24 +3642,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Eroare"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "Im&portÄ"
@@ -3702,7 +3720,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/ru.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ru.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/ru.po (original)
+++ trunk/libzypp/po/ru.po Mon Sep 3 13:56:27 2007
@@ -1,4 +1,3 @@
-# translation of zypp.ru.po to Russian
# translation of zypp.po to
# Russian message file for YaST2 (@memory@).
# Copyright (C) 2005, 2006 SUSE Linux Products GmbH.
@@ -11,93 +10,93 @@
# Nikolay Derkach , 2007.
msgid ""
msgstr ""
-"Project-Id-Version: zypp.ru\n"
+"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 15:37+0400\n"
-"Last-Translator: Aleksey Osipov \n"
-"Language-Team: Russian \n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 14:01+0400\n"
+"Last-Translator: Nikolay Derkach \n"
+"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ %s"
# To translators: error popup
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "ÐедопÑÑÑимÑй ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ %s: '%s'"
# To translators: error popup
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "ÐедопÑÑÑимÑй ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ %s"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "ÐÐ»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ URL-адÑеÑа ÑÐ°Ð·Ð±Ð¾Ñ Ð¿Ð°ÑамеÑÑов пÑÑи не поддеÑживаеÑÑÑ"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "ÐÐ»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ URL-адÑеÑа ÑÐ°Ð·Ð±Ð¾Ñ ÑÑÑоки запÑоÑа не поддеÑживаеÑÑÑ"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "СÑ
ема Url - ÑÑебÑемÑй компоненÑ"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "ÐевеÑÐ½Ð°Ñ ÑÑ
ема URL-адÑеÑа '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ Ð¿Ð°ÑолÑ"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
-msgstr "СÑ
ема URL-адÑеÑа ÑÑебÑÐµÑ ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñа Ñ
оÑÑа"
+msgstr "СÑ
ема URL-адÑеÑа ÑÑебÑÐµÑ ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñа Ñзла"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
-msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ñ
оÑÑа"
+msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ñзла"
# To translators: error popup
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
-msgstr "ÐевеÑнÑй ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ñ
оÑÑа '%s'"
+msgstr "ÐевеÑнÑй ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ñзла '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ Ð¿Ð¾ÑÑ"
# To translators: error popup
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "ÐевеÑнÑй ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð¿Ð¾ÑÑа '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "СÑ
ема URL-адÑеÑа ÑÑебÑÐµÑ ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿ÑÑи"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "ÐÑи налиÑии компоненÑов авÑоÑизаÑии оÑноÑиÑелÑнÑе пÑÑи ÑказÑваÑÑ Ð½ÐµÐ»ÑзÑ"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "ÐÐ»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ URL-адÑеÑа ÑÐ°Ð·Ð±Ð¾Ñ Ð¿Ð°ÑамеÑÑа пÑÑи не поддеÑживаеÑÑÑ"
@@ -2797,25 +2796,25 @@
msgstr "%s заменен на %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s бÑÐ´ÐµÑ ÑÑÑановлен дÑÑгим пÑиложением. (ApplLow/ApplHigh)\n"
@@ -2823,38 +2822,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Ðе найдено пÑавилÑное ÑеÑÐµÐ½Ð¸Ñ Ñ Ð¾Ð±ÑекÑами ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей ÑолÑко Ñ Ð¿Ð¾Ð´Ñ
одÑÑей аÑÑ
иÑекÑÑÑой."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Ð ÑÑом Ñикле ÑаÑÑмаÑÑивалиÑÑ ÑолÑко обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей Ñ Ð»ÑÑÑей аÑÑ
иÑекÑÑÑой.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "ЧÑение вÑеÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей Ð·Ð°Ð¹Ð¼ÐµÑ Ð½ÐµÐºÐ¾ÑоÑое вÑемÑ, но Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑивеÑÑи к пÑавилÑÐ½Ð¾Ð¼Ñ ÑезÑлÑÑаÑÑ."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "ÐепÑавилÑÐ½Ð°Ñ Ð¸Ð½ÑоÑмаÑиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2864,7 +2863,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s конÑликÑÑÐµÑ Ñ Ð´ÑÑгими обÑекÑами ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
@@ -2873,14 +2872,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2890,24 +2889,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑаÑевÑими дÑÑгие обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑаÑевÑим %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑаÑевÑим:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2916,7 +2915,7 @@
"ÐÑи обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей бÑдÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ñ Ð¸Ð· ÑиÑÑемÑ."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s завиÑÐ¸Ñ Ð¾Ñ Ð´ÑÑгиÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
@@ -2924,38 +2923,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s завиÑÐ¸Ñ Ð¾Ñ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "ÐоÑеÑнее"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Ðе ÑдалоÑÑ ÑÑÑановиÑÑ %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "ÐиÑÑо не пÑедоÑÑовлÑÐµÑ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2963,31 +2962,31 @@
"\n"
"ÐÐµÑ Ð´Ð¾ÑÑÑпнÑÑ
ÑеÑÑÑÑов, коÑоÑÑе ÑдовлеÑвоÑÑÑÑ ÑÑÐ¾Ð¼Ñ ÑÑебованиÑ."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Ðз-за пÑоблем, опиÑаннÑÑ
вÑÑе/ниже, ÑÑо ÑазÑеÑение не ÑеÑÐ¸Ñ Ð²Ñе завиÑимоÑÑи"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
-msgstr "%s не ÑÑÑановлен и помеÑен как доÑÑÑпнÑй Ð´Ð»Ñ ÑдалениÑ"
+msgstr "%s не ÑÑÑановлен и помеÑен как неÑÑÑанавливаемÑй"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2995,8 +2994,8 @@
msgstr "ÑдалиÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3004,118 +3003,130 @@
msgstr "не ÑÑÑанавливаÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s Ð¸Ð¼ÐµÐµÑ Ð½ÐµÑдовлеÑвоÑеннÑе ÑÑебованиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s Ð¸Ð¼ÐµÐµÑ Ð½ÐµÐ´Ð¾ÑÑаÑÑие завиÑимоÑÑи"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "ÐÐµÑ Ð½ÐµÐ¾Ð±Ñ
одимоÑÑи ÑÑÑанавливаÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
-msgstr "%s не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÑÑановлен из-за конÑликÑа Ñ %s"
+msgstr "%s помеÑен как неÑÑÑанавливаемÑй из-за конÑликÑа Ñ %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "ÐелÑÐ·Ñ ÑдовлеÑвоÑиÑÑ ÑÑебование %s."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ÐгноÑиÑоваÑÑ ÑÑо ÑÑебование ÑолÑко здеÑÑ"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "ÐгноÑиÑоваÑÑ ÑÑо ÑÑебование ÑолÑко здеÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "УÑÑановиÑÑ %s, Ñ
оÑÑ Ð¾Ð½ Ð¼Ð¾Ð¶ÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð°ÑÑ
иÑекÑÑÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s пÑедоÑÑавлÑÐµÑ ÑÑÑ Ð·Ð°Ð²Ð¸ÑимоÑÑÑ, но бÑÐ´ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð° аÑÑ
иÑекÑÑÑа ÑÑÑановленнÑÑ
пакеÑов"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../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 пÑедоÑÑавлÑÐµÑ ÑÑÑ Ð·Ð°Ð²Ð¸ÑимоÑÑÑ, но бÑÐ´ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ пÑоизводиÑÐµÐ»Ñ ÑÑÑановленного пакеÑа"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "ÐгноÑиÑоваÑÑ ÑÑÐ¾Ñ ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑ Ð´Ð»Ñ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "ÐгноÑиÑоваÑÑ ÑÑÑаÑевÑий %s в %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "ÐгноÑиÑоваÑÑ, ÑÑо %s Ñже опÑеделен, как подлежаÑий ÑÑÑановке"
@@ -3125,7 +3136,7 @@
msgstr "Ðе вÑполнÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ Ð¸Ð»Ð¸ Ñдаление заÑÑагиваемÑÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "из-за необÑ
одимоÑÑи %s Ð´Ð»Ñ %s пÑи обновлении %s"
@@ -3205,7 +3216,7 @@
#: ../zypp/solver/detail/ResolverInfoMisc.cc:151
#, c-format
msgid "Marking resolvable %s as uninstallable"
-msgstr "ÐомеÑиÑÑ Ð¾Ð±ÑÐµÐºÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей %s как ÑдалÑемÑй"
+msgstr "ÐомеÑиÑÑ Ð¾Ð±ÑÐµÐºÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей %s как неÑÑÑанавливаемÑй"
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
@@ -3358,7 +3369,7 @@
#: ../zypp/solver/detail/ResolverInfoMisc.cc:396
#, c-format
msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details."
-msgstr "%s пÑедоÑÑавлÑÐµÑ %s, но его нелÑÐ·Ñ ÑÑÑановиÑÑ. ÐопÑобÑйÑе ÑÑÑановиÑÑ Ð½Ð° Ñвой ÑиÑк, ÑÑÐ¾Ð±Ñ ÑзнаÑÑ."
+msgstr "%s пÑедоÑÑавлÑÐµÑ %s, но он помеÑен как неÑÑÑанавливаемÑй. ÐопÑобÑйÑе ÑÑÑановиÑÑ Ð½Ð° Ñвой ÑиÑк, ÑÑÐ¾Ð±Ñ ÑзнаÑÑ."
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:414
@@ -3378,9 +3389,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s пÑедоÑÑавлÑÐµÑ %s, но Ð¸Ð¼ÐµÐµÑ Ð´ÑÑгÑÑ Ð°ÑÑ
иÑекÑÑÑÑ."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ðевозможно ÑдовлеÑвоиÑÑÑ ÑÑебование %s Ð´Ð»Ñ %s"
@@ -3391,7 +3408,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s необÑ
одим дÑÑÐ³Ð¾Ð¼Ñ ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¼Ñ Ð¾Ð±ÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей, поÑÑÐ¾Ð¼Ñ ÑвÑÐ·Ñ Ñ Ð½Ð¸Ð¼ не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ñдалена."
@@ -3403,7 +3420,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s необÑ
одим дÑÑÐ³Ð¾Ð¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¼Ñ Ð¾Ð±ÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей, поÑÑÐ¾Ð¼Ñ ÑвÑÐ·Ñ Ñ Ð½Ð¸Ð¼ не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ñдалена."
@@ -3415,7 +3432,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s заблокиÑован и не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ñдален."
@@ -3426,7 +3443,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "ÐонÑÐ»Ð¸ÐºÑ Ñ %s (%s) ÑÑебÑÐµÑ ÑдалиÑÑ %s, коÑоÑÑй помеÑен Ð´Ð»Ñ ÑÑÑановки"
@@ -3437,23 +3454,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
-msgstr "%s помеÑаеÑÑÑ ÐºÐ°Ðº ÑдалÑемÑй из-за конÑликÑа Ñ %s"
+msgstr "%s помеÑаеÑÑÑ ÐºÐ°Ðº неÑÑÑанавливаемÑй из-за конÑликÑа Ñ %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "из %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "ÐÑибка!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Ðажно!"
@@ -3511,8 +3528,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s обновлен %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "УÑÑановка %s бÑÐ´ÐµÑ Ð¿ÑовеÑена %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4926,11 +4943,3 @@
"ÐÐ¶Ð¸Ð´Ð°ÐµÐ¼Ð°Ñ - %s, ÑакÑиÑеÑÐºÐ°Ñ - %s\n"
" ÐÑе Ñавно иÑполÑзоваÑÑ Ñайл?"
-#~ 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 необÑ
одим дÑÑÐ³Ð¾Ð¼Ñ ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¼Ñ Ð¾Ð±ÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей, поÑÑÐ¾Ð¼Ñ ÑвÑÐ·Ñ Ñ Ð½Ð¸Ð¼ не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ñдалена."
Modified: trunk/libzypp/po/si.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/si.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/si.po (original)
+++ trunk/libzypp/po/si.po Mon Sep 3 13:56:27 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: i18n@suse.de\n"
"Language-Team: Sinhala \n"
@@ -14,77 +14,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2743,25 +2743,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2769,38 +2769,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2808,7 +2808,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2817,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2832,31 +2832,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2864,68 +2864,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2933,8 +2933,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2942,118 +2942,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3063,7 +3075,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3314,9 +3326,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3327,7 +3345,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3339,7 +3357,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3351,7 +3369,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3362,7 +3380,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3373,23 +3391,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3447,7 +3465,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/sk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sk.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/sk.po (original)
+++ trunk/libzypp/po/sk.po Mon Sep 3 13:56:27 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp.sk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-03-05 10:26+0100\n"
"Last-Translator: Jan Kupec \n"
"Language-Team: Slovak \n"
@@ -20,77 +20,77 @@
"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Zadaná URL schéma nepovoľuje %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "%s obsahuje neplatnú položku '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "%s obsahuje neplatnú položku"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Path parametre nie sú pre túto URL podporované"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Query string nie je pre túto URL povolený"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Schéma URL je povinná"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Neplatný názov URL schémy: '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Daná URL schéma nepovoľuje meno použÃvateľa"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Daná URL schéma nepovoľuje heslo"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Daná URL schéma vyžaduje názov hostiteľského poÄÃtaÄa (host component)"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Daná URL schéma nepovoľuje názov hostiteľského poÄÃtaÄa (host component)"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Neplatný názov poÄÃtaÄa '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Daná URL schéma nepovoľuje port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Neplatný port '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Daná URL schéma vyžaduje zadanú cestu"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "RelatÃvna cesta nie je povolená v prÃpade, že je zadaná autorita"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Path parametre nie sú pre túto URL podporované"
@@ -3005,7 +3005,7 @@
msgstr "%s nahradené %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -3013,19 +3013,19 @@
"Tieto balÃÄky budú zo systému odstánené."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3033,38 +3033,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Neplatná informácia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3074,7 +3074,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s je v konflikte s inými balÃÄkami"
@@ -3083,14 +3083,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3100,24 +3100,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s nahrádza %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s nahrádza: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -3126,7 +3126,7 @@
"Tieto balÃÄky budú zo systému odstánené."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s závisà na iných balÃÄkoch"
@@ -3134,38 +3134,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s závisà na: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Potomok"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Nie je možné nainštalovať %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Žiaden balÃÄek neposkytuje %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -3174,32 +3174,32 @@
"\n"
"Nie je k dispozÃcii žiaden prostriedok, ktorý by mohol splniÅ¥ tento požiadavok"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, 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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3207,8 +3207,8 @@
msgstr "odstrániť %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3216,119 +3216,131 @@
msgstr "neinštaluj %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignoruj túto požiadavku len pre tento prÃpad"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Ignoruj túto požiadavku len pre tento prÃpad"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Nainštaluj %s, hoci to spôsobà zmenu architektúry"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s poskytuje túto závislosť, ale zmenil by architektúru nainštalovaného systému"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Nainštaluj %s, hoci to spôsobà zmenu architektúry"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s poskytuje túto závislosť, ale zmenil by architektúru nainštalovaného systému"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignoruj tento konflikt s balÃÄkom %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignoruj nahradený %s v %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignoruj fakt, že %s je už oznaÄený pre inÅ¡taláciu"
@@ -3339,7 +3351,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "pre vyžadovanie %s pre %s kvôli aktualizácii %s"
@@ -3592,8 +3604,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s poskytuje %s, ale má inú architektúru."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s poskytuje %s, ale má inú architektúru."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Nemôžem uspokojiť požiadavok %s na %s"
@@ -3605,7 +3623,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s je vyžadovaný iným nainÅ¡talovaným balÃÄkom, takže odkaz na neho nebude zruÅ¡ený."
@@ -3617,7 +3635,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s je vyžadovaný iným nainÅ¡talovaným balÃÄkom, takže odkaz na neho nebude zruÅ¡ený."
@@ -3629,7 +3647,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s je zamknutý, nie je možné ho odinštalovať."
@@ -3640,7 +3658,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Konflikt balÃÄka %s (%s) vyžaduje odstránenie balÃÄka %s, ktorý má byÅ¥ nainÅ¡talovaný."
@@ -3651,23 +3669,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "OznaÄujem %s ako nenainÅ¡talovateľný kvôli konfliktom s %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "z %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Chyba!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Dôležité!"
@@ -3725,9 +3743,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s je vyžadovaný balÃÄkom %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -5191,6 +5209,10 @@
"OÄakavaný: %s, nájdený %s\n"
"Chcete tento súbor napriek tomu použiť?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s je vyžadovaný balÃÄkom %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Zo zadanej URL nie je možné zÃskaÅ¥ autoritu "
Modified: trunk/libzypp/po/sl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sl.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/sl.po (original)
+++ trunk/libzypp/po/sl.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2001-10-18 11:02+0200\n"
"Last-Translator: Janez Krek \n"
"Language-Team: Slovenian\n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3062,25 +3062,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3088,38 +3088,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3127,7 +3127,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 je v sporu s/z %2"
@@ -3136,14 +3136,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3151,31 +3151,31 @@
msgstr "%1 je v sporu s/z %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3183,68 +3183,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "NameÅ¡Äam na:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3252,8 +3252,8 @@
msgstr "Zbriši %1"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3261,120 +3261,132 @@
msgstr "NameÅ¡Äam na:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "ima nerešene zahteve..."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ima nerešene zahteve..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1 je v sporu s/z %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1 je v sporu s/z %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "Imenik %1 je že na seznamu."
@@ -3385,7 +3397,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3637,9 +3649,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3650,7 +3668,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3662,7 +3680,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3674,7 +3692,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Ta paket ni nameÅ¡Äen in ne bo nameÅ¡Äen."
@@ -3685,7 +3703,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3696,24 +3714,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Napaka"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "Uvozi podatke"
@@ -3774,7 +3792,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/sr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sr.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/sr.po (original)
+++ trunk/libzypp/po/sr.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2004-03-31 11:34+0200\n"
"Last-Translator: Bojan Jovanovic \n"
"Language-Team: Serbian \n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2828,25 +2828,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2854,38 +2854,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2893,7 +2893,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 je u konfliktu sa %2"
@@ -2902,14 +2902,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -2917,31 +2917,31 @@
msgstr "%1 je u konfliktu sa %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2949,69 +2949,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
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:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instaliram na:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3020,8 +3020,8 @@
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3029,121 +3029,133 @@
msgstr "Instaliram na:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "ima neispunjene zahteve..."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ima neispunjene zahteve..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1 je u konfliktu sa %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1 je u konfliktu sa %2"
# error popup message
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "Direktorijum %1 je veÄ na listi."
@@ -3154,7 +3166,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3408,9 +3420,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3421,7 +3439,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3433,7 +3451,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3445,7 +3463,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Ovaj paket nije i neÄe biti instaliran."
@@ -3456,7 +3474,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3467,24 +3485,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Greška"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "Unos podataka"
@@ -3547,7 +3565,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/sv.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sv.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/sv.po (original)
+++ trunk/libzypp/po/sv.po Mon Sep 3 13:56:27 2007
@@ -11,8 +11,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-11 09:48+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-25 11:00+0200\n"
"Last-Translator: Mattias Newzella \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -21,77 +21,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "URL-schemat tillåter inte %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "%s-komponenten %s är ogiltig"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ogiltig %s-komponent"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Analysering av sökvägsparameter stöds inte för den här URL-adressen"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Analysering av frågesträng stöds inte för den här URL-adressen"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "URL-schemat är en obligatorisk komponent"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "URL-schemat %s är ogiltigt"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "URL-schemat tillåter inte något användarnamn"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "URL-schemat tillåter inte något lösenord"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Det måste finnas en värdkomponent i URL-schemat"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Det får inte finnas någon värdkomponent i URL-schemat"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Värdkomponenten %s är ogiltig"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "URL-schemat tillåter inte någon port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Portkomponenten %s är ogiltig"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Det måste finnas ett sökvägsnamn för URL-schemat"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relativa sökvägar tillåts inte om det finns behörighet"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Analysering av sökvägsparameter stöds inte för den här URL-adressen"
@@ -171,7 +171,7 @@
#: ../zypp/RepoManager.cc:614
msgid "Valid metadata not found at specified URL(s)"
-msgstr ""
+msgstr "Giltig metadata hittades inte på specificerad URL"
#: ../zypp/RepoManager.cc:664
#, c-format
@@ -2711,9 +2711,9 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1913
-#, fuzzy, c-format
+#, 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"
+msgstr "rpm sparade %s som %s, men det gick inte att avgöra skillnaden"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1915
@@ -2727,9 +2727,9 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1918
-#, fuzzy, c-format
+#, 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"
+msgstr "rpm skapade %s som %s, men det gick inte att avgöra skillnaden"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1920
@@ -2800,25 +2800,25 @@
msgstr "%s ersatt av %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2826,38 +2826,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ogiltig information"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2867,7 +2867,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s är i konflikt med andra resurser"
@@ -2876,14 +2876,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2893,24 +2893,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, 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:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s gör %s inaktuell"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2919,7 +2919,7 @@
"Dessa resurser tas bort från systemet."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s beror på andra resurser"
@@ -2927,39 +2927,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s är beroende av: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Barn till"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Det går inte att installera %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Ingen tillhandahåller %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2967,32 +2966,31 @@
"\n"
"Det finns ingen resurs tillgänglig vilken stödjer det här kravet."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:461
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"
+msgstr "På grund av problemen som beskrivs ovan/nedan, löser inte den här resursen alla beroenden"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
+#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3000,8 +2998,8 @@
msgstr "ta bort %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3009,137 +3007,147 @@
msgstr "installera inte %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:714
+#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
-msgstr "%s uppfyller beroenden för %s men avinstalleras"
+msgstr "%s uppfyller beroenden för %s men kommer att avinstalleras"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:724
+#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
-msgstr "%s uppfyller beroenden för %s men lämnas kvar på systemet"
+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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:742
+#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
+#, 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:803
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:826
+#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
-msgstr "%s gör %s inaktuellt. Det går dock inte att ta bort %s eftersom det är låst."
+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:835
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:858
+#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
-msgstr ""
+msgstr "Kravet %s kan inte uppfyllas."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorera det här kravet här"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
-#, fuzzy
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
-msgstr "Ignorera det här kravet här"
+msgstr "Ignorera allmänt det här kravet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installera %s trots att det kommer att ändra arkitekturen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
+#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
-msgstr "%s tillhandahåller detta beroende men skulle förändra arkitekturen för det installerade objektet"
+msgstr "%s tillhandahåller detta beroende, men skulle förändra arkitekturen för det installerade objektet"
+
+#. 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 "Installera %s trots att det kommer att ändra leverantören"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s tillhandahåller detta beroende, men skulle förändra leverantören för det installerade objektet"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorera den här konflikten för %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorera det inaktuella %s i %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorera att %s redan har angetts för installation"
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
msgid "Do not install or delete the resolvables concerned"
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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "för krav av %s för %s när %s uppgraderas"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency
#: ../zypp/solver/detail/ResolverInfoMissingReq.cc:64
-#, fuzzy, c-format
+#, c-format
msgid "%s is lacking the requirement %s"
msgstr "%s saknar kravet %s"
@@ -3216,14 +3224,14 @@
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
-#, fuzzy, c-format
+#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
msgstr "%s är schemalagd för installation, men det är inte möjligt på grund av beroendeproblem."
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:167
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s since it is already marked as needed to be uninstalled"
msgstr "Det går inte att installera %s eftersom det redan har markerats som att vara i behov av avinstallation"
@@ -3234,7 +3242,7 @@
#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed
#. TranslatorExplanation: package is not installed.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:179
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because it does not apply to this system."
msgstr "Kan inte installera %s eftersom det inte är tillämpligt för det här systemet."
@@ -3244,7 +3252,7 @@
#. other_capability() =
#. Translator: %s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoMisc.cc:190
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because %s is already marked as needed to for installation"
msgstr "Det går inte att installera %s, eftersom %s redan har markerats som att vara i behov av installation"
@@ -3312,7 +3320,7 @@
#. TranslatorExplanation: removal of this resolvable would therefore break dependency
#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled
#: ../zypp/solver/detail/ResolverInfoMisc.cc:292
-#, fuzzy, c-format
+#, c-format
msgid "There are no alternative providers of %s installed"
msgstr "Det finns inga alternativa installerade tillhandahållare för %s"
@@ -3343,7 +3351,7 @@
#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible
#. TranslatorExplanation: bar requires something from foo
#: ../zypp/solver/detail/ResolverInfoMisc.cc:341
-#, fuzzy, c-format
+#, c-format
msgid "Upgrading to %s to avoid removing %s is not possible."
msgstr "Uppdatering till %s för att undvika borttag av %s är inte möjligt."
@@ -3383,9 +3391,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s tillhandahåller %s, men har en annan arkitektur."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 tillhandahåller %s, men har en annan leverantör (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Kan inte tillfredsställa krav %s för %s"
@@ -3396,10 +3410,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
+#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
-msgstr "%s krävs av en annan installerad resurs, så länken tas inte bort."
+msgstr "%s krävs av en annan resurs vald för installation, så länken tas inte bort."
#. affected() = provider of cap
#. _capability =
@@ -3408,8 +3422,8 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
+#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s krävs av en annan installerad resurs, så länken tas inte bort."
@@ -3420,7 +3434,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s är låst och kan inte avinstalleras."
@@ -3431,8 +3445,8 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "En konflikt över %s (%s) kräver att %s som ska installeras tas bort"
@@ -3442,23 +3456,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s markeras som avinstallerbart på grund av konflikter över %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "från %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Fel!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Viktigt!"
@@ -3516,8 +3530,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s uppdateras av %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s kommer att utvärderas för installation (uppdaterad) av %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4940,11 +4954,3 @@
"%s förväntades, men %s hittades\n"
" Vill du använda filen ändå?"
-#~ msgid "Unable to parse Url authority"
-#~ msgstr "Det gick inte att analysera URL-behörigheten"
-
-#~ msgid "Ignore this requirement generally"
-#~ msgstr "Ignorera det här kravet generellt"
-
-#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
-#~ msgstr "%s krävs av en annan resurs som ska installeras, så länken tas inte bort."
Modified: trunk/libzypp/po/ta.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ta.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/ta.po (original)
+++ trunk/libzypp/po/ta.po Mon Sep 3 13:56:27 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: NetworkManager-vpnc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2005-06-26 01:20+0200\n"
"Last-Translator: Priyavert Sharma \n"
"Language-Team: AgreeYa Solutions \n"
@@ -11,77 +11,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ %sà®à¯à®à¯ à®
னà¯à®®à®¤à®¿à®ªà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "'%s' à®à¯à®²à¯à®²à®¾à®¤ à®à®±à¯à®ªà¯à®ªà¯"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "à®à¯à®²à¯à®²à®¾à®¤ %s à®à®±à¯à®ªà¯à®ªà¯"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "à®à®¨à¯à®¤ யà¯à®à®°à¯à®à®²à¯à®²à¯à®à¯à®à¯ பாத௠à®
ளவà¯à®à¯ விளà®à¯à®à®®à¯ à®à®¤à®°à®µà®³à®¿à®à¯à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "à®à®¨à¯à®¤ யà¯à®à®°à¯à®à®²à¯à®²à¯à®à¯à®à¯ வினா வரிà®à¯ விளà®à¯à®à®®à¯ à®à®¤à®°à®µà®³à®¿à®à¯à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ à®à®°à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®®à¯ à®à®±à¯à®ªà¯à®ªà®¾à®à¯à®®à¯"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "à®à¯à®²à¯à®²à®¾à®¤ யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ பயனாளர௠பà¯à®¯à®°à¯ à®
னà¯à®®à®¤à®¿à®ªà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ à®à®à®µà¯à®à¯à®à¯à®¾à®²à¯à®²à¯ à®
னà¯à®®à®¤à®¿à®ªà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®¤à¯à®¤à®¿à®±à¯à®à¯ à®à®°à¯ à®à®¤à®¾à®° à®à®±à¯à®ªà¯à®ªà¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ à®à®°à¯ à®à®¤à®¾à®° à®à®±à¯à®ªà¯à®ªà¯ à®
னà¯à®®à®¤à®¿à®ªà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "à®à¯à®²à¯à®²à®¾à®¤ à®à®¤à®¾à®° à®à®±à¯à®ªà¯à®ªà¯'%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ à®à®°à¯ à®®à¯à®£à¯à®¯à®¤à¯à®¤à¯ à®
னà¯à®®à®¤à®¿à®ªà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "à®à¯à®²à¯à®²à®¾à®¤ à®®à¯à®£à¯à®¯ à®à®±à¯à®ªà¯à®ªà¯'%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®¤à¯à®¤à®¿à®±à¯à®à¯ à®à®°à¯ பாத௠பà¯à®¯à®°à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "à®
திà®à®¾à®°à®®à¯ à®à®°à¯à®à¯à®à¯à®®à®¾à®©à®¾à®²à¯ தà¯à®¾à®à®°à¯à®ªà¯à®ªà¯ பாத௠à®à®¤à®°à®µà®³à®¿à®à¯à®à®ªà¯à®ªà®à¯à®µà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "à®à®¨à¯à®¤ யà¯à®à®°à¯à®à®²à¯à®²à¯à®à¯à®à¯ பாத௠à®
ளவà¯à®à¯ விளà®à¯à®à®®à¯ à®à®¤à®°à®µà®³à®¿à®à¯à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯"
@@ -2728,7 +2728,7 @@
msgstr "%s %sà®à®²à¯ மாறà¯à®±à®¿à®¯à®®à¯à®à¯à®à®ªà¯à®ªà®à¯à®à®¤à¯"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2736,19 +2736,19 @@
"à®à®¤à¯à®¤à¯à®°à¯à®µà¯à®à®³à¯ à®
à®®à¯à®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ நà¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2756,38 +2756,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "à®à¯à®²à¯à®²à®¾à®¤ தà®à®µà®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2797,7 +2797,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s மறà¯à®± தà¯à®°à¯à®µà¯à®à®³à¯à®à®©à¯ à®®à¯à®°à®£à¯à®ªà®à¯à®à®¿à®±à®¤à¯"
@@ -2806,14 +2806,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2823,24 +2823,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s மறà¯à®± தà¯à®°à¯à®µà¯à®à®³à¯ வழà®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s %s஠வழà®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s %s஠வழà®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯:"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2849,7 +2849,7 @@
"à®à®¤à¯à®¤à¯à®°à¯à®µà¯à®à®³à¯ à®
à®®à¯à®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ நà¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s மறà¯à®± தà¯à®°à¯à®µà¯à®à®³à¯ à®à®¾à®°à¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯"
@@ -2857,38 +2857,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s %sà® à®à®¾à®°à¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯:"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "à®à®¤à®©à¯ à®à®°à¯à®µà®¾à®à¯à®à®®à¯"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s஠நிறà¯à®µ à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "%s யாரà¯à®®à¯ à®
ளிபà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2897,32 +2897,32 @@
"\n"
"à®à®¤à¯à®¤à¯à®µà¯à®¯à¯ பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯à¯à®®à¯ à®à®¤à®¾à®°à®®à¯ à®à®¤à¯à®µà¯à®®à¯ à®à®²à¯à®²à¯"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "à®à®¤à¯à®¤à¯à®°à¯à®µà®¿à®©à¯ à®®à¯à®²à¯ மறà¯à®±à¯à®®à¯ à®à¯à®´à¯ விளà®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ பிரà®à¯à®©à¯à®à®³à¯, à®
னà¯à®¤à¯à®¤à¯ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯à®¯à¯à®®à¯ தà¯à®°à¯à®à¯à®à®à¯à®à¯à®à®¿à®¯à®µà¯ à®
லà¯à®²"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2930,8 +2930,8 @@
msgstr "%s ஠நà¯à®à¯à®à®µà¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2939,119 +2939,131 @@
msgstr "%s஠நிறà¯à®µ வà¯à®£à¯à®à®¾à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s தà¯à®°à¯à®à¯à®à®ªà¯à®ªà®à®¾à®¤ தà¯à®µà¯à®à®³à¯à®à¯ à®à¯à®¾à®£à¯à®à¯à®³à¯à®³à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s à®à®¾à®£à®ªà¯à®ªà®à®¾à®¤ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯à®à¯ à®à¯à®¾à®£à¯à®à¯à®³à¯à®³à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s஠நிறà¯à®µà®¤à¯ தà¯à®µà¯à®¯à®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s à®à®à®©à¯ à®à®³à¯à®³ à®®à¯à®°à®£à¯à®ªà®¾à®à¯ à®à®¾à®°à®£à®®à®¾à® %sன௠நிறà¯à®µà¯à®¤à®²à¯ நà¯à®à¯à® à®®à¯à®à®¿à®¯à®¾à®¤à¯"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "à®à®¤à¯à®¤à¯à®µà¯à®¯à¯ à®à®à¯à®à¯à®¯à¯ பà¯à®±à®à¯à®à®£à®¿à®à¯à®à®µà¯à®®à¯"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "à®à®¤à¯à®¤à¯à®µà¯à®¯à¯ à®à®à¯à®à¯à®¯à¯ பà¯à®±à®à¯à®à®£à®¿à®à¯à®à®µà¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "à®
த௠à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ மாறà¯à®±à®à¯à®à¯à®à¯à®®à¯à®©à¯à®±à®¾à®²à¯à®®à¯ %s஠நிறà¯à®µà®µà¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "à®à®à¯à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®¯à¯ %s à®
ளிà®à¯à®à®¿à®±à®¤à¯ à®à®©à®¾à®²à¯, நிறà¯à®µà®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ பà¯à®¾à®°à¯à®³à®¿à®©à¯ à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ மாறà¯à®±à®¿à®µà®¿à®à¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "à®à®à¯à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®¯à¯ %s à®
ளிà®à¯à®à®¿à®±à®¤à¯ à®à®©à®¾à®²à¯, நிறà¯à®µà®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ பà¯à®¾à®°à¯à®³à®¿à®©à¯ à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ மாறà¯à®±à®¿à®µà®¿à®à¯à®®à¯"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%sன௠மà¯à®°à®£à¯à®ªà®¾à®à¯à®à¯ பà¯à®±à®à¯à®à®£à®¿à®à¯à®à®µà¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%sல௠à®à®³à¯à®³ வழà®à¯à®à®¿à®²à¯ à®à®²à¯à®²à®¾à®¤ %s஠பà¯à®±à®à¯à®à®£à®¿à®à¯à®à®µà¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "ââà®à®±à¯à®à®©à®µà¯ நிறà¯à®µà¯à®µà®¤à®±à¯à®à®¾à® à®
à®®à¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ %s஠பà¯à®±à®à¯à®à®£à®¿à®à¯à®à®µà¯à®®à¯"
@@ -3062,7 +3074,7 @@
msgstr "தà¯à®¾à®à®°à¯à®ªà¯à®³à¯à®³ தà¯à®°à¯à®µà¯à®à®³à¯ நிறà¯à®µà®µà¯à®¾ à®
லà¯à®²à®¤à¯ நà¯à®à¯à®à®µà¯à®¾ வà¯à®£à¯à®à®¾à®®à¯"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s஠பà¯à®¤à¯à®ªà¯à®ªà®¿à®à¯à®à¯à®®à¯à®ªà¯à®¾à®¤à¯ %sà®à¯à®à®¾à® %s தà¯à®µà¯à®ªà¯âபà®à¯à®®à¯à®ªà¯à®¾à®¤à¯"
@@ -3315,8 +3327,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s, %sà® à®
ளிà®à¯à®à®¿à®±à®¤à¯, à®à®©à®¾à®²à¯ à®
தறà¯à®à¯ வà¯à®±à¯à®¾à®°à¯ à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ à®à®³à¯à®³à®¤à¯."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s, %sà® à®
ளிà®à¯à®à®¿à®±à®¤à¯, à®à®©à®¾à®²à¯ à®
தறà¯à®à¯ வà¯à®±à¯à®¾à®°à¯ à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ à®à®³à¯à®³à®¤à¯."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s à®à¯à®à®¾à®© %sன௠தà¯à®µà¯à®¯à¯à®ªà¯ பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯ à®à®¯à®²à®¾à®¤à¯"
@@ -3328,7 +3346,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "மறà¯à®±à¯à®¾à®°à¯ நிறà¯à®µà®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ தà¯à®°à¯à®µà¯à®à¯à®à¯ %s தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯, à®à®©à®µà¯ à®
தன à®à®£à¯à®ªà¯à®ªà¯ நà¯à®à¯à®à®ªà¯à®ªà® மாà®à¯à®à®¾à®¤à¯."
@@ -3340,7 +3358,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "மறà¯à®±à¯à®¾à®°à¯ நிறà¯à®µà®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ தà¯à®°à¯à®µà¯à®à¯à®à¯ %s தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯, à®à®©à®µà¯ à®
தன à®à®£à¯à®ªà¯à®ªà¯ நà¯à®à¯à®à®ªà¯à®ªà® மாà®à¯à®à®¾à®¤à¯."
@@ -3352,7 +3370,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s பà¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯ மறà¯à®±à¯à®®à¯ à®
தன௠நிறà¯à®µà¯à®¤à®²à¯ நà¯à®à¯à® à®à®¯à®²à®¾à®¤à¯."
@@ -3363,7 +3381,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) à®®à¯à®¤à®¾à®© à®à®°à¯ à®®à¯à®°à®£à¯à®ªà®¾à®à¯à®à®¿à®±à¯à®à¯, நிறà¯à®µà®ªà¯à®ªà®à®ªà¯à®ªà¯à®¾à®à¯à®®à¯ %sன௠நà¯à®à¯à®à®®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯."
@@ -3374,23 +3392,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s à®®à¯à®¤à®¾à®© à®à®°à¯ à®®à¯à®°à®£à¯à®ªà®¾à®à¯ à®à®¾à®°à®£à®®à®¾à® %s நிறà¯à®µà®ªà¯à®ªà® à®®à¯à®à®¿à®¯à®¾à®¤à®¤à®¾à® à®à¯à®±à®¿à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%sலிரà¯à®¨à¯à®¤à¯"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "பிழà¯!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "à®®à¯à®à¯à®à®¿à®¯à®®à¯!"
@@ -3447,9 +3465,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s, %sà®à¯à®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4768,6 +4786,10 @@
"à®à®¤à®¿à®°à¯à®ªà®¾à®°à¯à®¤à¯à®¤à®¤à¯ %s, à®à®£à¯à®à®¤à¯ %s\n"
"à®
வà¯à®µà®¾à®±à®¿à®°à¯à®¨à¯à®¤à¯à®®à¯ à®
à®à¯à®à¯à®¾à®ªà¯à®ªà¯ பயனà¯à®ªà®à¯à®¤à¯à®¤à®²à®¾à®®à®¾?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s, %sà®à¯à®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "யà¯à®à®°à¯à®à®²à¯ à®
திà®à®¾à®°à®¤à¯à®¤à¯ விளà®à¯à® à®à®¯à®²à®µà®¿à®²à¯à®²à¯"
Modified: trunk/libzypp/po/tr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/tr.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/tr.po (original)
+++ trunk/libzypp/po/tr.po Mon Sep 3 13:56:27 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2001-10-18 10:13+0200\n"
"Last-Translator: Görkem Ãetin \n"
"Language-Team: turkish \n"
@@ -19,81 +19,81 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
# include/nfs/routines.ycp:188
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "Geçersiz özellik '{0}'"
# include/nfs/routines.ycp:188
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Geçersiz özellik '{0}'"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Geçersiz yetki '{0}'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
# include/nfs/routines.ycp:188
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Geçersiz özellik '{0}'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
# include/nfs/routines.ycp:188
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Geçersiz özellik '{0}'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3243,25 +3243,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3269,38 +3269,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3308,7 +3308,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1, %2 ile çakıÅıyor"
@@ -3317,14 +3317,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3332,31 +3332,31 @@
msgstr "%1, %2 ile çakıÅıyor"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3364,69 +3364,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
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:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Kurulan disk:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3435,8 +3435,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:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3444,125 +3444,137 @@
msgstr "Kurulan disk:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "Åu çözülmemiÅ gereksinimlere sahip:"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Åu çözülmemiÅ gereksinimlere sahip:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1, %2 ile çakıÅıyor"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1, %2 ile çakıÅıyor"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "%1 dizini zaten listede."
@@ -3573,7 +3585,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3829,9 +3841,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3842,7 +3860,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3854,7 +3872,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3866,7 +3884,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Bu paket kurulu deÄildir ve kurulmayacaktır."
@@ -3877,7 +3895,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3888,25 +3906,25 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
# include/ui/common_messages.ycp:95
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Hata"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "DıÅarıdan veri al"
@@ -3967,7 +3985,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/uk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/uk.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/uk.po (original)
+++ trunk/libzypp/po/uk.po Mon Sep 3 13:56:27 2007
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: zypp.uk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-19 22:40-0700\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 20:52-0700\n"
"Last-Translator: Ivan Petrouchtchak \n"
"Language-Team: Ukrainian \n"
"MIME-Version: 1.0\n"
@@ -19,77 +19,77 @@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "СÑ
ема Url не дозволÑÑ %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ðе Ñинний %s ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ \"%s\""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ðе Ñинний ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ %s"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "РозбÑÑ Ð¿Ð°ÑамеÑÑÑв ÑлÑÑ
Ñ Ð½Ðµ пÑдÑÑимÑÑÑÑÑÑ Ð´Ð»Ñ ÑÑого URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "РозбÑÑ ÑÑдка запиÑÑ Ð½Ðµ пÑдÑÑимÑÑÑÑÑÑ Ð´Ð»Ñ ÑÑого URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "СÑ
ема URL - Ñе поÑÑÑбний компоненÑ"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ðе Ñинна ÑÑ
ема URL \"%s\""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "СÑ
ема URL не дозволÑÑ ÑÐ¼ÐµÐ½Ñ ÐºÐ¾ÑиÑÑÑваÑа"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "СÑ
ема URL не дозволÑÑ Ð¿Ð°ÑолÑ"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "СÑ
ема URL поÑÑебÑÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð²Ñзла"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "СÑ
ема URL не дозволÑÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð²Ñзла"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ðе Ñинний ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð²Ñзла \"%s\""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "СÑ
ема URL не дозволÑÑ Ð¿Ð¾ÑÑ"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ðе Ñинний ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð¿Ð¾ÑÑÑ \"%s\""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "СÑ
ема URL поÑÑебÑÑ Ð½Ð°Ð·Ð²Ñ ÑлÑÑ
Ñ"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "ÐÑдноÑний ÑлÑÑ
не дозволÑÑÑÑÑÑ Ð¿Ñи ÑÑнÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð½Ñ"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "РозбÑÑ Ð¿Ð°ÑамеÑÑÑв ÑлÑÑ
Ñ Ð½Ðµ пÑдÑÑимÑÑÑÑÑÑ Ð´Ð»Ñ ÑÑого URL"
@@ -99,15 +99,15 @@
#: ../zypp/url/UrlUtils.cc:173
msgid "Invalid parameter array split separator character"
-msgstr ""
+msgstr "Ðе Ñинний Ñимвол ÑоздÑÐ»ÐµÐ½Ð½Ñ Ð¼Ð°ÑÐ¸Ð²Ñ Ð¿Ð°ÑамеÑÑÑв"
#: ../zypp/url/UrlUtils.cc:213
msgid "Invalid parameter map split separator character"
-msgstr ""
+msgstr "Ðе Ñинний Ñимвол ÑоздÑÐ»ÐµÐ½Ð½Ñ ÐºÐ°ÑÑи паÑамеÑÑÑв"
#: ../zypp/url/UrlUtils.cc:283
msgid "Invalid parameter array join separator character"
-msgstr ""
+msgstr "Ðе Ñинний Ñимвол ÑполÑÑÐµÐ½Ð½Ñ Ð¼Ð°ÑÐ¸Ð²Ñ Ð¿Ð°ÑамеÑÑÑв"
#. TranslatorExplanation followed by the list of error messages that lead to this exception
#: ../zypp/base/Exception.cc:89
@@ -2798,25 +2798,25 @@
msgstr "%s замÑнено %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s бÑде вÑÑановлено ÑнÑÐ¾Ñ Ð¿ÑогамоÑ. (ApplLow/ApplHigh)\n"
@@ -2824,38 +2824,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ðе Ñинна ÑнÑоÑмаÑÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2865,7 +2865,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s конÑлÑкÑÑÑ Ð· ÑнÑими поÑÑÑбними"
@@ -2874,14 +2874,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2891,24 +2891,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s ÑобиÑÑ Ð·Ð°ÑÑаÑÑлими ÑнÑÑ Ð¿Ð¾ÑÑÑбнÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s ÑобиÑÑ Ð·Ð°ÑÑаÑÑлим %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s ÑобиÑÑ Ð·Ð°ÑÑаÑÑлим: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2917,7 +2917,7 @@
"Ð¦Ñ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð¿Ð°ÐºÑнки бÑде вилÑÑено з ÑиÑÑеми."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s залежиÑÑ Ð²Ñд ÑнÑиÑ
поÑÑÑбниÑ
пакÑнкÑв"
@@ -2925,38 +2925,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s залежиÑÑ Ð²Ñд: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "ÐаÑадок"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Ðеможливо вÑÑановиÑи %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "ÐÑÑо не Ð½Ð°Ð´Ð°Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2964,31 +2964,31 @@
"\n"
"Ðема наÑвного ÑеÑÑÑÑÑ, Ñкий пÑдÑÑимÑÑ ÑÑ Ð²Ð¸Ð¼Ð¾Ð³Ñ."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "У зв'ÑÐ·ÐºÑ Ð· пÑоблемами опиÑаними виÑе/нижÑе Ñе Ñозв'ÑÐ·Ð°Ð½Ð½Ñ Ð½Ðµ задоволÑниÑÑ Ð²ÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2996,8 +2996,8 @@
msgstr "вилÑÑиÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3005,118 +3005,130 @@
msgstr "не вÑÑановлÑваÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s Ð¼Ð°Ñ Ð²Ð¸Ð¼Ð¾Ð³Ð¸, ÑÐºÑ Ð½Ðµ задоволено"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s Ð¼Ð°Ñ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ, ÑÐºÑ Ð½Ðµ задоволено"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Ðема поÑÑеби вÑÑановлÑваÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "Ðеможливо вÑÑановиÑи %s ÑеÑез конÑлÑÐºÑ Ð· %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Ðеможливо задоволÑниÑи Ð²Ð¸Ð¼Ð¾Ð³Ñ %s."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ÐгноÑÑваÑи ÑÑ Ð²Ð¸Ð¼Ð¾Ð³Ñ ÑÑлÑки ÑÑÑ"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "ÐгноÑÑваÑи ÑÑ Ð²Ð¸Ð¼Ð¾Ð³Ñ Ð² загалÑномÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ÐÑÑановиÑи %s, незважаÑÑи на Ñе, Ñо Ñе змÑниÑÑ Ð°ÑÑ
ÑÑекÑÑÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s задоволÑнÑÑ ÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½ÑÑÑÑ, але змÑниÑÑ Ð°ÑÑ
ÑÑекÑÑÑÑ Ð²ÑÑановленого"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../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 задоволÑнÑÑ ÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½ÑÑÑÑ, але змÑниÑÑ Ð²Ð¸Ñобника вÑÑановленого"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "ÐгноÑÑваÑи Ñей конÑлÑÐºÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "ÐгноÑÑваÑи заÑÑаÑÑлий %s в %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "ÐгноÑÑваÑи, Ñо вже заплановано вÑÑановиÑи %s"
@@ -3126,7 +3138,7 @@
msgstr "Ðе вÑÑановлÑваÑи Ñ Ð½Ðµ вилÑÑаÑи Ð´Ð°Ð½Ñ Ð¿Ð°ÐºÑнки"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "поÑÑебÑÑ %s Ð´Ð»Ñ %s, коли оновлÑÑÑÑÑÑ %s"
@@ -3377,9 +3389,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s Ð½Ð°Ð´Ð°Ñ %s, але Ð¼Ð°Ñ ÑнÑÑ Ð°ÑÑ
ÑÑекÑÑÑÑ."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ðеможливо задоволÑниÑи Ð²Ð¸Ð¼Ð¾Ð³Ñ %s Ð´Ð»Ñ %s"
@@ -3390,7 +3408,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s поÑÑÑбний Ð´Ð»Ñ ÑнÑого вÑÑановленого поÑÑÑбного пакÑнка, оÑже вÑн не бÑде вÑдв'Ñзаний."
@@ -3402,7 +3420,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s поÑÑÑбний Ð´Ð»Ñ ÑнÑого вÑÑановленого поÑÑÑбного пакÑнка, оÑже вÑн не бÑде вÑдв'Ñзаний."
@@ -3414,7 +3432,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s заблоковано Ñ Ð¹Ð¾Ð³Ð¾ неможливо пÑибÑаÑи."
@@ -3425,7 +3443,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "ÐонÑлÑÐºÑ ÑеÑез %s (%s) поÑÑебÑÑ Ð²Ð¸Ð»ÑÑÐµÐ½Ð½Ñ %s, Ñкий запланований Ð´Ð»Ñ Ð²ÑÑановленнÑ"
@@ -3436,23 +3454,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "ÐознаÑÐµÐ½Ð½Ñ %s Ñк Ñакого, Ñо його не можна вÑÑановлÑваÑи ÑеÑез конÑлÑÐºÑ Ð· %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "з %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Ðомилка!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Ðажливе!"
@@ -3510,8 +3528,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s оÑвÑжений пакÑнком %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s бÑде оÑÑнено Ð´Ð»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ (оÑвÑжено): %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/vi.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/vi.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/vi.po (original)
+++ trunk/libzypp/po/vi.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan VÄ©nh Thá»nh \n"
"Language-Team: Vietnamese \n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2728,25 +2728,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2754,38 +2754,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2793,7 +2793,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2802,14 +2802,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2817,31 +2817,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2849,68 +2849,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2918,8 +2918,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2927,118 +2927,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3048,7 +3060,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3299,9 +3311,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3312,7 +3330,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3324,7 +3342,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3336,7 +3354,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3347,7 +3365,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3358,23 +3376,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3432,7 +3450,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/wa.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/wa.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/wa.po (original)
+++ trunk/libzypp/po/wa.po Mon Sep 3 13:56:27 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lcn memory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2004-04-05 17:37+0200\n"
"Last-Translator: Jean Cayron \n"
"Language-Team: Walloon \n"
@@ -16,77 +16,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Li valixhance ni clope nén pol tchuze '%1': %2"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Li valixhance ni clope nén pol tchuze '%1': %2"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2773,25 +2773,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2799,39 +2799,39 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
#, fuzzy
msgid "Invalid information"
msgstr "&Informåcion"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2839,7 +2839,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "Afrontmint etur les coridjaedjes"
@@ -2848,14 +2848,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -2863,31 +2863,31 @@
msgstr "afrontmint avou..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, fuzzy, c-format
msgid "%s obsoletes %s"
msgstr "trop vîs..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, fuzzy, c-format
msgid "%s obsoletes:%s"
msgstr "trop vîs..."
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, fuzzy, c-format
msgid "%s depends on other resolvables"
msgstr "Coridjaedjes ricomandés"
@@ -2895,70 +2895,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
#, fuzzy
msgid "Child of"
msgstr "Tchili"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "N' nén astaler"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, 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:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -2966,8 +2966,8 @@
msgstr "Dis&facer"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -2975,118 +2975,130 @@
msgstr "N' nén astaler"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, 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:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. 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 ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3097,7 +3109,7 @@
msgstr "Coridjaedjes di radjoutés"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3356,9 +3368,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. 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 ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3369,7 +3387,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3381,7 +3399,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3393,7 +3411,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Ãou paket n' est nén astalé et n' serè nén astalé."
@@ -3404,7 +3422,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3415,24 +3433,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Aroke"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "Abe&rweter"
@@ -3493,7 +3511,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/xh.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/xh.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/xh.po (original)
+++ trunk/libzypp/po/xh.po Mon Sep 3 13:56:27 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-03 12:03\n"
"Last-Translator: Novell Language \n"
"Language-Team: Novell Language \n"
@@ -13,77 +13,77 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Ulungiselelo lwe-Url aluyivumeli i-%s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ayisebenziseki %s inxalenye '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ayisebenziseki %s inxalenye"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Ukwahlula umda wenkcazelo yendlela yothungelwano awuxhaswa malunga ne-URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Ukwahlulwa komtya wokubuzisa awuxhaswa malunga nale-URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Ulungiselelo lwe-Url yinxalenye efunekayo"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ulungiselelo olusebenzisekayo lwe-Url '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Ulungiselelo lwe-Url akulivumeli igama lomsebenzisi"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Ulungiselelo lwe-Url awulivumeli igama lokugqithisa"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Ulungiselelo lwe-Url lufuna inxalenye yomamkeli"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Ulungiselelo lwe-Url awuyivumeli inxalenye yomamkeli"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ayisebenziseki inxalenye yomamkeli ye-'%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Ulungiselelo lwe-Url awusivumeli isiqhagamshelanisi"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ayisebenziseki inxalenye yesiqhagamshelanisi se-'%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Ulungiselelo lwe-Url lufuna igama lendlela yothungelwano"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Indlela yothungelwano ethelekisekayo ayivunyelwa xa lukhona ugunyaziso"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Ukwahlula umda wenkcazelo yendlela yothungelwano awuxhaswa malunga nale-URL"
@@ -2730,7 +2730,7 @@
msgstr "%s ibuyiselwe ngo %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2738,19 +2738,19 @@
"Ezi ziconjululwa ziza kucinywa kwisixokelelwano."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2758,38 +2758,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ulwazi olungasebenzi"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2799,7 +2799,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s iimpixano nezinye iziconjululwa"
@@ -2808,14 +2808,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2825,24 +2825,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s ziphelelwe lixehsa %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s ziphelelwe lixehsa:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2851,7 +2851,7 @@
"Ezi ziconjululwa ziza kucinywa kwisixokelelwano."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ixhomekeke kwezinye iziconjululwa"
@@ -2859,38 +2859,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ixhomekeke kwi:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Umntwana ka"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Ayikwazi kuhlohla%s "
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Akukho nanye ebonelela ngo%s "
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2899,32 +2899,32 @@
"\n"
"Akukho vimba ufumanekayo oxhasa le mfuneko."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, 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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2932,8 +2932,8 @@
msgstr "Cima %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2941,119 +2941,131 @@
msgstr "ungahlohli %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s inemfuneko ezingazalisekiswanga"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s inezixhomekeki ezilahlekileyo"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Suhoya le mfuneko apha nje"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Suhoya le mfuneko apha nje"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Hlohla%s nangona kuza kutshintsha inzululwazi yokwakha"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s ibonelela esi sixhomekeki kodwa kuza kutshintsha inzululwazi yokwakha into ehlohliweyo"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Hlohla%s nangona kuza kutshintsha inzululwazi yokwakha"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s ibonelela esi sixhomekeki kodwa kuza kutshintsha inzululwazi yokwakha into ehlohliweyo"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Suhoya le mpixano ka%s "
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Suhoya ukuphelelwa%s lixesha kwi%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Suhoya ukuba%s sele imiselwe ukuhlohla"
@@ -3064,7 +3076,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ukufuna%s ka%s xa ihlaziya%s"
@@ -3315,8 +3327,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s ibonelela%s, kodwa inenye inzululwazi ngokwakha."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s ibonelela%s, kodwa inenye inzululwazi ngokwakha."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ayikwazi kwanelisa imfuneko%s ka%s"
@@ -3328,7 +3346,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s iyafunwa zezinye ukuba ihlohle izicombululi, ayizukwazi ukwenziwa inganxulumani."
@@ -3340,7 +3358,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s iyafunwa zezinye ukuba ihlohle izicombululi, ayizukwazi ukwenziwa inganxulumani."
@@ -3352,7 +3370,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s itshixiwe kwaye ayikwazi kungahlohlwa."
@@ -3363,7 +3381,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Impixano ngaphezu%s (%s) ifuna ukushenxiswa ukuba kuhlohlwe%s"
@@ -3374,23 +3392,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Ukuphawula%s njengengahlohleki ngenxa yeempixano ezingaphezu kuka%s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "Ukusuka ku%s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Imposiso!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Ibalulekile!"
@@ -3447,9 +3465,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s ifunwa ngu %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4768,6 +4786,10 @@
"Ilindeleke%s, ifunyenwe%s\n"
" Sebenzisa ifayili nakanjani?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s ifunwa ngu %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Akukwazeki ukwahlula ugunyaziso lwe-Url"
Modified: trunk/libzypp/po/zh_CN.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zh_CN.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/zh_CN.po (original)
+++ trunk/libzypp/po/zh_CN.po Mon Sep 3 13:56:27 2007
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-01 08:54+0800\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-26 00:50+0800\n"
"Last-Translator: Thruth Wang \n"
"Language-Team: Novell Language \n"
"MIME-Version: 1.0\n"
@@ -16,77 +16,79 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "URL 纲è¦ä¸å
è®¸ä½¿ç¨ %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "æ æç %s ç»ä»¶â%sâ"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "æ æç %s ç»ä»¶"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "ä¸æ¯æå¯¹æ¤ URL çè·¯å¾åæ°è¿è¡è¯æ³åæ"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782
+#: ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "ä¸æ¯æå¯¹æ¤ URL çæ¥è¯¢å符串è¿è¡è¯æ³åæ"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url 模å¼ä¸æ¯å¿
éç»ä»¶"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "æ æç URL 纲è¦â%sâ"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "URL 纲è¦ä¸å
许使ç¨ç¨æ·å"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "URL 纲è¦ä¸å
许使ç¨å£ä»¤"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "URL 纲è¦è¦æ±æ主æºç»ä»¶"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "URL 纲è¦ä¸å
许使ç¨ä¸»æºç»ä»¶"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "æ æç主æºç»ä»¶â%sâ"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "URL 纲è¦ä¸å
许使ç¨ç«¯å£"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "æ æç端å£ç»ä»¶â%sâ"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "URL 纲è¦è¦æ±æè·¯å¾å"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117
+#: ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "å¦æåå¨è®¤è¯ï¼åä¸å
许ç¸å¯¹è·¯å¾"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "ä¸æ¯æå¯¹æ¤ URL çè·¯å¾åæ°è¿è¡è¯æ³åæ"
@@ -108,9 +110,8 @@
#. TranslatorExplanation followed by the list of error messages that lead to this exception
#: ../zypp/base/Exception.cc:89
-#, fuzzy
msgid "History:"
-msgstr "XF86History"
+msgstr "åå²ï¼"
#: ../zypp/repo/PackageProvider.cc:222
msgid "applydeltarpm check failed."
@@ -152,11 +153,13 @@
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' éè¦èº«ä»½éªè¯"
@@ -187,9 +190,9 @@
msgstr "æ£å¨æ·»å å®è£
æº '%s'"
#: ../zypp/RepoManager.cc:1004
-#, fuzzy, c-format
+#, c-format
msgid "Removing repository '%s'"
-msgstr "æ£å¨æ·»å å®è£
æº '%s'"
+msgstr "æ£å¨ç§»é¤å®è£
æº '%s'"
#: ../zypp/Url.cc:112
msgid "Invalid LDAP URL query string"
@@ -208,7 +211,8 @@
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 ç»ä»¶è¿è¡è¯æ³åæ"
@@ -218,7 +222,8 @@
#. Defined LanguageCode constants
#. Defined CountryCode constants
-#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215
+#: ../zypp/LanguageCode.cc:225
+#: ../zypp/CountryCode.cc:215
msgid "No Code"
msgstr "æ 代ç "
@@ -283,7 +288,8 @@
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 "é¿å°å·´å°¼äºè¯"
@@ -333,7 +339,8 @@
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 "äºç¾å°¼äºè¯"
@@ -433,7 +440,8 @@
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 "å·´æ¯å
è¯"
@@ -543,7 +551,8 @@
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 "ç¼
ç¸è¯"
@@ -608,7 +617,8 @@
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 "ä¸æ"
@@ -718,7 +728,8 @@
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 "æ·å
è¯"
@@ -793,7 +804,8 @@
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 "è·å
°è¯"
@@ -898,7 +910,8 @@
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 "æ³è¯"
@@ -948,12 +961,14 @@
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 "å¾·è¯"
@@ -1023,7 +1038,8 @@
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-)"
@@ -1128,7 +1144,8 @@
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 "å°å²è¯"
@@ -1498,7 +1515,8 @@
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 "马å
¶é¡¿è¯"
@@ -1538,7 +1556,8 @@
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 "æ¯å©è¯"
@@ -1558,7 +1577,8 @@
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 "马æ¥è¯"
@@ -1699,7 +1719,8 @@
#. 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 "çé²è¯"
@@ -1899,7 +1920,8 @@
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 "æ³¢æ¯è¯"
@@ -1984,7 +2006,8 @@
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 "ç½é©¬å°¼äºè¯"
@@ -2044,7 +2067,8 @@
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 "å¡å°ç»´äºè¯"
@@ -2059,7 +2083,8 @@
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 "å
ç½å°äºè¯"
@@ -2114,7 +2139,8 @@
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 "æ¯æ´ä¼å
è¯"
@@ -2309,7 +2335,8 @@
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 "西èè¯"
@@ -2330,7 +2357,8 @@
#. language code: tkl
#. :TJK:762:
-#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:428
+#: ../zypp/LanguageCode.cc:1122
+#: ../zypp/CountryCode.cc:428
msgid "Tokelau"
msgstr "æå
å³è¯"
@@ -2406,7 +2434,8 @@
#. language code: tvl
#. :TTO:780:
-#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:435
+#: ../zypp/LanguageCode.cc:1152
+#: ../zypp/CountryCode.cc:435
msgid "Tuvalu"
msgstr "å¾ç¦å¢è¯"
@@ -2506,7 +2535,8 @@
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 "å¨å°å£«è¯"
@@ -2590,7 +2620,8 @@
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 "软件管çå·²å¤äºè¿è¡ç¶æã"
@@ -2630,7 +2661,8 @@
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 ä¾å¤"
@@ -2681,7 +2713,8 @@
msgid "%s install failed"
msgstr "%s å®è£
失败"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1927
+#: ../zypp/target/rpm/RpmDb.cc:2045
msgid "rpm output:"
msgstr "rpm è¾åºï¼"
@@ -2692,7 +2725,8 @@
msgid "%s installed ok"
msgstr "%s å®è£
æå"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1936
+#: ../zypp/target/rpm/RpmDb.cc:2053
msgid "Additional rpm output:"
msgstr "å
¶ä» rpm è¾åºï¼"
@@ -2733,25 +2767,25 @@
msgstr "%s æ¿æ¢ä¸º %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s å°è¢«å¦ä¸ä¸ªç¨åºå®è£
ã(ApplLow/ApplHigh)\n"
@@ -2759,41 +2793,41 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
#, fuzzy
msgid "No valid solution found with just resolvables of best architecture."
msgstr "ä»
使ç¨æä½³æ¶æ解æ项æªå¾å°æææ¹æ¡ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
#, fuzzy
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "æ¤è¯ä¾ä¸ä»
使ç¨æä½³æ¶æçå¯è§£æ项ã\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
#, fuzzy
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "使ç¨ææå¯è½çå¯è§£æ项ï¼è´¹æ¶ä½ææã"
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "æ æä¿¡æ¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2803,7 +2837,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ä¸å
¶å®å¯è§£æ项å²çª"
@@ -2812,14 +2846,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2829,24 +2863,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s å°åºå¼å
¶å®å¯è§£æ项"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s åºå¼ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s åºå¼ï¼%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2855,7 +2889,7 @@
"å°ä»ç³»ç»å é¤è¿äºå¯è§£æ项ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s åå³äºå
¶å®å¯è§£æ项"
@@ -2863,38 +2897,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ä¾èµäºï¼%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "åé"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "æ æ³å®è£
%s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "åä¸æä¾ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2903,32 +2937,32 @@
"\n"
"没ææ¯ææ¤éæ±çèµæºå¯ç¨ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ç±äºä¸ï¼ä¸æè¿°çé®é¢ï¼æ¤è§£æå°ä¸è§£æææä¾èµæ§ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2936,8 +2970,8 @@
msgstr "å é¤ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2945,119 +2979,131 @@
msgstr "ä¸å®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s å
·ææªæ»¡è¶³çéæ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s 缺å°ä¾èµæ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "æ éå®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ç±äºä¸ä»¥ä¸å¯¹è±¡å²çªæ以ä¸å¯å¸è£
ï¼ %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ä»
å¨æ¤å¿½ç¥æ¤éæ±"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ä»
å¨æ¤å¿½ç¥æ¤éæ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "尽管ä¼æ¹åç»æï¼ä»è¯·å®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s æä¾äºæ¤ä¾èµæ§ï¼ä½æ¯ä¼æ¹åå·²å®è£
项ç®çç»æã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s æä¾äºæ¤ä¾èµæ§ï¼ä½æ¯ä¼æ¹åå·²å®è£
项ç®çç»æã"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "å¿½ç¥ %s çæ¤å²çª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "忽ç¥åºå¼ %sï¼%s ä¸ï¼"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "å¿½ç¥ %s 已被设置为å®è£
çå®äº"
@@ -3068,7 +3114,7 @@
msgstr "ä¸å®è£
æå é¤ç¸å
³çå¯è§£æ项"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "å 为éè¦ %sï¼å¯¹äº %sï¼ï¼ å¨å级 %s æ¶"
@@ -3319,8 +3365,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s æä¾äº %sï¼ä½å®å
·æå¦ä¸ç§ç»æã"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s æä¾äº %sï¼ä½å®å
·æå¦ä¸ç§ç»æã"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "æ æ³æ»¡è¶³éæ±\"%s\"ï¼å¯¹äº %sï¼"
@@ -3332,7 +3384,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s æ¯å
¶ä»å·²å®è£
çå¯è§£æ项æéè¦çï¼å æ¤ä¸ä¼å°å
¶åæ¶é¾æ¥ã"
@@ -3344,7 +3396,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s æ¯å
¶ä»å·²å®è£
çå¯è§£æ项æéè¦çï¼å æ¤ä¸ä¼å°å
¶åæ¶é¾æ¥ã"
@@ -3356,7 +3408,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s å·²éå®ï¼å æ¤æ æ³å°å
¶å¸è£
ã"
@@ -3367,7 +3419,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) ä¸åçå²çªï¼éè¦å»é¤å°å®è£
ç %s"
@@ -3378,23 +3430,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "å° %s æ 记为å¯å¸è½½ï¼è¿æ¯ç±äº %s ä¸åå¨å²çª"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "å件人 %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "é误ï¼"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "éè¦ä¿¡æ¯ï¼"
@@ -3453,8 +3505,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s 被以ä¸å¯¹è±¡å·æ°ï¼ %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -3708,7 +3760,8 @@
#. :CCK:166:
#. :CAF:140:
-#: ../zypp/CountryCode.cc:255 ../zypp/CountryCode.cc:257
+#: ../zypp/CountryCode.cc:255
+#: ../zypp/CountryCode.cc:257
msgid "Congo"
msgstr "åæ"
@@ -4772,81 +4825,44 @@
"æ件 %s å
·ææ æçæ ¡éªå ãé¢æ为 %sï¼å¾å°çæ¯ %s\n"
"ä»è¦ä½¿ç¨è¯¥æ件åï¼"
+#~ 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 "æ£å¨è¯»åå
æ件"
-# progress indicator label
-#~ msgid "Reading translation: %s"
-#~ msgstr "æ£å¨è¯»å转æ¢ï¼ %s"
-
-#~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?"
-#~ msgstr "%s å
æªè½éè¿å®æ´æ§æ£æ¥ãè¦éè¯ä¸è½½å®è¿æ¯ä¸æ¢å®è£
ï¼"
-
-#~ msgid " miss checksum."
-#~ msgstr " 缺å°æ ¡éªåã"
-
-#~ msgid " fails checksum verification."
-#~ msgstr "æ£éªåæ ¡éªå¤±è´¥ã"
-
-#~ msgid "Downloading %s"
-#~ msgstr "æ£å¨ä¸è½½ %s"
-
-#~ msgid "Downloaded %s from %s"
-#~ msgstr "å·²ä¸è½½ %s æ¥èª %s"
-
-#~ msgid "%s needed by %s"
-#~ msgstr "%s æ¯ä»¥ä¸å¯¹è±¡éè¦ç %s"
Modified: trunk/libzypp/po/zh_TW.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zh_TW.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/zh_TW.po (original)
+++ trunk/libzypp/po/zh_TW.po Mon Sep 3 13:56:27 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-05-31 13:41\n"
"Last-Translator: Novell Language \n"
"Language-Team: Novell Language \n"
@@ -16,77 +16,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url è¦åä¸å
許 %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "ç¡æç %s å
件ã%sã"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "ç¡æç %s å
件"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "æ¤ URL ä¸æ¯æ´è·¯å¾åæ¸åæ"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "æ¤ URL ä¸æ¯æ´æ¥è©¢å串åæ"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url è¦åçºå¿
è¦å
件"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "ç¡æç Url è¦åã%sã"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url è¦åä¸å
許使ç¨è
å稱"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url è¦åä¸å
許å¯ç¢¼"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url è¦åä¸å¿
é è¦æ主æ©å
件"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url è¦åä¸å
許主æ©å
件"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "ç¡æç主æ©å
件ã%sã"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url è¦åä¸å
許é£æ¥å "
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "ç¡æçé£æ¥å å
件ã%sã"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url è¦åå¿
é è¦æè·¯å¾å稱"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "å¦æææ¬åå¨ï¼åä¸å
許ç¸å°è·¯å¾"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "æ¤ URL ä¸æ¯æ´è·¯å¾åæ¸åæ"
@@ -2642,6 +2642,7 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1913
+#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm å·²å° %s å²åçº %sï¼ä½çä¸åºå·®ç°"
@@ -2657,6 +2658,7 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1918
+#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm å·²å° %s 建ç«çº %sï¼ä½çä¸åºå·®ç°"
@@ -2729,25 +2731,25 @@
msgstr "%s 已被 %s å代"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, 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:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s å°è¢«å
¶ä»æç¨ç¨å¼å®è£ã(ApplLow/ApplHigh)\n"
@@ -2755,38 +2757,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "å¨æ¤å¯ä¸æä½³æ¶æ§ä¸æ²æå¯ç¨ç解決æ¹æ¡ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "å¨é種å·è¡æ
æ³ä¸ï¼åªç½æ¶æ¤å¯ä¸æä½³æ¶æ§ç解決æ¹æ¡ã\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "ç½æ¶æææ¶æ§ç解決æ¹æ¡æè±è¼é·æéï¼ä½å¯è½æå¾å°å¯ç¨ççµæã"
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "ç¡æçè³è¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2796,7 +2798,7 @@
"%s çå¿
è¦é
ç®ï¼"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s èå
¶ä»è§£æ±ºæ¹æ¡ç¼çè¡çª"
@@ -2805,14 +2807,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2822,24 +2824,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s ææ±°æå
¶ä»è§£æ±ºæ¹æ¡"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s æ±°æ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s æ±°æï¼%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2848,7 +2850,7 @@
"éäºå¯è§£æ±ºæ¹æ¡å°å¾ç³»çµ±ä¸åªé¤ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ä¾è³´æ¼å
¶ä»è§£æ±ºæ¹æ¡"
@@ -2856,38 +2858,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ä¾è³´æ¼ï¼%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "å件屬æ¼"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "ç¡æ³å®è£ %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "æ²æä»»ä½æä¾ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2895,30 +2897,31 @@
"\n"
"æ²ææ¯æ´æ¤éæ±çå¯ç¨è³æºã"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "å çºå¦ä¸/ä¸ææè¿°çåé¡ï¼å°è´æ¤è§£æ±ºæ¹æ¡ç¡æ³è§£æ±ºææç¸ä¾æ§ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
+#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2926,8 +2929,8 @@
msgstr "åªé¤ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2935,111 +2938,128 @@
msgstr "è«å¿å®è£ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s æç¡æ³æ»¿è¶³çéæ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s 缺å°ç¸ä¾æ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
+#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
+#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "ä¸éè¦å®è£ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
+#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
+#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
+#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
+#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ç¡æ³å®è£ï¼å çºè %s è¡çª"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "éæ± %s ç¡æ³è¢«æ»¿è¶³ã"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "åªå¨é裡忽ç¥æ¤éæ±"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "å®å
¨å¿½ç¥æ¤éæ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "å®è£ %sï¼å³ä½¿å®æè®æ´æ¶æ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
+#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s å¯æä¾éé
ç¸ä¾æ§ï¼ä½æ¯å®æè®æ´å·²å®è£é
ç®çæ¶æ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+msgid "Install %s although it would change the vendor"
+msgstr "å®è£ %sï¼å³ä½¿å®æè®æ´å» å"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s å¯æä¾éé
ç¸ä¾æ§ï¼ä½æ¯å®æè®æ´å·²å®è£é
ç®çå» å"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "å¿½ç¥ %s çè¡çª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "忽ç¥æ·æ±° %s å¨ %s ä¸çæ
å½¢"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "å¿½ç¥ %s å·²è¨å®çºè¦å®è£"
@@ -3049,13 +3069,14 @@
msgstr "è«å¿å®è£æåªé¤ç¸é解決æ¹æ¡"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "å¿
é å
·å %s ç %sï¼æè½åç´ %s"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency
#: ../zypp/solver/detail/ResolverInfoMissingReq.cc:64
+#, c-format
msgid "%s is lacking the requirement %s"
msgstr "%s 缺å°éæ± %s"
@@ -3132,12 +3153,14 @@
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
+#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
msgstr "ç¡æ³å®è£æå®ç %sï¼ç¼çç¸ä¾æ§åé¡ã"
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:167
+#, c-format
msgid "Can't install %s since it is already marked as needed to be uninstalled"
msgstr "ç¡æ³å®è£ %sï¼å çºå®å·²ç¶æ¨ç¤ºçºå°è¢«è§£é¤å®è£"
@@ -3148,6 +3171,7 @@
#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed
#. TranslatorExplanation: package is not installed.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:179
+#, c-format
msgid "Can't install %s, because it does not apply to this system."
msgstr "ç¡æ³å®è£ %sï¼å çºå®æ²æå¥ç¨å°æ¤ç³»çµ±ã"
@@ -3157,6 +3181,7 @@
#. other_capability() =
#. Translator: %s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoMisc.cc:190
+#, c-format
msgid "Can't install %s, because %s is already marked as needed to for installation"
msgstr "ç¡æ³å®è£ %sï¼å çº %s å·²ç¶æ¨ç¤ºçºå¿
é å®è£"
@@ -3224,6 +3249,7 @@
#. TranslatorExplanation: removal of this resolvable would therefore break dependency
#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled
#: ../zypp/solver/detail/ResolverInfoMisc.cc:292
+#, c-format
msgid "There are no alternative providers of %s installed"
msgstr "%s æ²æå
¶ä»å·²å®è£çæä¾è
"
@@ -3254,6 +3280,7 @@
#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible
#. TranslatorExplanation: bar requires something from foo
#: ../zypp/solver/detail/ResolverInfoMisc.cc:341
+#, c-format
msgid "Upgrading to %s to avoid removing %s is not possible."
msgstr "å¨åç´è³ %s æï¼è¦é¿å
ç§»é¤ %s æ¯ä¸å¯è½çã"
@@ -3293,8 +3320,13 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s å¯æä¾ %sï¼ä½å®æ¯ä¸åçæ¶æ§ã"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s å¯æä¾ %sï¼ä½å®æ¯ä¸åå» å (%s) æä¾çã"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "ç¡æ³æ»¿è¶³å° %sç %s éæ±"
@@ -3306,7 +3338,8 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
+#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "å
¶ä»å·²å®è£ç解決æ¹æ¡éè¦ %sï¼æ
ç¡æ³åæ¶é£çµã"
@@ -3317,7 +3350,8 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
+#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "å
¶ä»å·²å®è£ç解決æ¹æ¡éè¦ %sï¼æ
ç¡æ³åæ¶é£çµã"
@@ -3328,7 +3362,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s 已被éä½ï¼æ¨ç¡æ³è§£é¤å®è£ã"
@@ -3339,7 +3373,8 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) ç¼çè¡çªï¼å¿
é 移é¤æºåå®è£ç %s"
@@ -3349,23 +3384,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "å° %s æ¨ç¤ºçºä¸å¯å®è£æå°è´å %s ç¼çè¡çªã"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "èª %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "é¯èª¤ï¼"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "éè¦ï¼"
@@ -3423,8 +3458,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s æ¯ç± %s ææ´æ°"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s å°éåå®è£è©ä¼°(éæ°æ´ç)ï¼éæ¯ç±æ¼ %s çç·£æ
"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4743,6 +4778,9 @@
"é æçº %sï¼ä½æ¾å°çæ¯ %s\n"
"ç¡è«å¦ä½é½è¦ä½¿ç¨æ¤æªæ¡åï¼"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s æ¯ç± %s ææ´æ°"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "ç¡æ³åæ Url ææ¬"
Modified: trunk/libzypp/po/zu.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zu.po?rev=7083&r1=7082&r2=7083&view=diff
==============================================================================
--- trunk/libzypp/po/zu.po (original)
+++ trunk/libzypp/po/zu.po Mon Sep 3 13:56:27 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-03 12:03\n"
"Last-Translator: Novell Language \n"
"Language-Team: Novell Language \n"
@@ -13,77 +13,77 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Uhlelo lwe-URL aluyivumeli i-%s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ingxenyana '%s' engekho emthethweni %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ingxenyana engekho emthethweni %s"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Ukucazwa kwepharamitha yomgudu akusekelwa kule-URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Ukucazwa kohlu lwemibuzo akusekelwa kule-URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Uhlelo lwe-Url luyingxenyana edingekayo"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Uhlelo lwe-Url olungekho emthethweni '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Uhlelo lwe-URL alulivumeli igama lomsebenzisi"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Uhlelo lwe-URL aluyivumeli iphasiwedi"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Uhlelo lwe-Url ludinga ingxenyana yesiphakeli"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Uhlelo lwe-URL aluyivumeli ingxenyana yesiphakeli"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ingxenyana engekho emthethweni '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Uhlelo lwe-URL aluyivumeli iphasiwedi"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ingxenyana engekho emthethweni '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Uhlelo lwe-Url ludinga igama lomgudu"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Umgudu ongaphelele awuvunyelwe uma kunegunya"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Ukucazwa kwepharamitha yomgudu akusekelwa kule-URL"
@@ -2731,7 +2731,7 @@
msgstr "%s ingenelwe esikhundleni yi- %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2739,19 +2739,19 @@
"Lezi zixazululi zizosulwa kwisistimu."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, 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:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, 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:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2759,38 +2759,38 @@
#. 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:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "ukwaziswa okungasebenzi"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, 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:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../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:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2800,7 +2800,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ixabana nezinye izixazululi"
@@ -2809,14 +2809,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:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../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:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2826,24 +2826,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, 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:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s yenza zingasebenzi %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s yenza zingasebenzi:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2852,7 +2852,7 @@
"Lezi zixazululi zizosulwa kwisistimu."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s yenzike kwezinye izixazululi"
@@ -2860,38 +2860,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:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../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:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s yencike kwi-:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Ingane ka-"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Ayikwazi ukufaka %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Akukho okunikeza %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2900,32 +2900,32 @@
"\n"
"Awukho umthombo otholakalayo osekela lemfuneko."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, 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:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, 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:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, 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:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, 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:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2933,8 +2933,8 @@
msgstr "Susa %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2942,119 +2942,131 @@
msgstr "ungafaki %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s inezimfuneko ezingagcwalisiwe"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, 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:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, 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:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, 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:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, 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:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, 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:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, 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:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, 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:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, 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:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, 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:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, 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:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, 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:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Sishaye indiva lesi sidingo lapha nje kuphela"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Sishaye indiva lesi sidingo lapha nje kuphela"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Faka %s nakuba izoshintsha ubuciko bomklamo"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s ihlinzeka ngalolu hlelo okuncikwe kulo kodwa ingabushintsha ubuciko bomklamo bento efakiwe"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Faka %s nakuba izoshintsha ubuciko bomklamo"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s ihlinzeka ngalolu hlelo okuncikwe kulo kodwa ingabushintsha ubuciko bomklamo bento efakiwe"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Kushaye indiva lokhu kuxabana kwe-%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ishaye indiva into engasebenzi i-%s e-%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Kushaye indiva ukuthi i-%s isisethelwe ukufakwa kakade"
@@ -3065,7 +3077,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:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ngokudinga i-%s ye-%s lapho kuvuselelwa uhlelo %s"
@@ -3316,8 +3328,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s ihlinzeka nge-%s, kodwa inobunye ubuciko bomklamo."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s ihlinzeka nge-%s, kodwa inobunye ubuciko bomklamo."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ayikwazi ukwanelisa isidingo se-%s ye-%s"
@@ -3329,7 +3347,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s idingwa ngesinye isixazululi esifakiwe, ngakho ngeke ingalinkeki."
@@ -3341,7 +3359,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s idingwa ngesinye isixazululi esifakiwe, ngakho ngeke ingalinkeki."
@@ -3353,7 +3371,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s ihluthulelwe futhi ngeke ikwazi ukukhipheka."
@@ -3364,7 +3382,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Ingxabano nge-%s (%s) idinga ukususwa kwe-%s ezofakwa "
@@ -3375,23 +3393,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Ukuphawula i-%s njengengafakeki ngenxa yezingxabano nge-%s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "ivela %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Iphutha!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Kubalulekile!"
@@ -3448,9 +3466,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s idingwa yi- %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4769,6 +4787,10 @@
"Bekulindeleke %s, kwatholakala %s\n"
" Nokho yisebenzise ifayela?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s idingwa yi- %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Ayikwazi ukucaza igunya le-Url"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org