October 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11525 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/Arch.cc zypp/Arch.h
by mlandres＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: mlandres Date: Tue Oct 28 16:49:07 2008 New Revision: 11525 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11525&view=rev Log: - Add "arm" architectures. Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/Arch.cc trunk/libzypp/zypp/Arch.h Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=11525&… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Tue Oct 28 16:49:07 2008 @@ -60,8 +60,8 @@ # SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "19") -SET(LIBZYPP_MINOR "19") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_MINOR "20") +SET(LIBZYPP_PATCH "0") # # LAST RELEASED: 5.19.0 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) 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 Tue Oct 28 16:49:07 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 28 16:47:36 CET 2008 - ma(a)suse.de + +- Add 'arm' architectures. +- revision 11525 + +------------------------------------------------------------------- Tue Oct 28 10:07:13 CET 2008 - schubi(a)suse.de - regarding "keep obsolete" in the solutions (bnc #439134) Modified: trunk/libzypp/zypp/Arch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.cc?rev=11525&r… ============================================================================== --- trunk/libzypp/zypp/Arch.cc (original) +++ trunk/libzypp/zypp/Arch.cc Tue Oct 28 16:49:07 2008 @@ -168,6 +168,14 @@ DEF_BUILTIN( sparcv9 ); DEF_BUILTIN( sparcv8 ); DEF_BUILTIN( sparc ); + + DEF_BUILTIN( armv6l ); + DEF_BUILTIN( armv5tejl ); + DEF_BUILTIN( armv5tel ); + DEF_BUILTIN( armv5l ); + DEF_BUILTIN( armv4tl ); + DEF_BUILTIN( armv4l ); + DEF_BUILTIN( armv3l ); #undef DEF_BUILTIN /////////////////////////////////////////////////////////////////// @@ -263,6 +271,14 @@ // defCompatibleWith( _sparcv9, _noarch,_sparc ); defCompatibleWith( _sparc64, _noarch,_sparc,_sparcv9 ); + + defCompatibleWith( _armv3l, _noarch ); + defCompatibleWith( _armv4l, _noarch,_armv3l ); + defCompatibleWith( _armv4tl, _noarch,_armv3l,_armv4l ); + defCompatibleWith( _armv5l, _noarch,_armv3l,_armv4l,_armv4tl ); + defCompatibleWith( _armv5tel, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l ); + defCompatibleWith( _armv5tejl, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel ); + defCompatibleWith( _armv6l, _noarch,_armv3l,_armv4l,_armv4tl,_armv5l,_armv5tel,_armv5tejl ); // /////////////////////////////////////////////////////////////////// //dumpOn( USR ) << endl; @@ -357,6 +373,14 @@ const Arch Arch_sparcv8( _sparcv8 ); const Arch Arch_sparc ( _sparc ); + const Arch Arch_armv6l ( _armv6l ); + const Arch Arch_armv5tejl( _armv5tejl ); + const Arch Arch_armv5tel ( _armv5tel ); + const Arch Arch_armv5l ( _armv5l ); + const Arch Arch_armv4tl ( _armv4tl ); + const Arch Arch_armv4l ( _armv4l ); + const Arch Arch_armv3l ( _armv3l ); + /////////////////////////////////////////////////////////////////// // // METHOD NAME : Arch::Arch Modified: trunk/libzypp/zypp/Arch.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.h?rev=11525&r1… ============================================================================== --- trunk/libzypp/zypp/Arch.h (original) +++ trunk/libzypp/zypp/Arch.h Tue Oct 28 16:49:07 2008 @@ -206,6 +206,22 @@ extern const Arch Arch_sparcv8; /** \relates Arch */ extern const Arch Arch_sparc; + + /** \relates Arch */ + extern const Arch Arch_armv6l; + /** \relates Arch */ + extern const Arch Arch_armv5tejl; + /** \relates Arch */ + extern const Arch Arch_armv5tel; + /** \relates Arch */ + extern const Arch Arch_armv5l; + /** \relates Arch */ + extern const Arch Arch_armv4tl; + /** \relates Arch */ + extern const Arch Arch_armv4l; + /** \relates Arch */ + extern const Arch Arch_armv3l; + //@} /////////////////////////////////////////////////////////////////// -- 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] r11524 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: jkupec Date: Tue Oct 28 15:59:46 2008 New Revision: 11524 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11524&view=rev Log: - changes Modified: trunk/zypper/package/zypper.changes 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 Tue Oct 28 15:59:46 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 28 15:36:42 CET 2008 - jkupec(a)suse.cz + +- fixed se -s to show multiple installed version of the same + package +- r11523 + +------------------------------------------------------------------- Tue Oct 28 10:29:10 CET 2008 - jkupec(a)suse.cz - translations update -- 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] r11523 - /trunk/zypper/src/search.cc
by jkupec＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: jkupec Date: Tue Oct 28 15:36:48 2008 New Revision: 11523 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11523&view=rev Log: - fixed se -s to show multiple installed version of the same package Modified: trunk/zypper/src/search.cc Modified: trunk/zypper/src/search.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/search.cc?rev=11523&r… ============================================================================== --- trunk/zypper/src/search.cc (original) +++ trunk/zypper/src/search.cc Tue Oct 28 15:36:48 2008 @@ -69,9 +69,6 @@ bool FillSearchTableSolvable::operator()(const zypp::ui::Selectable::constPtr & s) const { - static bool show_installed; - show_installed = true; - // show available objects for_(it, s->availableBegin(), s->availableEnd()) { @@ -84,7 +81,7 @@ if (zypp::traits::isPseudoInstalled(s->kind())) { // patches/patterns are installed if satisfied - if (pi->kind() != zypp::ResKind::srcpackage && pi.isSatisfied()) + if (pi->kind() != zypp::ResKind::srcpackage && pi.isSatisfied()) { // show only not installed if (_inst_notinst == false) @@ -117,7 +114,6 @@ if (equalNVRA(*instit->resolvable(), *pi.resolvable())) { installed = true; - show_installed = false; break; } } @@ -164,41 +160,49 @@ if (_inst_notinst == false) return true; - // show installed objects only if there is no counterpart in repos - if (show_installed || s->availableEmpty()) + // now list the system packages + for_(it, s->installedBegin(), s->installedEnd()) { - for_(it, s->installedBegin(), s->installedEnd()) - { - TableRow row; - zypp::PoolItem pi = *it; - row << "i"; - if (_gopts.is_rug_compatible) - { - row - << _("System Packages") - // TODO what about rug's Bundle? - << "" - << pi->name() - << pi->edition().asString() - << pi->arch().asString(); - } - else + // show installed objects only if there is no counterpart in repos + bool has_counterpart = false; + for_(ait, s->availableBegin(), s->availableEnd()) + if (equalNVRA(*it->resolvable(), *ait->resolvable())) { - row - << pi->name() - << kind_to_string_localized(pi->kind(), 1) - << pi->edition().asString() - << pi->arch().asString() - << (string("(") + _("System Packages") + ")"); + has_counterpart = true; + break; } + if (has_counterpart) + continue; - *_table << row;pi->repository().info().name(); + TableRow row; + zypp::PoolItem pi = *it; + row << "i"; + if (_gopts.is_rug_compatible) + { + row + << _("System Packages") + // TODO what about rug's Bundle? + << "" + << pi->name() + << pi->edition().asString() + << pi->arch().asString(); + } + else + { + row + << pi->name() + << kind_to_string_localized(pi->kind(), 1) + << pi->edition().asString() + << pi->arch().asString() + << (string("(") + _("System Packages") + ")"); } + + *_table << row;pi->repository().info().name(); } - //! \todo mainain an internal plaindir repo named "Local Packages" + //! \todo maintain an internal plaindir repo named "Local Packages" // for plain rpms (as rug does). ? - + return true; } @@ -283,7 +287,7 @@ TableRow row; zypp::Patch::constPtr patch = zypp::asKind<zypp::Patch>(pi.resolvable()); - + row << pi->repository().info().name() << pi->name() @@ -303,7 +307,7 @@ // show available objects for_(it, s.availableBegin(), s.availableEnd()) - { + { if (repostr.empty()) repostr = (*it)->repository().info().name(); else if (repostr != (*it)->repository().info().name()) @@ -323,7 +327,7 @@ return _("Recommended"); if (rs.isSuggested()) return _("Suggested"); - return ""; + return ""; } @@ -385,7 +389,7 @@ th << _("S"); th << _("Name") << _("Version"); if (!zypper.globalOpts().is_rug_compatible) - th << _("Repository") << _("Dependency"); + th << _("Repository") << _("Dependency"); tbl << th; bool installed_only = zypper.cOpts().count("installed-only"); @@ -404,7 +408,7 @@ Pattern::constPtr pattern = asKind<Pattern>(it->resolvable()); TableRow tr; - tr << (it->isSatisfied() ? "i" : ""); + tr << (it->isSatisfied() ? "i" : ""); tr << pattern->name () << pattern->edition().asString(); if (!zypper.globalOpts().is_rug_compatible) { @@ -446,7 +450,7 @@ th << _("Repository"); th << _("Name") << _("Version") << _("Arch"); tbl << th; - + bool installed_only = zypper.cOpts().count("installed-only"); bool notinst_only = zypper.cOpts().count("uninstalled-only"); -- 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] r11522 - /trunk/libzypp/zypp/base/Functional.h
by mlandres＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: mlandres Date: Tue Oct 28 12:54:31 2008 New Revision: 11522 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11522&view=rev Log: Add functor::GetAll to store results found to some output_iterator. Modified: trunk/libzypp/zypp/base/Functional.h Modified: trunk/libzypp/zypp/base/Functional.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/Functional.h?r… ============================================================================== --- trunk/libzypp/zypp/base/Functional.h (original) +++ trunk/libzypp/zypp/base/Functional.h Tue Oct 28 12:54:31 2008 @@ -383,6 +383,33 @@ { return GetLast<_Tp>( result_r ); } + /** Store all results found to some output_iterator. + * \code + * std::vector<parser::ProductFileData> result; + * parser::ProductFileReader::scanDir( functor::getAll( std::back_inserter( result ) ), + sysRoot / "etc/products.d" ); + * \endcode + */ + template<class _OutputIterator> + struct GetAll + { + GetAll( _OutputIterator result_r ) + : _result( result_r ) + {} + + template<class _Tp> + bool operator()( const _Tp & val_r ) const + { *(_result++) = val_r; return true; } + + private: + mutable _OutputIterator _result; + }; + + /** Convenience function for creating \ref GetAll. */ + template<class _OutputIterator> + GetAll<_OutputIterator> getAll( _OutputIterator result_r ) + { return GetAll<_OutputIterator>( result_r ); } + //@} /////////////////////////////////////////////////////////////////// -- 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] r11521 - /trunk/libzypp/zypp/solver/detail/SATResolver.cc
by schubi2＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: schubi2 Date: Tue Oct 28 11:05:57 2008 New Revision: 11521 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11521&view=rev Log: reducing logging Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Tue Oct 28 11:05:57 2008 @@ -356,7 +356,6 @@ bool by_solver = (status.isBySolver() || status.isByApplLow()); if (by_solver) { - _XDEBUG("Resetting " << item ); item.status().resetTransact( ResStatus::APPL_LOW );// clear any solver/establish transactions return true; // back out here, dont re-queue former solver result } -- 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] r11520 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: jkupec Date: Tue Oct 28 10:30:23 2008 New Revision: 11520 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11520&view=rev Log: - changes Modified: trunk/zypper/package/zypper.changes 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 Tue Oct 28 10:30:23 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 28 10:29:10 CET 2008 - jkupec(a)suse.cz + +- translations update +- r11519 + +------------------------------------------------------------------- Mon Oct 27 18:23:15 CET 2008 - jkupec(a)suse.cz - translations update -- 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] r11519 - in /trunk/zypper/po: da.po es.po fr.po it.po km.po nb.po nl.po pt_BR.po uk.po
by jkupec＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: jkupec Date: Tue Oct 28 10:28:46 2008 New Revision: 11519 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11519&view=rev Log: - translations update Modified: trunk/zypper/po/da.po trunk/zypper/po/es.po trunk/zypper/po/fr.po trunk/zypper/po/it.po trunk/zypper/po/km.po trunk/zypper/po/nb.po trunk/zypper/po/nl.po trunk/zypper/po/pt_BR.po trunk/zypper/po/uk.po Modified: trunk/zypper/po/da.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/da.po?rev=11519&r1=115… ============================================================================== --- trunk/zypper/po/da.po (original) +++ trunk/zypper/po/da.po Tue Oct 28 10:28:46 2008 @@ -15,7 +15,7 @@ "Project-Id-Version: zypper\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-10-15 13:10+0200\n" +"PO-Revision-Date: 2008-10-27 21:36+0100\n" "Last-Translator: Martin Schlander <mschlander(a)opensuse.org>\n" "Language-Team: Danish <opensuse-translation(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -99,7 +99,7 @@ #. translators: this message is shown after showing description of the key #: ../src/callbacks/keyring.h:150 msgid "Do you want to reject the key, trust temporarily, or trust always?" -msgstr "" +msgstr "Vil du afvise nÃ¸glen, betro den midlertidigt, eller betro den permanent?" #. translators: r/t/a stands for Reject/TrustTemporarily/trustAlways(import) #. translate to whatever is appropriate for your language @@ -108,13 +108,12 @@ #. The answers should be lower case letters. #: ../src/callbacks/keyring.h:162 msgid "r/t/a/" -msgstr "" +msgstr "a/m/p/" #. translators: the same as r/t/a, but without 'a' #: ../src/callbacks/keyring.h:165 -#, fuzzy msgid "r/t" -msgstr "n/m" +msgstr "a/m" #. translators: help text for the 'r' option in the 'r/t/a' prompt #: ../src/callbacks/keyring.h:167 @@ -559,20 +558,19 @@ msgstr "'%s' er ikke installeret." #: ../src/install.cc:437 -#, fuzzy msgid "Cannot uninstall patches." -msgstr "%s kan ikke installeres" +msgstr "Kan ikke afinstallere rettelser." #: ../src/install.cc:438 msgid "" "Installed status of a patch is determined solely based on its dependencies.\n" "Patches are not installed in sense of copied files, database records,\n" "or similar." -msgstr "" +msgstr "Installationsstatus for en rettelse bestemmes alene baseret pÃ¥ dens afhÃ¦ngigheder.\nâ©Rettelser installeres ikke i betydningen af kopierede filer, databaseindgange,\nâ©eller lignende." #: ../src/install.cc:449 msgid "Uninstallation of a pattern is currently not defined and implemented." -msgstr "" +msgstr "Afinstallation af et mÃ¸nster er endnu ikke defineret og implementeret." #: ../src/install.cc:463 #, c-format @@ -587,12 +585,12 @@ #: ../src/install.cc:520 msgid "Specifying architecture when selecting packages by name is not implemented." -msgstr "" +msgstr "Angivelse af arkitektur nÃ¥r pakke vÃ¦lges ved navn er endnu ikke implementeret." #: ../src/install.cc:555 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid package or capability name." -msgstr "`%s' er ikke en gyldig tjenestetype." +msgstr "`%s' er ikke et gyldigt pakke- eller kapabilitetsnavn." #. translators: meaning a package %s or provider of capability %s #: ../src/install.cc:630 @@ -886,9 +884,9 @@ msgstr "Brug '%s' for at fÃ¥ en liste over angivne softwarekilder." #: ../src/repos.cc:490 ../src/repos.cc:497 -#, fuzzy, c-format +#, c-format msgid "Ignoring repository '%s' because of '%s' option." -msgstr "Kan ikke rydde softwarekilden '%s' pga. en fejl." +msgstr "Ignorerer softwarekilden '%s' pga. valgmuligheden '%s'." #: ../src/repos.cc:527 ../src/repos.cc:563 #, c-format @@ -2200,7 +2198,7 @@ msgid "" "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." -msgstr "" +msgstr "Hvis du kÃ¸rer zypper uden en terminal, brug den globale\nâ©valgmulighed '%s', til at fÃ¥ zypper til at bruge standardsvar pÃ¥ spÃ¸rgsmÃ¥l." #. TranslatorExplanation These are reasons for various failures. #: ../src/utils/prompt.h:125 @@ -2275,7 +2273,7 @@ msgid "" "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" "\t--no-remote\t\tIgnore remote repositories.\n" -msgstr "" +msgstr "\t--no-cd\t\t\tIgnorÃ©r CD-/DVD-softwarekilder.\nâ©\t--no-remote\t\tIgnorÃ©r eksterne softwarekilder.\n" #: ../src/Zypper.cc:182 msgid "" @@ -2485,14 +2483,12 @@ msgstr "Automatisk genopfrisk deaktiveret." #: ../src/Zypper.cc:509 -#, fuzzy msgid "CD/DVD repositories disabled." -msgstr "Automatisk genopfrisk deaktiveret." +msgstr "CD-/DVD-softwarekilder deaktiverede." #: ../src/Zypper.cc:516 -#, fuzzy msgid "Remote repositories disabled." -msgstr "Automatisk genopfrisk deaktiveret." +msgstr "Eksterne softwarekilder deaktiverede." #: ../src/Zypper.cc:523 msgid "Ignoring installed resolvables." @@ -3852,3 +3848,4 @@ #~ msgid "n/t/i" #~ msgstr "n/m/i" + Modified: trunk/zypper/po/es.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/es.po?rev=11519&r1=115… ============================================================================== --- trunk/zypper/po/es.po (original) +++ trunk/zypper/po/es.po Tue Oct 28 10:28:46 2008 @@ -17,8 +17,8 @@ "Project-Id-Version: zypper\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-10-14 10:05-0300\n" -"Last-Translator: Sergio Gabriel Teves <gabriel(a)opensuse.org>\n" +"PO-Revision-Date: 2008-10-27 18:53-0300\n" +"Last-Translator: Sergio Gabriel Teves <gabriel.sgt(a)gmail.com>\n" "Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -102,7 +102,7 @@ #. translators: this message is shown after showing description of the key #: ../src/callbacks/keyring.h:150 msgid "Do you want to reject the key, trust temporarily, or trust always?" -msgstr "" +msgstr "Â¿QuÃ© desea hacer, rechazar la clave, confiar temporalmente o confiar siempre?" #. translators: r/t/a stands for Reject/TrustTemporarily/trustAlways(import) #. translate to whatever is appropriate for your language @@ -111,13 +111,12 @@ #. The answers should be lower case letters. #: ../src/callbacks/keyring.h:162 msgid "r/t/a/" -msgstr "" +msgstr "r/t/s/" #. translators: the same as r/t/a, but without 'a' #: ../src/callbacks/keyring.h:165 -#, fuzzy msgid "r/t" -msgstr "n/t" +msgstr "r/t" #. translators: help text for the 'r' option in the 'r/t/a' prompt #: ../src/callbacks/keyring.h:167 @@ -171,9 +170,12 @@ msgid "No digest for file %s." msgstr "No hay un resumen (digest) para el archivo %s." -#: ../src/callbacks/keyring.h:256 ../src/callbacks/keyring.h:266 -#: ../src/callbacks/keyring.h:288 ../src/callbacks/rpm.h:61 -#: ../src/solve-commit.cc:1033 ../src/solve-commit.cc:1057 +#: ../src/callbacks/keyring.h:256 +#: ../src/callbacks/keyring.h:266 +#: ../src/callbacks/keyring.h:288 +#: ../src/callbacks/rpm.h:61 +#: ../src/solve-commit.cc:1033 +#: ../src/solve-commit.cc:1057 msgid "Continue?" msgstr "Â¿Desea continuar?" @@ -209,7 +211,8 @@ msgid "Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation." msgstr "Por favor, introduzca el medio [%s] # %d y teclee 'y' para continuar o 'n' para cancelar la operaciÃ³n." -#: ../src/callbacks/media.h:228 ../src/callbacks/media.h:235 +#: ../src/callbacks/media.h:228 +#: ../src/callbacks/media.h:235 msgid "User Name" msgstr "Nombre de usuario" @@ -247,8 +250,10 @@ msgid "Running: %s (%s, %s)" msgstr "Ejecutando: %s (%s, %s)" -#: ../src/callbacks/rpm.h:139 ../src/callbacks/rpm.h:148 -#: ../src/callbacks/rpm.h:156 ../src/callbacks/rpm.h:163 +#: ../src/callbacks/rpm.h:139 +#: ../src/callbacks/rpm.h:148 +#: ../src/callbacks/rpm.h:156 +#: ../src/callbacks/rpm.h:163 msgid "Reading installed packages" msgstr "Leyendo los paquetes instalados" @@ -371,15 +376,20 @@ msgid "Conflict" msgstr "Conflicto" -#: ../src/info.cc:152 ../src/info.cc:274 ../src/info.cc:345 +#: ../src/info.cc:152 +#: ../src/info.cc:274 +#: ../src/info.cc:345 msgid "Catalog: " msgstr "CatÃ¡logo: " -#: ../src/info.cc:152 ../src/info.cc:274 ../src/info.cc:345 +#: ../src/info.cc:152 +#: ../src/info.cc:274 +#: ../src/info.cc:345 msgid "Repository: " msgstr "Repositorio: " -#: ../src/info.cc:157 ../src/info.cc:279 +#: ../src/info.cc:157 +#: ../src/info.cc:279 msgid "Installed: " msgstr "Instalado: " @@ -387,22 +397,39 @@ #. autorefresh? #. enabled? #. autorefresh? -#: ../src/info.cc:157 ../src/info.cc:214 ../src/info.cc:220 ../src/info.cc:222 -#: ../src/info.cc:279 ../src/repos.cc:735 ../src/repos.cc:737 -#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014 -#: ../src/repos.cc:2016 ../src/solve-commit.cc:855 +#: ../src/info.cc:157 +#: ../src/info.cc:214 +#: ../src/info.cc:220 +#: ../src/info.cc:222 +#: ../src/info.cc:279 +#: ../src/repos.cc:735 +#: ../src/repos.cc:737 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:1338 +#: ../src/repos.cc:2014 +#: ../src/repos.cc:2016 +#: ../src/solve-commit.cc:855 msgid "Yes" msgstr "Si" -#: ../src/info.cc:157 ../src/info.cc:214 ../src/info.cc:220 ../src/info.cc:222 -#: ../src/info.cc:279 ../src/repos.cc:735 ../src/repos.cc:737 -#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014 -#: ../src/repos.cc:2016 ../src/solve-commit.cc:855 +#: ../src/info.cc:157 +#: ../src/info.cc:214 +#: ../src/info.cc:220 +#: ../src/info.cc:222 +#: ../src/info.cc:279 +#: ../src/repos.cc:735 +#: ../src/repos.cc:737 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:1338 +#: ../src/repos.cc:2014 +#: ../src/repos.cc:2016 +#: ../src/solve-commit.cc:855 msgid "No" msgstr "No" #. ! \todo fix this - arch? -#: ../src/info.cc:160 ../src/info.cc:209 +#: ../src/info.cc:160 +#: ../src/info.cc:209 msgid "Status: " msgstr "Estado: " @@ -455,41 +482,64 @@ msgid "Requires:" msgstr "Requiere:" -#: ../src/info.cc:246 ../src/search.cc:323 +#: ../src/info.cc:246 +#: ../src/search.cc:323 msgid "Recommended" msgstr "Recomendado" -#: ../src/info.cc:248 ../src/search.cc:325 +#: ../src/info.cc:248 +#: ../src/search.cc:325 msgid "Suggested" msgstr "Sugerencias" #. translators: S for 'installed Status' #. translators: S for installed Status #. TranslatorExplanation S stands for Status -#: ../src/info.cc:289 ../src/search.cc:38 ../src/search.cc:54 -#: ../src/search.cc:214 ../src/search.cc:385 ../src/search.cc:441 -#: ../src/search.cc:533 ../src/update.cc:397 +#: ../src/info.cc:289 +#: ../src/search.cc:38 +#: ../src/search.cc:54 +#: ../src/search.cc:214 +#: ../src/search.cc:385 +#: ../src/search.cc:441 +#: ../src/search.cc:533 +#: ../src/update.cc:397 msgid "S" msgstr "E" #. translators: name (general header) -#: ../src/info.cc:289 ../src/locks.cc:39 ../src/repos.cc:655 -#: ../src/repos.cc:704 ../src/repos.cc:2081 ../src/search.cc:44 -#: ../src/search.cc:56 ../src/search.cc:215 ../src/search.cc:264 -#: ../src/search.cc:386 ../src/search.cc:447 ../src/search.cc:534 -#: ../src/update.cc:152 ../src/update.cc:405 ../src/Zypper.cc:3973 +#: ../src/info.cc:289 +#: ../src/locks.cc:39 +#: ../src/repos.cc:655 +#: ../src/repos.cc:704 +#: ../src/repos.cc:2081 +#: ../src/search.cc:44 +#: ../src/search.cc:56 +#: ../src/search.cc:215 +#: ../src/search.cc:264 +#: ../src/search.cc:386 +#: ../src/search.cc:447 +#: ../src/search.cc:534 +#: ../src/update.cc:152 +#: ../src/update.cc:405 +#: ../src/Zypper.cc:3973 msgid "Name" msgstr "Nombre" #. translators: type (general header) #. translators: product type (addon/base) (rug calls it Category) -#: ../src/info.cc:289 ../src/locks.cc:43 ../src/repos.cc:655 -#: ../src/repos.cc:713 ../src/repos.cc:2089 ../src/search.cc:58 -#: ../src/search.cc:218 ../src/search.cc:541 +#: ../src/info.cc:289 +#: ../src/locks.cc:43 +#: ../src/repos.cc:655 +#: ../src/repos.cc:713 +#: ../src/repos.cc:2089 +#: ../src/search.cc:58 +#: ../src/search.cc:218 +#: ../src/search.cc:541 msgid "Type" msgstr "Tipo" -#: ../src/info.cc:289 ../src/search.cc:388 +#: ../src/info.cc:289 +#: ../src/search.cc:388 msgid "Dependency" msgstr "Dependencias" @@ -503,7 +553,9 @@ #. translators: patch category (recommended, security) #. translators: product category (the rug term) -#: ../src/info.cc:351 ../src/search.cc:267 ../src/search.cc:538 +#: ../src/info.cc:351 +#: ../src/search.cc:267 +#: ../src/search.cc:538 #: ../src/update.cc:152 msgid "Category" msgstr "CategorÃa" @@ -512,7 +564,8 @@ msgid "Flavor" msgstr "VersiÃ³n" -#: ../src/info.cc:353 ../src/utils/misc.cc:111 +#: ../src/info.cc:353 +#: ../src/utils/misc.cc:111 msgid "Installed" msgstr "Instalado" @@ -521,7 +574,8 @@ msgstr "Nombres abreviado" #. translators: meaning a package %s or provider of capability %s -#: ../src/install.cc:68 ../src/install.cc:182 +#: ../src/install.cc:68 +#: ../src/install.cc:182 #, c-format msgid "'%s' not found" msgstr "No se ha encontrado %s " @@ -549,13 +603,15 @@ msgid "Failed to add '%s' to the list of packages to be removed." msgstr "Se ha producido un error al aÃ±adir '%s' a la lista de paquetes para eliminar." -#: ../src/install.cc:373 ../src/install.cc:659 +#: ../src/install.cc:373 +#: ../src/install.cc:659 #, c-format msgid "'%s' is already installed." msgstr "%s ya estÃ¡ instalado." #. translators: meaning a package %s or provider of capability %s -#: ../src/install.cc:413 ../src/install.cc:673 +#: ../src/install.cc:413 +#: ../src/install.cc:673 #, c-format msgid "'%s' is not installed." msgstr "%s no esta instalado." @@ -564,9 +620,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 #: ../src/install.cc:437 -#, fuzzy msgid "Cannot uninstall patches." -msgstr "No es posible instalar %s" +msgstr "No se pueden desinstalar parches." #: ../src/install.cc:438 msgid "" @@ -574,10 +629,13 @@ "Patches are not installed in sense of copied files, database records,\n" "or similar." msgstr "" +"El estado de un parche se determina Ãºnicamente en base a sus dependencias.\n" +"Los parches no se consideran instalados por los archivos copiados, registros en una base\n" +"de datos o similar." #: ../src/install.cc:449 msgid "Uninstallation of a pattern is currently not defined and implemented." -msgstr "" +msgstr "La desinstalaciÃ³n de un patrÃ³n actualmente no se encuentra definida ni implementada." #: ../src/install.cc:463 #, c-format @@ -592,12 +650,12 @@ #: ../src/install.cc:520 msgid "Specifying architecture when selecting packages by name is not implemented." -msgstr "" +msgstr "Indicar una arquitectura al seleccionar paquetes por su nombre no estÃ¡ implementado." #: ../src/install.cc:555 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid package or capability name." -msgstr "'%s' no es un tipo de servicio vÃ¡lido." +msgstr "'%s' no es un paquete o nombre de una caracterÃstica vÃ¡lida." #. translators: meaning a package %s or provider of capability %s #: ../src/install.cc:630 @@ -613,18 +671,25 @@ #. translators: locks table value #. importance -#: ../src/locks.cc:22 ../src/locks.cc:63 ../src/locks.cc:76 +#: ../src/locks.cc:22 +#: ../src/locks.cc:63 +#: ../src/locks.cc:76 msgid "(any)" msgstr "(cualquiera)" #. translators: locks table value -#: ../src/locks.cc:24 ../src/locks.cc:60 ../src/search.cc:311 +#: ../src/locks.cc:24 +#: ../src/locks.cc:60 +#: ../src/search.cc:311 msgid "(multiple)" msgstr "(multiple)" #. translators: catalog (rug's word for repository) (header) -#: ../src/locks.cc:41 ../src/search.cc:40 ../src/search.cc:263 -#: ../src/update.cc:151 ../src/update.cc:399 +#: ../src/locks.cc:41 +#: ../src/search.cc:40 +#: ../src/search.cc:263 +#: ../src/update.cc:151 +#: ../src/update.cc:399 msgid "Catalog" msgstr "CatÃ¡logo" @@ -633,8 +698,12 @@ msgstr "Importante" #. translators: package's repository (header) -#: ../src/locks.cc:43 ../src/search.cc:64 ../src/search.cc:388 -#: ../src/search.cc:446 ../src/update.cc:151 ../src/update.cc:399 +#: ../src/locks.cc:43 +#: ../src/search.cc:64 +#: ../src/search.cc:388 +#: ../src/search.cc:446 +#: ../src/update.cc:151 +#: ../src/update.cc:399 msgid "Repository" msgstr "Repositorio" @@ -743,7 +812,8 @@ msgid "Installed packages with EULAs: %d" msgstr "Paquetes instalados con EULA: %d" -#: ../src/misc.cc:372 ../src/misc.cc:397 +#: ../src/misc.cc:372 +#: ../src/misc.cc:397 #, c-format msgid "Source package '%s' not found." msgstr "No se ha encontrado el paquete fuente '%s'." @@ -767,16 +837,20 @@ msgid "Warning: " msgstr "Advertencia" -#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:224 +#: ../src/output/OutNormal.cc:151 +#: ../src/output/OutNormal.cc:224 msgid "error" msgstr "error" -#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:224 +#: ../src/output/OutNormal.cc:151 +#: ../src/output/OutNormal.cc:224 msgid "done" msgstr "hecho" -#: ../src/output/OutNormal.cc:165 ../src/output/OutNormal.cc:167 -#: ../src/output/OutNormal.cc:191 ../src/output/OutNormal.cc:217 +#: ../src/output/OutNormal.cc:165 +#: ../src/output/OutNormal.cc:167 +#: ../src/output/OutNormal.cc:191 +#: ../src/output/OutNormal.cc:217 msgid "Retrieving:" msgstr "Obteniendo:" @@ -822,8 +896,11 @@ msgid "Problem retrieving files from '%s'." msgstr "Se ha producido un problema al descargar los archivos desde '%s'." -#: ../src/repos.cc:160 ../src/repos.cc:2861 ../src/solve-commit.cc:1109 -#: ../src/solve-commit.cc:1137 ../src/solve-commit.cc:1169 +#: ../src/repos.cc:160 +#: ../src/repos.cc:2861 +#: ../src/solve-commit.cc:1109 +#: ../src/solve-commit.cc:1137 +#: ../src/solve-commit.cc:1169 msgid "Please see the above error message for a hint." msgstr "Por favor, revise el mensaje de error anterior para obtener alguna pista." @@ -889,12 +966,14 @@ msgid "Use '%s' to get the list of defined repositories." msgstr "Utilice '%s' para obtener la lista de los repositorios definidos." -#: ../src/repos.cc:490 ../src/repos.cc:497 -#, fuzzy, c-format +#: ../src/repos.cc:490 +#: ../src/repos.cc:497 +#, c-format msgid "Ignoring repository '%s' because of '%s' option." -msgstr "No se puede limpiar el repositorio '%s' debido a un error." +msgstr "Ignorando repositorio '%s' debido a la opciÃ³n '%s'." -#: ../src/repos.cc:527 ../src/repos.cc:563 +#: ../src/repos.cc:527 +#: ../src/repos.cc:563 #, c-format msgid "Disabling repository '%s' because of the above error." msgstr "Deshabilitando el repositorio '%s' debido al error anterior." @@ -922,12 +1001,15 @@ msgid "Target initialization failed:" msgstr "La inicializaciÃ³n del destino ha fallado:" -#: ../src/repos.cc:635 ../src/Zypper.cc:3343 +#: ../src/repos.cc:635 +#: ../src/Zypper.cc:3343 msgid "Running 'zypper refresh' as root might resolve the problem." msgstr "Ejecutando 'zypper refresh' como superusuario (root) puede solucionar el problema." #. translators: patch status (installed, uninstalled, needed) -#: ../src/repos.cc:655 ../src/search.cc:269 ../src/update.cc:152 +#: ../src/repos.cc:655 +#: ../src/search.cc:269 +#: ../src/update.cc:152 msgid "Status" msgstr "Estado" @@ -942,26 +1024,33 @@ msgid "Disabled" msgstr "Desactivado" -#: ../src/repos.cc:703 ../src/repos.cc:2080 ../src/Zypper.cc:3973 +#: ../src/repos.cc:703 +#: ../src/repos.cc:2080 +#: ../src/Zypper.cc:3973 msgid "Alias" msgstr "Alias" #. TranslatorExplanation used as e.g. "Enabled: Yes" -#: ../src/repos.cc:705 ../src/repos.cc:1336 ../src/repos.cc:2082 +#: ../src/repos.cc:705 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:2082 msgid "Enabled" msgstr "Activado" #. translators: 'zypper repos' column - whether autorefresh is enabled for the repository -#: ../src/repos.cc:707 ../src/repos.cc:2084 +#: ../src/repos.cc:707 +#: ../src/repos.cc:2084 msgid "Refresh" msgstr "Actualizar" #. translators: repository priority (in zypper repos -p or -d) -#: ../src/repos.cc:711 ../src/repos.cc:2088 +#: ../src/repos.cc:711 +#: ../src/repos.cc:2088 msgid "Priority" msgstr "Prioridad" -#: ../src/repos.cc:715 ../src/repos.cc:2091 +#: ../src/repos.cc:715 +#: ../src/repos.cc:2091 msgid "URI" msgstr "URI" @@ -973,25 +1062,31 @@ msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories." msgstr "No hay repositorios definidos. Utilice el comando 'zypper addrepo' para aÃ±adir uno o mÃ¡s repositorios." -#: ../src/repos.cc:837 ../src/repos.cc:909 ../src/repos.cc:1079 +#: ../src/repos.cc:837 +#: ../src/repos.cc:909 +#: ../src/repos.cc:1079 msgid "Error reading repositories:" msgstr "Se ha producido un error al leer los repositorios:" -#: ../src/repos.cc:865 ../src/repos.cc:2213 +#: ../src/repos.cc:865 +#: ../src/repos.cc:2213 #, c-format msgid "Can't open %s for writing." msgstr "No es posible abrir %s para escritura." -#: ../src/repos.cc:867 ../src/repos.cc:2215 +#: ../src/repos.cc:867 +#: ../src/repos.cc:2215 msgid "Maybe you do not have write permissions?" msgstr "Â¿Es posible que no tenga permisos de escritura?" -#: ../src/repos.cc:874 ../src/repos.cc:2222 +#: ../src/repos.cc:874 +#: ../src/repos.cc:2222 #, c-format msgid "Repositories have been successfully exported to %s." msgstr "Se han exportado correctamente los repositorios a %s." -#: ../src/repos.cc:927 ../src/repos.cc:1097 +#: ../src/repos.cc:927 +#: ../src/repos.cc:1097 msgid "Specified repositories: " msgstr "Repositorios especificados: " @@ -1083,7 +1178,8 @@ msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh." msgstr "Este es un medio de sÃ³lo lectura intercambiable (CD/DVD), deshabilitando la actualizaciÃ³n automÃ¡tica." -#: ../src/repos.cc:1282 ../src/repos.cc:1543 +#: ../src/repos.cc:1282 +#: ../src/repos.cc:1543 #, c-format msgid "Repository named '%s' already exists. Please use another alias." msgstr "Ya existe un repositorio llamado '%s'. Por favor, utilice otro alias." @@ -1092,7 +1188,8 @@ msgid "Could not determine the type of the repository. Please check if the defined URIs (see below) point to a valid repository:" msgstr "No es posible determinar el tipo de repositorio. Por favor, compruebe si las direcciones URIs definidas (ver mÃ¡s abajo) apuntan a un repositorio vÃ¡lido:" -#: ../src/repos.cc:1300 ../src/Zypper.cc:2420 +#: ../src/repos.cc:1300 +#: ../src/Zypper.cc:2420 msgid "Can't find a valid repository at given location:" msgstr "No es posible encontrar un repositorio vÃ¡lido en la ubicaciÃ³n proporcionada:" @@ -1178,7 +1275,8 @@ msgid "Repository '%s' renamed to '%s'." msgstr "El repositorio '%s' ha sido renombrado a '%s'." -#: ../src/repos.cc:1549 ../src/repos.cc:1769 +#: ../src/repos.cc:1549 +#: ../src/repos.cc:1769 msgid "Error while modifying the repository:" msgstr "Se ha producido un error al modificar el repositorio:" @@ -1425,12 +1523,14 @@ msgid "Repository '%s' not cached. Caching..." msgstr "Repositorio '%s' sin almacenar en cachÃ©. Almacenando en cachÃ©..." -#: ../src/repos.cc:2806 ../src/repos.cc:2834 +#: ../src/repos.cc:2806 +#: ../src/repos.cc:2834 #, c-format msgid "Problem loading data from '%s'" msgstr "Se ha producido un problema al cargar los datos desde '%s'" -#: ../src/repos.cc:2807 ../src/repos.cc:2840 +#: ../src/repos.cc:2807 +#: ../src/repos.cc:2840 #, c-format msgid "Resolvables from '%s' not loaded because of error." msgstr "No han sido cargados los elementos de '%s' debido a un error." @@ -1466,25 +1566,35 @@ "Utilice rug o yast2 para hacerlo." #. translators: Bundle is a term used in rug. See rug for how to translate it. -#: ../src/search.cc:42 ../src/search.cc:444 ../src/update.cc:402 +#: ../src/search.cc:42 +#: ../src/search.cc:444 +#: ../src/update.cc:402 msgid "Bundle" msgstr "Lote" #. translators: package version (header) #. best_effort does not know version or arch yet -#: ../src/search.cc:46 ../src/search.cc:60 ../src/search.cc:265 -#: ../src/search.cc:386 ../src/search.cc:447 ../src/search.cc:535 -#: ../src/update.cc:152 ../src/update.cc:407 +#: ../src/search.cc:46 +#: ../src/search.cc:60 +#: ../src/search.cc:265 +#: ../src/search.cc:386 +#: ../src/search.cc:447 +#: ../src/search.cc:535 +#: ../src/update.cc:152 +#: ../src/update.cc:407 msgid "Version" msgstr "VersiÃ³n" #. translators: package architecture (header) -#: ../src/search.cc:48 ../src/search.cc:62 ../src/search.cc:447 +#: ../src/search.cc:48 +#: ../src/search.cc:62 +#: ../src/search.cc:447 #: ../src/update.cc:407 msgid "Arch" msgstr "Arquitectura" -#: ../src/search.cc:178 ../src/search.cc:192 +#: ../src/search.cc:178 +#: ../src/search.cc:192 msgid "System Packages" msgstr "Paquetes del sistema" @@ -1501,7 +1611,8 @@ msgid "No patterns found." msgstr "No se han encontrado patrones." -#: ../src/search.cc:497 ../src/Zypper.cc:3301 +#: ../src/search.cc:497 +#: ../src/Zypper.cc:3301 msgid "No packages found." msgstr "No se han encontrado paquetes." @@ -1877,7 +1988,8 @@ msgid "(dry run)" msgstr "(ejecuciÃ³n de pruebas)" -#: ../src/solve-commit.cc:1108 ../src/solve-commit.cc:1147 +#: ../src/solve-commit.cc:1108 +#: ../src/solve-commit.cc:1147 msgid "Problem retrieving the package file from the repository:" msgstr "Ha ocurrido un problema al descargar el paquete desde el repositorio:" @@ -1933,7 +2045,8 @@ msgstr[0] "%d parche de seguridad" msgstr[1] "%d parches de seguridad" -#: ../src/update.cc:174 ../src/utils/misc.cc:113 +#: ../src/update.cc:174 +#: ../src/utils/misc.cc:113 msgid "Needed" msgstr "Necesario" @@ -1945,7 +2058,8 @@ "Ãstas son sÃ³lo las actualizaciones que afectan al propio actualizador.\n" "TambiÃ©n hay otras disponibles.\n" -#: ../src/update.cc:198 ../src/update.cc:448 +#: ../src/update.cc:198 +#: ../src/update.cc:448 msgid "No updates found." msgstr "No se ha encontrado ninguna actualizaciÃ³n." @@ -2026,8 +2140,10 @@ msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions." msgstr "Consulte http://en.opensuse.org/Zypper#Troubleshooting para obtener instrucciones." -#: ../src/utils/messages.cc:40 ../src/utils/messages.cc:50 -#: ../src/utils/messages.cc:68 ../src/Zypper.cc:3677 +#: ../src/utils/messages.cc:40 +#: ../src/utils/messages.cc:50 +#: ../src/utils/messages.cc:68 +#: ../src/Zypper.cc:3677 msgid "Usage" msgstr "UtilizaciÃ³n" @@ -2035,7 +2151,9 @@ msgid "Too many arguments." msgstr "Hay demasiados argumentos." -#: ../src/utils/messages.cc:48 ../src/Zypper.cc:2706 ../src/Zypper.cc:3674 +#: ../src/utils/messages.cc:48 +#: ../src/Zypper.cc:2706 +#: ../src/Zypper.cc:3674 msgid "Required argument missing." msgstr "Falta un argumento requerido." @@ -2175,12 +2293,14 @@ msgid "Abort, retry, ignore?" msgstr "Â¿Cancelar, Reintentar, Ignorar?" -#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:197 +#: ../src/utils/prompt.cc:169 +#: ../src/utils/prompt.cc:197 #: ../src/utils/prompt.cc:253 msgid "yes" msgstr "si" -#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:198 +#: ../src/utils/prompt.cc:169 +#: ../src/utils/prompt.cc:198 #: ../src/utils/prompt.cc:253 msgid "no" msgstr "no" @@ -2203,6 +2323,8 @@ "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." msgstr "" +"Si ejecuta zypper sin un terminal, utilice la opciÃ³n global '%s'\n" +"para hacer que zypper responda las solicitudes con respuestas por defecto." #. TranslatorExplanation These are reasons for various failures. #: ../src/utils/prompt.h:125 @@ -2279,6 +2401,8 @@ "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" "\t--no-remote\t\tIgnore remote repositories.\n" msgstr "" +"\t--no-cd\t\t\tIgnorar repositorios de CD/DVD.\n" +"\t--no-remote\t\tIgnorar repositorios remotos.\n" #: ../src/Zypper.cc:182 msgid "" @@ -2487,14 +2611,12 @@ msgstr "ActualizaciÃ³n automÃ¡tica deshabilitada." #: ../src/Zypper.cc:509 -#, fuzzy msgid "CD/DVD repositories disabled." -msgstr "ActualizaciÃ³n automÃ¡tica deshabilitada." +msgstr "Repositorios de CD/DVD desactivados." #: ../src/Zypper.cc:516 -#, fuzzy msgid "Remote repositories disabled." -msgstr "ActualizaciÃ³n automÃ¡tica deshabilitada." +msgstr "Repositorios remotos desactivados." #: ../src/Zypper.cc:523 msgid "Ignoring installed resolvables." @@ -2829,7 +2951,8 @@ #. translators: this is just a rug compatiblity command #. translators: this is just a rug-compatiblity command -#: ../src/Zypper.cc:1250 ../src/Zypper.cc:2127 +#: ../src/Zypper.cc:1250 +#: ../src/Zypper.cc:2127 msgid "" "list-resolvables (lr)\n" "\n" @@ -3592,7 +3715,8 @@ "Este comando tiene un implementaciÃ³n simple que siempre retorna 0.\n" "Se provee como compatiblidad con rug.\n" -#: ../src/Zypper.cc:2212 ../src/Zypper.cc:3959 +#: ../src/Zypper.cc:2212 +#: ../src/Zypper.cc:3959 msgid "Unexpected program flow." msgstr "Flujo de programa inesperado." @@ -3615,7 +3739,8 @@ msgid "Root privileges are required for refreshing services." msgstr "Se requieren privilegios de superusuario (root) para actualizar los servicios." -#: ../src/Zypper.cc:2352 ../src/Zypper.cc:2699 +#: ../src/Zypper.cc:2352 +#: ../src/Zypper.cc:2699 msgid "Root privileges are required for modifying system services." msgstr "Se requieren privilegios de superusuario (root) para modificar los servicios del sistema." @@ -3642,7 +3767,8 @@ #. followed by ms command help text which will explain it #. translators: aggregate option is e.g. "--all". This message will be #. followed by mr command help text which will explain it -#: ../src/Zypper.cc:2484 ../src/Zypper.cc:2852 +#: ../src/Zypper.cc:2484 +#: ../src/Zypper.cc:2852 msgid "Alias or an aggregate option is required." msgstr "Se necesita un alias o una opciÃ³n de agregado." @@ -3651,12 +3777,15 @@ msgid "Service '%s' not found." msgstr "Servicio '%s' no encontrado." -#: ../src/Zypper.cc:2554 ../src/Zypper.cc:2698 ../src/Zypper.cc:2784 +#: ../src/Zypper.cc:2554 +#: ../src/Zypper.cc:2698 +#: ../src/Zypper.cc:2784 #: ../src/Zypper.cc:2840 msgid "Root privileges are required for modifying system repositories." msgstr "Se requieren privilegios de superusuario (root) para modificar los repositorios del sistema." -#: ../src/Zypper.cc:2603 ../src/Zypper.cc:2960 +#: ../src/Zypper.cc:2603 +#: ../src/Zypper.cc:2960 msgid "Too few arguments." msgstr "Insuficientes argumentos." @@ -3761,7 +3890,8 @@ msgid "No valid arguments specified." msgstr "No se ha especificado ningÃºn argumento vÃ¡lido." -#: ../src/Zypper.cc:3100 ../src/Zypper.cc:3178 +#: ../src/Zypper.cc:3100 +#: ../src/Zypper.cc:3178 msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed." msgstr "Advertencia: no hay repositorios definidos. Se estÃ¡ operando sÃ³lo con los elementos instalados. No es posible instalar nada." @@ -3769,8 +3899,11 @@ msgid "Source package name is a required argument." msgstr "El nombre del paquete fuente es un argumento requerido." -#: ../src/Zypper.cc:3235 ../src/Zypper.cc:3495 ../src/Zypper.cc:3579 -#: ../src/Zypper.cc:3702 ../src/Zypper.cc:3770 +#: ../src/Zypper.cc:3235 +#: ../src/Zypper.cc:3495 +#: ../src/Zypper.cc:3579 +#: ../src/Zypper.cc:3702 +#: ../src/Zypper.cc:3770 #, c-format msgid "Unknown package type '%s'." msgstr "Tipo de paquete '%s' desconocido." @@ -3784,7 +3917,8 @@ msgstr "Por favor, revise el mensaje de error anterior para obtener alguna pista." #. translators: Running as 'rug', cannot use 'best-effort' option. -#: ../src/Zypper.cc:3514 ../src/Zypper.cc:3597 +#: ../src/Zypper.cc:3514 +#: ../src/Zypper.cc:3597 #, c-format msgid "Running as '%s', cannot use '%s' option." msgstr "Ejecutando como '%s', no es posible utilizar la opciÃ³n '%s'." @@ -3797,7 +3931,8 @@ msgid "Root privileges are required for performing a distribution upgrade." msgstr "Se requieren privilegios de superusuario (root) para realizar una actualizaciÃ³n de la distribuciÃ³n." -#: ../src/Zypper.cc:3732 ../src/Zypper.cc:3793 +#: ../src/Zypper.cc:3732 +#: ../src/Zypper.cc:3793 msgid "Root privileges are required for adding of package locks." msgstr "Se requieren privilegios de superusuario (root) para aÃ±adir bloqueos a los paquetes." @@ -3835,72 +3970,53 @@ # power-off message #~ msgid "Do you want to trust the key?" #~ msgstr "Â¿Desea confiar en esta clave?" - #~ msgid "n/t/i" #~ msgstr "n/t/i" - #~ msgid "Running as 'rug', can't do 'best-effort' approach to update." #~ msgstr "Ejecutando como 'rug', no es posible utilizar la aproximaciÃ³n 'mejor-esfuerzo' en la actualizaciÃ³n." - #~ msgid "Automatically trusting key id %s, %s, fingerprint %s" #~ msgstr "Confiar automÃ¡ticamente en el id de clave %s,%s, huella digital %s" - #~ msgid "Do you want to trust key id %s, %s, fingerprint %s" #~ msgstr "Desea confiar en el id de clave %s, %s, huella digital %s" - #, fuzzy #~ msgid "Specified type is not a valid service type:" #~ msgstr "El tipo especificado no es un tipo de repositorio vÃ¡lido:" - #~ msgid "Downloading delta" #~ msgstr "Descargando delta" - #~ msgid "Long Name: " #~ msgstr "Nombre largo: " - #~ msgid "Downloading:" #~ msgstr "Descargando:" - #~ msgid "Downloading repository '%s' metadata" #~ msgstr "Descargando los metadatos del repositorio '%s'" - #~ msgid "Error downloading metadata for '%s':" #~ msgstr "Se ha producido un error al descargar los metadatos para '%s':" - #~ msgid "script" #~ msgid_plural "scripts" #~ msgstr[0] "guiÃ³n (script)" #~ msgstr[1] "guiones (scripts)" - #~ msgid "message" #~ msgid_plural "messages" #~ msgstr[0] "mensaje" #~ msgstr[1] "mensajes" - #~ msgid "atom" #~ msgid_plural "atoms" #~ msgstr[0] "Ã¡tomo" #~ msgstr[1] "Ã¡tomos" - #~ msgid "'%s' option is deprecated and will be dropped soon." #~ msgstr "La opciÃ³n '%s' es obsoleta y se dejarÃ¡ de utilizar en breve." - #~ msgid "No resolvables found." #~ msgstr "No se han encontrado elementos." - #~ msgid "The updater could not access the package manager engine. This usually happens when you have another application (like YaST) using it at the same time. Please close the other applications and check again for updates." #~ msgstr "El actualizador no ha podido acceder al motor del gestor de paquetes. Esto suele ocurrir cuando hay otra aplicaciÃ³n (como YaST) utilizÃ¡ndolo al mismo tiempo. Cierre el resto de aplicaciones y vuelva a comprobar la existencia de actualizaciones." - #~ msgid "" #~ "Couldn't restore repository.\n" #~ "Detail: %s" #~ msgstr "" #~ "No es posible restaurar el repositorio.\n" #~ "Detalle: %s" - #~ msgid "There are no update repositories defined. Please add one or more update repositories in order to be notified of updates." #~ msgstr "No hay repositorios de actualizaciÃ³n definidos. Por favor, aÃ±ada uno o mÃ¡s repositorios de actualizaciÃ³n para que se le notifiquen actualizaciones." - #~ msgid "" #~ "xml-updates\n" #~ "\n" @@ -3915,12 +4031,10 @@ #~ "\n" #~ " Opciones de comando:\n" #~ "-r, --repo <alias|#|URI> Trabaja sÃ³lo con las actualizaciones del repositorio especificado.\n" - #~ msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command." #~ msgstr "Una transacciÃ³n ZYpp se encuentra actualmente en progreso. Esto significa que hay otra aplicaciÃ³n en ejecuciÃ³n que estÃ¡ utilizando la biblioteca libzypp para la gestiÃ³n de paquetes. Todas estas aplicaciones se deben cerrar antes de utilizar este comando." - #~ msgid "Only the first command argument considered. Zypper currently does not support versioned locks." #~ msgstr "Solo se tendra en cuenta el primer argumento del comando. Zypper actualmente no soporta versionado de bloqueos." - #~ msgid "%s %s license:" #~ msgstr "Licencia %s %s:" + Modified: trunk/zypper/po/fr.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/fr.po?rev=11519&r1=115… ============================================================================== --- trunk/zypper/po/fr.po (original) +++ trunk/zypper/po/fr.po Tue Oct 28 10:28:46 2008 @@ -13,7 +13,7 @@ "Project-Id-Version: zypper.fr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-10-14 16:53+0200\n" +"PO-Revision-Date: 2008-10-27 21:15+0100\n" "Last-Translator: RÃ©my Marquis <remy.marquis(a)opensuse.org>\n" "Language-Team: French <opensuse-fr(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -97,7 +97,7 @@ #. translators: this message is shown after showing description of the key #: ../src/callbacks/keyring.h:150 msgid "Do you want to reject the key, trust temporarily, or trust always?" -msgstr "" +msgstr "Voulez-vous rejeter la clÃ©, lui faire confiance temporairement, ou toujours lui faire confiance ?" #. translators: r/t/a stands for Reject/TrustTemporarily/trustAlways(import) #. translate to whatever is appropriate for your language @@ -106,13 +106,12 @@ #. The answers should be lower case letters. #: ../src/callbacks/keyring.h:162 msgid "r/t/a/" -msgstr "" +msgstr "r/t/a" #. translators: the same as r/t/a, but without 'a' #: ../src/callbacks/keyring.h:165 -#, fuzzy msgid "r/t" -msgstr "n/t" +msgstr "r/t" #. translators: help text for the 'r' option in the 'r/t/a' prompt #: ../src/callbacks/keyring.h:167 @@ -565,20 +564,19 @@ # TLABEL partitioning_2002_01_04_0147__180 #: ../src/install.cc:437 -#, fuzzy msgid "Cannot uninstall patches." -msgstr "Impossible d'installer %s" +msgstr "Impossible de dÃ©sinstaller des correctifs." #: ../src/install.cc:438 msgid "" "Installed status of a patch is determined solely based on its dependencies.\n" "Patches are not installed in sense of copied files, database records,\n" "or similar." -msgstr "" +msgstr "Le statut d'installation d'un correctif est dÃ©terminÃ© uniquement sur la base de\nâ©ses dÃ©pendances. Les correctifs ne sont pas installÃ©s dans le sens de fichiers\nâ©copiÃ©s, entrÃ©es de base de donnÃ©es ou similaire.â©" #: ../src/install.cc:449 msgid "Uninstallation of a pattern is currently not defined and implemented." -msgstr "" +msgstr "La dÃ©sinstallation d'un pattern n'est actuellement pas dÃ©finie ni implÃ©mentÃ©e." #: ../src/install.cc:463 #, c-format @@ -593,12 +591,12 @@ #: ../src/install.cc:520 msgid "Specifying architecture when selecting packages by name is not implemented." -msgstr "" +msgstr "La spÃ©cification de l'architecture lors de la sÃ©lection des paquets par nom n'est actuellement pas implÃ©mentÃ©e." #: ../src/install.cc:555 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid package or capability name." -msgstr "'%s' n'est pas un type de service valide." +msgstr "'%s' n'est pas un paquet ou une capacitÃ© valide." #. translators: meaning a package %s or provider of capability %s #: ../src/install.cc:630 @@ -898,9 +896,9 @@ msgstr "Utilisez '%s' pour obtenir la liste des dÃ©pÃ´ts dÃ©finis." #: ../src/repos.cc:490 ../src/repos.cc:497 -#, fuzzy, c-format +#, c-format msgid "Ignoring repository '%s' because of '%s' option." -msgstr "Impossible de nettoyer le dÃ©pÃ´t '%s' Ã cause d'une erreur." +msgstr "Ignore le dÃ©pÃ´t '%s' Ã cause de l'option '%s'." #: ../src/repos.cc:527 ../src/repos.cc:563 #, c-format @@ -2226,7 +2224,7 @@ msgid "" "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." -msgstr "" +msgstr "Si vous exÃ©cutez zypper sans un terminal, utiliser l'option globale '%s'\n â©afin que zypper donne des rÃ©ponses par dÃ©faut aux invites." #. TranslatorExplanation These are reasons for various failures. #: ../src/utils/prompt.h:125 @@ -2298,7 +2296,7 @@ msgid "" "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" "\t--no-remote\t\tIgnore remote repositories.\n" -msgstr "" +msgstr "\t--no-cd\t\t\tIgnore les dÃ©pÃ´ts CD/DVD.\nâ©\t--no-remote\t\tIgnore les dÃ©pÃ´ts distants.\n" #: ../src/Zypper.cc:182 msgid "" @@ -2505,14 +2503,12 @@ msgstr "RafraÃ®chissement automatique dÃ©sactivÃ©." #: ../src/Zypper.cc:509 -#, fuzzy msgid "CD/DVD repositories disabled." -msgstr "RafraÃ®chissement automatique dÃ©sactivÃ©." +msgstr "DÃ©pÃ´ts CD/DVD dÃ©sactivÃ©s." #: ../src/Zypper.cc:516 -#, fuzzy msgid "Remote repositories disabled." -msgstr "RafraÃ®chissement automatique dÃ©sactivÃ©." +msgstr "DÃ©pÃ´ts distants dÃ©sactivÃ©s." #: ../src/Zypper.cc:523 msgid "Ignoring installed resolvables." @@ -3961,3 +3957,4 @@ #~ msgid "%s %s license:" #~ msgstr "licence %s %s:" + Modified: trunk/zypper/po/it.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/it.po?rev=11519&r1=115… ============================================================================== --- trunk/zypper/po/it.po (original) +++ trunk/zypper/po/it.po Tue Oct 28 10:28:46 2008 @@ -10,7 +10,7 @@ "Project-Id-Version: zypper\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-10-20 12:22+0200\n" +"PO-Revision-Date: 2008-10-27 23:37+0100\n" "Last-Translator: Andrea Florio <andrea(a)opensuse.org>\n" "Language-Team: italian <opensuse-translation(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -94,7 +94,7 @@ #. translators: this message is shown after showing description of the key #: ../src/callbacks/keyring.h:150 msgid "Do you want to reject the key, trust temporarily, or trust always?" -msgstr "" +msgstr "Vuoi rifiutare la chiave, fidarti temporaneamente, o fidarti definitivamente?" #. translators: r/t/a stands for Reject/TrustTemporarily/trustAlways(import) #. translate to whatever is appropriate for your language @@ -103,13 +103,12 @@ #. The answers should be lower case letters. #: ../src/callbacks/keyring.h:162 msgid "r/t/a/" -msgstr "" +msgstr "r/t/d" #. translators: the same as r/t/a, but without 'a' #: ../src/callbacks/keyring.h:165 -#, fuzzy msgid "r/t" -msgstr "n/f" +msgstr "r/t" #. translators: help text for the 'r' option in the 'r/t/a' prompt #: ../src/callbacks/keyring.h:167 @@ -554,9 +553,8 @@ # TLABEL modules/inst_target_part.ycp:680 #: ../src/install.cc:437 -#, fuzzy msgid "Cannot uninstall patches." -msgstr "Impossibile installare %s" +msgstr "Impossibile disinstallare le patch." #: ../src/install.cc:438 msgid "" @@ -564,10 +562,13 @@ "Patches are not installed in sense of copied files, database records,\n" "or similar." msgstr "" +"Lo stato di installazione di una patch Ã¨ determinanto solamente in base alle sue dipendenze.\n" +"Le patch non sono installate nel senso di file copiati, aggiunte al database,\n" +"o simili." #: ../src/install.cc:449 msgid "Uninstallation of a pattern is currently not defined and implemented." -msgstr "" +msgstr "La disinstallazione di un modello non Ã¨ al momento definita ed implementata." #: ../src/install.cc:463 #, c-format @@ -582,12 +583,12 @@ #: ../src/install.cc:520 msgid "Specifying architecture when selecting packages by name is not implemented." -msgstr "" +msgstr "Specificare l'architettura quando si seleziona un pacchetto per nome non Ã¨ implementato." #: ../src/install.cc:555 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid package or capability name." -msgstr "'%s' non Ã¨ un Ã¨ un tipo di servizio valido." +msgstr "'%s' non Ã¨ un Ã¨ un nome di pacchetto o di possibilitÃ valido." #. translators: meaning a package %s or provider of capability %s #: ../src/install.cc:630 @@ -881,9 +882,9 @@ msgstr "Usare '%s' per ottenere una lista delle sorgenti di installazione definite." #: ../src/repos.cc:490 ../src/repos.cc:497 -#, fuzzy, c-format +#, c-format msgid "Ignoring repository '%s' because of '%s' option." -msgstr "Impossibile pulire la sorgente di installazione '%s' a causa dell'errore." +msgstr "Ignoro la sorgente di installazione '%s' a causa dell'opzione '%s'." #: ../src/repos.cc:527 ../src/repos.cc:563 #, c-format @@ -2200,6 +2201,8 @@ "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." msgstr "" +"Se utilizzi zypper senza un terminale, usa l'opzione globale\n" +"'%s' per far usare a zypper le risposte di default ai prompt." #. TranslatorExplanation These are reasons for various failures. #: ../src/utils/prompt.h:125 @@ -2275,6 +2278,8 @@ "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" "\t--no-remote\t\tIgnore remote repositories.\n" msgstr "" +"\t--no-cd\t\t\tIgnora sorgenti di installazione su CD/DVD.\n" +"\t--no-remote\t\tIgnora sorgenti di installazione remote.\n" #: ../src/Zypper.cc:182 msgid "" @@ -2484,14 +2489,12 @@ msgstr "Aggiornamento automaticamento disabilitato." #: ../src/Zypper.cc:509 -#, fuzzy msgid "CD/DVD repositories disabled." -msgstr "Aggiornamento automaticamento disabilitato." +msgstr "Sorgenti di installazione su CD/DVD disabilitate." #: ../src/Zypper.cc:516 -#, fuzzy msgid "Remote repositories disabled." -msgstr "Aggiornamento automaticamento disabilitato." +msgstr "Sorgenti di installazione remote disabilitate." #: ../src/Zypper.cc:523 msgid "Ignoring installed resolvables." @@ -3847,9 +3850,3 @@ msgid "Resolvable Type" msgstr "Tipo di risolvibile" -# power-off message -#~ msgid "Do you want to trust the key?" -#~ msgstr "Vuoi fidarti di questa chiave?" - -#~ msgid "n/t/i" -#~ msgstr "n/f/i" Modified: trunk/zypper/po/km.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/km.po?rev=11519&r1=115… ============================================================================== --- trunk/zypper/po/km.po (original) +++ trunk/zypper/po/km.po Tue Oct 28 10:28:46 2008 @@ -1,4 +1,4 @@ -# translation of zypper.km.po to Khmer +# translation of zypper.po to khmer # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # This file is distributed under the same license as @PACKAGE@ package. FIRST @@ -7,12 +7,12 @@ # Khoem Sokhem <khoemsokhem(a)khmeros.info>, 2007, 2008. msgid "" msgstr "" -"Project-Id-Version: zypper.km\n" +"Project-Id-Version: zypper\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-10-15 09:13+0700\n" -"Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n" -"Language-Team: Khmer <support(a)khmeros.info>\n" +"PO-Revision-Date: 2008-10-28 10:37+0700\n" +"Last-Translator: Auk Piseth <piseth_dv(a)khmeros.info>\n" +"Language-Team: khmer <support(a)khmeros.info>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -94,7 +94,7 @@ #. translators: this message is shown after showing description of the key #: ../src/callbacks/keyring.h:150 msgid "Do you want to reject the key, trust temporarily, or trust always?" -msgstr "" +msgstr "áá¾âá¢áááâáááâááá·áááâáá áá»ááá·áááâááááááâá¢á¶áááá á¬âáá»ááá·áááâáá á¼áÂ ?" #. translators: r/t/a stands for Reject/TrustTemporarily/trustAlways(import) #. translate to whatever is appropriate for your language @@ -103,13 +103,12 @@ #. The answers should be lower case letters. #: ../src/callbacks/keyring.h:162 msgid "r/t/a/" -msgstr "" +msgstr "r/t/a/" #. translators: the same as r/t/a, but without 'a' #: ../src/callbacks/keyring.h:165 -#, fuzzy msgid "r/t" -msgstr "n/t" +msgstr "r/t" #. translators: help text for the 'r' option in the 'r/t/a' prompt #: ../src/callbacks/keyring.h:167 @@ -548,9 +547,8 @@ msgstr "'%s' áá·ááá¶ááâáá¶áâááá¡á¾áâááÂ á" #: ../src/install.cc:437 -#, fuzzy msgid "Cannot uninstall patches." -msgstr "áá·áâá¢á¶áâááá¡á¾á %s" +msgstr "áá·áá¢á¶áâáá»áâááááâáá¶áááÂ á" #: ../src/install.cc:438 msgid "" @@ -558,10 +556,13 @@ "Patches are not installed in sense of copied files, database records,\n" "or similar." msgstr "" +"áá¶áâááá¡á¾áâáááá¶ááá¶áâááâáááá áááá¼ááá¶áâáááááâáááâáá¶áâáá¼ááááá¶áâáá¾âáá¶áá¢á¶áááááâááááâáá¶Â á\n" +"ááááâáá·ááááá¼ááá¶áâááá¡á¾áâááâáááá»áâá¯ááá¶áâáááâáá¶áâááááá áá¼ááááá¶áâáá·áááááá ááááááááá¶\n" +"á¬âá¢ááá¸âááááááááâáááâááááááâáááá¶Â á" #: ../src/install.cc:449 msgid "Uninstallation of a pattern is currently not defined and implemented." -msgstr "" +msgstr "áá¶áâáá»áâáááá¶á ááºâáá·áâáááá¼áâáá¶áâááááá á¬âááááá·ááááá·âáááááâááááá»ááááááâááÂ á" #: ../src/install.cc:463 #, c-format @@ -576,12 +577,12 @@ #: ../src/install.cc:520 msgid "Specifying architecture when selecting packages by name is not implemented." -msgstr "" +msgstr "áá¶áâááááá¶ááâáááá¶áááááááá áááááâáááâáááá¾áâááááááâáá¶áâáááááâááºâáá·áâáááá¼ááá¶áâááááá·ááááá·âááÂ á" #: ../src/install.cc:555 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid package or capability name." -msgstr "'%s' áá·áâáááâáá¶âááááááâáááá¶âáááâáááá¹ááááá¼áâááÂ á" +msgstr "'%s' áá·ááááâáá¶âááááááâáááá¹ááááá¼áâáá á¬âááááááá¶áÂ á" #. translators: meaning a package %s or provider of capability %s #: ../src/install.cc:630 @@ -872,9 +873,9 @@ msgstr "áááá¾ '%s' áá¾áááá¸âááá½áâááááá¸âááááâáááá¶ááâáááâáá¶ááááááÂ á" #: ../src/repos.cc:490 ../src/repos.cc:497 -#, fuzzy, c-format +#, c-format msgid "Ignoring repository '%s' because of '%s' option." -msgstr "áá·áá¢á¶áâáááááâáááá¶áá '%s' áá¶ááá áááááâáá¶áâááá á»áÂ á" +msgstr "áá·áá¢á¾áá¾âáá¹áâáááá¶áá '%s' ááááá¶áâááááá¾á '%s'Â á" #: ../src/repos.cc:527 ../src/repos.cc:563 #, c-format @@ -2135,6 +2136,8 @@ "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." msgstr "" +"ááááá·áâáá¾âá¢áááâáááá¾ááá¶á zypper ááâáá·áâáááá¾âáááá¶áá¸áá ááºâáááá¼áâáááá¾âááááá¾áâááá '%s'\n" +"áá¾áááá¸âáááá¾âá²áá zypper áááá¾âááááá¾áâáááá¶ááá¾áâááâáááá¢ááâááááá¼áÂ á" #. TranslatorExplanation These are reasons for various failures. #: ../src/utils/prompt.h:125 @@ -2210,6 +2213,8 @@ "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" "\t--no-remote\t\tIgnore remote repositories.\n" msgstr "" +"\t--no-cd\t\t\táá·áá¢á¾áá¾âáá¹áâáááá¶áá ááá¸áá¸/áá¸áá¸áá¸Â á\n" +"\t--no-remote\t\táá·áâá¢á¾áá¾âáá¹áâáááá¶ááâáá¸âááááá¶áÂ á\n" #: ../src/Zypper.cc:182 msgid "" @@ -2419,14 +2424,12 @@ msgstr "áá¶áâáá·áââáá¶áâáááá¾âá²áááááááâáááááâáááááááá·Â á" #: ../src/Zypper.cc:509 -#, fuzzy msgid "CD/DVD repositories disabled." -msgstr "áá¶áâáá·áââáá¶áâáááá¾âá²áááááááâáááááâáááááááá·Â á" +msgstr "áá¶áâáá·áâáááá¶ááâááá¸áá¸/áá¸áá¸áá¸Â á" #: ../src/Zypper.cc:516 -#, fuzzy msgid "Remote repositories disabled." -msgstr "áá¶áâáá·áââáá¶áâáááá¾âá²áááááááâáááááâáááááááá·Â á" +msgstr "áá¶áâáá·áâáááá¶ááâáá¸âááááá¶áÂ á" #: ../src/Zypper.cc:523 msgid "Ignoring installed resolvables." @@ -3759,9 +3762,3 @@ msgid "Resolvable Type" msgstr "ááááááâááááááâááááááá¶á" -# power-off message -#~ msgid "Do you want to trust the key?" -#~ msgstr "áá¾âá¢áááâáááâáá¿áá¶ááâáá¾âááâáááá¬ááÂ ?" - -#~ msgid "n/t/i" -#~ msgstr "n/t/i" Modified: trunk/zypper/po/nb.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/nb.po?rev=11519&r1=115… ============================================================================== --- trunk/zypper/po/nb.po (original) +++ trunk/zypper/po/nb.po Tue Oct 28 10:28:46 2008 @@ -1,22 +1,22 @@ # translation of zypper.po to norsk bokmÃ¥l -# Rune NordbÃ¸e Skillingstad <rune(a)skillingstad.no>, 2007. -# Olav Pettershagen <olav.pet(a)gmail.com>, 2008. -# Olav P. <olav.pet(a)gmail.com>, 2008. # @TITLE@ # Copyright (C) 2006, SUSE Linux GmbH, Nuremberg # This file is distributed under the same license as @PACKAGE@ package. FIRST +# Rune NordbÃ¸e Skillingstad <rune(a)skillingstad.no>, 2007. +# Olav Pettershagen <olav.pet(a)gmail.com>, 2008. +# Olav P. <olav.pet(a)gmail.com>, 2008. msgid "" msgstr "" "Project-Id-Version: zypper\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-10-18 12:15+0200\n" -"Last-Translator: Olav Pettershagen <olav.pet(a)gmail.com>\n" -"Language-Team: norsk bokmÃ¥l\n" +"PO-Revision-Date: 2008-10-28 08:25+0100\n" +"Last-Translator: Olav P. <olav.pet(a)gmail.com>\n" +"Language-Team: Norwegian BokmÃ¥l <>\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" +"X-Generator: Lokalize 0.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../src/callbacks/keyring.h:48 @@ -94,7 +94,7 @@ #. translators: this message is shown after showing description of the key #: ../src/callbacks/keyring.h:150 msgid "Do you want to reject the key, trust temporarily, or trust always?" -msgstr "" +msgstr "Vil du avvise nÃ¸kkelen, midlertidig stole pÃ¥ den eller alltid stole pÃ¥ den?" #. translators: r/t/a stands for Reject/TrustTemporarily/trustAlways(import) #. translate to whatever is appropriate for your language @@ -103,13 +103,12 @@ #. The answers should be lower case letters. #: ../src/callbacks/keyring.h:162 msgid "r/t/a/" -msgstr "" +msgstr "r/t/a/" #. translators: the same as r/t/a, but without 'a' #: ../src/callbacks/keyring.h:165 -#, fuzzy msgid "r/t" -msgstr "n/t" +msgstr "r/t" #. translators: help text for the 'r' option in the 'r/t/a' prompt #: ../src/callbacks/keyring.h:167 @@ -548,20 +547,19 @@ msgstr "'%s' er ikke installert." #: ../src/install.cc:437 -#, fuzzy msgid "Cannot uninstall patches." -msgstr "Kan ikke installere %s" +msgstr "Kan ikke fjerne pakkeoppdateringer." #: ../src/install.cc:438 msgid "" "Installed status of a patch is determined solely based on its dependencies.\n" "Patches are not installed in sense of copied files, database records,\n" "or similar." -msgstr "" +msgstr "'Installert'-status for en pakkeoppdatering er kun basert pÃ¥ oppdateringens avhengigheter.\nâ©Pakkeoppdateringer defineres ikke som installert pÃ¥ grunnlag av kopierte filer, databaseoppfÃ¸ringer\nâ©eller lignende." #: ../src/install.cc:449 msgid "Uninstallation of a pattern is currently not defined and implemented." -msgstr "" +msgstr "Ã fjerne et mÃ¸nster er forelÃ¸pig ikke definert som en funksjon og implementert." #: ../src/install.cc:463 #, c-format @@ -576,12 +574,12 @@ #: ../src/install.cc:520 msgid "Specifying architecture when selecting packages by name is not implemented." -msgstr "" +msgstr "Definisjon av arkitektur nÃ¥r pakker velges med navn er ikke implementert." #: ../src/install.cc:555 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid package or capability name." -msgstr "'%s' er ikke en gyldig tjenestetype." +msgstr "'%s' er ikke et gyldig navn pÃ¥ en pakke eller egenskap." #. translators: meaning a package %s or provider of capability %s #: ../src/install.cc:630 @@ -874,9 +872,9 @@ msgstr "Bruk %s for Ã¥ vise listen over definerte akriv." #: ../src/repos.cc:490 ../src/repos.cc:497 -#, fuzzy, c-format +#, c-format msgid "Ignoring repository '%s' because of '%s' option." -msgstr "Kan ikke rydde arkivet '%s' pÃ¥ grunn av en feil." +msgstr "Ignorerer arkivet '%s' pÃ¥ grunn av valget '%s'." #: ../src/repos.cc:527 ../src/repos.cc:563 #, c-format @@ -2181,7 +2179,7 @@ msgid "" "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." -msgstr "" +msgstr "Hvis du kjÃ¸rer zypper utenfor en terminal, mÃ¥ du bruke valget '%s' global\nâ©for Ã¥ be zypper om standardrespons pÃ¥ kommandoer." #. TranslatorExplanation These are reasons for various failures. #: ../src/utils/prompt.h:125 @@ -2254,7 +2252,7 @@ msgid "" "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" "\t--no-remote\t\tIgnore remote repositories.\n" -msgstr "" +msgstr "\t--no-cd\t\t\tIgnorer CD/DVD-arkiver.\nâ©\t--no-remote\t\tIgnorer eksterne arkiver.\n" #: ../src/Zypper.cc:182 msgid "" @@ -2464,14 +2462,12 @@ msgstr "Autooppdatering deaktivert." #: ../src/Zypper.cc:509 -#, fuzzy msgid "CD/DVD repositories disabled." -msgstr "Autooppdatering deaktivert." +msgstr "CD/DVD-arkiver deaktivert." #: ../src/Zypper.cc:516 -#, fuzzy msgid "Remote repositories disabled." -msgstr "Autooppdatering deaktivert." +msgstr "Eksterne arkiver deaktivert." #: ../src/Zypper.cc:523 msgid "Ignoring installed resolvables." @@ -3814,3 +3810,4 @@ #~ msgid "n/t/i" #~ msgstr "n/t/i" + Modified: trunk/zypper/po/nl.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/nl.po?rev=11519&r1=115… ============================================================================== --- trunk/zypper/po/nl.po (original) +++ trunk/zypper/po/nl.po Tue Oct 28 10:28:46 2008 @@ -12,7 +12,7 @@ "Project-Id-Version: zypper.nl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-10-14 18:51+0200\n" +"PO-Revision-Date: 2008-10-27 23:44+0100\n" "Last-Translator: Freek de Kruijf <freek(a)opensuse.org>\n" "Language-Team: Dutch <Yast-nl-l10n(a)lists.sf.kovoks.nl>\n" "MIME-Version: 1.0\n" @@ -96,7 +96,7 @@ #. translators: this message is shown after showing description of the key #: ../src/callbacks/keyring.h:150 msgid "Do you want to reject the key, trust temporarily, or trust always?" -msgstr "" +msgstr "Wilt u de sleutel verwerpen, tijdelijk vertrouwen of altijd vertrouwen?" #. translators: r/t/a stands for Reject/TrustTemporarily/trustAlways(import) #. translate to whatever is appropriate for your language @@ -105,13 +105,12 @@ #. The answers should be lower case letters. #: ../src/callbacks/keyring.h:162 msgid "r/t/a/" -msgstr "" +msgstr "v/t/a/" #. translators: the same as r/t/a, but without 'a' #: ../src/callbacks/keyring.h:165 -#, fuzzy msgid "r/t" -msgstr "n/t" +msgstr "v/t" #. translators: help text for the 'r' option in the 'r/t/a' prompt #: ../src/callbacks/keyring.h:167 @@ -553,9 +552,8 @@ msgstr "'%s' is niet geÃ¯nstalleerd." #: ../src/install.cc:437 -#, fuzzy msgid "Cannot uninstall patches." -msgstr "Kan %s niet installeren" +msgstr "Kan patches niet deÃ¯nstalleren." #: ../src/install.cc:438 msgid "" @@ -563,10 +561,13 @@ "Patches are not installed in sense of copied files, database records,\n" "or similar." msgstr "" +"De geÃ¯nstalleerde status van een patch wordt alleen gebaseerd op zijn afhankelijkheden.\n" +"Patches zijn niet geÃ¯nstalleerd op de manier van een gekopieerd bestand, database record\n" +"of iets dergelijks." #: ../src/install.cc:449 msgid "Uninstallation of a pattern is currently not defined and implemented." -msgstr "" +msgstr "DeÃ¯nstallatie van een patroon is nu niet gedefinieerd en geÃ¯mplementeerd." #: ../src/install.cc:463 #, c-format @@ -581,12 +582,12 @@ #: ../src/install.cc:520 msgid "Specifying architecture when selecting packages by name is not implemented." -msgstr "" +msgstr "Specificeren van de architectuur bij het selecteren van pakketten op naam is niet geÃ¯mplementeerd." #: ../src/install.cc:555 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid package or capability name." -msgstr "`%s' is geen geldig servicetype." +msgstr "`%s' is geen geldig pakket- of eigenschapnaam." #. translators: meaning a package %s or provider of capability %s #: ../src/install.cc:630 @@ -879,9 +880,9 @@ msgstr "Gebruik '%s' voor een lijst met gedefinieerde installatiebronnen." #: ../src/repos.cc:490 ../src/repos.cc:497 -#, fuzzy, c-format +#, c-format msgid "Ignoring repository '%s' because of '%s' option." -msgstr "Opschonen van installatiebron '%s' kan niet vanwege een fout." +msgstr "Installatiebron '%s' wordt genegeerd vanwege de optie '%s'." #: ../src/repos.cc:527 ../src/repos.cc:563 #, c-format @@ -2192,6 +2193,8 @@ "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." msgstr "" +"Als u zypper draait zonder een terminal gebruik dan de globale\n" +"optie '%s' zodat zypper de standaard antwoorden gebruikt op vragen." #. TranslatorExplanation These are reasons for various failures. #: ../src/utils/prompt.h:125 @@ -2269,6 +2272,8 @@ "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" "\t--no-remote\t\tIgnore remote repositories.\n" msgstr "" +"\t--no-cd\t\t\tNegeer CD/DVD installatiebronnen.\n" +"\t--no-remote\t\tNegeer installatiebronnen op afstand.\n" #: ../src/Zypper.cc:182 msgid "" @@ -2478,14 +2483,12 @@ msgstr "Automatisch vernieuwen uitgezet." #: ../src/Zypper.cc:509 -#, fuzzy msgid "CD/DVD repositories disabled." -msgstr "Automatisch vernieuwen uitgezet." +msgstr "CD/DVD-installatiebronnen uitgeschakeld." #: ../src/Zypper.cc:516 -#, fuzzy msgid "Remote repositories disabled." -msgstr "Automatisch vernieuwen uitgezet." +msgstr "Installatiebronnen op afstand uitgeschakeld." #: ../src/Zypper.cc:523 msgid "Ignoring installed resolvables." @@ -3817,9 +3820,3 @@ msgid "Resolvable Type" msgstr "Oplosbaartype" -# power-off message -#~ msgid "Do you want to trust the key?" -#~ msgstr "Wilt u de sleutel vertrouwen?" - -#~ msgid "n/t/i" -#~ msgstr "n/t/i" Modified: trunk/zypper/po/pt_BR.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/pt_BR.po?rev=11519&r1=… ============================================================================== --- trunk/zypper/po/pt_BR.po (original) +++ trunk/zypper/po/pt_BR.po Tue Oct 28 10:28:46 2008 @@ -11,14 +11,14 @@ "Project-Id-Version: zypper.pt_BR\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-10-18 23:42-0200\n" +"PO-Revision-Date: 2008-10-27 16:40-0300\n" "Last-Translator: Luiz Fernando Ranghetti <elchevive68(a)gmail.com>\n" "Language-Team: Brazilian Portuguese <opensuse-pt(a)opensuse.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: nplurals=2; plural=(n > 1);\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" "X-Poedit-SourceCharset: utf-8\n" @@ -98,7 +98,7 @@ #. translators: this message is shown after showing description of the key #: ../src/callbacks/keyring.h:150 msgid "Do you want to reject the key, trust temporarily, or trust always?" -msgstr "" +msgstr "VocÃª quer rejeitar a chave, confiar temporariamente ou confiar sempre?" #. translators: r/t/a stands for Reject/TrustTemporarily/trustAlways(import) #. translate to whatever is appropriate for your language @@ -107,13 +107,12 @@ #. The answers should be lower case letters. #: ../src/callbacks/keyring.h:162 msgid "r/t/a/" -msgstr "" +msgstr "r/c/s/" #. translators: the same as r/t/a, but without 'a' #: ../src/callbacks/keyring.h:165 -#, fuzzy msgid "r/t" -msgstr "n/c" +msgstr "r/c" #. translators: help text for the 'r' option in the 'r/t/a' prompt #: ../src/callbacks/keyring.h:167 @@ -168,9 +167,12 @@ msgstr "Nenhum digest para o arquivo %s." # internal key used: Ok -#: ../src/callbacks/keyring.h:256 ../src/callbacks/keyring.h:266 -#: ../src/callbacks/keyring.h:288 ../src/callbacks/rpm.h:61 -#: ../src/solve-commit.cc:1033 ../src/solve-commit.cc:1057 +#: ../src/callbacks/keyring.h:256 +#: ../src/callbacks/keyring.h:266 +#: ../src/callbacks/keyring.h:288 +#: ../src/callbacks/rpm.h:61 +#: ../src/solve-commit.cc:1033 +#: ../src/solve-commit.cc:1057 msgid "Continue?" msgstr "Continuar?" @@ -206,7 +208,8 @@ msgid "Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation." msgstr "Por favor insira a mÃdia [%s] #%d e digite 's' para continuar ou 'n' para cancelar a operaÃ§Ã£o." -#: ../src/callbacks/media.h:228 ../src/callbacks/media.h:235 +#: ../src/callbacks/media.h:228 +#: ../src/callbacks/media.h:235 msgid "User Name" msgstr "Nome do usuÃ¡rio" @@ -245,8 +248,10 @@ msgid "Running: %s (%s, %s)" msgstr "Executando: %s (%s, %s)" -#: ../src/callbacks/rpm.h:139 ../src/callbacks/rpm.h:148 -#: ../src/callbacks/rpm.h:156 ../src/callbacks/rpm.h:163 +#: ../src/callbacks/rpm.h:139 +#: ../src/callbacks/rpm.h:148 +#: ../src/callbacks/rpm.h:156 +#: ../src/callbacks/rpm.h:163 msgid "Reading installed packages" msgstr "Lendo os pacotes instalados" @@ -363,15 +368,20 @@ msgid "Conflict" msgstr "Conflita" -#: ../src/info.cc:152 ../src/info.cc:274 ../src/info.cc:345 +#: ../src/info.cc:152 +#: ../src/info.cc:274 +#: ../src/info.cc:345 msgid "Catalog: " msgstr "CatÃ¡logo: " -#: ../src/info.cc:152 ../src/info.cc:274 ../src/info.cc:345 +#: ../src/info.cc:152 +#: ../src/info.cc:274 +#: ../src/info.cc:345 msgid "Repository: " msgstr "RepositÃ³rio: " -#: ../src/info.cc:157 ../src/info.cc:279 +#: ../src/info.cc:157 +#: ../src/info.cc:279 msgid "Installed: " msgstr "Instalados: " @@ -379,22 +389,39 @@ #. autorefresh? #. enabled? #. autorefresh? -#: ../src/info.cc:157 ../src/info.cc:214 ../src/info.cc:220 ../src/info.cc:222 -#: ../src/info.cc:279 ../src/repos.cc:735 ../src/repos.cc:737 -#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014 -#: ../src/repos.cc:2016 ../src/solve-commit.cc:855 +#: ../src/info.cc:157 +#: ../src/info.cc:214 +#: ../src/info.cc:220 +#: ../src/info.cc:222 +#: ../src/info.cc:279 +#: ../src/repos.cc:735 +#: ../src/repos.cc:737 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:1338 +#: ../src/repos.cc:2014 +#: ../src/repos.cc:2016 +#: ../src/solve-commit.cc:855 msgid "Yes" msgstr "Sim" -#: ../src/info.cc:157 ../src/info.cc:214 ../src/info.cc:220 ../src/info.cc:222 -#: ../src/info.cc:279 ../src/repos.cc:735 ../src/repos.cc:737 -#: ../src/repos.cc:1336 ../src/repos.cc:1338 ../src/repos.cc:2014 -#: ../src/repos.cc:2016 ../src/solve-commit.cc:855 +#: ../src/info.cc:157 +#: ../src/info.cc:214 +#: ../src/info.cc:220 +#: ../src/info.cc:222 +#: ../src/info.cc:279 +#: ../src/repos.cc:735 +#: ../src/repos.cc:737 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:1338 +#: ../src/repos.cc:2014 +#: ../src/repos.cc:2016 +#: ../src/solve-commit.cc:855 msgid "No" msgstr "NÃ£o" #. ! \todo fix this - arch? -#: ../src/info.cc:160 ../src/info.cc:209 +#: ../src/info.cc:160 +#: ../src/info.cc:209 msgid "Status: " msgstr "Status: " @@ -447,41 +474,64 @@ msgid "Requires:" msgstr "Requer:" -#: ../src/info.cc:246 ../src/search.cc:323 +#: ../src/info.cc:246 +#: ../src/search.cc:323 msgid "Recommended" msgstr "Recomendado" -#: ../src/info.cc:248 ../src/search.cc:325 +#: ../src/info.cc:248 +#: ../src/search.cc:325 msgid "Suggested" msgstr "Sugerido" #. translators: S for 'installed Status' #. translators: S for installed Status #. TranslatorExplanation S stands for Status -#: ../src/info.cc:289 ../src/search.cc:38 ../src/search.cc:54 -#: ../src/search.cc:214 ../src/search.cc:385 ../src/search.cc:441 -#: ../src/search.cc:533 ../src/update.cc:397 +#: ../src/info.cc:289 +#: ../src/search.cc:38 +#: ../src/search.cc:54 +#: ../src/search.cc:214 +#: ../src/search.cc:385 +#: ../src/search.cc:441 +#: ../src/search.cc:533 +#: ../src/update.cc:397 msgid "S" msgstr "S" #. translators: name (general header) -#: ../src/info.cc:289 ../src/locks.cc:39 ../src/repos.cc:655 -#: ../src/repos.cc:704 ../src/repos.cc:2081 ../src/search.cc:44 -#: ../src/search.cc:56 ../src/search.cc:215 ../src/search.cc:264 -#: ../src/search.cc:386 ../src/search.cc:447 ../src/search.cc:534 -#: ../src/update.cc:152 ../src/update.cc:405 ../src/Zypper.cc:3973 +#: ../src/info.cc:289 +#: ../src/locks.cc:39 +#: ../src/repos.cc:655 +#: ../src/repos.cc:704 +#: ../src/repos.cc:2081 +#: ../src/search.cc:44 +#: ../src/search.cc:56 +#: ../src/search.cc:215 +#: ../src/search.cc:264 +#: ../src/search.cc:386 +#: ../src/search.cc:447 +#: ../src/search.cc:534 +#: ../src/update.cc:152 +#: ../src/update.cc:405 +#: ../src/Zypper.cc:3973 msgid "Name" msgstr "Nome" #. translators: type (general header) #. translators: product type (addon/base) (rug calls it Category) -#: ../src/info.cc:289 ../src/locks.cc:43 ../src/repos.cc:655 -#: ../src/repos.cc:713 ../src/repos.cc:2089 ../src/search.cc:58 -#: ../src/search.cc:218 ../src/search.cc:541 +#: ../src/info.cc:289 +#: ../src/locks.cc:43 +#: ../src/repos.cc:655 +#: ../src/repos.cc:713 +#: ../src/repos.cc:2089 +#: ../src/search.cc:58 +#: ../src/search.cc:218 +#: ../src/search.cc:541 msgid "Type" msgstr "Tipo" -#: ../src/info.cc:289 ../src/search.cc:388 +#: ../src/info.cc:289 +#: ../src/search.cc:388 msgid "Dependency" msgstr "DependÃªncia" @@ -495,7 +545,9 @@ #. translators: patch category (recommended, security) #. translators: product category (the rug term) -#: ../src/info.cc:351 ../src/search.cc:267 ../src/search.cc:538 +#: ../src/info.cc:351 +#: ../src/search.cc:267 +#: ../src/search.cc:538 #: ../src/update.cc:152 msgid "Category" msgstr "Categoria" @@ -504,7 +556,8 @@ msgid "Flavor" msgstr "Tipo" -#: ../src/info.cc:353 ../src/utils/misc.cc:111 +#: ../src/info.cc:353 +#: ../src/utils/misc.cc:111 msgid "Installed" msgstr "Instalado" @@ -513,7 +566,8 @@ msgstr "Nome curto" #. translators: meaning a package %s or provider of capability %s -#: ../src/install.cc:68 ../src/install.cc:182 +#: ../src/install.cc:68 +#: ../src/install.cc:182 #, c-format msgid "'%s' not found" msgstr "'%s' nÃ£o encontrado" @@ -541,21 +595,22 @@ msgid "Failed to add '%s' to the list of packages to be removed." msgstr "Falha ao adicionar '%s' Ã lista de pacotes a serem removidos." -#: ../src/install.cc:373 ../src/install.cc:659 +#: ../src/install.cc:373 +#: ../src/install.cc:659 #, c-format msgid "'%s' is already installed." msgstr "'%s' jÃ¡ estÃ¡ instalado." #. translators: meaning a package %s or provider of capability %s -#: ../src/install.cc:413 ../src/install.cc:673 +#: ../src/install.cc:413 +#: ../src/install.cc:673 #, c-format msgid "'%s' is not installed." msgstr "'%s' nÃ£o estÃ¡ instalado." #: ../src/install.cc:437 -#, fuzzy msgid "Cannot uninstall patches." -msgstr "NÃ£o Ã© possÃvel instalar %s" +msgstr "NÃ£o foi possÃvel desinstalar as correÃ§Ãµes." #: ../src/install.cc:438 msgid "" @@ -563,10 +618,13 @@ "Patches are not installed in sense of copied files, database records,\n" "or similar." msgstr "" +"O status de uma correÃ§Ã£o instalada Ã© determinado somente baseado na suas dependÃªncias.\n" +"As correÃ§Ãµes nÃ£o sÃ£o instaladas no sentido de arquivos copiados, registro de banco de dados\n" +"ou similar." #: ../src/install.cc:449 msgid "Uninstallation of a pattern is currently not defined and implemented." -msgstr "" +msgstr "A desinstalaÃ§Ã£o de um padrÃ£o nÃ£o estÃ¡ atualmente definido e implementado." #: ../src/install.cc:463 #, c-format @@ -581,12 +639,12 @@ #: ../src/install.cc:520 msgid "Specifying architecture when selecting packages by name is not implemented." -msgstr "" +msgstr "Especificar a arquitetura quando selecionar pacotes pelo nome nÃ£o estÃ¡ implementado." #: ../src/install.cc:555 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid package or capability name." -msgstr "'%s' nÃ£o Ã© um tipo de serviÃ§o vÃ¡lido." +msgstr "'%s' nÃ£o Ã© um pacote vÃ¡lido ou um nome de recurso." #. translators: meaning a package %s or provider of capability %s #: ../src/install.cc:630 @@ -602,18 +660,25 @@ #. translators: locks table value #. importance -#: ../src/locks.cc:22 ../src/locks.cc:63 ../src/locks.cc:76 +#: ../src/locks.cc:22 +#: ../src/locks.cc:63 +#: ../src/locks.cc:76 msgid "(any)" msgstr "(qualquer)" #. translators: locks table value -#: ../src/locks.cc:24 ../src/locks.cc:60 ../src/search.cc:311 +#: ../src/locks.cc:24 +#: ../src/locks.cc:60 +#: ../src/search.cc:311 msgid "(multiple)" msgstr "(mÃºltiplos)" #. translators: catalog (rug's word for repository) (header) -#: ../src/locks.cc:41 ../src/search.cc:40 ../src/search.cc:263 -#: ../src/update.cc:151 ../src/update.cc:399 +#: ../src/locks.cc:41 +#: ../src/search.cc:40 +#: ../src/search.cc:263 +#: ../src/update.cc:151 +#: ../src/update.cc:399 msgid "Catalog" msgstr "CatÃ¡logo" @@ -622,8 +687,12 @@ msgstr "ImportÃ¢ncia" #. translators: package's repository (header) -#: ../src/locks.cc:43 ../src/search.cc:64 ../src/search.cc:388 -#: ../src/search.cc:446 ../src/update.cc:151 ../src/update.cc:399 +#: ../src/locks.cc:43 +#: ../src/search.cc:64 +#: ../src/search.cc:388 +#: ../src/search.cc:446 +#: ../src/update.cc:151 +#: ../src/update.cc:399 msgid "Repository" msgstr "RepositÃ³rio" @@ -732,7 +801,8 @@ msgid "Installed packages with EULAs: %d" msgstr "Pacote instalados com EULAs: %d" -#: ../src/misc.cc:372 ../src/misc.cc:397 +#: ../src/misc.cc:372 +#: ../src/misc.cc:397 #, c-format msgid "Source package '%s' not found." msgstr "O pacote fonte '%s' nÃ£o foi encontrado." @@ -756,16 +826,20 @@ msgid "Warning: " msgstr "Aviso: " -#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:224 +#: ../src/output/OutNormal.cc:151 +#: ../src/output/OutNormal.cc:224 msgid "error" msgstr "erro" -#: ../src/output/OutNormal.cc:151 ../src/output/OutNormal.cc:224 +#: ../src/output/OutNormal.cc:151 +#: ../src/output/OutNormal.cc:224 msgid "done" msgstr "concluÃdo" -#: ../src/output/OutNormal.cc:165 ../src/output/OutNormal.cc:167 -#: ../src/output/OutNormal.cc:191 ../src/output/OutNormal.cc:217 +#: ../src/output/OutNormal.cc:165 +#: ../src/output/OutNormal.cc:167 +#: ../src/output/OutNormal.cc:191 +#: ../src/output/OutNormal.cc:217 msgid "Retrieving:" msgstr "Obtendo:" @@ -811,8 +885,11 @@ msgid "Problem retrieving files from '%s'." msgstr "Problema ao obter os arquivos de '%s'." -#: ../src/repos.cc:160 ../src/repos.cc:2861 ../src/solve-commit.cc:1109 -#: ../src/solve-commit.cc:1137 ../src/solve-commit.cc:1169 +#: ../src/repos.cc:160 +#: ../src/repos.cc:2861 +#: ../src/solve-commit.cc:1109 +#: ../src/solve-commit.cc:1137 +#: ../src/solve-commit.cc:1169 msgid "Please see the above error message for a hint." msgstr "Por favor veja a mensagem de erro acima para uma dica." @@ -878,12 +955,14 @@ msgid "Use '%s' to get the list of defined repositories." msgstr "Use '%s' para obter a lista dos repositÃ³rios definidos." -#: ../src/repos.cc:490 ../src/repos.cc:497 -#, fuzzy, c-format +#: ../src/repos.cc:490 +#: ../src/repos.cc:497 +#, c-format msgid "Ignoring repository '%s' because of '%s' option." -msgstr "NÃ£o foi possÃvel limpar o repositÃ³rio '%s' devido a um erro." +msgstr "Ignorando o repositÃ³rio '%s' devido a opÃ§Ã£o '%s'." -#: ../src/repos.cc:527 ../src/repos.cc:563 +#: ../src/repos.cc:527 +#: ../src/repos.cc:563 #, c-format msgid "Disabling repository '%s' because of the above error." msgstr "Desabilitando o repositÃ³rio '%s' devido ao erro acima." @@ -911,12 +990,15 @@ msgid "Target initialization failed:" msgstr "Falha na inicializaÃ§Ã£o do destino:" -#: ../src/repos.cc:635 ../src/Zypper.cc:3343 +#: ../src/repos.cc:635 +#: ../src/Zypper.cc:3343 msgid "Running 'zypper refresh' as root might resolve the problem." msgstr "Executar 'zypper refresh' como root deve resolver este problema." #. translators: patch status (installed, uninstalled, needed) -#: ../src/repos.cc:655 ../src/search.cc:269 ../src/update.cc:152 +#: ../src/repos.cc:655 +#: ../src/search.cc:269 +#: ../src/update.cc:152 msgid "Status" msgstr "Status" @@ -931,26 +1013,33 @@ msgid "Disabled" msgstr "Desabilitado" -#: ../src/repos.cc:703 ../src/repos.cc:2080 ../src/Zypper.cc:3973 +#: ../src/repos.cc:703 +#: ../src/repos.cc:2080 +#: ../src/Zypper.cc:3973 msgid "Alias" msgstr "Apelido" #. TranslatorExplanation used as e.g. "Enabled: Yes" -#: ../src/repos.cc:705 ../src/repos.cc:1336 ../src/repos.cc:2082 +#: ../src/repos.cc:705 +#: ../src/repos.cc:1336 +#: ../src/repos.cc:2082 msgid "Enabled" msgstr "Habilitado" #. translators: 'zypper repos' column - whether autorefresh is enabled for the repository -#: ../src/repos.cc:707 ../src/repos.cc:2084 +#: ../src/repos.cc:707 +#: ../src/repos.cc:2084 msgid "Refresh" msgstr "Atualizar" #. translators: repository priority (in zypper repos -p or -d) -#: ../src/repos.cc:711 ../src/repos.cc:2088 +#: ../src/repos.cc:711 +#: ../src/repos.cc:2088 msgid "Priority" msgstr "Prioridade" -#: ../src/repos.cc:715 ../src/repos.cc:2091 +#: ../src/repos.cc:715 +#: ../src/repos.cc:2091 msgid "URI" msgstr "URL" @@ -962,25 +1051,31 @@ msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories." msgstr "Nenhum repositÃ³rio definido. Use o comando 'zypper addrepo' para adicionar um ou mais repositÃ³rios." -#: ../src/repos.cc:837 ../src/repos.cc:909 ../src/repos.cc:1079 +#: ../src/repos.cc:837 +#: ../src/repos.cc:909 +#: ../src/repos.cc:1079 msgid "Error reading repositories:" msgstr "Ocorreu um erro ao ler os repositÃ³rios:" -#: ../src/repos.cc:865 ../src/repos.cc:2213 +#: ../src/repos.cc:865 +#: ../src/repos.cc:2213 #, c-format msgid "Can't open %s for writing." msgstr "NÃ£o foi possÃvel abrir %s para salvar." -#: ../src/repos.cc:867 ../src/repos.cc:2215 +#: ../src/repos.cc:867 +#: ../src/repos.cc:2215 msgid "Maybe you do not have write permissions?" msgstr "Talvez vocÃª nÃ£o tenha permissÃ£o de escrita?" -#: ../src/repos.cc:874 ../src/repos.cc:2222 +#: ../src/repos.cc:874 +#: ../src/repos.cc:2222 #, c-format msgid "Repositories have been successfully exported to %s." msgstr "Os repositÃ³rios foram exportados para %s com sucesso." -#: ../src/repos.cc:927 ../src/repos.cc:1097 +#: ../src/repos.cc:927 +#: ../src/repos.cc:1097 msgid "Specified repositories: " msgstr "RepositÃ³rios especificados: " @@ -1072,7 +1167,8 @@ msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh." msgstr "Isto Ã© uma mÃdia removÃvel de leitura apenas (CD/DVD), desabilitando a atualizaÃ§Ã£o automÃ¡tica." -#: ../src/repos.cc:1282 ../src/repos.cc:1543 +#: ../src/repos.cc:1282 +#: ../src/repos.cc:1543 #, c-format msgid "Repository named '%s' already exists. Please use another alias." msgstr "Um repositÃ³rio chamado '%s' jÃ¡ existe. Por favor escolha outro apelido." @@ -1081,7 +1177,8 @@ msgid "Could not determine the type of the repository. Please check if the defined URIs (see below) point to a valid repository:" msgstr "NÃ£o foi possÃvel determinar o tipo do repositÃ³rio. Por favor verifique se as URLs definidas (veja abaixo) apontam para um repositÃ³rio vÃ¡lido:" -#: ../src/repos.cc:1300 ../src/Zypper.cc:2420 +#: ../src/repos.cc:1300 +#: ../src/Zypper.cc:2420 msgid "Can't find a valid repository at given location:" msgstr "NÃ£o foi possÃvel encontrar um repositÃ³rio vÃ¡lido no local indicado:" @@ -1167,7 +1264,8 @@ msgid "Repository '%s' renamed to '%s'." msgstr "O repositÃ³rio '%s' foi renomeado para '%s'." -#: ../src/repos.cc:1549 ../src/repos.cc:1769 +#: ../src/repos.cc:1549 +#: ../src/repos.cc:1769 msgid "Error while modifying the repository:" msgstr "Ocorreu um erro enquanto alterava o repositÃ³rio:" @@ -1414,12 +1512,14 @@ msgid "Repository '%s' not cached. Caching..." msgstr "O repositÃ³rio '%s' nÃ£o estÃ¡ no cache. Criando o cache..." -#: ../src/repos.cc:2806 ../src/repos.cc:2834 +#: ../src/repos.cc:2806 +#: ../src/repos.cc:2834 #, c-format msgid "Problem loading data from '%s'" msgstr "Problema ao carregar os dados de '%s'" -#: ../src/repos.cc:2807 ../src/repos.cc:2840 +#: ../src/repos.cc:2807 +#: ../src/repos.cc:2840 #, c-format msgid "Resolvables from '%s' not loaded because of error." msgstr "Os resolvÃveis de '%s' nÃ£o foram carregados devido a um erro." @@ -1455,25 +1555,35 @@ "Use o 'rug' ou o 'yast2' para isso." #. translators: Bundle is a term used in rug. See rug for how to translate it. -#: ../src/search.cc:42 ../src/search.cc:444 ../src/update.cc:402 +#: ../src/search.cc:42 +#: ../src/search.cc:444 +#: ../src/update.cc:402 msgid "Bundle" msgstr "Bundle" #. translators: package version (header) #. best_effort does not know version or arch yet -#: ../src/search.cc:46 ../src/search.cc:60 ../src/search.cc:265 -#: ../src/search.cc:386 ../src/search.cc:447 ../src/search.cc:535 -#: ../src/update.cc:152 ../src/update.cc:407 +#: ../src/search.cc:46 +#: ../src/search.cc:60 +#: ../src/search.cc:265 +#: ../src/search.cc:386 +#: ../src/search.cc:447 +#: ../src/search.cc:535 +#: ../src/update.cc:152 +#: ../src/update.cc:407 msgid "Version" msgstr "VersÃ£o" #. translators: package architecture (header) -#: ../src/search.cc:48 ../src/search.cc:62 ../src/search.cc:447 +#: ../src/search.cc:48 +#: ../src/search.cc:62 +#: ../src/search.cc:447 #: ../src/update.cc:407 msgid "Arch" msgstr "Arquitetura" -#: ../src/search.cc:178 ../src/search.cc:192 +#: ../src/search.cc:178 +#: ../src/search.cc:192 msgid "System Packages" msgstr "Pacotes do sistema" @@ -1490,7 +1600,8 @@ msgid "No patterns found." msgstr "Nenhum padrÃ£o foi encontrado." -#: ../src/search.cc:497 ../src/Zypper.cc:3301 +#: ../src/search.cc:497 +#: ../src/Zypper.cc:3301 msgid "No packages found." msgstr "Nenhum pacote foi encontrado." @@ -1866,7 +1977,8 @@ msgid "(dry run)" msgstr "(corrida a seco)" -#: ../src/solve-commit.cc:1108 ../src/solve-commit.cc:1147 +#: ../src/solve-commit.cc:1108 +#: ../src/solve-commit.cc:1147 msgid "Problem retrieving the package file from the repository:" msgstr "Problema ao obter o pacote do repositÃ³rio:" @@ -1922,7 +2034,8 @@ msgstr[0] "%d correÃ§Ã£o de seguranÃ§a" msgstr[1] "%d correÃ§Ãµes de seguranÃ§a" -#: ../src/update.cc:174 ../src/utils/misc.cc:113 +#: ../src/update.cc:174 +#: ../src/utils/misc.cc:113 msgid "Needed" msgstr "NecessÃ¡rio" @@ -1934,7 +2047,8 @@ "Estas sÃ£o somente as atualizaÃ§Ãµes que afetam o atualizador propriamente dito.\n" "Outras atualizaÃ§Ãµes estÃ£o disponÃveis tambÃ©m.\n" -#: ../src/update.cc:198 ../src/update.cc:448 +#: ../src/update.cc:198 +#: ../src/update.cc:448 msgid "No updates found." msgstr "Nenhuma atualizaÃ§Ã£o encontrada." @@ -2014,8 +2128,10 @@ msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions." msgstr "Veja em http://en.opensuse.org/Zypper#Troubleshooting para obter instruÃ§Ãµes." -#: ../src/utils/messages.cc:40 ../src/utils/messages.cc:50 -#: ../src/utils/messages.cc:68 ../src/Zypper.cc:3677 +#: ../src/utils/messages.cc:40 +#: ../src/utils/messages.cc:50 +#: ../src/utils/messages.cc:68 +#: ../src/Zypper.cc:3677 msgid "Usage" msgstr "Uso" @@ -2023,7 +2139,9 @@ msgid "Too many arguments." msgstr "Excesso de argumentos." -#: ../src/utils/messages.cc:48 ../src/Zypper.cc:2706 ../src/Zypper.cc:3674 +#: ../src/utils/messages.cc:48 +#: ../src/Zypper.cc:2706 +#: ../src/Zypper.cc:3674 msgid "Required argument missing." msgstr "O argumento necessÃ¡rio estÃ¡ faltando." @@ -2161,12 +2279,14 @@ msgid "Abort, retry, ignore?" msgstr "Cancelar, repetir ou ignorar?" -#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:197 +#: ../src/utils/prompt.cc:169 +#: ../src/utils/prompt.cc:197 #: ../src/utils/prompt.cc:253 msgid "yes" msgstr "sim" -#: ../src/utils/prompt.cc:169 ../src/utils/prompt.cc:198 +#: ../src/utils/prompt.cc:169 +#: ../src/utils/prompt.cc:198 #: ../src/utils/prompt.cc:253 msgid "no" msgstr "nÃ£o" @@ -2189,6 +2309,8 @@ "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." msgstr "" +"Se vocÃª executar o zypper sem um terminal, use a opÃ§Ã£o global\n" +"'%s' para fazer o zypper usar as respostas padrÃµes nos prompts." #. TranslatorExplanation These are reasons for various failures. #: ../src/utils/prompt.h:125 @@ -2266,6 +2388,8 @@ "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" "\t--no-remote\t\tIgnore remote repositories.\n" msgstr "" +"\t--no-cd\t\t\tIgnorar repositÃ³rios de CD/DVD.\n" +"\t--no-remote\t\tIgnorar repositÃ³rios remotos.\n" #: ../src/Zypper.cc:182 msgid "" @@ -2476,14 +2600,12 @@ msgstr "AtualizaÃ§Ã£o automÃ¡tica desabilitada." #: ../src/Zypper.cc:509 -#, fuzzy msgid "CD/DVD repositories disabled." -msgstr "AtualizaÃ§Ã£o automÃ¡tica desabilitada." +msgstr "RepositÃ³rios do CD/DVD desabilitados." #: ../src/Zypper.cc:516 -#, fuzzy msgid "Remote repositories disabled." -msgstr "AtualizaÃ§Ã£o automÃ¡tica desabilitada." +msgstr "RepositÃ³rios remotos desabilitados." #: ../src/Zypper.cc:523 msgid "Ignoring installed resolvables." @@ -2817,7 +2939,8 @@ #. translators: this is just a rug compatiblity command #. translators: this is just a rug-compatiblity command -#: ../src/Zypper.cc:1250 ../src/Zypper.cc:2127 +#: ../src/Zypper.cc:1250 +#: ../src/Zypper.cc:2127 msgid "" "list-resolvables (lr)\n" "\n" @@ -3578,7 +3701,8 @@ "Este comando tem implementaÃ§Ã£o fictÃcia e sempre retorna 0.\n" "Ele Ã© fornecido para compatibilidade com o rug.\n" -#: ../src/Zypper.cc:2212 ../src/Zypper.cc:3959 +#: ../src/Zypper.cc:2212 +#: ../src/Zypper.cc:3959 msgid "Unexpected program flow." msgstr "Erro inesperado no programa." @@ -3625,7 +3749,8 @@ msgid "Root privileges are required for refreshing services." msgstr "SÃ£o necessÃ¡rios privilÃ©gios de root para atualizar os serviÃ§os." -#: ../src/Zypper.cc:2352 ../src/Zypper.cc:2699 +#: ../src/Zypper.cc:2352 +#: ../src/Zypper.cc:2699 msgid "Root privileges are required for modifying system services." msgstr "SÃ£o necessÃ¡rios privilÃ©gios de root para alterar os serviÃ§os do sistema." @@ -3651,7 +3776,8 @@ #. followed by ms command help text which will explain it #. translators: aggregate option is e.g. "--all". This message will be #. followed by mr command help text which will explain it -#: ../src/Zypper.cc:2484 ../src/Zypper.cc:2852 +#: ../src/Zypper.cc:2484 +#: ../src/Zypper.cc:2852 msgid "Alias or an aggregate option is required." msgstr "O apelido ou uma opÃ§Ã£o agregada Ã© obrigatÃ³ria." @@ -3660,12 +3786,15 @@ msgid "Service '%s' not found." msgstr "O serviÃ§o '%s' nÃ£o encontrado." -#: ../src/Zypper.cc:2554 ../src/Zypper.cc:2698 ../src/Zypper.cc:2784 +#: ../src/Zypper.cc:2554 +#: ../src/Zypper.cc:2698 +#: ../src/Zypper.cc:2784 #: ../src/Zypper.cc:2840 msgid "Root privileges are required for modifying system repositories." msgstr "SÃ£o necessÃ¡rios privilÃ©gios de root para alterar os repositÃ³rios do sistema." -#: ../src/Zypper.cc:2603 ../src/Zypper.cc:2960 +#: ../src/Zypper.cc:2603 +#: ../src/Zypper.cc:2960 msgid "Too few arguments." msgstr "Poucos argumentos." @@ -3769,7 +3898,8 @@ msgid "No valid arguments specified." msgstr "Nenhum argumento vÃ¡lido especificado." -#: ../src/Zypper.cc:3100 ../src/Zypper.cc:3178 +#: ../src/Zypper.cc:3100 +#: ../src/Zypper.cc:3178 msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed." msgstr "Aviso: Nenhum repositÃ³rio foi definido. Operando somente com os resolvÃveis instalados. Nada pode ser instalado." @@ -3777,8 +3907,11 @@ msgid "Source package name is a required argument." msgstr "O nome do pacote fonte Ã© um argumento necessÃ¡rio." -#: ../src/Zypper.cc:3235 ../src/Zypper.cc:3495 ../src/Zypper.cc:3579 -#: ../src/Zypper.cc:3702 ../src/Zypper.cc:3770 +#: ../src/Zypper.cc:3235 +#: ../src/Zypper.cc:3495 +#: ../src/Zypper.cc:3579 +#: ../src/Zypper.cc:3702 +#: ../src/Zypper.cc:3770 #, c-format msgid "Unknown package type '%s'." msgstr "Tipo de pacote desconhecido '%s'." @@ -3792,7 +3925,8 @@ msgstr "Veja a mensagem acima para uma dica." #. translators: Running as 'rug', cannot use 'best-effort' option. -#: ../src/Zypper.cc:3514 ../src/Zypper.cc:3597 +#: ../src/Zypper.cc:3514 +#: ../src/Zypper.cc:3597 #, c-format msgid "Running as '%s', cannot use '%s' option." msgstr "Executando como '%s', nÃ£o Ã© possÃvel usar a opÃ§Ã£o '%s'." @@ -3805,7 +3939,8 @@ msgid "Root privileges are required for performing a distribution upgrade." msgstr "SÃ£o necessÃ¡rios privilÃ©gios de root para atualizar a distribuiÃ§Ã£o." -#: ../src/Zypper.cc:3732 ../src/Zypper.cc:3793 +#: ../src/Zypper.cc:3732 +#: ../src/Zypper.cc:3793 msgid "Root privileges are required for adding of package locks." msgstr "SÃ£o necessÃ¡rios privilÃ©gios de root para adicionar as travas de pacote." @@ -3840,9 +3975,3 @@ msgid "Resolvable Type" msgstr "Tipo de resolvÃvel" -# power-off message -#~ msgid "Do you want to trust the key?" -#~ msgstr "Deseja confiar na chave?" - -#~ msgid "n/t/i" -#~ msgstr "n/c/i" Modified: trunk/zypper/po/uk.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/uk.po?rev=11519&r1=115… ============================================================================== --- trunk/zypper/po/uk.po (original) +++ trunk/zypper/po/uk.po Tue Oct 28 10:28:46 2008 @@ -13,7 +13,7 @@ "Project-Id-Version: zypper.uk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-10-27 18:08+0100\n" -"PO-Revision-Date: 2008-10-21 14:40-0700\n" +"PO-Revision-Date: 2008-10-27 21:58-0700\n" "Last-Translator: Ivan Petrouchtchak <fr.ivan(a)ukrainian-orthodox.org>\n" "Language-Team: Ukrainian <translation(a)linux.org.ua>\n" "MIME-Version: 1.0\n" @@ -97,7 +97,7 @@ #. translators: this message is shown after showing description of the key #: ../src/callbacks/keyring.h:150 msgid "Do you want to reject the key, trust temporarily, or trust always?" -msgstr "" +msgstr "ÐÑÐ´ÐºÐ¸Ð½ÑÑÐ¸ ÐºÐ»ÑÑ, Ð¿ÑÐ¸Ð¹Ð½ÑÑÐ¸ ÑÐ¸Ð¼ÑÐ°ÑÐ¾Ð²Ð¾ ÑÐ¸ Ð¿ÑÐ¸Ð¹Ð½ÑÑÐ¸ Ð½Ð° Ð¿Ð¾ÑÑÑÐ¹Ð½Ð¾?" #. translators: r/t/a stands for Reject/TrustTemporarily/trustAlways(import) #. translate to whatever is appropriate for your language @@ -106,13 +106,12 @@ #. The answers should be lower case letters. #: ../src/callbacks/keyring.h:162 msgid "r/t/a/" -msgstr "" +msgstr "Ð²/Ñ/Ð¿/" #. translators: the same as r/t/a, but without 'a' #: ../src/callbacks/keyring.h:165 -#, fuzzy msgid "r/t" -msgstr "n/t" +msgstr "Ð²/Ñ" #. translators: help text for the 'r' option in the 'r/t/a' prompt #: ../src/callbacks/keyring.h:167 @@ -552,9 +551,8 @@ msgstr "Â«%sÂ» Ð½Ðµ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾." #: ../src/install.cc:437 -#, fuzzy msgid "Cannot uninstall patches." -msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ %s" +msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð¿ÑÐ¸Ð±ÑÐ°ÑÐ¸ Ð¿Ð°ÐºÑÐ½ÐºÐ¸." #: ../src/install.cc:438 msgid "" @@ -562,10 +560,13 @@ "Patches are not installed in sense of copied files, database records,\n" "or similar." msgstr "" +"Ð¡ÑÐ°Ð½ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð»Ð°ÑÐºÐ¸ Ð²Ð¸Ð·Ð½Ð°ÑÐ°ÑÑÑÑÑ ÑÑÐ»ÑÐºÐ¸ Ð½Ð° Ð¾ÑÐ½Ð¾Ð²Ñ Ð¹Ð¾Ð³Ð¾ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÐµÐ¹.\n" +"ÐÐ°ÑÐºÐ¸ Ð½Ðµ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÑÑÑÑÑÑ Ð² Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ°Ð¹Ð»ÑÐ², Ð·Ð°Ð¿Ð¸ÑÑÐ² Ð±Ð°Ð· Ð´Ð°Ð½Ð¸Ñ,\n" +"ÑÐ¸ ÑÐ¾Ð³Ð¾ÑÑ Ð¿Ð¾Ð´ÑÐ±Ð½Ð¾Ð³Ð¾." #: ../src/install.cc:449 msgid "Uninstallation of a pattern is currently not defined and implemented." -msgstr "" +msgstr "ÐÐ¸Ð»ÑÑÐµÐ½Ð½Ñ ÑÐ°Ð±Ð»Ð¾Ð½Ð° Ð² Ð´Ð°Ð½Ð¸Ð¹ ÑÐ°Ñ Ð½Ðµ Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¾ Ñ Ð½Ðµ Ð²Ð¿ÑÐ¾Ð²Ð°Ð´Ð¶ÐµÐ½Ð¾." #: ../src/install.cc:463 #, c-format @@ -580,12 +581,12 @@ #: ../src/install.cc:520 msgid "Specifying architecture when selecting packages by name is not implemented." -msgstr "" +msgstr "ÐÐºÐ°Ð·ÑÐ²Ð°Ð½Ð½Ñ Ð°ÑÑÑÑÐµÐºÑÑÑÐ¸ Ð¿ÑÐ¸ Ð²Ð¸Ð±Ð¸ÑÐ°Ð½Ð½Ñ Ð¿Ð°ÐºÑÐ½ÐºÑÐ² Ð·Ð° Ð½Ð°Ð·Ð²Ð¾Ñ â Ð½Ðµ Ð²Ð¿ÑÐ¾Ð²Ð°Ð´Ð¶ÐµÐ½Ð¾." #: ../src/install.cc:555 -#, fuzzy, c-format +#, c-format msgid "'%s' is not a valid package or capability name." -msgstr "Â«%sÂ» Ð½Ðµ Ñ ÑÐ¸Ð½Ð½Ð¸Ð¼ ÑÐ¸Ð¿Ð¾Ð¼ ÑÐ»ÑÐ¶Ð±Ð¸." +msgstr "Â«%sÂ» Ð½Ðµ Ñ ÑÐ¸Ð½Ð½Ð¾Ñ Ð½Ð°Ð·Ð²Ð¾Ñ Ð¿Ð°ÐºÑÐ½ÐºÐ° Ð°Ð±Ð¾ ÑÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½Ð¾ÑÑÑ." #. translators: meaning a package %s or provider of capability %s #: ../src/install.cc:630 @@ -880,9 +881,9 @@ msgstr "ÐÐ¶Ð¸Ð²Ð°Ð¹ÑÐµ Â«%sÂ», ÑÐ¾Ð± Ð¾ÑÑÐ¸Ð¼Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ ÑÑÐ¾Ð²Ð¸Ñ." #: ../src/repos.cc:490 ../src/repos.cc:497 -#, fuzzy, c-format +#, c-format msgid "Ignoring repository '%s' because of '%s' option." -msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð¾ÑÐ¸ÑÑÐ¸ÑÐ¸ ÑÑÐ¾Ð²Ð¸ÑÐµ Â«%sÂ» ÑÐµÑÐµÐ· Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ." +msgstr "ÐÐ³Ð½Ð¾ÑÑÑÑÑÑÑ ÑÑÐ¾Ð²Ð¸ÑÐµ Â«%sÂ» ÑÐµÑÐµÐ· Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Â«%sÂ»." #: ../src/repos.cc:527 ../src/repos.cc:563 #, c-format @@ -2233,6 +2234,8 @@ "If you run zypper without a terminal, use '%s' global\n" "option to make zypper use default answers to prompts." msgstr "" +"ÐÐ¾Ð»Ð¸ Ð²Ð¸ Ð·Ð°Ð¿ÑÑÐºÐ°ÑÑÐµ zypper Ð±ÐµÐ· ÑÐµÑÐ¼ÑÐ½Ð°Ð»Ð°, Ð²Ð¶Ð¸Ð²Ð°Ð¹ÑÐµ Ð³Ð»Ð¾Ð±Ð°Ð»ÑÐ½Ð¸Ð¹\n" +"Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Â«%sÂ», ÑÐ¾Ð± zypper Ð´Ð°Ð²Ð°Ð»Ð° ÑÐ¸Ð¿Ð¾Ð²Ñ Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´Ñ Ð½Ð° Ð·Ð°Ð¿Ð¸ÑÐ¸." #. TranslatorExplanation These are reasons for various failures. #: ../src/utils/prompt.h:125 @@ -2308,6 +2311,8 @@ "\t--no-cd\t\t\tIgnore CD/DVD repositories.\n" "\t--no-remote\t\tIgnore remote repositories.\n" msgstr "" +"\t--no-cd\t\t\tÐÐ³Ð½Ð¾ÑÑÐ²Ð°ÑÐ¸ ÑÑÐ¾Ð²Ð¸ÑÐ° ÐÐ/DVD.\n" +"\t--no-remote\t\tÐÐ³Ð½Ð¾ÑÑÐ²Ð°ÑÐ¸ Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ñ ÑÑÐ¾Ð²Ð¸ÑÐ°.\n" #: ../src/Zypper.cc:182 msgid "" @@ -2399,9 +2404,15 @@ "\tdist-upgrade, dup\tPerform a distribution upgrade.\n" "\tpatch-check, pchk\tCheck for patches.\n" msgstr "" +" ÐÐµÑÑÐ²Ð°Ð½Ð½Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÐ¼Ð¸:\n" +"\tupdate, up\t\tÐÐ½Ð¾Ð²Ð¸ÑÐ¸ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð¿Ð°ÐºÑÐ½ÐºÐ¸ Ð´Ð¾ Ð½Ð¾Ð²ÑÑÐ¸Ñ Ð²ÐµÑÑÑÐ¹.\n" +"\tlist-updates, lu\tÐÐ°Ð´Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð»Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ñ.\n" +"\tpatch\t\t\tÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð»Ð°ÑÐºÐ¸.\n" +"\tlist-patches, lp\tÐÐ°Ð´Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð¾ÑÑÑÐ±Ð½Ð¸Ñ Ð»Ð°ÑÐ¾Ðº.\n" +"\tdist-upgrade, dup\tÐÐ¸ÐºÐ¾Ð½Ð°ÑÐ¸ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð´Ð¸ÑÑÑÐ¸Ð±ÑÑÐ¸Ð²Ñ.\n" +"\tpatch-check, pchk\tÐÐµÑÐµÐ²ÑÑÐ¸ÑÐ¸ Ð½Ð°ÑÐ²Ð½ÑÑÑÑ Ð»Ð°ÑÐ¾Ðº Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ.\n" #: ../src/Zypper.cc:232 -#, fuzzy msgid "" " Querying:\n" "\tsearch, se\t\tSearch for packages matching a pattern.\n" @@ -2417,17 +2428,15 @@ msgstr "" "\tÐÐ°Ð¿Ð¸ÑÐ¸:\n" "\tsearch, se\t\tÐ¨ÑÐºÐ°ÑÐ¸ Ð¿Ð°ÐºÑÐ½ÐºÐ¸, ÑÐ¾ Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´Ð°ÑÑÑ ÑÐ°Ð±Ð»Ð¾Ð½Ñ.\n" -"\tinfo, if\t\tÐ¨ÑÐºÐ°ÑÐ¸ Ð¿Ð¾Ð²Ð½Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ ÑÐ¾Ð´Ð¾ Ð²ÐºÐ°Ð·Ð°Ð½Ñ Ð¿Ð°ÐºÑÐ½ÐºÐ¸.\n" +"\tinfo, if\t\tÐ¨ÑÐºÐ°ÑÐ¸ Ð¿Ð¾Ð²Ð½Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ ÑÐ¾Ð´Ð¾ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿Ð°ÐºÑÐ½ÐºÑÐ².\n" "\tpatch-info\t\tÐ¨ÑÐºÐ°ÑÐ¸ Ð¿Ð¾Ð²Ð½Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ ÑÐ¾Ð´Ð¾ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð»Ð°ÑÐ¾Ðº.\n" "\tpattern-info\t\tÐ¨ÑÐºÐ°ÑÐ¸ Ð¿Ð¾Ð²Ð½Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ ÑÐ¾Ð´Ð¾ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÑÐ°Ð±Ð»Ð¾Ð½ÑÐ².\n" "\tproduct-info\t\tÐ¨ÑÐºÐ°ÑÐ¸ Ð¿Ð¾Ð²Ð½Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ ÑÐ¾Ð´Ð¾ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿ÑÐ¾Ð´ÑÐºÑÑÐ².\n" -"\tpatch-check, pchk\tÐÐµÑÐµÐ²ÑÑÐ¸ÑÐ¸ Ð½Ð°ÑÐ²Ð½ÑÑÑÑ Ð»Ð°ÑÐ¾Ðº.\n" -"\tlist-updates, lu\tÐÐ°Ð´Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ñ.\n" "\tpatches, pch\t\tÐÐ°Ð´Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ Ð»Ð°ÑÐ¾Ðº.\n" "\tpackages, pa\t\tÐÐ°Ð´Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ Ð¿Ð°ÐºÑÐ½ÐºÑÐ².\n" "\tpatterns, pt\t\tÐÐ°Ð´Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ ÑÐ°Ð±Ð»Ð¾Ð½ÑÐ².\n" "\tproducts, pd\t\tÐÐ°Ð´Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾ÑÑÑÐ¿Ð½Ð¸Ñ Ð¿ÑÐ¾Ð´ÑÐºÑÑÐ².\n" -"\twhat-provides, wp\tÐÐ°Ð´Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð°ÐºÑÐ½ÐºÑÐ², ÑÐ¾ Ð½Ð°Ð´Ð°ÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸ Ð´Ð»Ñ Ð¿ÐµÐ²Ð½Ð¾Ñ Ð¼ÐµÑÐ¸.\n" +"\twhat-provides, wp\tÐÐ°Ð´Ð°ÑÐ¸ ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð°ÐºÑÐ½ÐºÑÐ², ÑÐ¾ Ð½Ð°Ð´Ð°ÑÑÑ Ð¿ÐµÐ²Ð½Ñ ÑÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ.\n" #: ../src/Zypper.cc:247 msgid "" @@ -2449,6 +2458,11 @@ "\tlicenses\t\tPrint report about licenses and EULAs of\n" "\t\t\t\tinstalled packages.\n" msgstr "" +" ÐÐ½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸:\n" +"\tversioncmp, vcmp\tÐÐ¾ÑÑÐ²Ð½ÑÑÐ¸ Ð´Ð²Ð° ÑÑÐ´ÐºÐ¸ Ð²ÐµÑÑÑÐ¹.\n" +"\ttargetos, tos\t\tÐÐ¾ÐºÐ°Ð·Ð°ÑÐ¸ ÑÑÐ´Ð¾Ðº ÐÐ Ð¾Ð¿ÐµÑÐ°ÑÑÐ¹Ð½Ð¾Ñ ÑÐ¸ÑÑÐµÐ¼Ð¸ ÑÑÐ»Ñ.\n" +"\tlicenses\t\tÐÐ¾ÐºÐ°Ð·Ð°ÑÐ¸ Ð»ÑÑÐµÐ½Ð·ÑÑ Ñ ÑÐ³Ð¾Ð´Ð¸ Ð´Ð»Ñ\n" +"\t\t\t\tÐ²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°ÐºÑÐ½ÐºÑÐ².\n" #: ../src/Zypper.cc:261 msgid "" @@ -2508,14 +2522,12 @@ msgstr "ÐÐ²ÑÐ¾Ð¾ÑÐ²ÑÐ¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾." #: ../src/Zypper.cc:509 -#, fuzzy msgid "CD/DVD repositories disabled." -msgstr "ÐÐ²ÑÐ¾Ð¾ÑÐ²ÑÐ¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾." +msgstr "Ð¡ÑÐ¾Ð²Ð¸ÑÐ° ÐÐ/DVD Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾." #: ../src/Zypper.cc:516 -#, fuzzy msgid "Remote repositories disabled." -msgstr "ÐÐ²ÑÐ¾Ð¾ÑÐ²ÑÐ¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾." +msgstr "ÐÑÐ´Ð´Ð°Ð»ÐµÐ½Ñ ÑÑÐ¾Ð²Ð¸ÑÐ° Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾." #: ../src/Zypper.cc:523 msgid "Ignoring installed resolvables." @@ -2536,7 +2548,7 @@ #. ! \todo A capability is NAME[.ARCH][OP<VERSION>] now, #. ! the help text will be changed after release #: ../src/Zypper.cc:881 -#, fuzzy, c-format +#, c-format msgid "" "install (in) [options] <capability|rpm_file_uri> ...\n" "\n" @@ -2557,27 +2569,28 @@ " --force-resolution Force the solver to find a solution (even an agressive).\n" "-D, --dry-run Test the installation, do not actually install.\n" msgstr "" -"install (in) [Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸] <Ð²ÐµÑÑÑÑ|ÑÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÐ¾Ñ_rpm_ÑÐ°Ð¹Ð»Ð°> ...\n" +"install (in) [Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸] <ÑÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ|uri_rpm_ÑÐ°Ð¹Ð»Ð°> ...\n" "\n" -"ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ Ð· Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¼Ð¸ Ð²ÐµÑÑÑÑÐ¼Ð¸ Ð°Ð±Ð¾ ÑÐ°Ð¹Ð»Ð¸ RPM Ñ Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¾Ð¼Ñ Ð¼ÑÑÑÑ. ÐÐµÑÑÑÑÑ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ ÐÐÐÐÐ[ÐÐÐÐ ÐÐ¢ÐÐ <VERSION>], Ð´Ðµ ÐÐÐÐ ÐÐ¢ÐÐ Ñ Ð¾Ð´Ð½Ð¸Ð¼ Ð·Ñ Ð·Ð½Ð°ÐºÑÐ² Ð¿Ð¾ÑÑÐ²Ð½ÑÐ½Ð½Ñ <, <=, =, >=, >.\n" +"ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿Ð°ÐºÑÐ½ÐºÐ¸ Ð· Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¾Ñ ÑÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ Ð°Ð±Ð¾ ÑÐ°Ð¹Ð»Ð¸ RPM Ñ Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¾Ð¼Ñ Ð¼ÑÑÑÑ. Ð¤ÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ ÐÐÐÐÐ[ÐÐÐ¯<VERSION>], Ð´Ðµ ÐÐÐ¯ Ñ Ð¾Ð´Ð½Ð¸Ð¼ Ð·Ñ Ð·Ð½Ð°ÐºÑÐ² Ð¿Ð¾ÑÑÐ²Ð½ÑÐ½Ð½Ñ <, <=, =, >=, >.\n" "\n" " ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸:\n" -"-r, --repo <Ð¿ÑÐµÐ²Ð´Ð¾Ð½ÑÐ¼|#|URI> ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ Ð»Ð¸ÑÐµ Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ ÑÑÐ¾Ð²Ð¸ÑÐ°.\n" +"-r, --repo <Ð¿ÑÐµÐ²Ð´Ð¾Ð½ÑÐ¼|#|URI> ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿Ð°ÐºÑÐ½ÐºÐ¸ Ð»Ð¸ÑÐµ Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ ÑÑÐ¾Ð²Ð¸ÑÐ°.\n" "-t, --type <ÑÐ¸Ð¿> Ð¢Ð¸Ð¿ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÐµÐ¹ (%s)\n" " Ð¢Ð¸Ð¿Ð¾Ð²Ð¾: %s\n" -"-n, --name ÐÐ¸Ð±ÑÐ°ÑÐ¸ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ Ð·Ð° Ð½Ð°Ð·Ð²Ð¾Ñ, Ð° Ð½Ðµ Ð²ÐµÑÑÑÑÑ\n" -"-C, --capability ÐÐ¸Ð±ÑÐ°ÑÐ¸ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ Ð·Ð° Ð²ÐµÑÑÑÑÑ\n" -"-f, --force ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸, Ð½Ð°Ð²ÑÑÑ ÑÐºÑÐ¾ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ Ð²Ð¶Ðµ Ð±ÑÐ»Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ (Ð¿ÐµÑÐµÐ²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸)\n" -"-l, --auto-agree-with-licenses ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¾ Ð²ÑÐ´Ð¿Ð¾Ð²ÑÑÑÐ¸ 'ÑÐ°Ðº' Ð½Ð° Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ð½Ñ Ð¿ÑÐ¾ Ð·Ð³Ð¾Ð´Ñ Ð· Ð¿ÑÐ°Ð²Ð¸Ð»Ð°Ð¼Ð¸ Ð»ÑÑÐµÐ½Ð·ÑÐ²Ð°Ð½Ð½Ñ.\n" +"-n, --name ÐÐ¸Ð±ÑÐ°ÑÐ¸ Ð¿Ð°ÐºÑÐ½ÐºÐ¸ Ð·Ð° Ð½Ð°Ð·Ð²Ð¾Ñ, Ð° Ð½Ðµ ÑÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ.\n" +"-C, --capability ÐÐ¸Ð±ÑÐ°ÑÐ¸ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ Ð·Ð° ÑÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ.\n" +"-f, --force ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸, Ð½Ð°Ð²ÑÑÑ ÑÐºÑÐ¾ ÐµÐ»ÐµÐ¼ÐµÐ½Ñ Ð²Ð¶Ðµ Ð±ÑÐ»Ð¾ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ (Ð¿ÐµÑÐµÐ²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸).\n" +"-l, --auto-agree-with-licenses ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¾ Ð²ÑÐ´Ð¿Ð¾Ð²ÑÑÑÐ¸ Â«ÑÐ°ÐºÂ» Ð½Ð° Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ð½Ñ Ð¿ÑÐ¾ Ð·Ð³Ð¾Ð´Ñ Ð· Ð»ÑÑÐµÐ½Ð·ÑÑÐ¼Ð¸.\n" " Ð©Ð¾Ð± Ð´ÑÐ·Ð½Ð°ÑÐ¸ÑÑ Ð±ÑÐ»ÑÑÐµ, Ð²Ð¸ÐºÐ¾Ð½Ð°Ð¹ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Â«man zypperÂ».\n" " --debug-solver Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÐµÑÑÐ¾Ð²Ð¸Ð¹ Ð¿ÑÐ¸ÐºÐ»Ð°Ð´ Ð´Ð»Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ ÑÐ¾Ð·Ð²âÑÐ·ÑÑÑÐ¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸\n" -"-R, --force-resolution <on|off> ÐÑÐ¸Ð¼ÑÑÐ¸ÑÐ¸ ÑÐ¾Ð·Ð²âÑÐ·ÑÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð·Ð½Ð°Ð¹ÑÐ¸ ÑÐ¾Ð·Ð²âÑÐ·Ð¾Ðº (Ð½Ð°Ð²ÑÑÑ Ð½ÐµÑÐ¾ÑÐ½Ð¸Ð¹)\n" +"-R, --no-force-resolution ÐÐµ Ð¿ÑÐ¸Ð¼ÑÑÑÐ²Ð°ÑÐ¸ ÑÐ¾Ð·Ð²âÑÐ·ÑÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð·Ð½Ð°Ð¹ÑÐ¸ Ð²Ð¸ÑÑÑÐµÐ½Ð½Ñ.\n" +" --force-resolution ÐÑÐ¸Ð¼ÑÑÐ¸ÑÐ¸ ÑÐ¾Ð·Ð²âÑÐ·ÑÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð·Ð½Ð°Ð¹ÑÐ¸ Ð²Ð¸ÑÑÑÐµÐ½Ð½Ñ (Ð½Ð°Ð²ÑÑÑ, Ð½ÐµÑÐ¾ÑÐ½Ðµ).\n" "-D, --dry-run ÐÐ¸Ð¿ÑÐ¾Ð±ÑÐ²Ð°ÑÐ¸ Ð¼Ð¾Ð¶Ð»Ð¸Ð²ÑÑÑÑ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ, Ð½Ðµ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÑÐ²Ð°ÑÐ¸ Ð½Ð°ÑÐ¿ÑÐ°Ð²Ð´Ñ\n" #. TranslatorExplanation the first %s = "package, patch, pattern, product" #. and the second %s = "package" #: ../src/Zypper.cc:930 -#, fuzzy, c-format +#, c-format msgid "" "remove (rm) [options] <capability> ...\n" "\n" @@ -2594,18 +2607,20 @@ " --force-resolution Force the solver to find a solution (even an agressive).\n" "-D, --dry-run Test the removal, do not actually remove.\n" msgstr "" -"remove (rm) [Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸] <Ð²ÐµÑÑÑÑ> ...\n" +"remove (rm) [Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸] <capability> ...\n" "\n" -"ÐÐ¸Ð»ÑÑÐ¸ÑÐ¸ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð²ÐµÑÑÑÐ¹. ÐÐµÑÑÑÑÑ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð·Ð°Ð¿Ð¸Ñ Ñ Ð²Ð¸Ð³Ð»ÑÐ´Ñ ÐÐÐÐÐ[ÐÐÐÐ ÐÐ¦ÐÐ¯<VERSION>], Ð´Ðµ ÐÐÐÐ ÐÐ¦ÐÐÐ® Ñ Ð·Ð½Ð°ÐºÐ¸ Ð¿Ð¾ÑÑÐ²Ð½ÑÐ½Ð½Ñ <, <=, =, >=, >.\n" +"ÐÐ¸Ð»ÑÑÐ¸ÑÐ¸ Ð¿Ð°ÐºÑÐ½ÐºÐ¸ Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ñ ÑÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ. Ð¤ÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð·Ð°Ð¿Ð¸Ñ\n" +"Ñ Ð²Ð¸Ð³Ð»ÑÐ´Ñ ÐÐÐÐÐ[ÐÐÐ¯<VERSION>], Ð´Ðµ ÐÐÐÐ® Ñ Ð·Ð½Ð°ÐºÐ¸ Ð¿Ð¾ÑÑÐ²Ð½ÑÐ½Ð½Ñ <, <=, =, >=, >.\n" "\n" " ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸:\n" -"-r, --repo <Ð¿ÑÐµÐ²Ð´Ð¾Ð½ÑÐ¼|#|URI> ÐÐ¸ÐºÐ¾Ð½ÑÐ²Ð°ÑÐ¸ Ð¾Ð¿ÐµÑÐ°ÑÑÑ Ð»Ð¸ÑÐµ Ð· Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑÐ¼Ð¸ Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ ÑÑÐ¾Ð²Ð¸ÑÐ°.\n" -"-t, --type <ÑÐ¸Ð¿> Ð¢Ð¸Ð¿ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ (%s)\n" -" Default: %s\n" -"-n, --name ÐÐ¸Ð±ÑÐ°ÑÐ¸ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ Ð·Ð° Ð½Ð°Ð·Ð²Ð¾Ñ, Ð° Ð½Ðµ Ð·Ð° Ð²ÐµÑÑÑÑÑ\n" -"-C, --capability ÐÐ¸Ð±ÑÐ°ÑÐ¸ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ Ð·Ð° Ð²ÐµÑÑÑÑÑ\n" -" --debug-solver Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÐµÑÑÐ¾Ð²Ð¸Ð¹ Ð¿ÑÐ¸ÐºÐ»Ð°Ð´ Ð´Ð»Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ ÑÐ¾Ð·Ð²âÑÐ·ÑÑÑÐ¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸\n" -"-R, --force-resolution <on|off> ÐÑÐ¸Ð¼ÑÑÐ¸ÑÐ¸ ÑÐ¾Ð·Ð²âÑÐ·ÑÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð·Ð½Ð°Ð¹ÑÐ¸ ÑÐ¾Ð·Ð²âÑÐ·Ð¾Ðº (Ð½Ð°Ð²ÑÑÑ Ð½ÐµÑÐ¾ÑÐ½Ð¸Ð¹)\n" +"-r, --repo <Ð¿ÑÐµÐ²Ð´Ð¾Ð½ÑÐ¼|#|URI> ÐÐ¸ÐºÐ¾Ð½ÑÐ²Ð°ÑÐ¸ Ð´ÑÑ Ð»Ð¸ÑÐµ Ð· Ð¿Ð°ÐºÑÐ½ÐºÐ°Ð¼Ð¸ Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ ÑÑÐ¾Ð²Ð¸ÑÐ°.\n" +"-t, --type <ÑÐ¸Ð¿> Ð¢Ð¸Ð¿ Ð¿Ð°ÐºÑÐ½ÐºÐ° (%s)\n" +" Ð¢Ð¸Ð¿Ð¾Ð²Ð¸Ð¹: %s\n" +"-n, --name ÐÐ¸Ð±ÑÐ°ÑÐ¸ Ð¿Ð°ÐºÑÐ½ÐºÐ¸ Ð·Ð° Ð½Ð°Ð·Ð²Ð¾Ñ, Ð° Ð½Ðµ Ð·Ð° ÑÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ.\n" +"-C, --capability ÐÐ¸Ð±ÑÐ°ÑÐ¸ Ð¿Ð°ÐºÑÐ½ÐºÐ¸ Ð·Ð° ÑÑÐ½ÐºÑÑÐ¾Ð½Ð°Ð»ÑÐ½ÑÑÑÑ.\n" +" --debug-solver Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÐµÑÑÐ¾Ð²Ð¸Ð¹ Ð¿ÑÐ¸ÐºÐ»Ð°Ð´ Ð´Ð»Ñ Ð·Ð½ÐµÐ²Ð°Ð´Ð¶ÐµÐ½Ð½Ñ ÑÐ¾Ð·Ð²âÑÐ·ÑÑÑÐ¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸.\n" +"-R, --no-force-resolution ÐÐµ Ð¿ÑÐ¸Ð¼ÑÑÑÐ²Ð°ÑÐ¸ ÑÐ¾Ð·Ð²âÑÐ·ÑÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð·Ð½Ð°Ð¹ÑÐ¸ Ð²Ð¸ÑÑÑÐµÐ½Ð½Ñ.\n" +" --force-resolution ÐÑÐ¸Ð¼ÑÑÐ¸ÑÐ¸ ÑÐ¾Ð·Ð²âÑÐ·ÑÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð·Ð½Ð°Ð¹ÑÐ¸ Ð²Ð¸ÑÑÑÐµÐ½Ð½Ñ (Ð½Ð°Ð²ÑÑÑ, Ð½ÐµÑÐ¾ÑÐ½Ðµ).\n" "-D, --dry-run ÐÐ¸Ð¿ÑÐ¾Ð±ÑÐ²Ð°ÑÐ¸ Ð¼Ð¾Ð¶Ð»Ð¸Ð²ÑÑÑÑ Ð²Ð¸Ð»ÑÑÐµÐ½Ð½Ñ, Ð½Ðµ Ð²Ð¸Ð»ÑÑÐ°ÑÐ¸ Ð½Ð°ÑÐ¿ÑÐ°Ð²Ð´Ñ\n" #: ../src/Zypper.cc:960 @@ -2809,7 +2824,7 @@ #. TranslatorExplanation the %s = "yast2, rpm-md, plaindir" #: ../src/Zypper.cc:1201 -#, fuzzy, c-format +#, c-format msgid "" "addrepo (ar) [options] <URI> <alias>\n" "addrepo (ar) [options] <FILE.repo>\n" @@ -2833,14 +2848,15 @@ "ÐÐ¾Ð´Ð°ÑÐ¸ Ð´Ð¾ ÑÐ¸ÑÑÐµÐ¼Ð¸ ÑÑÐ¾Ð²Ð¸ÑÐµ. Ð¡ÑÐ¾Ð²Ð¸ÑÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð²ÐºÐ°Ð·Ð°ÑÐ¸ Ð°Ð´ÑÐµÑÐ¾Ñ URI Ð°Ð±Ð¾ Ð¿ÑÐ¾ÑÐ¸ÑÐ°ÑÐ¸ Ð· Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° .repo (Ð¼Ð¾Ð¶Ð½Ð° Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾).\n" "\n" " ÐÐ°ÑÐ°Ð¼ÐµÑÑÐ¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸:\n" -"-r, --repo <FILE.repo> ÐÑÐ¾ÑÐ¸ÑÐ°ÑÐ¸ URL Ñ Ð¿ÑÐµÐ²Ð´Ð¾Ð½ÑÐ¼ Ð· ÑÐ°Ð¹Ð»Ð° (Ð½Ð°Ð²ÑÑÑ, Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¾Ð³Ð¾)\n" -"-t, --type <Ð¢ÐÐ> Ð¢Ð¸Ð¿ ÑÑÐ¾Ð²Ð¸ÑÐ° (%s)\n" +"-r, --repo <FILE.repo> Ð©Ðµ Ð¾Ð´Ð¸Ð½ ÑÐ¿Ð¾ÑÑÐ± Ð²ÐºÐ°Ð·Ð°ÑÐ¸ ÑÐ°Ð¹Ð» .repo (Ð½Ð°Ð²ÑÑÑ, Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¸Ð¹)\n" +"-t, --type <TYPE> Ð¢Ð¸Ð¿ ÑÑÐ¾Ð²Ð¸ÑÐ° (%s)\n" "-d, --disabled ÐÐ¾Ð´Ð°ÑÐ¸ ÑÑÐ¾Ð²Ð¸ÑÐµ ÑÐº Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ðµ\n" "-c, --check ÐÐ¾Ð½Ð´ÑÐ²Ð°ÑÐ¸ URI\n" "-C, --no-check ÐÐµ Ð·Ð¾Ð½Ð´ÑÐ²Ð°ÑÐ¸ URI, Ð¿ÑÐ¾Ð·Ð¾Ð½Ð´ÑÐ²Ð°ÑÐ¸ Ð¹Ð¾Ð³Ð¾ Ð¿ÑÐ´ ÑÐ°Ñ Ð¾ÑÐ²ÑÐ¶ÐµÐ½Ð½Ñ.\n" "-n, --name ÐÐºÐ°Ð·Ð°ÑÐ¸ Ð¾Ð¿Ð¸ÑÐ¾Ð²Ñ Ð½Ð°Ð·Ð²Ñ ÑÑÐ¾Ð²Ð¸ÑÐ°.\n" "-k, --keep-packages Ð£Ð²ÑÐ¼ÐºÐ½ÑÑÐ¸ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ°Ð¹Ð»ÑÐ² RPM.\n" "-K, --no-keep-packages ÐÐ¸Ð¼ÐºÐ½ÑÑÐ¸ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ°Ð¹Ð»ÑÐ² RPM.\n" +"-f, --refresh Ð£Ð²ÑÐ¼ÐºÐ½ÑÑÐ¸ Ð°Ð²ÑÐ¾Ð¾ÑÐ²ÑÐ¶ÐµÐ½Ð½Ñ ÑÑÐ¾Ð²Ð¸ÑÐ°.\n" #. translators: this is just a rug compatiblity command #. translators: this is just a rug-compatiblity command @@ -3838,9 +3854,3 @@ msgid "Resolvable Type" msgstr "Ð¢Ð¸Ð¿ ÑÐ¾Ð·Ð²âÑÐ·ÑÐ²Ð°ÑÐ°" -# power-off message -#~ msgid "Do you want to trust the key?" -#~ msgstr "ÐÐ¾Ð²ÑÑÑÑÐ¸ ÑÑÐ¾Ð¼Ñ ÐºÐ»ÑÑÑ?" - -#~ msgid "n/t/i" -#~ msgstr "n/t/i" -- 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] r11518 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: schubi2 Date: Tue Oct 28 10:08:15 2008 New Revision: 11518 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11518&view=rev Log: revision 11517 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 Tue Oct 28 10:08:15 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 28 10:07:13 CET 2008 - schubi(a)suse.de + +- regarding "keep obsolete" in the solutions (bnc #439134) +- revision 11517 + +------------------------------------------------------------------- Mon Oct 27 10:51:01 CET 2008 - dmacvicar(a)suse.de - fix broken aria2c command line (bnc#438971) -- 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] r11517 - /trunk/libzypp/zypp/solver/detail/SATResolver.cc
by schubi2＠svn.opensuse.org 28 Oct '08

28 Oct '08

Author: schubi2 Date: Tue Oct 28 10:05:37 2008 New Revision: 11517 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11517&view=rev Log: regarding keep obsolete in the solutions (bnc #439134) Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Tue Oct 28 10:05:37 2008 @@ -1186,7 +1186,20 @@ sd = mapSolvable (rp); PoolItem itemFrom = _pool.find (s); - if (rp) + if (s == sd && _solv->distupgrade) + { + PoolItem poolItem = _pool.find (s); + if (poolItem) { + problemSolution->addSingleAction (poolItem, KEEP); + string description = str::form (_("keep %s"), solvable2str(pool, s.get())); + MIL << description << endl; + problemSolution->addDescription (description); + } else { + ERR << "SOLVER_INSTALL_SOLVABLE: No item found for " << id2str(pool, s.get()->name) << "-" + << id2str(pool, s.get()->evr) << "." << id2str(pool, s.get()->arch) << endl; + } + } + else if (rp) { int gotone = 0; -- 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] r11516 - in /trunk/zypper: VERSION.cmake doc/zypper.8 package/zypper.changes zypper.spec.cmake
by jkupec＠svn.opensuse.org 27 Oct '08

27 Oct '08

Author: jkupec Date: Mon Oct 27 19:03:10 2008 New Revision: 11516 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11516&view=rev Log: - release Modified: trunk/zypper/VERSION.cmake trunk/zypper/doc/zypper.8 trunk/zypper/package/zypper.changes trunk/zypper/zypper.spec.cmake Modified: trunk/zypper/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/VERSION.cmake?rev=11516&r… ============================================================================== --- trunk/zypper/VERSION.cmake (original) +++ trunk/zypper/VERSION.cmake Mon Oct 27 19:03:10 2008 @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "0") SET(VERSION_MINOR "12") -SET(VERSION_PATCH "10") +SET(VERSION_PATCH "11") -# LAST RELEASED: 0.12.10 +# LAST RELEASED: 0.12.11 #======= Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11516&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Mon Oct 27 19:03:10 2008 @@ -1,4 +1,4 @@ -.TH "zypper" "8" "0.12.9" "zypper" "System Tools" +.TH "zypper" "8" "0.12.11" "zypper" "System Tools" .SH "SYNTAX" .LP zypper [\fI\-\-global\-opts\fR] <\fBcommand\fR> [\fI\-\-command\-opts\fR] [\fBcommand-arguments\fR] 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 Oct 27 19:03:10 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Oct 27 18:23:15 CET 2008 - jkupec(a)suse.cz + +- translations update +- r11515 +- 0.12.11 + +------------------------------------------------------------------- Mon Oct 27 17:16:17 CET 2008 - jkupec(a)suse.cz - use /dev/tty for input, instead of stdin Modified: trunk/zypper/zypper.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/zypper.spec.cmake?rev=115… ============================================================================== --- trunk/zypper/zypper.spec.cmake (original) +++ trunk/zypper/zypper.spec.cmake Mon Oct 27 19:03:10 2008 @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 5.15.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 +BuildRequires: libzypp-devel >= 5.17.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps Recommends: logrotate cron -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0