Zypp Commits

Download

zypp-commit@lists.opensuse.org

September 2007

12 participants
325 discussions

[zypp-commit] r7086 - in /trunk/zypper/src: zypper-misc.cc zypper-rpm-callbacks.h
by jkupec＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: jkupec Date: Mon Sep 3 14:15:45 2007 New Revision: 7086 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7086&view=rev Log: - removing rpm message improved (#307132) Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-rpm-callbacks.h Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=70… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Mon Sep 3 14:15:45 2007 @@ -746,8 +746,11 @@ cout << endl; - cout_n << format(_("Overall download size: %s.")) % download_size; - cout_n << " "; + if (download_size > 0) + { + cout_n << format(_("Overall download size: %s.")) % download_size; + cout_n << " "; + } if (new_installed_size > 0) // TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K cout_n << format(_("After the operation, additional %s will be used.")) Modified: trunk/zypper/src/zypper-rpm-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-rpm-callbacks.… ============================================================================== --- trunk/zypper/src/zypper-rpm-callbacks.h (original) +++ trunk/zypper/src/zypper-rpm-callbacks.h Mon Sep 3 14:15:45 2007 @@ -137,13 +137,16 @@ { virtual void start( zypp::Resolvable::constPtr resolvable ) { - display_progress ( "remove-resolvable", cout, _("Removing ") + to_string (resolvable), 0); + //! \todo (10.3+) use format + display_progress ( "remove-resolvable", cout, + _("Removing ") + resolvable->name() + string("-") + resolvable->edition().asString(), 0); } virtual bool progress(int value, zypp::Resolvable::constPtr resolvable) { // TranslatorExplanation This text is a progress display label e.g. "Removing [42%]" - display_progress ( "remove-resolvable", cout, _("Removing ") + to_string (resolvable), value); + display_progress ( "remove-resolvable", cout, + _("Removing ") + resolvable->name() + string("-") + resolvable->edition().asString(), value); return true; } @@ -177,7 +180,7 @@ void display_step( zypp::Resolvable::constPtr resolvable, int value ) { - // TranslatorExplanation This text is a progress display label e.g. "Installing [42%]" + // TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]" string s = boost::str(boost::format(_("Installing: %s-%s")) % resolvable->name() % resolvable->edition()); display_progress ( "install-resolvable", cout, s, value); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7085 - in /trunk/libzypp: devel/devel.ma/Parse.cc zypp/VendorAttr.cc zypp/VendorAttr.h
by mlandres＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: mlandres Date: Mon Sep 3 13:57:23 2007 New Revision: 7085 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7085&view=rev Log: Added 'bool VendorAttr::equivalent( const Vendor & lhs, const Vendor & rhs ) const'. Test whether to vendor strings denote the same (or equivalent) vendors. Modified: trunk/libzypp/devel/devel.ma/Parse.cc trunk/libzypp/zypp/VendorAttr.cc trunk/libzypp/zypp/VendorAttr.h Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?… ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Mon Sep 3 13:57:23 2007 @@ -53,7 +53,7 @@ bool operator()( const PoolItem & obj_r ) { //handle( asKind<Package>( obj_r ) ); - handle( asKind<Patch>( obj_r ) ); + //handle( asKind<Patch>( obj_r ) ); //handle( asKind<Pattern>( obj_r ) ); //handle( asKind<Product>( obj_r ) ); return true; @@ -347,10 +347,11 @@ INT << "===[START]==========================================" << endl; setenv( "ZYPP_CONF", "/Local/ROOT/zypp.conf", 1 ); - - INT << ZConfig::instance().download_use_patchrpm() << endl; - INT << ZConfig::instance().download_use_deltarpm() << endl; - return 0; + std::string t( "ABCD" ); + MIL << str::toLower(t.substr(0,3)) << endl; + MIL << str::toLower(t.substr(0,4)) << endl; + MIL << str::toLower(t.substr(0,5)) << endl; + throw; DigestReceive foo; KeyRingSignalsReceive baa; @@ -414,7 +415,7 @@ USR << "pool: " << pool << endl; SEC << pool.knownRepositoriesSize() << endl; - if ( 0 ) + if ( 1 ) { { zypp::base::LogControl::TmpLineWriter shutUp; @@ -425,6 +426,13 @@ INT << getZYpp()->diskUsage() << endl; + { + Measure x("SHUTDOWN"); + getZYpp()->removeResolvables( getZYpp()->target()->resolvables() ); + getZYpp()->target()->reset(); + } + + std::for_each( pool.begin(), pool.end(), Xprint() ); /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/VendorAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/VendorAttr.cc?rev=7… ============================================================================== --- trunk/libzypp/zypp/VendorAttr.cc (original) +++ trunk/libzypp/zypp/VendorAttr.cc Mon Sep 3 13:57:23 2007 @@ -147,6 +147,20 @@ bool VendorAttr::autoProtect( const Vendor & vendor_r ) const { return( ZConfig::instance().autolock_untrustedvendor() && ! trusted( vendor_r ) ); } + bool VendorAttr::equivalent( const Vendor & lhs, const Vendor & rhs ) const + { + static const std::string defSUSE( "suse" ); + + if ( lhs == rhs ) + return true; + // By now handcrafted equivalence definition: + if ( str::toLower( lhs.substr( 0, 4 ) ) == defSUSE + && str::toLower( rhs.substr( 0, 4 ) ) == defSUSE ) + return true; + + return false; + } + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/VendorAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/VendorAttr.h?rev=70… ============================================================================== --- trunk/libzypp/zypp/VendorAttr.h (original) +++ trunk/libzypp/zypp/VendorAttr.h Mon Sep 3 13:57:23 2007 @@ -52,6 +52,13 @@ **/ bool autoProtect( const Vendor & vendor_r ) const; + /** Return whether two vendor strings shold be treated as the same vendor. + * Usually the solver is allowed to automatically select a package of an + * equivalent vendor when updating. Replacing a package with one of a + * different vendor usually must be confirmed by the user. + */ + bool equivalent( const Vendor & lhs, const Vendor & rhs ) const; + private: VendorAttr(); }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7084 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: schubi2 Date: Mon Sep 3 13:57:10 2007 New Revision: 7084 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7084&view=rev Log: new translations added Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Mon Sep 3 13:57:10 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 3 13:56:42 CEST 2007 - schubi(a)suse.de + +- new translations added +- rev 7083 + +------------------------------------------------------------------- Fri Aug 31 22:10:55 CEST 2007 - ma(a)suse.de - Added ability to switch off use of patch and delta rpms via zypp.conf (#305864) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

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

03 Sep '07

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=708… ============================================================================== --- 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 <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\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=708… ============================================================================== --- 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 <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\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=708… ============================================================================== --- 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 <morbid_viper(a)tkzs.org>\n" "Language-Team: Bulgarian <bg(a)li.org>\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=708… ============================================================================== --- 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<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\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=708… ============================================================================== --- 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 <Nagual(a)lugbih.org>\n" "Language-Team: Bosnian <i18n(a)suse.de>\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=708… ============================================================================== --- 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=708… ============================================================================== --- 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 <pp(a)suse.cz>, 1999, 2000, 2001. # Klara Cihlarova <koty(a)seznam.cz>, 2006. +# Jakub Hegenbart <jhegenbart(a)suse.cz>, 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 <language(a)novell.com>\n" -"Language-Team: Novell Language <language(a)novell.com>\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 <jhegenbart(a)suse.cz>\n" +"Language-Team: <cs(a)li.org>\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=708… ============================================================================== --- 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 <kevin(a)dotmon.com>\n" "Language-Team: Welsh <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <suse(a)linuxin.dk>\n" "Language-Team: <opensuse-translation(a)opensuse.org>\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=708… ============================================================================== --- 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 <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\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=708… ============================================================================== --- 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 <billg(a)hellug.gr>\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=… ============================================================================== --- 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 <b.weber(a)warwick.ac.uk>\n" "Language-Team: <en(a)li.org>\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=… ============================================================================== --- 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 <i18n(a)suse.de>\n" "Language-Team: English <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\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=708… ============================================================================== --- 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 <avagula(a)gmail.com>\n" "Language-Team: Estonian <linux-ee(a)lists.eenet.ee>\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=708… ============================================================================== --- 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 <sami.vento(a)opensuse.fi>\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 <jmp(a)opensuse.fi>\n" "Language-Team: Suomi <fi(a)li.org>\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=708… ============================================================================== --- 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 <guillaume.gardet(a)free.fr>\n" "Language-Team: French Team <opensuse-fr(a)opensuse.org>\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=708… ============================================================================== --- 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 <jba(a)pobox.com>\n" "Language-Team: Galician <i18n(a)suse.de>\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=708… ============================================================================== --- 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<priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions<linux_team(a)agreeya.com>\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=708… ============================================================================== --- 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 <yyy(a)example.org>\n" "Language-Team: Hebrew <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <k.sangeeta09(a)gmail.com>, 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 <priyavert.sharma(a)agreeya.com>\n" -"Language-Team: AgreeYa Solutions <www.agreeya.com>\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 <k.sangeeta09(a)gmail.com>\n" +"Language-Team: Hindi <en(a)li.org>\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=708… ============================================================================== --- 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 <kost(a)iname.com>\n" "Language-Team: Croatian <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <kkemenczy(a)novell.com>\n" "Language-Team: <hu(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: 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=708… ============================================================================== --- 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 <made(a)nakula.rvs.uni-bielefeld.de>\n" "Language-Team: Indonesian <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <alberto.passalacqua(a)tin.it>\n" "Language-Team: Novell Language <opensuse-translation(a)opensuse.org>\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=708… ============================================================================== --- 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 <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\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=708… ============================================================================== --- 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 <aiet(a)qartuli.net>\n" "Language-Team: Georgian <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <khoemsokhem(a)khmeros.info>\n" "Language-Team: Khmer <support(a)khmeros.info>\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=708… ============================================================================== --- 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 <violiet(a)suse.de>\n" "Language-Team: Korean <i18n(a)suse.de>\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=708… ============================================================================== --- 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(a)suse.de\n" "Language-Team: Lao <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <stikonas(a)gmail.com>\n" "Language-Team: LietuviÅ³ <komp_lt(a)konf.lt>\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=708… ============================================================================== --- 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: ÐÐ¾ÑÐ°Ð½ ÐÐ¸Ð¼Ð¾Ð²ÑÐºÐ¸ <zoki.dimovski(a)gmail.com>\n" "Language-Team: Macedonian <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\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=708… ============================================================================== --- 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 <rune(a)skillingstad.no>\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=708… ============================================================================== --- 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 <rinsedevries(a)kde.nl>\n" -"Language-Team: Nederlands <kde-i18n-nl(a)kde.org>\n" +"Language-Team: Dutch <nl(a)li.org>\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=708… ============================================================================== --- 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 <aalam(a)users.sf.net>\n" "Language-Team: Panjabi <punjabi-l10n(a)lists.sf.net>\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=708… ============================================================================== --- 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 <nikdo(a)aviary.pl>\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 <wdziedzic(a)aviary.pl>\n" "Language-Team: <pl(a)li.org>\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=708… ============================================================================== --- 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 <carlos(a)pinguix.com>\n" "Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\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=… ============================================================================== --- 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 <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\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=708… ============================================================================== --- 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: <i18n(a)suse.de>\n" "Language-Team: Romanian <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <nderkach(a)gmail.com>, 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 <aliks-os(a)yandex.ru>\n" -"Language-Team: Russian <i18n(a)suse.org>\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 <nderkach(a)gmail.com>\n" +"Language-Team: <opensuse-ru(a)opensuse.org>\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=708… ============================================================================== --- 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(a)suse.de\n" "Language-Team: Sinhala <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <jkupec(a)suse.cz>\n" "Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\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=708… ============================================================================== --- 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 <janez.krek(a)euroteh.si>\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=708… ============================================================================== --- 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 <bojov(a)fon.bg.ac.yu>\n" "Language-Team: Serbian <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <newzella(a)linux.se>\n" "Language-Team: <sv(a)li.org>\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=708… ============================================================================== --- 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 <priyavert.sharma(a)agreeya.com>\n" "Language-Team: AgreeYa Solutions <www.agreeya.com>\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=708… ============================================================================== --- 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 <gorkem(a)gelecek.com.tr>\n" "Language-Team: turkish <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <ivanpetrouchtchak(a)yahoo.com>\n" "Language-Team: Ukrainian <translation(a)linux.org.ua>\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=708… ============================================================================== --- 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 <teppi82(a)gmail.com>\n" "Language-Team: Vietnamese <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <jean.cayron(a)gmail.com>\n" "Language-Team: Walloon <i18n(a)suse.de>\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=708… ============================================================================== --- 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 <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\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=… ============================================================================== --- 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 <gubotruth(a)gmail.com>\n" "Language-Team: Novell Language <language(a)novell.com>\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=… ============================================================================== --- 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 <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\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=708… ============================================================================== --- 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 <language(a)novell.com>\n" "Language-Team: Novell Language <language(a)novell.com>\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(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7082 - /trunk/updater-gnome/package/opensuse-updater-gnome.changes
by joshkress＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: joshkress Date: Mon Sep 3 12:58:09 2007 New Revision: 7082 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7082&view=rev Log: changes Modified: trunk/updater-gnome/package/opensuse-updater-gnome.changes Modified: trunk/updater-gnome/package/opensuse-updater-gnome.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/package/opensuse-u… ============================================================================== --- trunk/updater-gnome/package/opensuse-updater-gnome.changes (original) +++ trunk/updater-gnome/package/opensuse-updater-gnome.changes Mon Sep 3 12:58:09 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Sep 3 12:49:55 CEST 2007 - jkress(a)suse.de + +- took care of yet another Gtk-CRITICAL + +------------------------------------------------------------------- Tue Sep 3 11:40:21 CEST 2007 - jkress(a)suse.de - fixed bug #306700 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7081 - in /trunk/updater-gnome/src: updater-callbacks.c updater.c
by joshkress＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: joshkress Date: Mon Sep 3 12:55:52 2007 New Revision: 7081 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7081&view=rev Log: - took care of another Gtk-Critical Modified: trunk/updater-gnome/src/updater-callbacks.c trunk/updater-gnome/src/updater.c Modified: trunk/updater-gnome/src/updater-callbacks.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-callba… ============================================================================== --- trunk/updater-gnome/src/updater-callbacks.c (original) +++ trunk/updater-gnome/src/updater-callbacks.c Mon Sep 3 12:55:52 2007 @@ -286,7 +286,7 @@ { SUSEUpdater *updater = user_data; - gtk_widget_hide(widget); + gtk_widget_hide (widget); updater->preferences_win_shown = FALSE; updater_ui_update(updater); return TRUE; Modified: trunk/updater-gnome/src/updater.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater.c?rev=… ============================================================================== --- trunk/updater-gnome/src/updater.c (original) +++ trunk/updater-gnome/src/updater.c Mon Sep 3 12:55:52 2007 @@ -95,11 +95,13 @@ // g_print ("Destroying backend.\n"); backend_destroy (updater->backend); } + /* if (updater->preferences_window) { - // g_print ("Destroying preferces window.\n"); + g_print ("Destroying preferces window.\n"); gtk_widget_destroy (updater->preferences_window); } + */ if (updater->update_timer) g_timer_destroy (updater->update_timer); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7080 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: tgoettlicher Date: Mon Sep 3 12:52:40 2007 New Revision: 7080 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7080&view=rev Log: changes Modified: trunk/updater-kde/package/opensuse-updater-kde.changes Modified: trunk/updater-kde/package/opensuse-updater-kde.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd… ============================================================================== --- trunk/updater-kde/package/opensuse-updater-kde.changes (original) +++ trunk/updater-kde/package/opensuse-updater-kde.changes Mon Sep 3 12:52:40 2007 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Mon Sep 3 12:49:17 CEST 2007 - tgoettlicher(a)suse.de + +- updated translations +- r7079 + +------------------------------------------------------------------- +Mon Sep 3 12:40:00 CEST 2007 - tgoettlicher(a)suse.de + +- fixed bug that prevented install of pkg-mgr-patch +- r7078 + +------------------------------------------------------------------- Fri Aug 31 09:38:46 CEST 2007 - tgoettlicher(a)suse.de - improved error handling -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7079 - /trunk/updater-kde/po/zh_TW.po
by tgoettlicher＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: tgoettlicher Date: Mon Sep 3 12:50:16 2007 New Revision: 7079 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7079&view=rev Log: updated translations Modified: trunk/updater-kde/po/zh_TW.po Modified: trunk/updater-kde/po/zh_TW.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/zh_TW.po?rev=7079… ============================================================================== --- trunk/updater-kde/po/zh_TW.po (original) +++ trunk/updater-kde/po/zh_TW.po Mon Sep 3 12:50:16 2007 @@ -3,6 +3,7 @@ # msgid "" msgstr "" +"Plural-Forms: nplurals=1; plural=0;\n" "Project-Id-Version: opensuseupdater\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-27 16:28+0200\n" @@ -14,9 +15,8 @@ "Content-Transfer-Encoding: 8bit\n" #: ../po/rc.cpp:3 -#, fuzzy, no-c-format msgid "Check for updates every:" -msgstr "æª¢æ¥æ´æ°æ¯é " +msgstr "æª¢æ¥æ´æ°æ¯éï¼" #: ../po/rc.cpp:6 #, no-c-format @@ -24,9 +24,8 @@ msgstr "å°æ" #: ../po/rc.cpp:8 -#, fuzzy, no-c-format msgid "Show recurring notification when updates are available every:" -msgstr "ç¶æå¯ç¨çæ´æ°ï¼ééå¤ä¹é¡¯ç¤ºä¸æ¬¡è¦åã" +msgstr "ç¶æå¯ç¨çæ´æ°ï¼ééå¤ä¹é¡¯ç¤ºä¸æ¬¡è¦åï¼" #: ../po/rc.cpp:11 #, no-c-format @@ -79,9 +78,8 @@ msgstr "é¡¯ç¤ºå¯ç¨åç´(åæä¾å°å®¶ä½¿ç¨)ã" #: ../po/rc.cpp:35 -#, fuzzy, no-c-format msgid "Show notifications." -msgstr "é¡¯ç¤ºéç¥" +msgstr "é¡¯ç¤ºéç¥ã" #: ../updater/simpleview.cpp:39 ../updater/simpleview.cpp:200 #: ../updater/simpleview.cpp:217 @@ -94,11 +92,9 @@ #: ../updater/simpleview.cpp:50 ../updater/simpleview.cpp:55 #: ../updater/simpleview.cpp:225 -#, fuzzy, c-format msgid "Install %n recommended update additionally" msgid_plural "Install %n recommended updates additionally" -msgstr[0] "éå å®è£ %s åå»ºè°çæ´æ°" -msgstr[1] "éå å®è£ %s åå»ºè°çæ´æ°" +msgstr[0] "éå å®è£ %n åå»ºè°çæ´æ°" #: ../updater/simpleview.cpp:58 msgid "Don't install updates that require a restart" @@ -131,21 +127,16 @@ msgstr "æéæ¼æ¨çæ´æ°ç¨å¼çæ´æ°ã" #: ../updater/simpleview.cpp:218 -#, fuzzy, c-format msgid "%n security update is available" msgid_plural "%n security updates are available" -msgstr[0] "æ %1 åå®å¨æ§æ´æ°" -msgstr[1] "æ %1 åå®å¨æ§æ´æ°" +msgstr[0] "æ %n åå®å¨æ§æ´æ°" #: ../updater/simpleview.cpp:232 -#, fuzzy, c-format msgid "%n recommended update is available" msgid_plural "%n recommended updates are available" -msgstr[0] "æ %1 åå»ºè°çæ´æ°" -msgstr[1] "æ %1 åå»ºè°çæ´æ°" +msgstr[0] "æ %n åå»ºè°çæ´æ°" #: ../updater/simpleview.cpp:261 -#, fuzzy, c-format msgid "" "%n optional update is available.\n" "You can select optional updates in the detailed dialog." @@ -153,10 +144,7 @@ "%n optional updates are available.\n" "You can select optional updates in the detailed dialog." msgstr[0] "" -"æ %1 åå¯é¸çæ´æ°ã\n" -"æ¨å¯ä»¥å¨è©³ç´°è³æå°è©±æ¡ä¸é¸æå¯é¸çæ´æ°ã" -msgstr[1] "" -"æ %1 åå¯é¸çæ´æ°ã\n" +"æ %n åå¯é¸çæ´æ°ã\n" "æ¨å¯ä»¥å¨è©³ç´°è³æå°è©±æ¡ä¸é¸æå¯é¸çæ´æ°ã" #: ../updater/simpleview.cpp:268 @@ -168,12 +156,11 @@ msgstr "<b>ç¡æ³æª¢æ¥æ¯å¦æå¯ç¨çæ´æ°ã</b>" #: ../updater/simpleview.cpp:280 -#, fuzzy msgid "" "Please use \"Add/Remove Update Sources...\"\n" "from the tray icon menu to define an update repository." msgstr "" -"è«ç±ç³»çµ±å¤¾åç¤ºé¸å®ä¸ä½¿ç¨\n" +"è«ç±ç³»çµ±å£åç¤ºé¸å®ä¸ä½¿ç¨\n" "\"æ°å¢/ç§»é¤æ´æ°ä¾æº...\"ä¾å®ç¾©æ´æ°å¥ä»¶åº«ã" #: ../updater/UpdaterApplication.cpp:83 @@ -334,9 +321,8 @@ msgstr "ç«å»æª¢æ¥" #: ../updater/MainWindow.cpp:126 -#, fuzzy msgid "The following official patches for openSUSE either fix security holes or errors in the software." -msgstr "ä¸å openSUSE çå®æ¹ä¿®æ£ç¨å¼åçºä¿®æ£è»é«çå®å¨æ¼æ´æå´éé¯èª¤ã<br>å¼·çå»ºè°æ¨å®è£ä»åã" +msgstr "ä¸å openSUSE çå®æ¹ä¿®æ£ç¨å¼åçºä¿®æ£è»é«çå®å¨æ¼æ´æå´éé¯èª¤ã" #: ../updater/MainWindow.cpp:128 ../updater/MainWindow.cpp:166 msgid "Name" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7078 - in /trunk/updater-kde/updater: MainWindow.cpp simpleview.cpp zypp/ZYppUpdater.cpp
by tgoettlicher＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: tgoettlicher Date: Mon Sep 3 12:46:57 2007 New Revision: 7078 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7078&view=rev Log: fixed bug that prevented install of pkg-mgr-patches Modified: trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/simpleview.cpp trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.c… ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Mon Sep 3 12:46:57 2007 @@ -631,7 +631,8 @@ QCheckListItem *item = (QCheckListItem*)patchList->firstChild(); while (item != NULL) { - if (item->text(COLUMN_TYPE).lower() == "recommended" && + if ((item->text(COLUMN_TYPE).lower() == "recommended" || + item->text(COLUMN_TYPE).lower() == "packagemanager" ) && (!onlySelected || item->isOn())) count++; Modified: trunk/updater-kde/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.c… ============================================================================== --- trunk/updater-kde/updater/simpleview.cpp (original) +++ trunk/updater-kde/updater/simpleview.cpp Mon Sep 3 12:46:57 2007 @@ -152,6 +152,10 @@ QTimer::singleShot(0, this, SLOT(hide())); } + + // perhaps someone has changed selection within detail view + // => update button selection + updateSelection(); } void SimpleView::setDetailWindow(MainWindow * detailWindow) Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpd… ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original) +++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Mon Sep 3 12:46:57 2007 @@ -449,6 +449,12 @@ kdDebug() << "_process" << endl; _process = new KProcess; + + kdDebug() << "patches:" << installPatchList << endl; + kdDebug() << "packages:" << installPackageList << endl; + + + QString command="/usr/sbin/zypper_install"; *_process << command << "--patch" << installPatchList << "--package" << installPackageList; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r7077 - in /trunk/zypper: package/zypper.changes src/zypper-misc.cc
by kkaempf＠svn.opensuse.org 03 Sep '07

03 Sep '07

Author: kkaempf Date: Mon Sep 3 12:35:11 2007 New Revision: 7077 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7077&view=rev Log: - make (r)etry (c)ancel answer case-insensitive (#307122) Modified: trunk/zypper/package/zypper.changes trunk/zypper/src/zypper-misc.cc Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Mon Sep 3 12:35:11 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Sep 3 12:34:35 CEST 2007 - kkaempf(a)suse.de + +- make (r)etry (c)ancel answer case-insensitive (#307122) + +------------------------------------------------------------------- Fri Aug 31 14:35:01 CEST 2007 - jkupec(a)suse.cz - fixed error message of zypper ar -r (#306667) Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=70… ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Mon Sep 3 12:35:11 2007 @@ -1,5 +1,6 @@ #include <fstream> #include <sstream> +#include <ctype.h> #include <boost/format.hpp> #include <boost/logic/tribool_io.hpp> @@ -453,6 +454,9 @@ cerr_v << "cin: " << cin.rdstate() << endl; return false; } + if (isupper( reply_s[0] )) + reply_s[0] = tolower( reply_s[0] ); + // translators: corresponds to (r)etry if (reply_s == _("r")) return true; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

Jump to page: