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

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