From 3f93154c71c3cee4be5192f19087dff7188966d5 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 27 Feb 2006 11:48:58 +0000 Subject: [PATCH] new translations --- po/ar.po | 159 +-- po/bg.po | 4108 ++++++++++++++++++++++++++++++++++++++++++++++++++--------- po/bn.po | 163 +-- po/br.po | 160 +-- po/bs.po | 165 +-- po/ca.po | 162 +-- po/cs.po | 382 +++--- po/cy.po | 165 +-- po/da.po | 163 +-- po/de.po | 162 +-- po/el_GR.po | 162 +-- po/en_GB.po | 162 +-- po/en_US.po | 156 +-- po/es.po | 162 +-- po/fi.po | 285 ++--- po/fr.po | 162 +-- po/gl.po | 165 +-- po/he.po | 165 +-- po/hi.po | 156 +-- po/hr.po | 162 +-- po/hu.po | 323 ++--- po/id.po | 159 +-- po/it.po | 162 +-- po/ja.po | 162 +-- po/ka.po | 156 +-- po/km.po | 162 +-- po/ko.po | 163 +-- po/lt.po | 162 +-- po/nb.po | 269 ++-- po/nl.po | 162 +-- po/pa.po | 162 +-- po/pl.po | 162 +-- po/pt.po | 162 +-- po/pt_BR.po | 162 +-- po/ro.po | 162 +-- po/ru.po | 162 +-- po/sk.po | 162 +-- po/sl_SI.po | 162 +-- po/sr.po | 163 +-- po/sv.po | 162 +-- po/ta.po | 159 +-- po/tr.po | 162 +-- po/uk.po | 162 +-- po/zh.po | 165 +-- po/zh_CN.po | 162 +-- po/zh_TW.po | 162 +-- 46 files changed, 7390 insertions(+), 4609 deletions(-) diff --git a/po/ar.po b/po/ar.po index d0f43f9..a96b9a3 100644 --- a/po/ar.po +++ b/po/ar.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-07-13 15:36+0200\n" "Last-Translator: Ghayss Tarraf \n" "Language-Team: Arabic \n" @@ -2080,7 +2080,7 @@ msgstr "" msgid "%s install failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2089,57 +2089,57 @@ msgstr "" msgid "%s installed ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2236,7 +2236,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "ﺔﻴﻟﺎﻄﻳﺇ" @@ -2263,82 +2263,82 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2348,10 +2348,10 @@ msgid "delete %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2361,191 +2361,191 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "ﺔﻴﻟﺎﻄﻳﺇ" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "ﺔﻴﻟﺎﻄﻳﺇ" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2556,7 +2556,7 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2566,8 +2566,9 @@ msgid "install %s" msgstr "ﺔﻴﻟﺎﻄﻳﺇ" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 -msgid "Install missing resolvables." -msgstr "" +#, fuzzy +msgid "Install missing resolvables" +msgstr "ﺔﻴﻟﺎﻄﻳﺇ" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -2596,7 +2597,7 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "" #: zypp/CountryCode.cc:135 diff --git a/po/bg.po b/po/bg.po index a2af575..2821894 100644 --- a/po/bg.po +++ b/po/bg.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: zypp.bg\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-27 15:08+0100\n" -"PO-Revision-Date: 2006-02-02 00:16+0200\n" +"Report-Msgid-Bugs-To: translation@suse.de\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" +"PO-Revision-Date: 2006-02-20 13:13+0100\n" "Last-Translator: Borislav Mitev \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" @@ -22,818 +22,3698 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.10.2\n" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ProblemSolutionIgnore.cc:54 -#, c-format -msgid "Ignoring conflict of %s" -msgstr "Пренебрегване на конфликта на %s" +#: zypp/LanguageCode.cc:145 +msgid "Unknown language: " +msgstr "Неизвестен език: " -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ProblemSolutionIgnore.cc:58 -msgid "Ignoring this requirement" -msgstr "Пренебрегване на тези изисквания" +#: zypp/LanguageCode.cc:226 zypp/CountryCode.cc:215 +#, fuzzy +msgid "noCode" +msgstr "Код" -#. TranslatorExplanation %s = name of package, patch, selection ... -#. affected() = resolvable to be installed -#. _capability = -#. other() = -#. other_capability() = -#. Translator: %s = name of package,patch,... -#. TranslatorExample: Installing foo -#. TranslatorExplanation: Just a progress indicator that something is scheduled for installation -#. Translator: %s = packagename -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ProblemSolutionInstall.cc:53 -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ProblemSolutionInstall.cc:57 -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:241 -#, c-format -msgid "Installing %s" -msgstr "Инсталиране на %s" +#: zypp/LanguageCode.cc:227 +msgid "Default" +msgstr "Стандартно" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ProblemSolutionInstall.cc:67 -msgid "Installing missing resolvables" -msgstr "Инсталиране на липсващите пакети" +#: zypp/LanguageCode.cc:230 +msgid "Afar" +msgstr "Африкански" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ProblemSolutionUninstall.cc:52 -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ProblemSolutionUninstall.cc:56 -#, c-format -msgid "Deleting %s" -msgstr "Изтриване на %s" +#: zypp/LanguageCode.cc:232 +msgid "Abkhazian" +msgstr "Абхазки" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Removing conflicting resolvables" -msgstr "" +#: zypp/LanguageCode.cc:234 +msgid "Achinese" +msgstr "Ачински" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ProblemSolutionUnlock.cc:52 -#, c-format -msgid "Unlock %s" -msgstr "" +#: zypp/LanguageCode.cc:236 +msgid "Acoli" +msgstr "Аколи" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlocking these resolvables" -msgstr "" +#: zypp/LanguageCode.cc:238 +msgid "Adangme" +msgstr "Адангме" -#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc:370 -#, c-format -msgid "for requiring %s for %s when upgrading %s" -msgstr "за изисканото %s за %s, когато се обновява %s" +#: zypp/LanguageCode.cc:240 +msgid "Adyghe" +msgstr "Адиге" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfo.cc:113 -msgid " Error!" -msgstr " Грешка!" +#: zypp/LanguageCode.cc:242 +msgid "Afro-Asiatic (Other)" +msgstr "Афро-азиатски (друг)" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfo.cc:114 -msgid " Important!" -msgstr " Важно!" +#: zypp/LanguageCode.cc:244 +msgid "Afrihili" +msgstr "Африхили" -#. Translator all.%s = name of packages,patches,.... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoChildOf.cc:54 -#, c-format -msgid "%s part of %s" -msgstr "%s е част от %s" +#: zypp/LanguageCode.cc:246 +msgid "Afrikaans" +msgstr "Африкаанс" -#. Translator: all.%s = name of package, patch,... -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoConflictsWith.cc:54 -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:142 -#, c-format -msgid "%s conflicts with %s" -msgstr "%s е в конфликт с %s" +#: zypp/LanguageCode.cc:248 +msgid "Ainu" +msgstr "Аину" -#. Translator: all.%s = name of package,patch,.... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoDependsOn.cc:53 -#, c-format -msgid "%s depended on %s" -msgstr "%s зависи от %s" +#: zypp/LanguageCode.cc:250 +msgid "Akan" +msgstr "Акан" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:59 -msgid ", Action: " -msgstr ", Действие:" +#: zypp/LanguageCode.cc:252 +msgid "Akkadian" +msgstr "Акадски" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:62 -msgid ", Trigger: " -msgstr ", Задействане при:" +#: zypp/LanguageCode.cc:254 +msgid "Albanian" +msgstr "Албански" -#. Translator: Notation for (RPM) package -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:87 -msgid "package" -msgstr "" +#: zypp/LanguageCode.cc:256 +msgid "Aleut" +msgstr "Алют" -#. Translator: Notation for SuSE package selection (set of packages) -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:91 -msgid "selection" -msgstr "" +#: zypp/LanguageCode.cc:258 +#, fuzzy +msgid "Algonquian languages" +msgstr "Алгонквиански езици" -#. Translator: Notation for SuSE installation pattern (set of packages, describing use of system) -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:95 -msgid "pattern" -msgstr "" +#: zypp/LanguageCode.cc:260 +msgid "Southern Altai" +msgstr "Южно-алтайски" -#. Translator: Notation for product -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:99 -msgid "product" -msgstr "" +#: zypp/LanguageCode.cc:262 +msgid "Amharic" +msgstr "Амхарик" -#. Translator: Notation for patch -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:103 -msgid "patch" -msgstr "" +#: zypp/LanguageCode.cc:264 +msgid "English, Old (ca.450-1100)" +msgstr "Английски, стар (ок. 450-1100)" -#. Translator: Notation for script (part of a patch) -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:107 -msgid "script" -msgstr "" +#: zypp/LanguageCode.cc:266 +#, fuzzy +msgid "Apache languages" +msgstr "Апачи езици" -#. Translator: Notation for message (part of a patch) -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:111 -msgid "message" -msgstr "" +#: zypp/LanguageCode.cc:268 +msgid "Arabic" +msgstr "Арабски" -#. Translator: Notation for computer system -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:115 -msgid "system" -msgstr "" +#: zypp/LanguageCode.cc:270 +msgid "Aramaic" +msgstr "Арамайски" -#. Translator: Generic term for an item with dependencies, please leave untranslated for now -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:119 -msgid "Resolvable" -msgstr "" +#: zypp/LanguageCode.cc:272 +msgid "Aragonese" +msgstr "Арагонски" -#. TranslatorExplanation: Additional information to dependency solver result, no solution could be found -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:155 -msgid "Marking this resolution attempt as invalid." -msgstr "Маркиране на този опит за разрешаване като невалиден." +# AM +#: zypp/LanguageCode.cc:274 +msgid "Armenian" +msgstr "Арменски" + +#: zypp/LanguageCode.cc:276 +msgid "Araucanian" +msgstr "Араукански" + +#: zypp/LanguageCode.cc:278 +msgid "Arapaho" +msgstr "Арапахо" + +#: zypp/LanguageCode.cc:280 +msgid "Artificial (Other)" +msgstr "Изкуствен (друг)" + +#: zypp/LanguageCode.cc:282 +msgid "Arawak" +msgstr "Аравак" + +#: zypp/LanguageCode.cc:284 +msgid "Assamese" +msgstr "Асамески" + +#: zypp/LanguageCode.cc:286 +msgid "Asturian" +msgstr "Астурийски" + +#: zypp/LanguageCode.cc:288 +#, fuzzy +msgid "Athapascan languages" +msgstr "Атапаскан езици" + +#: zypp/LanguageCode.cc:290 +#, fuzzy +msgid "Australian languages" +msgstr "Австралийски езици" + +#: zypp/LanguageCode.cc:292 +msgid "Avaric" +msgstr "Аварски" + +#: zypp/LanguageCode.cc:294 +msgid "Avestan" +msgstr "Авестански" + +# SZ +#: zypp/LanguageCode.cc:296 +msgid "Awadhi" +msgstr "Авадхи" + +# MM +#: zypp/LanguageCode.cc:298 +msgid "Aymara" +msgstr "Аймара" + +#: zypp/LanguageCode.cc:300 +msgid "Azerbaijani" +msgstr "Азербайджански" + +#: zypp/LanguageCode.cc:302 +msgid "Banda" +msgstr "Банда" + +#: zypp/LanguageCode.cc:304 +#, fuzzy +msgid "Bamileke languages" +msgstr "Бамилеке езици" + +#: zypp/LanguageCode.cc:306 +msgid "Bashkir" +msgstr "Башкирски" + +#: zypp/LanguageCode.cc:308 +msgid "Baluchi" +msgstr "Балучи" + +#: zypp/LanguageCode.cc:310 +msgid "Bambara" +msgstr "Бамбара" + +#: zypp/LanguageCode.cc:312 +msgid "Balinese" +msgstr "Балинески" + +#: zypp/LanguageCode.cc:314 +msgid "Basque" +msgstr "Баски" + +#: zypp/LanguageCode.cc:316 +msgid "Basa" +msgstr "Баса" + +#: zypp/LanguageCode.cc:318 +msgid "Baltic (Other)" +msgstr "Балтийски (друг)" + +#: zypp/LanguageCode.cc:320 +msgid "Beja" +msgstr "Бея" + +#: zypp/LanguageCode.cc:322 +msgid "Belarusian" +msgstr "Беларуски" + +#: zypp/LanguageCode.cc:324 +msgid "Bemba" +msgstr "Бебма" + +# SN +#: zypp/LanguageCode.cc:326 +msgid "Bengali" +msgstr "Бенгалски" + +#: zypp/LanguageCode.cc:328 +msgid "Berber (Other)" +msgstr "Бербер (друг)" + +#: zypp/LanguageCode.cc:330 +msgid "Bhojpuri" +msgstr "Бходжури" + +#: zypp/LanguageCode.cc:332 +msgid "Bihari" +msgstr "Бихари" + +#: zypp/LanguageCode.cc:334 +msgid "Bikol" +msgstr "Бикол" + +#: zypp/LanguageCode.cc:336 +msgid "Bini" +msgstr "Бини" + +#: zypp/LanguageCode.cc:338 +msgid "Bislama" +msgstr "Бислама" + +#: zypp/LanguageCode.cc:340 +msgid "Siksika" +msgstr "Сиксика" + +#: zypp/LanguageCode.cc:342 +msgid "Bantu (Other)" +msgstr "Банту (друг)" + +# BJ +#: zypp/LanguageCode.cc:344 +msgid "Bosnian" +msgstr "Босненски" + +# BR +#: zypp/LanguageCode.cc:346 +msgid "Braj" +msgstr "Брая" + +#: zypp/LanguageCode.cc:348 +msgid "Breton" +msgstr "Бретон" + +#: zypp/LanguageCode.cc:350 +msgid "Batak (Indonesia)" +msgstr "Батак (Индонезия)" + +#: zypp/LanguageCode.cc:352 +msgid "Buriat" +msgstr "Бурият" + +#: zypp/LanguageCode.cc:354 +msgid "Buginese" +msgstr "Бугинески" + +#: zypp/LanguageCode.cc:356 +msgid "Bulgarian" +msgstr "Български" + +#: zypp/LanguageCode.cc:358 +msgid "Burmese" +msgstr "Бурмийски" + +#: zypp/LanguageCode.cc:360 +msgid "Blin" +msgstr "Блин" + +#: zypp/LanguageCode.cc:362 +msgid "Caddo" +msgstr "Каддо" + +#: zypp/LanguageCode.cc:364 +msgid "Central American Indian (Other)" +msgstr "Централно-американски индиански (друг)" + +#: zypp/LanguageCode.cc:366 +msgid "Carib" +msgstr "Карибски" + +#: zypp/LanguageCode.cc:368 +msgid "Catalan" +msgstr "Каталунски" + +#: zypp/LanguageCode.cc:370 +msgid "Caucasian (Other)" +msgstr "Кауказийски (друг)" + +#: zypp/LanguageCode.cc:372 +msgid "Cebuano" +msgstr "Кебуано" + +#: zypp/LanguageCode.cc:374 +msgid "Celtic (Other)" +msgstr "Келтски (друг)" + +# KM +#: zypp/LanguageCode.cc:376 +msgid "Chamorro" +msgstr "Коморийски" + +#: zypp/LanguageCode.cc:378 +msgid "Chibcha" +msgstr "Чибча" + +#: zypp/LanguageCode.cc:380 +msgid "Chechen" +msgstr "Чеченски" + +#: zypp/LanguageCode.cc:382 +msgid "Chagatai" +msgstr "Чагатай" + +#: zypp/LanguageCode.cc:384 +msgid "Chinese" +msgstr "Китайски" + +#: zypp/LanguageCode.cc:386 +msgid "Chuukese" +msgstr "Чуукски" + +# ML +#: zypp/LanguageCode.cc:388 +msgid "Mari" +msgstr "Мари" + +#: zypp/LanguageCode.cc:390 +#, fuzzy +msgid "Chinook jargon" +msgstr "Чинук жаргон" + +#: zypp/LanguageCode.cc:392 +msgid "Choctaw" +msgstr "Чоктау" + +#: zypp/LanguageCode.cc:394 +msgid "Chipewyan" +msgstr "Чипеуан" + +#: zypp/LanguageCode.cc:396 +msgid "Cherokee" +msgstr "Чероки" + +#: zypp/LanguageCode.cc:398 +msgid "Church Slavic" +msgstr "Църковно-славянски" + +#: zypp/LanguageCode.cc:400 +msgid "Chuvash" +msgstr "Чуваш" + +#: zypp/LanguageCode.cc:402 +msgid "Cheyenne" +msgstr "Кайенски" + +#: zypp/LanguageCode.cc:404 +#, fuzzy +msgid "Chamic languages" +msgstr "Чамик езици" + +#: zypp/LanguageCode.cc:406 +msgid "Coptic" +msgstr "Коптик" + +#: zypp/LanguageCode.cc:408 +msgid "Cornish" +msgstr "Корнски" + +#: zypp/LanguageCode.cc:410 +msgid "Corsican" +msgstr "Корсикански" + +#: zypp/LanguageCode.cc:412 +#, fuzzy +msgid "Creoles and pidgins, English based (Other)" +msgstr "Креолски и пидгински, базиран на английски (друг)" + +#: zypp/LanguageCode.cc:414 +#, fuzzy +msgid "Creoles and pidgins, French-based (Other)" +msgstr "Креолски и пидгински, базиран на френски (друг)" + +#: zypp/LanguageCode.cc:416 +#, fuzzy +msgid "Creoles and pidgins, Portuguese-based (Other)" +msgstr "Креолски и пидгински, базиран на португалски (друг)" + +#: zypp/LanguageCode.cc:418 +msgid "Cree" +msgstr "Крее" + +#: zypp/LanguageCode.cc:420 +msgid "Crimean Tatar" +msgstr "Кримин татарски" + +#: zypp/LanguageCode.cc:422 +#, fuzzy +msgid "Creoles and pidgins (Other)" +msgstr "Креолски и пидгински (друг)" + +#: zypp/LanguageCode.cc:424 +msgid "Kashubian" +msgstr "Кашубски" + +#: zypp/LanguageCode.cc:426 +msgid "Cushitic (Other)" +msgstr "Кушитик (друг)" + +#: zypp/LanguageCode.cc:428 +msgid "Czech" +msgstr "Чешка" + +#: zypp/LanguageCode.cc:430 +msgid "Dakota" +msgstr "Дакота" + +#: zypp/LanguageCode.cc:432 +msgid "Danish" +msgstr "Датска" + +#: zypp/LanguageCode.cc:434 +msgid "Dargwa" +msgstr "Доргава" + +#: zypp/LanguageCode.cc:436 +msgid "Dayak" +msgstr "Даяк" + +#: zypp/LanguageCode.cc:438 +msgid "Delaware" +msgstr "Делауеър" + +#: zypp/LanguageCode.cc:440 +msgid "Slave (Athapascan)" +msgstr "Славе (Атапаскан)" + +#: zypp/LanguageCode.cc:442 +msgid "Dogrib" +msgstr "Догриб" + +#: zypp/LanguageCode.cc:444 +msgid "Dinka" +msgstr "Динка" + +#: zypp/LanguageCode.cc:446 +msgid "Divehi" +msgstr "Дивехи" + +#: zypp/LanguageCode.cc:448 +msgid "Dogri" +msgstr "Догри" + +#: zypp/LanguageCode.cc:450 +msgid "Dravidian (Other)" +msgstr "Дравидски (друг)" + +#: zypp/LanguageCode.cc:452 +msgid "Lower Sorbian" +msgstr "Долно-сорбийски" + +#: zypp/LanguageCode.cc:454 +msgid "Duala" +msgstr "ДуалаДу" + +#: zypp/LanguageCode.cc:456 +msgid "Dutch, Middle (ca.1050-1350)" +msgstr "Холандски, среден (ок. 1050-1350)" + +#: zypp/LanguageCode.cc:458 +msgid "Dutch" +msgstr "Холандска" + +#: zypp/LanguageCode.cc:460 +msgid "Dyula" +msgstr "Дюла" + +# TO +#: zypp/LanguageCode.cc:462 +msgid "Dzongkha" +msgstr "Дзонга" + +#: zypp/LanguageCode.cc:464 +msgid "Efik" +msgstr "Ефик" + +#: zypp/LanguageCode.cc:466 +msgid "Egyptian (Ancient)" +msgstr "Египетски (древен)" + +#: zypp/LanguageCode.cc:468 +msgid "Ekajuk" +msgstr "Екаджук" + +#: zypp/LanguageCode.cc:470 +msgid "Elamite" +msgstr "Еламите" + +#: zypp/LanguageCode.cc:472 +msgid "English" +msgstr "Английски" + +#: zypp/LanguageCode.cc:474 +msgid "English, Middle (1100-1500)" +msgstr "Английски, среден (1100-1500)" + +#: zypp/LanguageCode.cc:476 +msgid "Esperanto" +msgstr "Есперанто" + +#: zypp/LanguageCode.cc:478 +msgid "Estonian" +msgstr "Естонска" + +#: zypp/LanguageCode.cc:480 +msgid "Ewe" +msgstr "Еве" + +#: zypp/LanguageCode.cc:482 +msgid "Ewondo" +msgstr "Евондо" + +#: zypp/LanguageCode.cc:484 +msgid "Fang" +msgstr "Фанг" + +#: zypp/LanguageCode.cc:486 +msgid "Faroese" +msgstr "Фаероски" + +#: zypp/LanguageCode.cc:488 +msgid "Fanti" +msgstr "Фанти" + +#: zypp/LanguageCode.cc:490 +msgid "Fijian" +msgstr "Фуджиянски" + +#: zypp/LanguageCode.cc:492 +msgid "Filipino" +msgstr "Филипино" + +#: zypp/LanguageCode.cc:494 +msgid "Finnish" +msgstr "Финландска" + +#: zypp/LanguageCode.cc:496 +msgid "Finno-Ugrian (Other)" +msgstr "Фино-угрийски (друг)" + +#: zypp/LanguageCode.cc:498 +msgid "Fon" +msgstr "Фон" + +#: zypp/LanguageCode.cc:500 +msgid "French" +msgstr "Френска" + +#: zypp/LanguageCode.cc:502 +msgid "French, Middle (ca.1400-1600)" +msgstr "Френски, среден (ок. 1400-1600)" + +#: zypp/LanguageCode.cc:504 +msgid "French, Old (842-ca.1400)" +msgstr "Френски, стар (842-ок. 1400)" + +#: zypp/LanguageCode.cc:506 +msgid "Frisian" +msgstr "Фризийски" + +#: zypp/LanguageCode.cc:508 +msgid "Fulah" +msgstr "Фула" + +#: zypp/LanguageCode.cc:510 +msgid "Friulian" +msgstr "Флюлийски" + +#: zypp/LanguageCode.cc:512 +msgid "Ga" +msgstr "Га" + +# GA +#: zypp/LanguageCode.cc:514 +msgid "Gayo" +msgstr "Гайо" + +#: zypp/LanguageCode.cc:516 +msgid "Gbaya" +msgstr "Гбая" + +#: zypp/LanguageCode.cc:518 +msgid "Germanic (Other)" +msgstr "Германски (друг)" + +#: zypp/LanguageCode.cc:520 +msgid "Georgian" +msgstr "Грузински" + +#: zypp/LanguageCode.cc:522 +msgid "German" +msgstr "Германска" + +#: zypp/LanguageCode.cc:524 +msgid "Geez" +msgstr "Гииз" + +#: zypp/LanguageCode.cc:526 +msgid "Gilbertese" +msgstr "Гилбертезки" + +#: zypp/LanguageCode.cc:528 +msgid "Gaelic" +msgstr "Гаелски" + +#: zypp/LanguageCode.cc:530 +msgid "Irish" +msgstr "Ирландски" + +#: zypp/LanguageCode.cc:532 +msgid "Galician" +msgstr "Галицийски" + +#: zypp/LanguageCode.cc:534 +msgid "Manx" +msgstr "Манкс" + +#: zypp/LanguageCode.cc:536 +msgid "German, Middle High (ca.1050-1500)" +msgstr "Немски, късно среден (ок. 1050-1500)" + +#: zypp/LanguageCode.cc:538 +msgid "German, Old High (ca.750-1050)" +msgstr "Немски, късно стар (ок. 750-1050)" + +#: zypp/LanguageCode.cc:540 +msgid "Gondi" +msgstr "Гонди" + +#: zypp/LanguageCode.cc:542 +msgid "Gorontalo" +msgstr "Горонтало" + +#: zypp/LanguageCode.cc:544 +msgid "Gothic" +msgstr "Готски" + +#: zypp/LanguageCode.cc:546 +msgid "Grebo" +msgstr "Гребо" + +#: zypp/LanguageCode.cc:548 +msgid "Greek, Ancient (to 1453)" +msgstr "Гръцки, древен (до 1453)" + +#: zypp/LanguageCode.cc:550 +msgid "Greek, Modern (1453-)" +msgstr "Гръцки, модерен (след 1453)" + +#: zypp/LanguageCode.cc:552 +msgid "Guarani" +msgstr "Гуарани" + +#: zypp/LanguageCode.cc:554 +msgid "Gujarati" +msgstr "Гуджарити" + +#: zypp/LanguageCode.cc:556 +msgid "Gwich'in" +msgstr "Гвич'ин" + +#: zypp/LanguageCode.cc:558 +msgid "Haida" +msgstr "Хайда" + +# HT +#: zypp/LanguageCode.cc:560 +msgid "Haitian" +msgstr "Хаитски" + +#: zypp/LanguageCode.cc:562 +msgid "Hausa" +msgstr "Хауза" + +#: zypp/LanguageCode.cc:564 +msgid "Hawaiian" +msgstr "Хавайски" + +#: zypp/LanguageCode.cc:566 +msgid "Hebrew" +msgstr "Еврейски" + +#: zypp/LanguageCode.cc:568 +msgid "Herero" +msgstr "Хереро" + +#: zypp/LanguageCode.cc:570 +msgid "Hiligaynon" +msgstr "Хилигонски" + +#: zypp/LanguageCode.cc:572 +msgid "Himachali" +msgstr "Химачали" + +#: zypp/LanguageCode.cc:574 +msgid "Hindi" +msgstr "Хинди" + +# HT +#: zypp/LanguageCode.cc:576 +msgid "Hittite" +msgstr "Хитите" + +#: zypp/LanguageCode.cc:578 +msgid "Hmong" +msgstr "Хмонг" + +# HT +#: zypp/LanguageCode.cc:580 +msgid "Hiri Motu" +msgstr "Хири Моту" + +#: zypp/LanguageCode.cc:582 +msgid "Upper Sorbian" +msgstr "Горно-сорбийски" + +#: zypp/LanguageCode.cc:584 +msgid "Hungarian" +msgstr "Унгарска" + +#: zypp/LanguageCode.cc:586 +msgid "Hupa" +msgstr "Хупа" + +# IR +# fuzzy +#: zypp/LanguageCode.cc:588 +msgid "Iban" +msgstr "Ибан" + +#: zypp/LanguageCode.cc:590 +msgid "Igbo" +msgstr "Игбо" + +#: zypp/LanguageCode.cc:592 +msgid "Icelandic" +msgstr "Исландска" + +#: zypp/LanguageCode.cc:594 +msgid "Ido" +msgstr "Идо" + +#: zypp/LanguageCode.cc:596 +msgid "Sichuan Yi" +msgstr "Сичуан юи" + +#: zypp/LanguageCode.cc:598 +msgid "Ijo" +msgstr "Ижо" + +#: zypp/LanguageCode.cc:600 +msgid "Inuktitut" +msgstr "Инуктитут" + +#: zypp/LanguageCode.cc:602 +msgid "Interlingue" +msgstr "Интерезичен" + +#: zypp/LanguageCode.cc:604 +msgid "Iloko" +msgstr "Илоко" + +#: zypp/LanguageCode.cc:606 +msgid "Interlingua (International Auxiliary Language Association)" +msgstr "Интерлингва (Международна Асоциация за Помощен Език)" + +#: zypp/LanguageCode.cc:608 +msgid "Indic (Other)" +msgstr "Индски (друг)" + +#: zypp/LanguageCode.cc:610 +msgid "Indonesian" +msgstr "Индонезийски" + +#: zypp/LanguageCode.cc:612 +msgid "Indo-European (Other)" +msgstr "Индо-европейски (друг)" + +#: zypp/LanguageCode.cc:614 +msgid "Ingush" +msgstr "Ингуш" + +#: zypp/LanguageCode.cc:616 +msgid "Inupiaq" +msgstr "Инупиаг" + +#: zypp/LanguageCode.cc:618 +msgid "Iranian (Other)" +msgstr "Ирански (друг)" + +#: zypp/LanguageCode.cc:620 +#, fuzzy +msgid "Iroquoian languages" +msgstr "Ирокуонски езици" + +#: zypp/LanguageCode.cc:622 +msgid "Italian" +msgstr "Италианска" + +#: zypp/LanguageCode.cc:624 +msgid "Javanese" +msgstr "Явайски" + +#: zypp/LanguageCode.cc:626 +msgid "Lojban" +msgstr "Лоджбан" + +#: zypp/LanguageCode.cc:628 +msgid "Japanese" +msgstr "Японска" + +#: zypp/LanguageCode.cc:630 +msgid "Judeo-Persian" +msgstr "Юдейо-персийски" + +#: zypp/LanguageCode.cc:632 +msgid "Judeo-Arabic" +msgstr "Юдейо-арабски" + +#: zypp/LanguageCode.cc:634 +msgid "Kara-Kalpak" +msgstr "Кара-калпака-кал" + +#: zypp/LanguageCode.cc:636 +msgid "Kabyle" +msgstr "Кабил" + +#: zypp/LanguageCode.cc:638 +msgid "Kachin" +msgstr "Качин" + +#: zypp/LanguageCode.cc:640 +msgid "Kalaallisut" +msgstr "Калаалисут" + +#: zypp/LanguageCode.cc:642 +msgid "Kamba" +msgstr "Камба" + +#: zypp/LanguageCode.cc:644 +msgid "Kannada" +msgstr "Канада" + +#: zypp/LanguageCode.cc:646 +msgid "Karen" +msgstr "Карен" + +#: zypp/LanguageCode.cc:648 +msgid "Kashmiri" +msgstr "Кашмирски" + +#: zypp/LanguageCode.cc:650 +msgid "Kanuri" +msgstr "Канури" + +#: zypp/LanguageCode.cc:652 +msgid "Kawi" +msgstr "Кави" + +# KZ +# fuzzy +#: zypp/LanguageCode.cc:654 +msgid "Kazakh" +msgstr "Казакски" + +# MR +#: zypp/LanguageCode.cc:656 +msgid "Kabardian" +msgstr "Кабардийски" + +#: zypp/LanguageCode.cc:658 +msgid "Khasi" +msgstr "Каси" + +#: zypp/LanguageCode.cc:660 +msgid "Khoisan (Other)" +msgstr "Койсан (друг)" + +#: zypp/LanguageCode.cc:662 +msgid "Khmer" +msgstr "Хмерски" + +#: zypp/LanguageCode.cc:664 +msgid "Khotanese" +msgstr "Котанески" + +#: zypp/LanguageCode.cc:666 +msgid "Kikuyu" +msgstr "Кикую" + +#: zypp/LanguageCode.cc:668 +msgid "Kinyarwanda" +msgstr "Кинярванда" + +#: zypp/LanguageCode.cc:670 +msgid "Kirghiz" +msgstr "Киргизки" + +#: zypp/LanguageCode.cc:672 +msgid "Kimbundu" +msgstr "Кимбунду" + +#: zypp/LanguageCode.cc:674 +msgid "Konkani" +msgstr "Конкани" + +#: zypp/LanguageCode.cc:676 +msgid "Komi" +msgstr "Коми" + +# CG +#: zypp/LanguageCode.cc:678 +msgid "Kongo" +msgstr "Конго" + +#: zypp/LanguageCode.cc:680 +msgid "Korean" +msgstr "Корейски" + +#: zypp/LanguageCode.cc:682 +msgid "Kosraean" +msgstr "Косраейски" + +#: zypp/LanguageCode.cc:684 +msgid "Kpelle" +msgstr "Кпеле" + +#: zypp/LanguageCode.cc:686 +msgid "Karachay-Balkar" +msgstr "Карачай-балкар" + +#: zypp/LanguageCode.cc:688 +msgid "Kru" +msgstr "Крю" + +#: zypp/LanguageCode.cc:690 +msgid "Kurukh" +msgstr "Курук" + +#: zypp/LanguageCode.cc:692 +msgid "Kuanyama" +msgstr "Куаняма" + +#: zypp/LanguageCode.cc:694 +msgid "Kumyk" +msgstr "Кумикумик" + +#: zypp/LanguageCode.cc:696 +msgid "Kurdish" +msgstr "Кюрдски" + +# KE +#: zypp/LanguageCode.cc:698 +msgid "Kutenai" +msgstr "Кутенай" + +#: zypp/LanguageCode.cc:700 +msgid "Ladino" +msgstr "Ладино" + +#: zypp/LanguageCode.cc:702 +msgid "Lahnda" +msgstr "Ланда" + +#: zypp/LanguageCode.cc:704 +msgid "Lamba" +msgstr "Ламба" + +#: zypp/LanguageCode.cc:706 +msgid "Lao" +msgstr "Лао" + +#: zypp/LanguageCode.cc:708 +msgid "Latin" +msgstr "Латински" + +#: zypp/LanguageCode.cc:710 +msgid "Latvian" +msgstr "Латвийски" + +#: zypp/LanguageCode.cc:712 +msgid "Lezghian" +msgstr "Лезганийски" + +#: zypp/LanguageCode.cc:714 +msgid "Limburgan" +msgstr "Лимбурган" + +# AO +#: zypp/LanguageCode.cc:716 +msgid "Lingala" +msgstr "Лингала" + +#: zypp/LanguageCode.cc:718 +msgid "Lithuanian" +msgstr "Литовска" + +# CG +#: zypp/LanguageCode.cc:720 +msgid "Mongo" +msgstr "Монго" + +#: zypp/LanguageCode.cc:722 +msgid "Lozi" +msgstr "Лози" + +#: zypp/LanguageCode.cc:724 +msgid "Luxembourgish" +msgstr "Люксембургски" + +#: zypp/LanguageCode.cc:726 +msgid "Luba-Lulua" +msgstr "Луба-лулуя" + +#: zypp/LanguageCode.cc:728 +msgid "Luba-Katanga" +msgstr "Луба-катанга" + +# GH +#: zypp/LanguageCode.cc:730 +msgid "Ganda" +msgstr "Ганда" + +#: zypp/LanguageCode.cc:732 +msgid "Luiseno" +msgstr "Луисено" + +#: zypp/LanguageCode.cc:734 +msgid "Lunda" +msgstr "Лунда" + +#: zypp/LanguageCode.cc:736 +msgid "Luo (Kenya and Tanzania)" +msgstr "Луо (Кения и Танзания)" + +#: zypp/LanguageCode.cc:738 +#, fuzzy +msgid "lushai" +msgstr "Лушай" + +#: zypp/LanguageCode.cc:740 +msgid "Macedonian" +msgstr "Македонски" + +#: zypp/LanguageCode.cc:742 +msgid "Madurese" +msgstr "Мадурейски" + +#: zypp/LanguageCode.cc:744 +msgid "Magahi" +msgstr "Магахи" + +# MH +#: zypp/LanguageCode.cc:746 +msgid "Marshallese" +msgstr "Маршалски" + +#: zypp/LanguageCode.cc:748 +msgid "Maithili" +msgstr "Майтили" + +# MG +#: zypp/LanguageCode.cc:750 +msgid "Makasar" +msgstr "Макасар" + +#: zypp/LanguageCode.cc:752 +msgid "Malayalam" +msgstr "Малаялам" + +#: zypp/LanguageCode.cc:754 +msgid "Mandingo" +msgstr "Мандинго" + +# ML +#: zypp/LanguageCode.cc:756 +msgid "Maori" +msgstr "Маори" + +#: zypp/LanguageCode.cc:758 +msgid "Austronesian (Other)" +msgstr "Австронезийски (друг)" + +#: zypp/LanguageCode.cc:760 +msgid "Marathi" +msgstr "Марати" + +# MW +#: zypp/LanguageCode.cc:762 +msgid "Masai" +msgstr "Масаи" + +#: zypp/LanguageCode.cc:764 +msgid "Malay" +msgstr "Малайски" + +#: zypp/LanguageCode.cc:766 +msgid "Moksha" +msgstr "Мокша" + +# MM +#: zypp/LanguageCode.cc:768 +msgid "Mandar" +msgstr "Мандар" + +#: zypp/LanguageCode.cc:770 +msgid "Mende" +msgstr "Менде" + +#: zypp/LanguageCode.cc:772 +msgid "Irish, Middle (900-1200)" +msgstr "Ирландски, среден (900-1200)" + +#: zypp/LanguageCode.cc:774 +msgid "Mi'kmaq" +msgstr "Ми'кмак" + +#: zypp/LanguageCode.cc:776 +msgid "Minangkabau" +msgstr "Минанкубау" + +#: zypp/LanguageCode.cc:778 +#, fuzzy +msgid "Miscellaneous languages" +msgstr "Разни езици" + +#: zypp/LanguageCode.cc:780 +msgid "Mon-Khmer (Other)" +msgstr "Мон-кхмер (друг)" + +# MG +#: zypp/LanguageCode.cc:782 +msgid "Malagasy" +msgstr "Малагаси" + +# MV +# fuzzy +#: zypp/LanguageCode.cc:784 +msgid "Maltese" +msgstr "Малтийски" + +#: zypp/LanguageCode.cc:786 +msgid "Manchu" +msgstr "Манчу" + +# ML +#: zypp/LanguageCode.cc:788 +msgid "Manipuri" +msgstr "Манпури" + +#: zypp/LanguageCode.cc:790 +#, fuzzy +msgid "Manobo languages" +msgstr "Манобо езици" + +#: zypp/LanguageCode.cc:792 +msgid "Mohawk" +msgstr "Мохаук" + +#: zypp/LanguageCode.cc:794 +msgid "Moldavian" +msgstr "Молдовски" + +# MN +#: zypp/LanguageCode.cc:796 +msgid "Mongolian" +msgstr "Монголски" + +#: zypp/LanguageCode.cc:798 +msgid "Mossi" +msgstr "Моси" + +#: zypp/LanguageCode.cc:800 +#, fuzzy +msgid "Multiple languages" +msgstr "Множество езици" + +#: zypp/LanguageCode.cc:802 +#, fuzzy +msgid "Munda languages" +msgstr "Мунда езици" + +#: zypp/LanguageCode.cc:804 +msgid "Creek" +msgstr "Креек" + +# FM +# fuzzy +#: zypp/LanguageCode.cc:806 +msgid "Mirandese" +msgstr "Мирандейски" + +#: zypp/LanguageCode.cc:808 +msgid "Marwari" +msgstr "Марвари" + +#: zypp/LanguageCode.cc:810 +#, fuzzy +msgid "Mayan languages" +msgstr "Майски езици" + +# SY +# fuzzy +#: zypp/LanguageCode.cc:812 +msgid "Erzya" +msgstr "Ерзя" + +#: zypp/LanguageCode.cc:814 +msgid "Nahuatl" +msgstr "Нахуати" + +#: zypp/LanguageCode.cc:816 +msgid "North American Indian" +msgstr "Северна-американски индиански" + +# NP +#: zypp/LanguageCode.cc:818 +msgid "Neapolitan" +msgstr "Неаполитански" + +#: zypp/LanguageCode.cc:820 zypp/CountryCode.cc:380 +msgid "Nauru" +msgstr "Науру" + +#: zypp/LanguageCode.cc:822 +msgid "Navajo" +msgstr "Навахо" + +#: zypp/LanguageCode.cc:824 +msgid "Ndebele, South" +msgstr "Ндебеле, южен" + +#: zypp/LanguageCode.cc:826 +msgid "Ndebele, North" +msgstr "Ндебеле, северерен" + +# TO +#: zypp/LanguageCode.cc:828 +msgid "Ndonga" +msgstr "Ндонга" + +#: zypp/LanguageCode.cc:830 +msgid "Low German" +msgstr "Долно-германски" + +# NP +#: zypp/LanguageCode.cc:832 +msgid "Nepali" +msgstr "Непалски" + +# NP +#: zypp/LanguageCode.cc:834 +msgid "Nepal Bhasa" +msgstr "Непал баса" + +#: zypp/LanguageCode.cc:836 +msgid "Nias" +msgstr "Ниас" + +#: zypp/LanguageCode.cc:838 +msgid "Niger-Kordofanian (Other)" +msgstr "Нигер-гордофански (друг)" + +# NU +#: zypp/LanguageCode.cc:840 +msgid "Niuean" +msgstr "Нюеан" + +#: zypp/LanguageCode.cc:842 +msgid "Norwegian Nynorsk" +msgstr "Норвежки нинорск" + +#: zypp/LanguageCode.cc:844 +msgid "Norwegian Bokmal" +msgstr "Норвежки бокмал" + +# TO +#: zypp/LanguageCode.cc:846 +msgid "Nogai" +msgstr "Ногай" + +#: zypp/LanguageCode.cc:848 +msgid "Norse, Old" +msgstr "Норсе, стар" + +#: zypp/LanguageCode.cc:850 +msgid "Norwegian" +msgstr "Норвежка" + +#: zypp/LanguageCode.cc:852 +msgid "Northern Sotho" +msgstr "Северно сото" + +#: zypp/LanguageCode.cc:854 +#, fuzzy +msgid "Nubian languages" +msgstr "Нубийски езици" + +#: zypp/LanguageCode.cc:856 +msgid "Classical Newari" +msgstr "Класически невари" + +#: zypp/LanguageCode.cc:858 +msgid "Chichewa" +msgstr "Чичева" + +#: zypp/LanguageCode.cc:860 +msgid "Nyamwezi" +msgstr "Нямвези" + +#: zypp/LanguageCode.cc:862 +msgid "Nyankole" +msgstr "Нянколе" + +#: zypp/LanguageCode.cc:864 +msgid "Nyoro" +msgstr "Ньоро" + +#: zypp/LanguageCode.cc:866 +msgid "Nzima" +msgstr "Нзима" + +#: zypp/LanguageCode.cc:868 +msgid "Occitan (post 1500)" +msgstr "Окцитан (след 1500)" + +#: zypp/LanguageCode.cc:870 +msgid "Ojibwa" +msgstr "Ожибва" + +# SY +# fuzzy +#: zypp/LanguageCode.cc:872 +msgid "Oriya" +msgstr "Ория" + +#: zypp/LanguageCode.cc:874 +msgid "Oromo" +msgstr "Оромо" + +#: zypp/LanguageCode.cc:876 +msgid "Osage" +msgstr "Осаге" + +#: zypp/LanguageCode.cc:878 +msgid "Ossetian" +msgstr "Осетински" + +#: zypp/LanguageCode.cc:880 +msgid "Turkish, Ottoman (1500-1928)" +msgstr "Турски, отомански (1500-1928)" + +#: zypp/LanguageCode.cc:882 +#, fuzzy +msgid "Otomian languages" +msgstr "Отомански езици" + +#: zypp/LanguageCode.cc:884 +msgid "Papuan (Other)" +msgstr "Папуански (друг)" + +#: zypp/LanguageCode.cc:886 +msgid "Pangasinan" +msgstr "Пангасински" + +#: zypp/LanguageCode.cc:888 +msgid "Pahlavi" +msgstr "Пахлави" + +#: zypp/LanguageCode.cc:890 +msgid "Pampanga" +msgstr "Пампанга" + +#: zypp/LanguageCode.cc:892 +msgid "Panjabi" +msgstr "Панджаби" + +#: zypp/LanguageCode.cc:894 +msgid "Papiamento" +msgstr "Папияменто" + +#: zypp/LanguageCode.cc:896 +msgid "Palauan" +msgstr "Палауан" + +#: zypp/LanguageCode.cc:898 +msgid "Persian, Old (ca.600-400 B.C.)" +msgstr "Персийски, стар (ок. 600-400 пр.н.е.)" + +#: zypp/LanguageCode.cc:900 +msgid "Persian" +msgstr "Персийски" + +#: zypp/LanguageCode.cc:902 +msgid "Philippine (Other)" +msgstr "Филипински (друг)" + +#: zypp/LanguageCode.cc:904 +msgid "Phoenician" +msgstr "Финикийски" + +#: zypp/LanguageCode.cc:906 +msgid "Pali" +msgstr "Пали" + +#: zypp/LanguageCode.cc:908 +msgid "Polish" +msgstr "Полска" + +#: zypp/LanguageCode.cc:910 +msgid "Pohnpeian" +msgstr "Понпейски" + +#: zypp/LanguageCode.cc:912 +msgid "Portuguese" +msgstr "Португалска" + +#: zypp/LanguageCode.cc:914 +#, fuzzy +msgid "Prakrit languages" +msgstr "Пракрит езици" + +#: zypp/LanguageCode.cc:916 +msgid "Provencal, Old (to 1500)" +msgstr "Провенциален, стар (до 1500)" -#. Translator: %s = name of packages,patch,... -#. TranslatorExplanation: Additional information to dependency solver result. -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:162 +#: zypp/LanguageCode.cc:918 +msgid "Pushto" +msgstr "Пущо" + +#: zypp/LanguageCode.cc:920 +msgid "Quechua" +msgstr "Куечуа" + +# KZ +# fuzzy +#: zypp/LanguageCode.cc:922 +msgid "Rajasthani" +msgstr "Раджастани" + +#: zypp/LanguageCode.cc:924 +msgid "Rapanui" +msgstr "Папануй" + +#: zypp/LanguageCode.cc:926 +msgid "Rarotongan" +msgstr "Раротоган" + +#: zypp/LanguageCode.cc:928 +msgid "Romance (Other)" +msgstr "Романски (друг)" + +#: zypp/LanguageCode.cc:930 +msgid "Raeto-Romance" +msgstr "Раето-романс" + +#: zypp/LanguageCode.cc:932 +msgid "Romany" +msgstr "Романи" + +#: zypp/LanguageCode.cc:934 +msgid "Romanian" +msgstr "Румънски" + +# RE +#: zypp/LanguageCode.cc:936 +msgid "Rundi" +msgstr "Рунди" + +#: zypp/LanguageCode.cc:938 +msgid "Russian" +msgstr "Руска" + +#: zypp/LanguageCode.cc:940 +msgid "Sandawe" +msgstr "Сандауе" + +#: zypp/LanguageCode.cc:942 +msgid "Sango" +msgstr "Санго" + +#: zypp/LanguageCode.cc:944 +msgid "Yakut" +msgstr "Якут" + +#: zypp/LanguageCode.cc:946 +msgid "South American Indian (Other)" +msgstr "Южно-американски индиански (друг)" + +#: zypp/LanguageCode.cc:948 +#, fuzzy +msgid "Salishan languages" +msgstr "Салишан езици" + +#: zypp/LanguageCode.cc:950 +msgid "Samaritan Aramaic" +msgstr "Самаритан арамаик" + +#: zypp/LanguageCode.cc:952 +msgid "Sanskrit" +msgstr "Санскрит" + +#: zypp/LanguageCode.cc:954 +msgid "Sasak" +msgstr "Сасак" + +#: zypp/LanguageCode.cc:956 +msgid "Santali" +msgstr "Сантали" + +#: zypp/LanguageCode.cc:958 +msgid "Serbian" +msgstr "Сръбски" + +#: zypp/LanguageCode.cc:960 +msgid "Sicilian" +msgstr "Сицилиански" + +#: zypp/LanguageCode.cc:962 +msgid "Scots" +msgstr "Скотски" + +#: zypp/LanguageCode.cc:964 +msgid "Croatian" +msgstr "Хърватска" + +#: zypp/LanguageCode.cc:966 +msgid "Selkup" +msgstr "Селкуп" + +#: zypp/LanguageCode.cc:968 +msgid "Semitic (Other)" +msgstr "Семитски (друг)" + +#: zypp/LanguageCode.cc:970 +msgid "Irish, Old (to 900)" +msgstr "Ирландски, стар (до 900)" + +#: zypp/LanguageCode.cc:972 +msgid "Sign Languages" +msgstr "Знакови езици" + +#: zypp/LanguageCode.cc:974 +msgid "Shan" +msgstr "Шан" + +#: zypp/LanguageCode.cc:976 +msgid "Sidamo" +msgstr "Сидамо" + +# AO +#: zypp/LanguageCode.cc:978 +msgid "Sinhala" +msgstr "Синхала" + +#: zypp/LanguageCode.cc:980 +#, fuzzy +msgid "Siouan languages" +msgstr "Сиуан езици" + +#: zypp/LanguageCode.cc:982 +msgid "Sino-Tibetan (Other)" +msgstr "Сино-тибетски (друг)" + +#: zypp/LanguageCode.cc:984 +msgid "Slavic (Other)" +msgstr "Славянски (друг)" + +#: zypp/LanguageCode.cc:986 +msgid "Slovak" +msgstr "Словашка" + +#: zypp/LanguageCode.cc:988 +msgid "Slovenian" +msgstr "Словенски" + +#: zypp/LanguageCode.cc:990 +msgid "Southern Sami" +msgstr "Южно сами" + +#: zypp/LanguageCode.cc:992 +msgid "Northern Sami" +msgstr "Северно сами" + +#: zypp/LanguageCode.cc:994 +#, fuzzy +msgid "Sami languages (Other)" +msgstr "Сами езици (друг)" + +#: zypp/LanguageCode.cc:996 +msgid "Lule Sami" +msgstr "Люле сами" + +#: zypp/LanguageCode.cc:998 +msgid "Inari Sami" +msgstr "Инари сами" + +#: zypp/LanguageCode.cc:1000 +msgid "Samoan" +msgstr "Самоански" + +#: zypp/LanguageCode.cc:1002 +msgid "Skolt Sami" +msgstr "Сколт сами" + +#: zypp/LanguageCode.cc:1004 +msgid "Shona" +msgstr "Шона" + +#: zypp/LanguageCode.cc:1006 +msgid "Sindhi" +msgstr "Синди" + +#: zypp/LanguageCode.cc:1008 +msgid "Soninke" +msgstr "Синонке" + +#: zypp/LanguageCode.cc:1010 +msgid "Sogdian" +msgstr "Согдийски" + +# SO +#: zypp/LanguageCode.cc:1012 +msgid "Somali" +msgstr "Сомалийски" + +#: zypp/LanguageCode.cc:1014 +msgid "Songhai" +msgstr "Сонгхай" + +#: zypp/LanguageCode.cc:1016 +msgid "Sotho, Southern" +msgstr "Сото, южно" + +#: zypp/LanguageCode.cc:1018 +msgid "Spanish" +msgstr "Испанска" + +# MR +#: zypp/LanguageCode.cc:1020 +msgid "Sardinian" +msgstr "Сардински" + +#: zypp/LanguageCode.cc:1022 +msgid "Serer" +msgstr "Серер" + +#: zypp/LanguageCode.cc:1024 +msgid "Nilo-Saharan (Other)" +msgstr "Нило-сахарски (друг)" + +# HT +#: zypp/LanguageCode.cc:1026 +msgid "Swati" +msgstr "Свати" + +#: zypp/LanguageCode.cc:1028 +msgid "Sukuma" +msgstr "Сукума" + +#: zypp/LanguageCode.cc:1030 +msgid "Sundanese" +msgstr "Сундански" + +#: zypp/LanguageCode.cc:1032 +msgid "Susu" +msgstr "Сусу" + +#: zypp/LanguageCode.cc:1034 +msgid "Sumerian" +msgstr "Шумерски" + +# SZ +#: zypp/LanguageCode.cc:1036 +msgid "Swahili" +msgstr "Свахили" + +#: zypp/LanguageCode.cc:1038 +msgid "Swedish" +msgstr "Шведска" + +# SY +# fuzzy +#: zypp/LanguageCode.cc:1040 +msgid "Syriac" +msgstr "Сирийски" + +#: zypp/LanguageCode.cc:1042 +msgid "Tahitian" +msgstr "Таитски" + +#: zypp/LanguageCode.cc:1044 +msgid "Tai (Other)" +msgstr "Тай (друг)" + +#: zypp/LanguageCode.cc:1046 +msgid "Tamil" +msgstr "Тамилски" + +#: zypp/LanguageCode.cc:1048 +msgid "Tatar" +msgstr "Татарски" + +#: zypp/LanguageCode.cc:1050 +msgid "Telugu" +msgstr "Телугу" + +#: zypp/LanguageCode.cc:1052 +msgid "Timne" +msgstr "Тимне" + +#: zypp/LanguageCode.cc:1054 +msgid "Tereno" +msgstr "Терено" + +#: zypp/LanguageCode.cc:1056 +msgid "Tetum" +msgstr "Тетум" + +#: zypp/LanguageCode.cc:1058 +msgid "Tajik" +msgstr "Таджикски" + +#: zypp/LanguageCode.cc:1060 +msgid "Tagalog" +msgstr "Тагалог" + +#: zypp/LanguageCode.cc:1062 +msgid "Thai" +msgstr "Тайландски" + +# TW +# fuzzy +#: zypp/LanguageCode.cc:1064 +msgid "Tibetan" +msgstr "Тибетски" + +#: zypp/LanguageCode.cc:1066 +msgid "Tigre" +msgstr "Тигре" + +# NG +#: zypp/LanguageCode.cc:1068 +msgid "Tigrinya" +msgstr "Тигриния" + +#: zypp/LanguageCode.cc:1070 +msgid "Tiv" +msgstr "Тив" + +# TK +#: zypp/LanguageCode.cc:1072 zypp/CountryCode.cc:428 +msgid "Tokelau" +msgstr "Токелау" + +#: zypp/LanguageCode.cc:1074 +msgid "Klingon" +msgstr "Клингон" + +#: zypp/LanguageCode.cc:1076 +msgid "Tlingit" +msgstr "Тлингит" + +#: zypp/LanguageCode.cc:1078 +msgid "Tamashek" +msgstr "Тамашек" + +#: zypp/LanguageCode.cc:1080 +msgid "Tonga (Nyasa)" +msgstr "Тонга (Няса)" + +# SB +#: zypp/LanguageCode.cc:1082 +msgid "Tonga (Tonga Islands)" +msgstr "Тонга (Острови Тонга)" + +#: zypp/LanguageCode.cc:1084 +msgid "Tok Pisin" +msgstr "Ток писин" + +#: zypp/LanguageCode.cc:1086 +msgid "Tsimshian" +msgstr "Цимашински" + +#: zypp/LanguageCode.cc:1088 +msgid "Tswana" +msgstr "Цвана" + +# TO +#: zypp/LanguageCode.cc:1090 +msgid "Tsonga" +msgstr "Цонга" + +#: zypp/LanguageCode.cc:1092 +msgid "Turkmen" +msgstr "Туркменски" + +#: zypp/LanguageCode.cc:1094 +msgid "Tumbuka" +msgstr "Тумбука" + +#: zypp/LanguageCode.cc:1096 +#, fuzzy +msgid "Tupi languages" +msgstr "Тупи езици" + +#: zypp/LanguageCode.cc:1098 +msgid "Turkish" +msgstr "Турска" + +#: zypp/LanguageCode.cc:1100 +msgid "Altaic (Other)" +msgstr "Алтайски (друг)" + +# TV +#: zypp/LanguageCode.cc:1102 zypp/CountryCode.cc:435 +msgid "Tuvalu" +msgstr "Тувалу" + +#: zypp/LanguageCode.cc:1104 +msgid "Twi" +msgstr "Тви" + +#: zypp/LanguageCode.cc:1106 +msgid "Tuvinian" +msgstr "Тувински" + +#: zypp/LanguageCode.cc:1108 +msgid "Udmurt" +msgstr "Удмурт" + +# HT +#: zypp/LanguageCode.cc:1110 +msgid "Ugaritic" +msgstr "Угаритски" + +#: zypp/LanguageCode.cc:1112 +msgid "Uighur" +msgstr "Уигурски" + +#: zypp/LanguageCode.cc:1114 +msgid "Ukrainian" +msgstr "Украинска" + +#: zypp/LanguageCode.cc:1116 +msgid "Umbundu" +msgstr "Умбурду" + +#: zypp/LanguageCode.cc:1118 +msgid "Undetermined" +msgstr "Неопределен" + +#: zypp/LanguageCode.cc:1120 +msgid "Urdu" +msgstr "Урду" + +#: zypp/LanguageCode.cc:1122 +msgid "Uzbek" +msgstr "Узбекски" + +#: zypp/LanguageCode.cc:1124 +msgid "Vai" +msgstr "Вай" + +#: zypp/LanguageCode.cc:1126 +msgid "Venda" +msgstr "Венда" + +#: zypp/LanguageCode.cc:1128 +msgid "Vietnamese" +msgstr "Виетнамски" + +#: zypp/LanguageCode.cc:1130 +msgid "Volapuk" +msgstr "Волапук" + +#: zypp/LanguageCode.cc:1132 +msgid "Votic" +msgstr "Вотски" + +#: zypp/LanguageCode.cc:1134 +#, fuzzy +msgid "Wakashan languages" +msgstr "Вакашан езици" + +#: zypp/LanguageCode.cc:1136 +msgid "Walamo" +msgstr "Валамо" + +#: zypp/LanguageCode.cc:1138 +msgid "Waray" +msgstr "Варай" + +#: zypp/LanguageCode.cc:1140 +msgid "Washo" +msgstr "Вашо" + +#: zypp/LanguageCode.cc:1142 +msgid "Welsh" +msgstr "Уелски" + +#: zypp/LanguageCode.cc:1144 +#, fuzzy +msgid "Sorbian languages" +msgstr "Сорбийски езици" + +#: zypp/LanguageCode.cc:1146 +msgid "Walloon" +msgstr "Валун" + +#: zypp/LanguageCode.cc:1148 +msgid "Wolof" +msgstr "Волоф" + +#: zypp/LanguageCode.cc:1150 +msgid "Kalmyk" +msgstr "Калмик" + +#: zypp/LanguageCode.cc:1152 +msgid "Xhosa" +msgstr "Ксоса" + +#: zypp/LanguageCode.cc:1154 +msgid "Yao" +msgstr "Яо" + +#: zypp/LanguageCode.cc:1156 +msgid "Yapese" +msgstr "Япесе" + +#: zypp/LanguageCode.cc:1158 +msgid "Yiddish" +msgstr "Юдийски" + +# AW +#: zypp/LanguageCode.cc:1160 +msgid "Yoruba" +msgstr "Йоруба" + +#: zypp/LanguageCode.cc:1162 +#, fuzzy +msgid "Yupik languages" +msgstr "Юпик езици" + +#: zypp/LanguageCode.cc:1164 +msgid "Zapotec" +msgstr "Запотек" + +# SN +#: zypp/LanguageCode.cc:1166 +msgid "Zenaga" +msgstr "Зенага" + +# BT +#: zypp/LanguageCode.cc:1168 +msgid "Zhuang" +msgstr "Цуанг" + +#: zypp/LanguageCode.cc:1170 +msgid "Zande" +msgstr "Занде" + +#: zypp/LanguageCode.cc:1172 +msgid "Zulu" +msgstr "Зулу" + +#: zypp/LanguageCode.cc:1174 +msgid "Zuni" +msgstr "Зуни" + +#: zypp/target/rpm/RpmDb.cc:1656 #, c-format -msgid "Marking resolvable %s as uninstallable" -msgstr "Маркиране на пакета %s като деинсталируем" +msgid "Changed configuration files for %s:" +msgstr "Променени файлове с настройки за %s:" -#. Translator: %s = name of packages,patch,... -#. TranslatorExplanation: Additional information to dependency solver result. -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:170 +#: zypp/target/rpm/RpmDb.cc:1807 #, c-format -msgid "" -"%s is scheduled to be installed, but this is not possible because of " -"dependency problems." -msgstr "" -"%s е подготвен за инсталиране, но това не е възможно заради проблеми със " -"зависимости." +msgid "rpm saved %s as %s but it was impossible to determine the difference" +msgstr "rpm запази %s като %s, но е невъзможно да се открие разликата" -#. Translator: %s = name of package,patch,... -#. TranslatorExplanation: Additional information to dependency solver result. -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:178 +#: zypp/target/rpm/RpmDb.cc:1809 #, c-format msgid "" -"Can't install %s since it is already marked as needing to be uninstalled" -msgstr "Не може да се инсталира %s след като вече е маркиран за деинсталиране" +"rpm saved %s as %s.\n" +"Here are the first 25 lines of difference:\n" +msgstr "" +"rpm запази %s като %s.\n" +"Ето първите 25 реда от разликите:\n" -#. Translator: %s = name of patch -#. TranslatorExplanation: A patch which is not needed (does not apply) cant be installed -#. TranslatorExplanation: Patches contain updates (bug fixes) to packages. Such fixes -#. TranslatorExplanation: do only apply if the package to-be-fixed is actually installed. -#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed -#. TranslatorExplanation: package is not installed. -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:190 -#, fuzzy, c-format -msgid "Can't install %s since it is does not apply to this system." -msgstr "Не може да се инсталира %s след като вече е маркиран за деинсталиране" +#: zypp/target/rpm/RpmDb.cc:1812 +#, c-format +msgid "rpm created %s as %s but it was impossible to determine the difference" +msgstr "rpm създаде %s като %s, но е невъзможно да се открие разликата" -#. Translator: %s = name of package,patch,... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:197 +#: zypp/target/rpm/RpmDb.cc:1814 #, c-format msgid "" -"Can't install %s, since a resolvable of the same name is already marked as " -"needing to be installed" +"rpm created %s as %s.\n" +"Here are the first 25 lines of difference:\n" msgstr "" -"Не може да се инсталира %s, след като пакет със същото име вече е маркиран " -"за инсталиране" +"rpm създаде %s като %s.\n" +"Ето първите 25 реда от разликите:\n" -#. Translator: %s = name of patch,product -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:204 +#: zypp/target/rpm/RpmDb.cc:1819 #, c-format -msgid "This would invalidate %s." -msgstr "" - -#. Translator: %s = name of patch, pattern, ... -#. TranslatorExplanation: Establishing is the process of computing which patches are needed -#. TranslatorExplanation: This is just a progress indicator -#. TranslatorExplanation: It is also used for other types of resolvables in order to verify -#. TranslatorExplanation: the completeness of their dependencies -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:220 -#, fuzzy, c-format -msgid "Establishing %s" -msgstr "Инсталиране на %s" +msgid "%s install failed" +msgstr "Инсталирането на %s бе неуспешно" -#. affected() = updated resolvable -#. _capability = -#. other() = currently installed, being updated resolvable -#. other_capability() = -#. Translator: 1.%s and 2.%s = name of package -#. TranslatorExample: Updating foo-1.1 to foo-1.2 -#. TranslatorExplanation: Just a progress indicator that something is scheduled for upgrade -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:258 -#, fuzzy, c-format -msgid "Updating %s to %s" -msgstr "Обновяване на %s => %s" +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 +msgid "rpm output:" +msgstr "Изход от rpm:" -#. affected() = -#. _capability = -#. other() = -#. other_capability() = -#. Translator: %s = name of package,patch,... -#. TranslatorExample: Skipping foo: already installed -#. TranslatorExplanation: An installation request for foo is skipped since foo is already installed -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:276 +#: zypp/target/rpm/RpmDb.cc:1824 #, c-format -msgid "Skipping %s: already installed" -msgstr "Пропускане на %s: вече е инсталиран" +msgid "%s installed ok" +msgstr "Инсталирането на %s бе успешно" -#. affected() = is set -#. _capability = is set -#. other() = -#. other_capability() = -#. Translator: 1.%s = dependency -#. TranslatorExample: There are no alternative installed providers of foo -#. TranslatorExplanation: A resolvable is to be uninstalled. It provides 'foo' which is needed by others -#. TranslatorExplanation: We just found out that 'foo' is not provided by anything else (an alternative) -#. TranslatorExplanation: removal of this resolvable would therefore break dependency -#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:298 -#, c-format -msgid "There are no alternative installed providers of %s" -msgstr "Няма инсталирани алтернативни доставчици на %s" +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 +msgid "Additional rpm output:" +msgstr "Допълнителен изход от rpm:" -#. Translator: 1.%s = name of package,patch.... -#. TranslatorExample: for bar -#. TranslatorExplanation: extension to previous message if we know what the resolvable is -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:304 -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:329 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format -msgid "for %s" -msgstr "" +msgid "%s remove failed" +msgstr "Премахването на %s бе неуспешно" -#. affected() = -#. _capability = -#. other() = -#. other_capability() = -#. Translator: 1.%s = dependency -#. TranslatorExample: There are no installable providers of foo -#. TranslatorExplanation: A resolvable is to be installed which requires foo -#. TranslatorExplanation: But there is nothing available to fulfill this requirement -#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be installed -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:323 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format -msgid "There are no installable providers of %s" -msgstr "Няма инсталируеми доставчици на %s" +msgid "%s remove ok" +msgstr "Премахването на %s бе успешно" -#. affected() = resolvable to be removed -#. _capability = -#. other() = failed upgrade to affected() -#. other_capability() = -#. Translator: 1.%s = name of package,patch,..., 2.%s = name of package,patch,... -#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible -#. TranslatorExplanation: bar requires something from foo -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:346 -#, c-format -msgid "Upgrade to %s to avoid removing %s is not possible." -msgstr "Не е възможно обновяването към %s за да се избегне премахването на %s." +#: zypp/target/rpm/RpmDb.cc:1945 +msgid "Ok" +msgstr "Добре" -#. affected() = requirer of capability -#. _capability = provided by other() -#. other() = provider of capability -#. other_capability() = - empty - -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:362 -#, c-format -msgid "%s provides %s, but is scheduled to be uninstalled." -msgstr "%s доставя %s, но е планирано за деинсталиране." +#: zypp/target/rpm/RpmDb.cc:1948 +msgid "The package is not OK for the following reasons:" +msgstr "Пакетът не е наред поради следните причини:" -#. affected() = requirer of capability -#. _capability = provided by other() -#. other() = provider of capability -#. other_capability() = - empty - -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s type (package, patch, ...) -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:378 -#, fuzzy, c-format -msgid "%s provides %s, but another version of that %s is already installed." -msgstr "%s доставя %s, но друга версия на същия пакет вече е инсталирана." +#: zypp/target/rpm/RpmDb.cc:1954 +msgid "The package contains different version than expected" +msgstr "Пакетът съдържа различна от очакваната версия" -#. affected() = requirer of capability -#. _capability = provided by other() -#. other() = provider of capability -#. other_capability() = - empty - -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:395 -#, c-format -msgid "" -"%s provides %s, but it is uninstallable. Try installing it on its own for " -"more details." -msgstr "" -"%s доставя %s, но е деинсталируем. Опитайте да го инсталирате ръчно за " -"повече подробности." +#: zypp/target/rpm/RpmDb.cc:1960 +msgid "The package file has incorrect MD5 sum" +msgstr "Файлът на пакета има некоректна MD5 сума" -#. affected() = requirer of capability -#. _capability = provided by other() -#. other() = provider of capability -#. other_capability() = - empty - -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:411 -#, c-format -msgid "%s provides %s, but it is locked." -msgstr "%s доставя %s, но е заключен." +#: zypp/target/rpm/RpmDb.cc:1966 +msgid "The package is not signed" +msgstr "Пакетът не е подписан" -#. affected() = requirer of capability -#. _capability = required capability -#. other() = - empty - -#. other_capability() = - empty - -#. Translator: 1.%s = dependency. 2.%s name of package, patch, ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:427 -#, fuzzy, c-format -msgid "Can't satisfy requirement %s for %s" -msgstr "Не могат да се удовлетворят изискванията за %s" - -#. affected() = to-be-installed resolvable which was scheduled to be uninstalled -#. _capability = -#. other() = -#. other_capability() = -#. Translator: %s = name of package,patch,... -#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked. -#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:448 -#, fuzzy, c-format -msgid "" -"%s is required by other to-be-installed resolvable, so it won't be unlinked." -msgstr "%s се изисква от друг инсталиран пакет и няма да бъде премахнат." +#: zypp/target/rpm/RpmDb.cc:1972 +msgid "The package has no MD5 sum" +msgstr "Пакетът няма MD5 сума" -#. affected() = provider of cap -#. _capability = -#. other() = -#. other_capability() = -#. Translator: %s = name of package,patch,... -#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked. -#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:465 -#, c-format -msgid "%s is required by other installed resolvable, so it won't be unlinked." -msgstr "%s се изисква от друг инсталиран пакет и няма да бъде премахнат." +#: zypp/target/rpm/RpmDb.cc:1978 +msgid "The package has incorrect signature" +msgstr "Пакетът има невалидна сигнатура." -#. affected() = to-be-uninstalled resolvable which is locked -#. _capability = -#. other() = -#. other_capability() = -#. Translator: %s = name of package,patch,... -#. TranslatorExample: foo is locked and cannot be uninstalled. -#. TranslatorExplanation: foo is to-be-uninstalled but it is locked -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:482 -#, fuzzy, c-format -msgid "%s is locked and cannot be uninstalled." -msgstr "%s е заключен и не може да бъде деинсталиран." +#: zypp/target/rpm/RpmDb.cc:1984 +msgid "The package archive has incorrect MD5 sum" +msgstr "Архивът с пакетите има некоректна MD5 сума" -#. affected() = provider of capability -#. _capability = provided by provider -#. other() = conflict issuer -#. other_capability() = conflict capability -#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,... -#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:501 -#, fuzzy, c-format -msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" +#: zypp/target/rpm/RpmDb.cc:1990 +msgid "rpm failed for unkown reason, see log file" msgstr "" -"Конфликтът с %s (%s) с изисква премахването на %s, което е било подготвено " -"за инсталиране" - -#. affected() = provider of capability -#. _capability = provided by provider -#. other() = conflict issuer -#. other_capability() = conflict capability from issuer -#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency; -#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar) -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:519 -#, fuzzy, c-format -msgid "Marking %s as uninstallable due to conflicts over %s" -msgstr "Маркиране на %s като деинсталируем поради конфликта с %s (%s)" +"rpm завърши с неуспех поради неизвестна причина, прегледайте файла-дневник" -#. Translator: %s = name of package,patch -#. TranslatorExample: from abc -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMisc.cc:527 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format -msgid "from %s" -msgstr "" - -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoMissingReq.cc:56 -#, fuzzy, c-format -msgid "%s is missing the requirement %s" -msgstr "%s липсва изискания %s" +msgid "created backup %s" +msgstr "създадено резервно копие %s" -#. Translator: all.%s = name of package,patch,... -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoNeededBy.cc:55 -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:131 -#, fuzzy, c-format -msgid "%s is needed by %s" -msgstr "%s е необходим на %s" +#: zypp/solver/detail/ResolverInfoObsoletes.cc:55 +#, c-format +msgid "%s is replaced by %s" +msgstr "%s е заменен от %s" -#. Translator: all.%s = name of package,patch,.... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/ResolverInfoObsoletes.cc:54 +#: zypp/solver/detail/ResolverInfoObsoletes.cc:69 #, fuzzy, c-format -msgid "%s is replaced by %s" +msgid "%s replaced by %s" msgstr "%s е заменен от %s" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:121 +#: zypp/solver/detail/Resolver_problems.cc:172 msgid "Invalid information" -msgstr "" +msgstr "Невалидна информация" + +#: zypp/solver/detail/Resolver_problems.cc:179 +#, c-format +msgid "%s is needed by other resolvables" +msgstr "%s е необходим на друг пакет" + +#: zypp/solver/detail/Resolver_problems.cc:182 +#: zypp/solver/detail/ResolverInfoNeededBy.cc:56 +#, c-format +msgid "%s is needed by %s" +msgstr "%s е необходим на %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:128 +#: zypp/solver/detail/Resolver_problems.cc:183 #, c-format -msgid "%s is needed by other resolvables" -msgstr "" - -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:132 -#, fuzzy, c-format msgid "" "%s is needed by:\n" "%s" -msgstr "%s е необходим на %s" +msgstr "" +"%s е необходим на:\n" +"%s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:139 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:190 +#, c-format msgid "%s conflicts with other resolvables" +msgstr "%s е в конфликт с други пакети" + +#: zypp/solver/detail/Resolver_problems.cc:193 +#: zypp/solver/detail/ResolverInfoConflictsWith.cc:55 +#: zypp/solver/detail/ResolverInfoConflictsWith.cc:70 +#, c-format +msgid "%s conflicts with %s" msgstr "%s е в конфликт с %s" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:143 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:194 +#, c-format msgid "" "%s conflicts with:\n" "%s" -msgstr "%s е в конфликт с %s" +msgstr "" +"%s е в конфликт с:\n" +"%s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:150 +#: zypp/solver/detail/Resolver_problems.cc:201 #, c-format msgid "%s obsoletes other resolvables" -msgstr "" +msgstr "%s прави ненужни други пакети" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:153 +#: zypp/solver/detail/Resolver_problems.cc:204 #, c-format msgid "%s obsoletes %s" -msgstr "" +msgstr "%s прави ненужно %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:155 +#: zypp/solver/detail/Resolver_problems.cc:206 #, c-format msgid "%s obsoletes:%s" -msgstr "" +msgstr "%s прави ненужно: %s" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:156 +#: zypp/solver/detail/Resolver_problems.cc:207 msgid "" "\n" "These resolvables will be deleted from the system." msgstr "" +"\n" +"Тези пакети ще бъдат изтрити от системата." -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:163 +#: zypp/solver/detail/Resolver_problems.cc:214 #, c-format msgid "%s depends on other resolvables" -msgstr "" +msgstr "%s зависи от други пакети" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:167 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:218 +#, c-format msgid "%s depends on %s" msgstr "%s зависи от %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:170 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:221 +#, c-format msgid "%s depends on:%s" -msgstr "%s зависи от %s" +msgstr "%s зависи от: %s" -#. TranslatorExplanation: currently it is unused. -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:176 +#: zypp/solver/detail/Resolver_problems.cc:227 msgid "Child of" -msgstr "" +msgstr "Дете на" -#. TranslatorExplanation %s = dependency -#. TranslatorExplanation %s = name of package,patch,... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:182 -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:233 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:233 +#: zypp/solver/detail/Resolver_problems.cc:296 +#, c-format msgid "Cannot install %s" -msgstr "Инсталиране на %s" +msgstr "%s не може да бъде инсталиран" -#. TranslatorExplanation %s = capability -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:184 +#: zypp/solver/detail/Resolver_problems.cc:235 #, c-format msgid "None provides %s" -msgstr "" +msgstr "Никой не доставя %s" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:185 +#: zypp/solver/detail/Resolver_problems.cc:236 msgid "" "\n" "There is no resource available which support this requirement." msgstr "" +"\n" +"Няма наличен ресурс за поддръжката на това изискване." -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:193 +#: zypp/solver/detail/Resolver_problems.cc:244 msgid "" "Due problems which are described above/below this resolution will not solve " "all dependencies" msgstr "" +"Поради проблемите, които са показани по-долу/горе сега няма да могат да " +"сеудовлетворят всички зависимости." -#. TranslatorExplanation %s = name of package,patch,... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:201 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:252 +#, c-format msgid "%s is not installed and has been marked as uninstallable" -msgstr "%s е заключен и не може да бъде деинсталиран." +msgstr "%s не е инсталиран и не може да бъде маркиран за деинсталиране." -#. TranslatorExplanation %s = name of package,patch,... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:208 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" -msgstr "" +msgstr "%s не може да бъде инсталиран поради пробем със зависимостите" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:243 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:311 +#, c-format msgid "%s has unfulfiled requirements" -msgstr "%s липсва изискания %s" +msgstr "%s има незадоволени изискания" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:277 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format -msgid "%s cannot be uninstalled due missing dependencies" -msgstr "за деинсталиране поради премахване" +msgid "%s has missing dependencies" +msgstr "%s не може да бъде инсталиран поради липсващи зависимости" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:289 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" -msgstr "" +msgstr "%s не може да бъде инсталиран поради липсващи зависимости" -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:309 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:409 +#, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" -msgstr "%s доставя %s, но е планирано за деинсталиране." +msgstr "%s задоволява зависимостите на %s, но ще бъде деинсталиран" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:319 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:419 +#, c-format msgid "No need to install %s" -msgstr "за инсталиране" +msgstr "Няма нужда от инсталиране на %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:327 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" -msgstr "" +msgstr "%s не може да бъде инсталиран за задоволяване на зависимостите на %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:337 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" -msgstr "" +msgstr "%s не може да бъде инсталиран за задоволяване на зависимостите на %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:358 -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:366 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 +#, c-format msgid "%s will not be uninstalled cause it is still required" -msgstr "за деинсталиране поради остаряване" +msgstr "%s няма да бъде деинсталиран, защото все още е необходим" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" -msgstr "" +msgstr "%s не може да бъде инсталиран, защото е в конфликт с %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: /usr/local/src/solver/trunk/libzypp/zypp/solver/detail/Resolver_problems.cc:404 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:509 +#, c-format msgid "%s is uninstallable due conflicts with %s" -msgstr "Маркиране на %s като деинсталируем поради конфликта с %s (%s)" +msgstr "%s е деинсталируем поради конфликта с %s" -#: CountryCode.cc:135 -msgid "Unknown country: " -msgstr "" +#: zypp/solver/detail/ProblemSolutionIgnore.cc:54 +#, fuzzy +msgid "Ignore this requirement just here" +msgstr "Пренебрегване на тези изисквания" -#: LanguageCode.cc:145 -msgid "Unknown language: " -msgstr "" +#: zypp/solver/detail/ProblemSolutionIgnore.cc:63 +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "Пренебрегване на тези изисквания" + +#: zypp/solver/detail/ProblemSolutionIgnore.cc:77 +#, fuzzy, c-format +msgid "Ignore this conflict of %s" +msgstr "Пренебрегване на конфликта на %s" + +#: zypp/solver/detail/ProblemSolutionIgnore.cc:86 +#, fuzzy +msgid "Ignore architecture" +msgstr "Архитектура" -#. Translator: %s = name of an rpm package. A list of diffs follows -#. this message. -#: target/rpm/RpmDb.cc:1624 +#: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Changed configuration files for %s:" -msgstr "Променени файлове с настройки за %s:" +msgid "Ignore that %s is already set to install" +msgstr "" + +#: zypp/solver/detail/ProblemSolutionUninstall.cc:52 +#: zypp/solver/detail/ProblemSolutionUninstall.cc:56 +#, fuzzy, c-format +msgid "delete %s" +msgstr "Изтриване на %1" -#. %s = filenames -#: target/rpm/RpmDb.cc:1762 +#: zypp/solver/detail/ProblemSolutionUninstall.cc:65 +#, fuzzy +msgid "Delete conflicting resolvables" +msgstr "Премахване на конфликтните пакети" + +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format -msgid "rpm saved %s as %s but it was impossible to determine the difference" -msgstr "rpm запази %s като %s, но е невъзможно да се открие разликата" +msgid "for requiring %s for %s when upgrading %s" +msgstr "за изисканото %s за %s, когато се обновява %s" -#. %s = filenames -#: target/rpm/RpmDb.cc:1764 +#: zypp/solver/detail/ResolverInfoMissingReq.cc:64 #, c-format -msgid "" -"rpm saved %s as %s.\n" -"Here are the first 25 lines of difference:\n" -msgstr "" -"rpm запази %s като %s.\n" -"Ето първите 25 реда от разликите:\n" +msgid "%s is missing the requirement %s" +msgstr "%s липсва изискания %s" + +#: zypp/solver/detail/ResolverInfoMisc.cc:56 +msgid ", Action: " +msgstr ", Действие:" + +#: zypp/solver/detail/ResolverInfoMisc.cc:59 +msgid ", Trigger: " +msgstr ", задействане при:" + +#: zypp/solver/detail/ResolverInfoMisc.cc:84 +msgid "package" +msgstr "пакет" + +#: zypp/solver/detail/ResolverInfoMisc.cc:88 +msgid "selection" +msgstr "подбор" + +#: zypp/solver/detail/ResolverInfoMisc.cc:92 +msgid "pattern" +msgstr "шаблон" + +#: zypp/solver/detail/ResolverInfoMisc.cc:96 +msgid "product" +msgstr "продукт" + +#: zypp/solver/detail/ResolverInfoMisc.cc:100 +msgid "patch" +msgstr "кръпка" + +#: zypp/solver/detail/ResolverInfoMisc.cc:104 +msgid "script" +msgstr "скрипт" + +#: zypp/solver/detail/ResolverInfoMisc.cc:108 +msgid "message" +msgstr "съобщение" + +#: zypp/solver/detail/ResolverInfoMisc.cc:112 +msgid "system" +msgstr "система" + +#: zypp/solver/detail/ResolverInfoMisc.cc:116 +msgid "Resolvable" +msgstr "Пакет" + +#: zypp/solver/detail/ResolverInfoMisc.cc:134 +msgid "Marking this resolution attempt as invalid." +msgstr "Маркиране на този опит за разрешаване като невалиден." -#. %s = filenames -#: target/rpm/RpmDb.cc:1767 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format -msgid "rpm created %s as %s but it was impossible to determine the difference" -msgstr "rpm създаде %s като %s, но е невъзможно да се открие разликата" +msgid "Marking resolvable %s as uninstallable" +msgstr "Маркиране на пакета %s като деинсталируем" -#. %s = filenames -#: target/rpm/RpmDb.cc:1769 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" -"rpm created %s as %s.\n" -"Here are the first 25 lines of difference:\n" +"%s is scheduled to be installed, but this is not possible because of " +"dependency problems." msgstr "" -"rpm създаде %s като %s.\n" -"Ето първите 25 реда от разликите:\n" +"%s е подготвен за инсталиране, но това не е възможно заради проблеми със " +"зависимости." -#. %s = filename of rpm package -#. timestamp -#: target/rpm/RpmDb.cc:1774 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format -msgid "%s install failed" -msgstr "Инсталирането на %s бе неуспешно" - -#: target/rpm/RpmDb.cc:1775 target/rpm/RpmDb.cc:1876 -msgid "rpm output:" -msgstr "Изход от rpm:" +msgid "" +"Can't install %s since it is already marked as needing to be uninstalled" +msgstr "Не може да се инсталира %s след като вече е маркиран за деинсталиране" -#. %s = filename of rpm package -#. timestamp -#: target/rpm/RpmDb.cc:1779 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format -msgid "%s installed ok" -msgstr "Инсталирането на %s бе успешно" +msgid "Can't install %s since it is does not apply to this system." +msgstr "" +"%s не може да се инсталира след като вече не е приложим за тази система." -#: target/rpm/RpmDb.cc:1781 target/rpm/RpmDb.cc:1881 -msgid "Additional rpm output:" -msgstr "Допълнителен изход от rpm:" +#: zypp/solver/detail/ResolverInfoMisc.cc:180 +#, fuzzy, c-format +msgid "Can't install %s, since %s is already marked as needing to be installed" +msgstr "Не може да се инсталира %s след като вече е маркиран за деинсталиране" -#. %s = name of rpm package -#. timestamp -#: target/rpm/RpmDb.cc:1875 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format -msgid "%s remove failed" -msgstr "Премахването на %s бе неуспешно" +msgid "This would invalidate %s." +msgstr "Това ще направи невалиден %s." -#. timestamp -#: target/rpm/RpmDb.cc:1879 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format -msgid "%s remove ok" -msgstr "Премахването на %s бе успешно" - -#: target/rpm/RpmDb.cc:1895 -msgid "Ok" -msgstr "ОК" - -#. translator: these are different kinds of how an rpm package can be broken -#: target/rpm/RpmDb.cc:1898 -#, fuzzy -msgid "The package is not OK for the following reasons:" -msgstr "Пакетът не е наред поради следните причини:" +msgid "Establishing %s" +msgstr "Откриване на %s" -#: target/rpm/RpmDb.cc:1904 -#, fuzzy -msgid "The package contains different version than expected" -msgstr "Пакетът съдържа различна от очакваната версия" +#: zypp/solver/detail/ResolverInfoMisc.cc:225 +#, c-format +msgid "Installing %s" +msgstr "Инсталиране на %s" -#: target/rpm/RpmDb.cc:1910 -#, fuzzy -msgid "The package file has incorrect MD5 sum" -msgstr "Пакетът има некоректна MD5 сума" +#: zypp/solver/detail/ResolverInfoMisc.cc:242 +#, c-format +msgid "Updating %s to %s" +msgstr "Обновяване на %s към %s" -#: target/rpm/RpmDb.cc:1916 -#, fuzzy -msgid "The package is not signed" -msgstr "Пакетът не е подписан" +#: zypp/solver/detail/ResolverInfoMisc.cc:260 +#, c-format +msgid "Skipping %s: already installed" +msgstr "Пропускане на %s: вече е инсталиран" -#: target/rpm/RpmDb.cc:1922 -#, fuzzy -msgid "The package has no MD5 sum" -msgstr "Пакетът няма MD5 сума" +#: zypp/solver/detail/ResolverInfoMisc.cc:282 +#, c-format +msgid "There are no alternative installed providers of %s" +msgstr "Няма инсталирани алтернативни доставчици на %s" -#: target/rpm/RpmDb.cc:1928 -#, fuzzy -msgid "The package has incorrect signature" -msgstr "Пакетът има невалидна сигнатура." +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 +#, c-format +msgid "for %s" +msgstr "за %s" -#: target/rpm/RpmDb.cc:1934 -#, fuzzy -msgid "The package archive has incorrect MD5 sum" -msgstr "Архивът с пакетите има некоректна MD5 сума" +#: zypp/solver/detail/ResolverInfoMisc.cc:307 +#, c-format +msgid "There are no installable providers of %s" +msgstr "Няма инсталируеми доставчици на %s" -#: target/rpm/RpmDb.cc:1940 -msgid "rpm failed for unkown reason, see log file" -msgstr "" -"rpm завърши с неуспех поради неизвестна причина, прегледайте файла-дневник" +#: zypp/solver/detail/ResolverInfoMisc.cc:330 +#, c-format +msgid "Upgrade to %s to avoid removing %s is not possible." +msgstr "Не е възможно обновяването към %s за да се избегне премахването на %s." -#. timestamp -#: target/rpm/RpmDb.cc:2084 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format -msgid "created backup %s" -msgstr "създадено резервно копие %s" +msgid "%s provides %s, but is scheduled to be uninstalled." +msgstr "%s доставя %s, но е планирано за деинсталиране." -#~ msgid "" -#~ "A conflict over %s (%s) requires the removal of the to-be-installed " -#~ "resolvable %s" -#~ msgstr "" -#~ "Конфликтът с %s (%s) с изисква премахването на %s, което е било " -#~ "подготвено за инсталиране" +#: zypp/solver/detail/ResolverInfoMisc.cc:362 +#, c-format +msgid "%s provides %s, but another version of that %s is already installed." +msgstr "%s доставя %s, но друга версия на %s вече е инсталирана." -#~ msgid "Marking %s as uninstallable due to conflicts over %s (%s) from %s" -#~ msgstr "Маркиране на %s като деинсталируем поради конфликта с %s (%s) от %s" +#: zypp/solver/detail/ResolverInfoMisc.cc:379 +#, c-format +msgid "" +"%s provides %s, but it is uninstallable. Try installing it on its own for " +"more details." +msgstr "" +"%s доставя %s, но е деинсталируем. Опитайте да го инсталирате ръчно за " +"повече подробности." -#~ msgid "Marking %s as uninstallable due to conflicts over %s (%s)" -#~ msgstr "Маркиране на %s като деинсталируем поради конфликта с %s (%s)" +#: zypp/solver/detail/ResolverInfoMisc.cc:395 +#, c-format +msgid "%s provides %s, but it is locked." +msgstr "%s доставя %s, но е заключен." -#~ msgid "Upgrading %s => %s" -#~ msgstr "Обновяване на %s => %s" +#: zypp/solver/detail/ResolverInfoMisc.cc:411 +#, c-format +msgid "Can't satisfy requirement %s for %s" +msgstr "Не могат да се удовлетворят изискванията на %s за %s" -#~ msgid "" -#~ "%s provides %s, but another version of that resItem is already installed." -#~ msgstr "%s доставя %s, но друга версия на същия пакет вече е инсталирана." +#: zypp/solver/detail/ResolverInfoMisc.cc:432 +#, c-format +msgid "" +"%s is required by other to-be-installed resolvable, so it won't be unlinked." +msgstr "" +"%s се изисква от друг, маркиран за инсталиране пакет и няма да бъде " +"премахнат." -#~ msgid "There are no alternative installed providers of %s for %s" -#~ msgstr "Няма инсталирани алтернативни доставчици на %s за %s" +#: zypp/solver/detail/ResolverInfoMisc.cc:449 +#, c-format +msgid "%s is required by other installed resolvable, so it won't be unlinked." +msgstr "%s се изисква от друг инсталиран пакет и няма да бъде премахнат." -#~ msgid "There are no installable providers of %s for %s" -#~ msgstr "Няма инсталируеми доставчици на %s за %s" +#: zypp/solver/detail/ResolverInfoMisc.cc:466 +#, c-format +msgid "%s is locked and cannot be uninstalled." +msgstr "%s е заключен и не може да бъде деинсталиран." -#~ msgid "Can't satisfy requirement '%s'" -#~ msgstr "Не могат да се удовлетворят изискванията за %s" +#: zypp/solver/detail/ResolverInfoMisc.cc:485 +#, c-format +msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" +msgstr "" +"Конфликтът с %s (%s) изисква премахването на %s, което е било подготвено за " +"инсталиране" -#~ msgid "%s is locked, and cannot be uninstalled." -#~ msgstr "%s е заключен и не може да бъде деинсталиран." +#: zypp/solver/detail/ResolverInfoMisc.cc:503 +#, c-format +msgid "Marking %s as uninstallable due to conflicts over %s" +msgstr "Маркиране на %s като деинсталируем поради конфликта с %s" -#~ msgid "unknown" -#~ msgstr "неизвестно" +#: zypp/solver/detail/ResolverInfoMisc.cc:511 +#, c-format +msgid "from %s" +msgstr "от %s" -#~ msgid "installed" -#~ msgstr "инсталиран" +#: zypp/solver/detail/ResolverInfo.cc:189 +msgid " Error!" +msgstr " Грешка!" -#~ msgid "uninstalled" -#~ msgstr "деинсталиран" +#: zypp/solver/detail/ResolverInfo.cc:190 +msgid " Important!" +msgstr " Важно!" -#~ msgid "to be installed" -#~ msgstr "за инсталиране" +#: zypp/solver/detail/ProblemSolutionKeep.cc:53 +#: zypp/solver/detail/ProblemSolutionKeep.cc:57 +#, c-format +msgid "keep %s" +msgstr "" -#~ msgid "to be installed (soft)" -#~ msgstr "за инсталиране (меко)" +#: zypp/solver/detail/ProblemSolutionKeep.cc:67 +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Инсталиране на липсващите пакети" -#~ msgid "to be uninstalled" -#~ msgstr "за деинсталиране" +#: zypp/solver/detail/ProblemSolutionInstall.cc:53 +#: zypp/solver/detail/ProblemSolutionInstall.cc:57 +#, fuzzy, c-format +msgid "install %s" +msgstr "Инсталиране на %1" -#~ msgid "to be uninstalled due to obsolete" -#~ msgstr "за деинсталиране поради остаряване" +#: zypp/solver/detail/ProblemSolutionInstall.cc:67 +#, fuzzy +msgid "Install missing resolvables" +msgstr "Инсталиране на липсващите пакети" -#~ msgid "to be uninstalled due to unlink" -#~ msgstr "за деинсталиране поради премахване" +#: zypp/solver/detail/ResolverInfoDependsOn.cc:55 +#, c-format +msgid "%s depended on %s" +msgstr "%s зависи от %s" -#~ msgid "%s missing requirement %s" -#~ msgstr "%s липсва изискания %s" +#: zypp/solver/detail/ResolverInfoDependsOn.cc:69 +#, fuzzy, c-format +msgid "%s dependend on %s" +msgstr "%s зависи от %s" -#~ msgid "%s needed by %s" -#~ msgstr "%s е необходим на %s" +#: zypp/solver/detail/ResolverInfoNeededBy.cc:70 +#, fuzzy, c-format +msgid "%s needed by %s" +msgstr "%s е необходим на %s" -#~ msgid "%s replaced by %s" -#~ msgstr "%s е заменен от %s" +#: zypp/solver/detail/ResolverInfoChildOf.cc:56 +#: zypp/solver/detail/ResolverInfoChildOf.cc:71 +#, c-format +msgid "%s part of %s" +msgstr "%s е част от %s" -#~ msgid "Package is not OK for the following reasons:" -#~ msgstr "Пакетът не е наред поради следните причини:" +#: zypp/solver/detail/ProblemSolutionUnlock.cc:52 +#, fuzzy, c-format +msgid "unlock %s" +msgstr "Отключване на %s" -#~ msgid "Package contains different version than expected" -#~ msgstr "Пакетът съдържа различна от очакваната версия" +#: zypp/solver/detail/ProblemSolutionUnlock.cc:61 +#, fuzzy +msgid "Unlock these resolvables" +msgstr "Отключване на тези пакети" -#~ msgid "Package file has incorrect MD5 sum" -#~ msgstr "Пакетът има некоректна MD5 сума" +#: zypp/CountryCode.cc:135 +msgid "Unknown country: " +msgstr "Неизвестна държава: " + +# AD +#: zypp/CountryCode.cc:217 +msgid "Andorra" +msgstr "Андора" + +#: zypp/CountryCode.cc:218 +msgid "United Arab Emirates" +msgstr "Обединени арабски емирства" + +# AF +#: zypp/CountryCode.cc:219 +msgid "Afghanistan" +msgstr "Афганистан" + +# AG +#: zypp/CountryCode.cc:220 +msgid "Antigua and Barbuda" +msgstr "Антигуа и Барбуда" + +# AI +#: zypp/CountryCode.cc:221 +msgid "Anguilla" +msgstr "Ангила" + +#: zypp/CountryCode.cc:222 +msgid "Albania" +msgstr "Албания" + +# AM +#: zypp/CountryCode.cc:223 +msgid "Armenia" +msgstr "Армения" + +# AN +#: zypp/CountryCode.cc:224 +msgid "Netherlands Antilles" +msgstr "Холандски Антили" + +# AO +#: zypp/CountryCode.cc:225 +msgid "Angola" +msgstr "Ангола" + +# AQ +#: zypp/CountryCode.cc:226 +msgid "Antarctica" +msgstr "Антарктика" + +#: zypp/CountryCode.cc:227 +msgid "Argentina" +msgstr "Аржентина" + +# AS +#: zypp/CountryCode.cc:228 +msgid "American Samoa" +msgstr "Американска Самоа" + +#: zypp/CountryCode.cc:229 +msgid "Austria" +msgstr "Австрия" + +#: zypp/CountryCode.cc:230 +msgid "Australia" +msgstr "Австралия" + +# AW +#: zypp/CountryCode.cc:231 +msgid "Aruba" +msgstr "Аруба" + +# KY +#: zypp/CountryCode.cc:232 +msgid "Aland Islands" +msgstr "Алански Острови" + +# AZ +#: zypp/CountryCode.cc:233 +msgid "Azerbaijan" +msgstr "Азербайджан" + +# BA +#: zypp/CountryCode.cc:234 +msgid "Bosnia and Herzegovina" +msgstr "Босна и Херцеговина" + +#: zypp/CountryCode.cc:235 +msgid "Barbados" +msgstr "Барбадос" + +#: zypp/CountryCode.cc:236 +msgid "Bangladesh" +msgstr "Бангладеш" + +#: zypp/CountryCode.cc:237 +msgid "Belgium" +msgstr "Белгия" + +# BF +#: zypp/CountryCode.cc:238 +msgid "Burkina Faso" +msgstr "Буркина Фасо" + +#: zypp/CountryCode.cc:239 +msgid "Bulgaria" +msgstr "България" + +#: zypp/CountryCode.cc:240 +msgid "Bahrain" +msgstr "Бахрейн" + +# BI +#: zypp/CountryCode.cc:241 +msgid "Burundi" +msgstr "Бурунди" + +# BJ +#: zypp/CountryCode.cc:242 +msgid "Benin" +msgstr "Бенин" + +#: zypp/CountryCode.cc:243 +msgid "Bermuda" +msgstr "Бермуда" + +# BN +#: zypp/CountryCode.cc:244 +msgid "Brunei Darussalam" +msgstr "Бруней" + +#: zypp/CountryCode.cc:245 +msgid "Bolivia" +msgstr "Боливия" + +# BR +#: zypp/CountryCode.cc:246 +msgid "Brazil" +msgstr "Бразилия" + +# BS +#: zypp/CountryCode.cc:247 +msgid "Bahamas" +msgstr "Бахами" + +# BT +#: zypp/CountryCode.cc:248 +msgid "Bhutan" +msgstr "Бутан" + +# BV +#: zypp/CountryCode.cc:249 +msgid "Bouvet Island" +msgstr "Остров Бувет" + +#: zypp/CountryCode.cc:250 +msgid "Botswana" +msgstr "Боцвана" + +#: zypp/CountryCode.cc:251 +msgid "Belarus" +msgstr "Беларус" + +# BZ +#: zypp/CountryCode.cc:252 +msgid "Belize" +msgstr "Белиз" + +#: zypp/CountryCode.cc:253 +msgid "Canada" +msgstr "Канада" + +# CC +#: zypp/CountryCode.cc:254 +msgid "Cocos (Keeling) Islands" +msgstr "Кокосови Острови" + +# CG +#: zypp/CountryCode.cc:255 zypp/CountryCode.cc:257 +msgid "Congo" +msgstr "Конго" + +# CF +#: zypp/CountryCode.cc:256 +msgid "Centruual African Republic" +msgstr "Централноафриканска Република" + +#: zypp/CountryCode.cc:258 +msgid "Switzerland" +msgstr "Швейцария" + +# CI +# fuzzy +#: zypp/CountryCode.cc:259 +msgid "Cote D'Ivoire" +msgstr "Кот д'ивоар" + +# CK +#: zypp/CountryCode.cc:260 +msgid "Cook Islands" +msgstr "Острови Кук" + +#: zypp/CountryCode.cc:261 +msgid "Chile" +msgstr "Чили" + +# CM +#: zypp/CountryCode.cc:262 +msgid "Cameroon" +msgstr "Камерун" + +#: zypp/CountryCode.cc:263 +msgid "China" +msgstr "Китай" + +#: zypp/CountryCode.cc:264 +msgid "Colombia" +msgstr "Колумбия" + +#: zypp/CountryCode.cc:265 +msgid "Costa Rica" +msgstr "Коста Рика" + +#: zypp/CountryCode.cc:266 +msgid "Serbia and Montenegro" +msgstr "Сърбия и Черна Гора" + +# CU +#: zypp/CountryCode.cc:267 +msgid "Cuba" +msgstr "Куба" + +# CV +#: zypp/CountryCode.cc:268 +msgid "Cape Verde" +msgstr "Капо Верде" + +# CX +#: zypp/CountryCode.cc:269 +msgid "Christmas Island" +msgstr "Коледни Острови" + +# CY +#: zypp/CountryCode.cc:270 +msgid "Cyprus" +msgstr "Кипър" + +#: zypp/CountryCode.cc:271 +msgid "Czech Republic" +msgstr "Чешка република" + +#: zypp/CountryCode.cc:272 +msgid "Germany" +msgstr "Германия" + +#: zypp/CountryCode.cc:273 +msgid "Djibouti" +msgstr "Джибути" + +#: zypp/CountryCode.cc:274 +msgid "Denmark" +msgstr "Дания" + +#: zypp/CountryCode.cc:275 +msgid "Dominica" +msgstr "Доминика" + +#: zypp/CountryCode.cc:276 +msgid "Dominican Republic" +msgstr "Доминиканска република" + +#: zypp/CountryCode.cc:277 +msgid "Algeria" +msgstr "Алжир" + +#: zypp/CountryCode.cc:278 +msgid "Ecuador" +msgstr "Еквадор" + +#: zypp/CountryCode.cc:279 +msgid "Estonia" +msgstr "Естония" + +#: zypp/CountryCode.cc:280 +msgid "Egypt" +msgstr "Египет" + +# EH +#: zypp/CountryCode.cc:281 +msgid "Western Sahara" +msgstr "Западна Сахара" + +# ER +#: zypp/CountryCode.cc:282 +msgid "Eritrea" +msgstr "Еритрея" + +#: zypp/CountryCode.cc:283 +msgid "Spain" +msgstr "Испания" + +# ET +#: zypp/CountryCode.cc:284 +msgid "Ethiopia" +msgstr "Етиопия" + +#: zypp/CountryCode.cc:285 +msgid "Finland" +msgstr "Финландия" + +#: zypp/CountryCode.cc:286 +msgid "Fiji" +msgstr "Фуджи" + +# FK +#: zypp/CountryCode.cc:287 +msgid "Falkland Islands (Malvinas)" +msgstr "Фолклендски Острови (Малвини)" + +#: zypp/CountryCode.cc:288 +msgid "Federated States of Micronesia" +msgstr "Федерални Щати Микронезия" + +#: zypp/CountryCode.cc:289 +msgid "Faroe Islands" +msgstr "Фароеви острови" + +#: zypp/CountryCode.cc:290 +msgid "France" +msgstr "Франция" + +#: zypp/CountryCode.cc:291 +msgid "Metropolitan France" +msgstr "Френска метрополия" + +# GA +#: zypp/CountryCode.cc:292 +msgid "Gabon" +msgstr "Габон" + +#: zypp/CountryCode.cc:293 +msgid "United Kingdom" +msgstr "Великобритания" + +#: zypp/CountryCode.cc:294 +msgid "Grenada" +msgstr "Гренада" + +#: zypp/CountryCode.cc:295 +msgid "Georgia" +msgstr "Грузия" + +# GF +# fuzzy +#: zypp/CountryCode.cc:296 +msgid "French Guiana" +msgstr "Френска Гвиана" + +# GH +#: zypp/CountryCode.cc:297 +msgid "Ghana" +msgstr "Гана" + +#: zypp/CountryCode.cc:298 +msgid "Gibraltar" +msgstr "Гибралтар" + +#: zypp/CountryCode.cc:299 +msgid "Greenland" +msgstr "Гренландия" + +# GM +#: zypp/CountryCode.cc:300 +msgid "Gambia" +msgstr "Гамбия" + +# GN +#: zypp/CountryCode.cc:301 +msgid "Guinea" +msgstr "Гвинея" + +#: zypp/CountryCode.cc:302 +msgid "Guadeloupe" +msgstr "Гваделупа" + +# GQ +#: zypp/CountryCode.cc:303 +msgid "Equatorial Guinea" +msgstr "Екваториална Гвинея" + +#: zypp/CountryCode.cc:304 +msgid "Greece" +msgstr "Гърция" + +# GS +# fuzzy +#: zypp/CountryCode.cc:305 +msgid "South Georgia and the South Sandwich Islands" +msgstr "Южни Сандвичеви Острови" + +#: zypp/CountryCode.cc:306 +msgid "Guatemala" +msgstr "Гватемала" + +#: zypp/CountryCode.cc:307 +msgid "Guam" +msgstr "Гуам" + +# GW +#: zypp/CountryCode.cc:308 +msgid "Guinea-Bissau" +msgstr "Гвинея-Бисау" + +# GY +#: zypp/CountryCode.cc:309 +msgid "Guyana" +msgstr "Гияна" + +#: zypp/CountryCode.cc:310 +msgid "Hong Kong" +msgstr "Хонг Конг" + +# HM +# fuzzy +#: zypp/CountryCode.cc:311 +msgid "Heard Island and McDonald Islands" +msgstr "Хърд и МакДоналд Острови" + +#: zypp/CountryCode.cc:312 +msgid "Honduras" +msgstr "Хондурас" + +#: zypp/CountryCode.cc:313 +msgid "Croatia" +msgstr "Хърватска" + +# HT +#: zypp/CountryCode.cc:314 +msgid "Haiti" +msgstr "Хаити" + +#: zypp/CountryCode.cc:315 +msgid "Hungary" +msgstr "Унгария" + +#: zypp/CountryCode.cc:316 +msgid "Indonesia" +msgstr "Индонезия" + +#: zypp/CountryCode.cc:317 +msgid "Ireland" +msgstr "Ирландия" + +#: zypp/CountryCode.cc:318 +msgid "Israel" +msgstr "Израел" + +#: zypp/CountryCode.cc:319 +msgid "India" +msgstr "Индия" + +# IO +#: zypp/CountryCode.cc:320 +msgid "British Indian Ocean Territory" +msgstr "Английски територии в Индийския океан" + +#: zypp/CountryCode.cc:321 +msgid "Iraq" +msgstr "Ирак" + +# IR +# fuzzy +#: zypp/CountryCode.cc:322 +msgid "Iran" +msgstr "Ирак" + +#: zypp/CountryCode.cc:323 +msgid "Iceland" +msgstr "Исландия" + +#: zypp/CountryCode.cc:324 +msgid "Italy" +msgstr "Италия" + +#: zypp/CountryCode.cc:325 +msgid "Jamaica" +msgstr "Ямайка" + +#: zypp/CountryCode.cc:326 +msgid "Jordan" +msgstr "Йордания" + +#: zypp/CountryCode.cc:327 +msgid "Japan" +msgstr "Япония" + +# KE +#: zypp/CountryCode.cc:328 +msgid "Kenya" +msgstr "Кения" + +# KG +# fuzzy +#: zypp/CountryCode.cc:329 +msgid "Kyrgyzstan" +msgstr "Киргизтан" + +# KH +#: zypp/CountryCode.cc:330 +msgid "Cambodia" +msgstr "Камбоджа" + +# KI +#: zypp/CountryCode.cc:331 +msgid "Kiribati" +msgstr "Кирибати" + +# KM +#: zypp/CountryCode.cc:332 +msgid "Comoros" +msgstr "Комори" + +# KN +# fuzzy +#: zypp/CountryCode.cc:333 +msgid "Saint Kitts and Nevis" +msgstr "Свети Китс и Невис" + +#: zypp/CountryCode.cc:334 +msgid "North Korea" +msgstr "Северна Корея" + +#: zypp/CountryCode.cc:335 +msgid "South Korea" +msgstr "Южна Корея" + +#: zypp/CountryCode.cc:336 +msgid "Kuwait" +msgstr "Кувейт" + +# KY +#: zypp/CountryCode.cc:337 +msgid "Cayman Islands" +msgstr "Кайманови Острови" + +# KZ +# fuzzy +#: zypp/CountryCode.cc:338 +msgid "Kazakhstan" +msgstr "Казахстан" + +# CD +# fuzzy +#: zypp/CountryCode.cc:339 +msgid "Lao People's Democratic Republic" +msgstr "Лао Народна Демократична Република" + +#: zypp/CountryCode.cc:340 +msgid "Lebanon" +msgstr "Ливан" + +# LC +# fuzzy +#: zypp/CountryCode.cc:341 +msgid "Saint Lucia" +msgstr "Санта Лучия" + +#: zypp/CountryCode.cc:342 +msgid "Liechtenstein" +msgstr "Лихтенщайн" + +# LK +#: zypp/CountryCode.cc:343 +msgid "Sri Lanka" +msgstr "Шри Ланка" + +# LR +#: zypp/CountryCode.cc:344 +msgid "Liberia" +msgstr "Либерия" + +# LS +#: zypp/CountryCode.cc:345 +msgid "Lesotho" +msgstr "Лесото" + +#: zypp/CountryCode.cc:346 +msgid "Lithuania" +msgstr "Литва" + +#: zypp/CountryCode.cc:347 +msgid "Luxembourg" +msgstr "Люксембург" + +#: zypp/CountryCode.cc:348 +msgid "Latvia" +msgstr "Латвия" + +# LY +# fuzzy +#: zypp/CountryCode.cc:349 +msgid "Libya" +msgstr "Либерия" + +#: zypp/CountryCode.cc:350 +msgid "Morocco" +msgstr "Мароко" + +#: zypp/CountryCode.cc:351 +msgid "Monaco" +msgstr "Монако" + +#: zypp/CountryCode.cc:352 +msgid "Moldova" +msgstr "Молдова" + +# MG +#: zypp/CountryCode.cc:353 +msgid "Madagascar" +msgstr "Мадагаскар" + +# MH +#: zypp/CountryCode.cc:354 +msgid "Marshall Islands" +msgstr "Маршалови Острови" + +#: zypp/CountryCode.cc:355 +msgid "Macedonia" +msgstr "Македония" + +# ML +#: zypp/CountryCode.cc:356 +msgid "Mali" +msgstr "Мали" + +# MM +#: zypp/CountryCode.cc:357 +msgid "Myanmar" +msgstr "Мианмар" + +# MN +#: zypp/CountryCode.cc:358 +msgid "Mongolia" +msgstr "Монголия" + +#: zypp/CountryCode.cc:359 +msgid "Macao" +msgstr "Макао" + +# MP +#: zypp/CountryCode.cc:360 +msgid "Northern Mariana Islands" +msgstr "Северни Марианови Острови" + +#: zypp/CountryCode.cc:361 +msgid "Martinique" +msgstr "Мартиник" + +# MR +#: zypp/CountryCode.cc:362 +msgid "Mauritania" +msgstr "Мавритания" + +# MS +#: zypp/CountryCode.cc:363 +msgid "Montserrat" +msgstr "Монсерат" + +#: zypp/CountryCode.cc:364 +msgid "Malta" +msgstr "Малта" + +# MU +# fuzzy +#: zypp/CountryCode.cc:365 +msgid "Mauritius" +msgstr "Мавриций" + +# MV +# fuzzy +#: zypp/CountryCode.cc:366 +msgid "Maldives" +msgstr "Мали" + +# MW +#: zypp/CountryCode.cc:367 +msgid "Malawi" +msgstr "Малави" + +#: zypp/CountryCode.cc:368 +msgid "Mexico" +msgstr "Мексико" + +#: zypp/CountryCode.cc:369 +msgid "Malaysia" +msgstr "Малайзия" + +# MZ +#: zypp/CountryCode.cc:370 +msgid "Mozambique" +msgstr "Мозамбик" + +# NA +#: zypp/CountryCode.cc:371 +msgid "Namibia" +msgstr "Намибия" + +# NC +#: zypp/CountryCode.cc:372 +msgid "New Caledonia" +msgstr "Нова Каледония" + +# NE +#: zypp/CountryCode.cc:373 +msgid "Niger" +msgstr "Нигер" + +# NF +#: zypp/CountryCode.cc:374 +msgid "Norfolk Island" +msgstr "Норфолк Остров" + +# NG +#: zypp/CountryCode.cc:375 +msgid "Nigeria" +msgstr "Нигерия" + +#: zypp/CountryCode.cc:376 +msgid "Nicaragua" +msgstr "Никарагуа" + +#: zypp/CountryCode.cc:377 +msgid "Netherlands" +msgstr "Холандия" + +#: zypp/CountryCode.cc:378 +msgid "Norway" +msgstr "Норвегия" + +# NP +#: zypp/CountryCode.cc:379 +msgid "Nepal" +msgstr "Непал" + +# NU +#: zypp/CountryCode.cc:381 +msgid "Niue" +msgstr "Нию" + +#: zypp/CountryCode.cc:382 +msgid "New Zealand" +msgstr "Нова Зеландия" + +#: zypp/CountryCode.cc:383 +msgid "Oman" +msgstr "Оман" + +#: zypp/CountryCode.cc:384 +msgid "Panama" +msgstr "Панама" + +#: zypp/CountryCode.cc:385 +msgid "Peru" +msgstr "Перу" + +# PF +#: zypp/CountryCode.cc:386 +msgid "French Polynesia" +msgstr "Френска Полинезия" + +# PG +#: zypp/CountryCode.cc:387 +msgid "Papua New Guinea" +msgstr "Папуа Нова Гвинея" + +#: zypp/CountryCode.cc:388 +msgid "Philippines" +msgstr "Филипини" + +#: zypp/CountryCode.cc:389 +msgid "Pakistan" +msgstr "Пакистан" + +#: zypp/CountryCode.cc:390 +msgid "Poland" +msgstr "Полша" + +# PM +# fuzzy +#: zypp/CountryCode.cc:391 +msgid "Saint Pierre and Miquelon" +msgstr "Свети Пиер и Микелон" + +#: zypp/CountryCode.cc:392 +msgid "Pitcairn" +msgstr "Питкаирн" + +#: zypp/CountryCode.cc:393 +msgid "Puerto Rico" +msgstr "Пуерто Рико" + +# IO +#: zypp/CountryCode.cc:394 +msgid "Palestinian Territory" +msgstr "Палестински територии" + +#: zypp/CountryCode.cc:395 +msgid "Portugal" +msgstr "Португалия" + +#: zypp/CountryCode.cc:396 +msgid "Palau" +msgstr "Палау" + +#: zypp/CountryCode.cc:397 +msgid "Paraguay" +msgstr "Парагвай" + +#: zypp/CountryCode.cc:398 +msgid "Qatar" +msgstr "Катар" + +# RE +#: zypp/CountryCode.cc:399 +msgid "Reunion" +msgstr "Риюниън" + +#: zypp/CountryCode.cc:400 +msgid "Romania" +msgstr "Румъния" + +# RU +#: zypp/CountryCode.cc:401 +msgid "Russian Federation" +msgstr "Руска Федерация" + +# RW +#: zypp/CountryCode.cc:402 +msgid "Rwanda" +msgstr "Руанда" + +#: zypp/CountryCode.cc:403 +msgid "Saudi Arabia" +msgstr "Саудитска Арабия" + +# SB +#: zypp/CountryCode.cc:404 +msgid "Solomon Islands" +msgstr "Соломонови Острови" + +# SC +#: zypp/CountryCode.cc:405 +msgid "Seychelles" +msgstr "Сейшели" + +#: zypp/CountryCode.cc:406 +msgid "Sudan" +msgstr "Судан" + +#: zypp/CountryCode.cc:407 +msgid "Sweden" +msgstr "Швеция" + +#: zypp/CountryCode.cc:408 +msgid "Singapore" +msgstr "Сингапур" + +# SH +#: zypp/CountryCode.cc:409 +msgid "Saint Helena" +msgstr "Света Елена" + +#: zypp/CountryCode.cc:410 +msgid "Slovenia" +msgstr "Словения" + +# SJ +# fuzzy +#: zypp/CountryCode.cc:411 +msgid "Svalbard and Jan Mayen" +msgstr "Свалбард и Ян Майен Острови" + +#: zypp/CountryCode.cc:412 +msgid "Slovakia" +msgstr "Словакия" + +# SL +#: zypp/CountryCode.cc:413 +msgid "Sierra Leone" +msgstr "Сиера Леоне" + +# SM +#: zypp/CountryCode.cc:414 +msgid "San Marino" +msgstr "Сан Марино" + +# SN +#: zypp/CountryCode.cc:415 +msgid "Senegal" +msgstr "Сенегал" + +# SO +#: zypp/CountryCode.cc:416 +msgid "Somalia" +msgstr "Сомалия" + +# SR +#: zypp/CountryCode.cc:417 +msgid "Suriname" +msgstr "Суринам" + +# ST +#: zypp/CountryCode.cc:418 +msgid "Sao Tome and Principe" +msgstr "Сао Томе и Принсипи" + +#: zypp/CountryCode.cc:419 +msgid "El Salvador" +msgstr "Ел Салвадор" + +# SY +# fuzzy +#: zypp/CountryCode.cc:420 +msgid "Syria" +msgstr "Суринам" + +# SZ +#: zypp/CountryCode.cc:421 +msgid "Swaziland" +msgstr "Свазиленд" + +# TC +# fuzzy +#: zypp/CountryCode.cc:422 +msgid "Turks and Caicos Islands" +msgstr "Тюрк и Кайкос Острови" + +# TD +#: zypp/CountryCode.cc:423 +msgid "Chad" +msgstr "Чад" + +# TF +# fuzzy +#: zypp/CountryCode.cc:424 +msgid "French Southern Territories" +msgstr "Франция Южни Територии" + +# TG +#: zypp/CountryCode.cc:425 +msgid "Togo" +msgstr "Того" + +#: zypp/CountryCode.cc:426 +msgid "Thailand" +msgstr "Тайланд" + +#: zypp/CountryCode.cc:427 +msgid "Tajikistan" +msgstr "Таджикистан" + +# TM +#: zypp/CountryCode.cc:429 +msgid "Turkmenistan" +msgstr "Туркменистан" + +#: zypp/CountryCode.cc:430 +msgid "Tunisia" +msgstr "Тунис" + +# TO +#: zypp/CountryCode.cc:431 +msgid "Tonga" +msgstr "Тонга" + +#: zypp/CountryCode.cc:432 +msgid "East Timor" +msgstr "Източен Тимор" + +#: zypp/CountryCode.cc:433 +msgid "Turkey" +msgstr "Турция" + +# TT +#: zypp/CountryCode.cc:434 +msgid "Trinidad and Tobago" +msgstr "Тринидад и Тобаго" + +#: zypp/CountryCode.cc:436 +msgid "Taiwan" +msgstr "Тайван" + +#: zypp/CountryCode.cc:437 +msgid "Tanzania" +msgstr "Танзания" + +#: zypp/CountryCode.cc:438 +msgid "Ukraine" +msgstr "Украйна" + +# UG +#: zypp/CountryCode.cc:439 +msgid "Uganda" +msgstr "Уганда" + +# UM +#: zypp/CountryCode.cc:440 +msgid "United States Minor Outlying Islands" +msgstr "Малки Острови по крайбрежието на САЩ" + +# US +#: zypp/CountryCode.cc:441 +msgid "United States" +msgstr "САЩ" + +#: zypp/CountryCode.cc:442 +msgid "Uruguay" +msgstr "Уругвай" + +#: zypp/CountryCode.cc:443 +msgid "Uzbekistan" +msgstr "Узбекистан" + +# VA +# fuzzy +#: zypp/CountryCode.cc:444 +msgid "Holy See (Vatican City State)" +msgstr "Ватикана" + +# VC +# fuzzy +#: zypp/CountryCode.cc:445 +msgid "Saint Vincent and the Grenadines" +msgstr "Свети Винсент и Гренадин" + +#: zypp/CountryCode.cc:446 +msgid "Venezuela" +msgstr "Венецуела" + +# VI +# fuzzy +#: zypp/CountryCode.cc:447 +msgid "British Virgin Islands" +msgstr "Вирджински Острови (Великобритания)" + +# VI +# fuzzy +#: zypp/CountryCode.cc:448 +msgid "Virgin Islands, U.S." +msgstr "Вирджински Острови (САЩ)" + +# VN +# fuzzy +#: zypp/CountryCode.cc:449 +msgid "Vietnam" +msgstr "Виетнам" + +# VU +#: zypp/CountryCode.cc:450 +msgid "Vanuatu" +msgstr "Вануату" + +# WF +# fuzzy +#: zypp/CountryCode.cc:451 +msgid "Wallis and Futuna" +msgstr "Уолис и Футуна Острови" + +#: zypp/CountryCode.cc:452 +msgid "Samoa" +msgstr "Самоа" + +#: zypp/CountryCode.cc:453 +msgid "Yemen" +msgstr "Йемен" + +# YT +#: zypp/CountryCode.cc:454 +msgid "Mayotte" +msgstr "Майот" + +#: zypp/CountryCode.cc:455 +msgid "South Africa" +msgstr "Южна Африка" + +# ZM +#: zypp/CountryCode.cc:456 +msgid "Zambia" +msgstr "Замбия" + +#: zypp/CountryCode.cc:457 +msgid "Zimbabwe" +msgstr "Зимбабве" -#~ msgid "Package is not signed" -#~ msgstr "Пакетът не е подписан" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s е необходим на друг пакет" -#~ msgid "Package has no MD5 sum" -#~ msgstr "Пакетът няма MD5 сума" +#~ msgid "Deleting %s" +#~ msgstr "Изтриване на %s" -#~ msgid "Package has incorrect signature" -#~ msgstr "Пакетът има невалидна сигнатура." +#~ msgid "" +#~ "Can't install %s, since a resolvable of the same name is already marked " +#~ "as needing to be installed" +#~ msgstr "" +#~ "%s не може да се инсталира, след като пакет със същото име вече е " +#~ "маркиран за инсталиране" -#~ msgid "Package archive has incorrect MD5 sum" -#~ msgstr "Архивът с пакетите има некоректна MD5 сума" +#~ msgid "%s cannot be uninstalled due missing dependencies" +#~ msgstr "%s не може да бъде деинсталиран поради липсващи зависимости" diff --git a/po/bn.po b/po/bn.po index 51320fe..9ee3a1a 100644 --- a/po/bn.po +++ b/po/bn.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2004-08-09 10:24+0200\n" "Last-Translator: xxx \n" "Language-Team: Bengali \n" @@ -2188,7 +2188,7 @@ msgstr "" msgid "%s install failed" msgstr "ইনস্টলেশন ব্যর্থ।" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2198,64 +2198,64 @@ msgstr "" msgid "%s installed ok" msgstr "ইনস্টলকৃত সাইজ:" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "অতিরিক্ত তথ্য" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm ব্যর্থ।" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 #, fuzzy msgid "Ok" msgstr "ঠিক আছে\n" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "RPM এ ভুল স্বাক্ষর আছে।" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "প্যাকেজের তালিকা (&P)" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "RPM এ ভুল স্বাক্ষর আছে।" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "RPM এ ভুল স্বাক্ষর আছে।" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" # Proposal for backup during update -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "কোন ব্যাকআপ তৈরী করবে না" @@ -2355,7 +2355,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "ইনস্টল করা হচ্ছে %s: \"%s\" " @@ -2383,88 +2383,89 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "প্যাকেজটি ইনস্টলকৃত নয় এবং ইনস্টল করা হবে না।" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" # নির্ভরতা -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "নির্ভরতা পরীক্ষা করা হচ্ছে..." -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "আবারো ইনস্টল করা প্রয়োজন" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" # দ্বন্দ্ব -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 এর দ্বন্দ্ব %2 এর সাথে" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "কিছু অমীমাংসিত আবশ্যকতা আছে..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "কিছু অমীমাংসিত আবশ্যকতা আছে..." # দ্বন্দ্ব #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 এর দ্বন্দ্ব %2 এর সাথে" # architecture = স্থাপত্য in commonwords.po, but does not sound right here. #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "বুট স্থাপত্য" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2476,10 +2477,10 @@ msgstr "%1 মুছে ফেলো" # দ্বন্দ্ব #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 এর দ্বন্দ্ব %2 এর সাথে" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2490,195 +2491,195 @@ msgid "%s is missing the requirement %s" msgstr "" # সাম: -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "ক্রিয়া (&A)" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "ইনস্টল করা হচ্ছে %s: \"%s\" " -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "ইনস্টল করা হচ্ছে %s: \"%s\" " -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" # প্যাকেজ -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "এই প্যাকেজটি আগে থেকেই ইনস্টল করা আছে। এটি মুছে দাও।" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" # প্যাকেজ -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "প্যাকেজটি ইনস্টলকৃত নয় এবং ইনস্টল করা হবে না।" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "ত্রুটি" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2688,9 +2689,11 @@ msgstr "" msgid "keep %s" msgstr "" +# VENDOR: dialog heading #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "ড্রাইভার ইনস্টল করা হচ্ছে..." # ইনস্টল #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2702,7 +2705,7 @@ msgstr "%1 ইনস্টল করো" # VENDOR: dialog heading #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "ড্রাইভার ইনস্টল করা হচ্ছে..." #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2734,7 +2737,7 @@ msgstr "" # দ্বন্দ্ব #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 এর দ্বন্দ্ব %2 এর সাথে" #: zypp/CountryCode.cc:135 diff --git a/po/br.po b/po/br.po index bb32f31..2486d58 100644 --- a/po/br.po +++ b/po/br.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-07-18 10:57+0200\n" "Last-Translator: Francoise Lermen \n" "Language-Team: i18n \n" @@ -2209,7 +2209,7 @@ msgstr "" msgid "%s install failed" msgstr "Ne vo ket staliet" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2219,60 +2219,60 @@ msgstr "" msgid "%s installed ok" msgstr "&Ya - staliañ" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" # TLABEL /usr/lib/YaST2/clients/remotechooser.ycp:33 -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, fuzzy, c-format msgid "%s remove ok" msgstr "Ostiz a-bell" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "" # TLABEL /usr/lib/YaST2/clients/tune_step1.ycp:160 -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 #, fuzzy msgid "The package is not OK for the following reasons:" msgstr "&Gweredekaat UDMA evit an trobarzhelloù-mañ:" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2375,7 +2375,7 @@ msgstr "" # TLABEL /usr/lib/YaST2/clients/inst_target_part.ycp:757 #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "O staliañ war:" @@ -2402,83 +2402,83 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" # TLABEL modules/inst_doit.ycp:127 -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "&Ya - staliañ" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" # TLABEL /usr/lib/YaST2/clients/lan_nfs_exports.ycp:141 @@ -2489,10 +2489,10 @@ msgid "delete %s" msgstr "Dilemel" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2502,193 +2502,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" # TLABEL /usr/lib/YaST2/clients/inst_target_part.ycp:757 -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "O staliañ war:" # TLABEL /usr/lib/YaST2/clients/inst_target_part.ycp:757 -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "O staliañ war:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2699,7 +2699,7 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "" # TLABEL /usr/lib/YaST2/clients/inst_target_part.ycp:757 @@ -2709,9 +2709,11 @@ msgstr "" msgid "install %s" msgstr "O staliañ war:" +# TLABEL /usr/lib/YaST2/clients/inst_target_part.ycp:757 #: zypp/solver/detail/ProblemSolutionInstall.cc:67 -msgid "Install missing resolvables." -msgstr "" +#, fuzzy +msgid "Install missing resolvables" +msgstr "O staliañ war:" # TLABEL /usr/lib/YaST2/clients/dialup_detection.ycp:263 #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2743,7 +2745,7 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "" #: zypp/CountryCode.cc:135 diff --git a/po/bs.po b/po/bs.po index 6383ff1..ea16f14 100644 --- a/po/bs.po +++ b/po/bs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2002-07-23 18:27+0200\n" "Last-Translator: Damir Bjelobradic \n" "Language-Team: Bosnian \n" @@ -2277,7 +2277,7 @@ msgstr "" msgid "%s install failed" msgstr "Nova instalacija" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "" @@ -2289,58 +2289,58 @@ msgstr "" msgid "%s installed ok" msgstr "&Da, instaliraj" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "&Dodatne informacije za korisnika" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "U redu" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2437,7 +2437,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Instaliram driver..." @@ -2464,82 +2464,82 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "&Da, instaliraj" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2549,10 +2549,11 @@ msgid "delete %s" msgstr "Izbrii" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." -msgstr "" +#, fuzzy +msgid "Delete conflicting resolvables" +msgstr "Instaliram driver..." -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2562,193 +2563,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "3D ubrzanje:" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Instaliram driver..." -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Instaliram driver..." -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Greška" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2759,8 +2760,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Instaliram driver..." #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2770,7 +2772,7 @@ msgstr "Instaliram driver..." #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Instaliram driver..." #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2800,8 +2802,9 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." -msgstr "" +#, fuzzy +msgid "Unlock these resolvables" +msgstr "Instaliram driver..." #: zypp/CountryCode.cc:135 msgid "Unknown country: " diff --git a/po/ca.po b/po/ca.po index aa98911..4a8c933 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2002-02-08 15:47+0100\n" "Last-Translator: Jaume Badiella \n" "Language-Team: Catalan\n" @@ -2336,7 +2336,7 @@ msgstr "" msgid "%s install failed" msgstr "fdisk ha fallat." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2345,57 +2345,57 @@ msgstr "" msgid "%s installed ok" msgstr "S'instal·larà com:" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Bé" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2492,7 +2492,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Instal·lant a:" @@ -2519,83 +2519,83 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "S'instal·larà com:" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Arquitectura d'engegada" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2606,10 +2606,10 @@ msgstr "&Suprimeix" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "Establiment de les variables de configuració" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2619,192 +2619,192 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Instal·lant a:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Instal·lant a:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Comprovant els escàners ja instal·lats" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Error" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2815,8 +2815,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Instal·lant el driver..." #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2826,7 +2827,7 @@ msgstr "Instal·lant a:" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Instal·lant el driver..." #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2856,8 +2857,9 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." -msgstr "" +#, fuzzy +msgid "Unlock these resolvables" +msgstr "Instal·lant el driver..." #: zypp/CountryCode.cc:135 msgid "Unknown country: " diff --git a/po/cs.po b/po/cs.po index bf09d90..60e7e78 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,30 +1,33 @@ +# translation of zypp.cs.po to Czech # Czech message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002 SuSE Linux AG. # Copyright (C) 1999-2001 SuSE GmbH. # Petr Pavlik , 1999, 2000, 2001. +# Klara Cihlarova , 2006. # msgid "" msgstr "" -"Project-Id-Version: YaST (@memory@)\n" +"Project-Id-Version: zypp.cs\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" -"PO-Revision-Date: 2005-10-21 16:16+0200\n" -"Last-Translator: Petr Pavlík \n" -"Language-Team: Czech \n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" +"PO-Revision-Date: 2006-02-18 19:08+0100\n" +"Last-Translator: Klara Cihlarova \n" +"Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: KBabel 1.10.2\n" #: zypp/LanguageCode.cc:145 msgid "Unknown language: " -msgstr "" +msgstr "Neznámý jazyk: " #: zypp/LanguageCode.cc:226 zypp/CountryCode.cc:215 -#, fuzzy msgid "noCode" -msgstr "Kód" +msgstr "" #: zypp/LanguageCode.cc:227 msgid "Default" @@ -87,7 +90,6 @@ msgid "Aleut" msgstr "Aleutština" #: zypp/LanguageCode.cc:258 -#, fuzzy msgid "Algonquian languages" msgstr "Algonkinské jazyky" @@ -104,7 +106,6 @@ msgid "English, Old (ca.450-1100)" msgstr "Angličtina, stará (cca 450-1100)" #: zypp/LanguageCode.cc:266 -#, fuzzy msgid "Apache languages" msgstr "Apačské jazyky" @@ -151,12 +152,10 @@ msgstr "Asturian" # modules/inst_language.ycp:93 #: zypp/LanguageCode.cc:288 -#, fuzzy msgid "Athapascan languages" msgstr "Athabaské jazyky" #: zypp/LanguageCode.cc:290 -#, fuzzy msgid "Australian languages" msgstr "Australské jazyky" @@ -187,7 +186,6 @@ msgid "Banda" msgstr "Banda" #: zypp/LanguageCode.cc:304 -#, fuzzy msgid "Bamileke languages" msgstr "Bamilekské jazyky" @@ -363,7 +361,6 @@ msgid "Mari" msgstr "Marijština" #: zypp/LanguageCode.cc:390 -#, fuzzy msgid "Chinook jargon" msgstr "Činúcký žargon" @@ -392,7 +389,6 @@ msgid "Cheyenne" msgstr "Čejenština" #: zypp/LanguageCode.cc:404 -#, fuzzy msgid "Chamic languages" msgstr "Čamské jazyky" @@ -409,17 +405,14 @@ msgid "Corsican" msgstr "Korsičtina" #: zypp/LanguageCode.cc:412 -#, fuzzy msgid "Creoles and pidgins, English based (Other)" msgstr "Kreolské jazyky a pidžiny, anglické (jiné)" #: zypp/LanguageCode.cc:414 -#, fuzzy msgid "Creoles and pidgins, French-based (Other)" msgstr "Kreolské jazyky a pidžiny, francouzské (jiné)" #: zypp/LanguageCode.cc:416 -#, fuzzy msgid "Creoles and pidgins, Portuguese-based (Other)" msgstr "Kreolské jazyky a pidžiny, portugalské (jiné)" @@ -432,7 +425,6 @@ msgid "Crimean Tatar" msgstr "Crimean Tatar" #: zypp/LanguageCode.cc:422 -#, fuzzy msgid "Creoles and pidgins (Other)" msgstr "Kreolské jazyky a pidžiny (jiné)" @@ -836,7 +828,6 @@ msgid "Iranian (Other)" msgstr "Íránské (jiné)" #: zypp/LanguageCode.cc:620 -#, fuzzy msgid "Iroquoian languages" msgstr "Irokézština" @@ -1080,7 +1071,6 @@ msgid "Luo (Kenya and Tanzania)" msgstr "Luoština" #: zypp/LanguageCode.cc:738 -#, fuzzy msgid "lushai" msgstr "Lushai" @@ -1165,7 +1155,6 @@ msgid "Minangkabau" msgstr "Minangkabauština" #: zypp/LanguageCode.cc:778 -#, fuzzy msgid "Miscellaneous languages" msgstr "Různé jazyky" @@ -1193,7 +1182,6 @@ msgid "Manipuri" msgstr "Manipurština" #: zypp/LanguageCode.cc:790 -#, fuzzy msgid "Manobo languages" msgstr "Manobo" @@ -1215,12 +1203,10 @@ msgid "Mossi" msgstr "Mossi" #: zypp/LanguageCode.cc:800 -#, fuzzy msgid "Multiple languages" msgstr "Více jazyků" #: zypp/LanguageCode.cc:802 -#, fuzzy msgid "Munda languages" msgstr "Mundské jazyky" @@ -1239,7 +1225,6 @@ msgid "Marwari" msgstr "Marwari" #: zypp/LanguageCode.cc:810 -#, fuzzy msgid "Mayan languages" msgstr "Mayština" @@ -1340,7 +1325,6 @@ msgid "Northern Sotho" msgstr "Severní sotho" #: zypp/LanguageCode.cc:854 -#, fuzzy msgid "Nubian languages" msgstr "Nubijština" @@ -1403,7 +1387,6 @@ msgid "Turkish, Ottoman (1500-1928)" msgstr "Osmanská turečtina (1500-1928)" #: zypp/LanguageCode.cc:882 -#, fuzzy msgid "Otomian languages" msgstr "Otomi" @@ -1468,7 +1451,6 @@ msgid "Portuguese" msgstr "Portugalské" #: zypp/LanguageCode.cc:914 -#, fuzzy msgid "Prakrit languages" msgstr "Prákrity" @@ -1540,7 +1522,6 @@ msgid "South American Indian (Other)" msgstr "Jihoamerické indiánské (jiné)" #: zypp/LanguageCode.cc:948 -#, fuzzy msgid "Salishan languages" msgstr "Saliština" @@ -1606,7 +1587,6 @@ msgid "Sinhala" msgstr "Sinhalština" #: zypp/LanguageCode.cc:980 -#, fuzzy msgid "Siouan languages" msgstr "Siouské jazyky" @@ -1635,7 +1615,6 @@ msgid "Northern Sami" msgstr "Severní Sami" #: zypp/LanguageCode.cc:994 -#, fuzzy msgid "Sami languages (Other)" msgstr "Laponské (jiné)" @@ -1849,7 +1828,6 @@ msgid "Tumbuka" msgstr "Tumbuka" #: zypp/LanguageCode.cc:1096 -#, fuzzy msgid "Tupi languages" msgstr "Tupi" @@ -1927,7 +1905,6 @@ msgid "Votic" msgstr "Votština" #: zypp/LanguageCode.cc:1134 -#, fuzzy msgid "Wakashan languages" msgstr "Wakašské jazyky" @@ -1948,9 +1925,8 @@ msgid "Welsh" msgstr "Welština" #: zypp/LanguageCode.cc:1144 -#, fuzzy msgid "Sorbian languages" -msgstr "Lužická Srbština" +msgstr "Srbské jazyky" #: zypp/LanguageCode.cc:1146 msgid "Walloon" @@ -1986,7 +1962,6 @@ msgid "Yoruba" msgstr "Jarubština" #: zypp/LanguageCode.cc:1162 -#, fuzzy msgid "Yupik languages" msgstr "Yupické jazyky" @@ -2016,9 +1991,9 @@ msgid "Zuni" msgstr "Zuni" #: zypp/target/rpm/RpmDb.cc:1656 -#, fuzzy, c-format +#, c-format msgid "Changed configuration files for %s:" -msgstr "Uložit konfigurační soubory" +msgstr "Změněné konfigurační soubory pro %s:" #: zypp/target/rpm/RpmDb.cc:1807 #, c-format @@ -2045,97 +2020,88 @@ msgid "" msgstr "" #: zypp/target/rpm/RpmDb.cc:1819 -#, fuzzy, c-format +#, c-format msgid "%s install failed" -msgstr "Instalace selhala." +msgstr "Instalace %s selhala" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 -#, fuzzy +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" -msgstr "" -"\n" -"Výstup příkazu:" +msgstr "rpm výstup:" # #: zypp/target/rpm/RpmDb.cc:1824 -#, fuzzy, c-format +#, c-format msgid "%s installed ok" -msgstr "Nenainstalováno (%1)" +msgstr "%s nainstalován ok" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 -#, fuzzy +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" -msgstr "Další nastavení skupiny" +msgstr "Další rpm výstup:" -#: zypp/target/rpm/RpmDb.cc:1923 -#, fuzzy, c-format +#: zypp/target/rpm/RpmDb.cc:1925 +#, c-format msgid "%s remove failed" -msgstr "rpm selhal." +msgstr "Odstraněné %s selhalo" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" -msgstr "" +msgstr "%s odstranění ok" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Ok" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" -msgstr "" +msgstr "Balíček obsahuje jinou verzi, než byla očekávána" -#: zypp/target/rpm/RpmDb.cc:1958 -#, fuzzy +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" -msgstr "Balíky k odstranění" +msgstr "Soubor má špatný MD5 součet" -#: zypp/target/rpm/RpmDb.cc:1964 -#, fuzzy +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" -msgstr "Balíky k obnovení" +msgstr "Balíček není podepsán" -#: zypp/target/rpm/RpmDb.cc:1970 -#, fuzzy +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" -msgstr "Balíky k odstranění" +msgstr "Balíček neobsahuje MD5 součet" -#: zypp/target/rpm/RpmDb.cc:1976 -#, fuzzy +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" -msgstr "Balíky k obnovení" +msgstr "Balíček má chybný podpis" -#: zypp/target/rpm/RpmDb.cc:1982 -#, fuzzy +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" -msgstr "Balíky k odstranění" +msgstr "Archiv balíčku má chybný MD5 součet" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" -msgstr "" +msgstr "rpm selhal z neznámých důvodů, viz log" -#: zypp/target/rpm/RpmDb.cc:2132 -#, fuzzy, c-format +#: zypp/target/rpm/RpmDb.cc:2134 +#, c-format msgid "created backup %s" -msgstr "Vytvořit &zálohu" +msgstr "vytvořena záloha %s" #: zypp/solver/detail/ResolverInfoObsoletes.cc:55 #, c-format msgid "%s is replaced by %s" -msgstr "" +msgstr "%s je nahrazen %s" #: zypp/solver/detail/ResolverInfoObsoletes.cc:69 #, c-format msgid "%s replaced by %s" -msgstr "" +msgstr "%s nahrazen %s" #: zypp/solver/detail/Resolver_problems.cc:172 msgid "Invalid information" -msgstr "" +msgstr "Chybná informace" #: zypp/solver/detail/Resolver_problems.cc:179 #, c-format @@ -2146,7 +2112,7 @@ msgstr "" #: zypp/solver/detail/ResolverInfoNeededBy.cc:56 #, c-format msgid "%s is needed by %s" -msgstr "" +msgstr "%s je požadován pro %s" #: zypp/solver/detail/Resolver_problems.cc:183 #, c-format @@ -2154,25 +2120,29 @@ msgid "" "%s is needed by:\n" "%s" msgstr "" +"%s je požadován pro:\n" +"%s" #: zypp/solver/detail/Resolver_problems.cc:190 -#, fuzzy, c-format +#, c-format msgid "%s conflicts with other resolvables" -msgstr "%1 koliduje s %2" +msgstr "%s koliduje" #: zypp/solver/detail/Resolver_problems.cc:193 #: zypp/solver/detail/ResolverInfoConflictsWith.cc:55 #: zypp/solver/detail/ResolverInfoConflictsWith.cc:70 -#, fuzzy, c-format +#, c-format msgid "%s conflicts with %s" -msgstr "%1 koliduje s %2" +msgstr "%s koliduje s %s" #: zypp/solver/detail/Resolver_problems.cc:194 -#, fuzzy, c-format +#, c-format msgid "" "%s conflicts with:\n" "%s" -msgstr "%1 koliduje s %2" +msgstr "" +"%s koliduje s:\n" +"%s" #: zypp/solver/detail/Resolver_problems.cc:201 #, c-format @@ -2203,22 +2173,22 @@ msgstr "" #: zypp/solver/detail/Resolver_problems.cc:218 #, c-format msgid "%s depends on %s" -msgstr "" +msgstr "%s závisí na %s" #: zypp/solver/detail/Resolver_problems.cc:221 #, c-format msgid "%s depends on:%s" -msgstr "" +msgstr "%s závisí na: %s" #: zypp/solver/detail/Resolver_problems.cc:227 msgid "Child of" -msgstr "" +msgstr "Potomek" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:296 +#, c-format msgid "Cannot install %s" -msgstr "Instaluje se na:" +msgstr "Nelze nainstalovat %s" #: zypp/solver/detail/Resolver_problems.cc:235 #, c-format @@ -2238,102 +2208,103 @@ msgid "" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:252 -#, fuzzy, c-format +#, c-format msgid "%s is not installed and has been marked as uninstallable" -msgstr "Musí být nainstalován balíček %1." +msgstr "%s nebude nainstalován a byl označen jako nenainstalovatelný" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" -msgstr "" +msgstr "Vzhledem k problémům se závislostí nelze nainstalovat %s" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:349 +#, c-format msgid "%s has missing dependencies" -msgstr "Nevyřešené závislosti:" +msgstr "%s má nesplněné závislosti" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" -msgstr "" +msgstr "%s nelze nainstalovat kvůli nesplněným závislostem" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:419 +#, c-format msgid "No need to install %s" -msgstr "je potřeba přeinstalovat" +msgstr "Není potřeba instalovat %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:509 +#, c-format msgid "%s is uninstallable due conflicts with %s" -msgstr "%1 koliduje s %2" +msgstr "%s nelze nainstalovat, koliduje s %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." -msgstr "má nevyřešené požadavky..." +msgid "Ignore this requirement just here" +msgstr "Ignorovat požadavky." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "Ignorovat požadavky." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." -msgstr "%1 koliduje s %2" +msgid "Ignore this conflict of %s" +msgstr "Ignorovat konflikt %s." #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" -msgstr "Boot architektura" +msgid "Ignore architecture" +msgstr "ignorovat architekturu" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." -msgstr "Adresář %1 je již v seznamu." +msgid "Ignore that %s is already set to install" +msgstr "Ignorovat nastavení %s k instalaci." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 #: zypp/solver/detail/ProblemSolutionUninstall.cc:56 -#, fuzzy, c-format +#, c-format msgid "delete %s" -msgstr "Smazat %1" +msgstr "smazat %s" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." -msgstr "%1 koliduje s %2" +msgid "Delete conflicting resolvables" +msgstr "%s koliduje" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2343,196 +2314,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 -#, fuzzy +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " -msgstr "Akce" +msgstr ", Akce: " -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "aktualizace" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 -#, fuzzy, c-format +#: zypp/solver/detail/ResolverInfoMisc.cc:204 +#, c-format msgid "Establishing %s" -msgstr "Instaluje se na:" +msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 -#, fuzzy, c-format +#: zypp/solver/detail/ResolverInfoMisc.cc:225 +#, c-format msgid "Installing %s" -msgstr "Instaluje se na:" +msgstr "Instaluje se %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 -#, fuzzy, c-format +#: zypp/solver/detail/ResolverInfoMisc.cc:260 +#, c-format msgid "Skipping %s: already installed" -msgstr "Kontrolují se již nainstalované skenery" +msgstr "Přeskakuji %s: je již nainstalován" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 -#, fuzzy, c-format +#: zypp/solver/detail/ResolverInfoMisc.cc:466 +#, c-format msgid "%s is locked and cannot be uninstalled." -msgstr "Musí být nainstalován balíček %1." +msgstr "%s je uzamčen a nelze odinstalovat." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 -#, fuzzy +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" -msgstr "Chyba" +msgstr " Chyba!" -#: zypp/solver/detail/ResolverInfo.cc:173 -#, fuzzy +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" -msgstr "Importovat data" +msgstr " Důležité!" #: zypp/solver/detail/ProblemSolutionKeep.cc:53 #: zypp/solver/detail/ProblemSolutionKeep.cc:57 @@ -2541,19 +2509,19 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 -#, fuzzy, c-format +#, c-format msgid "install %s" -msgstr "Instalovat %1" +msgstr "instalovat %s" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." -msgstr "Nainstalovat chybějící balíčky" +msgid "Install missing resolvables" +msgstr "Instaluje se %s" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -2577,14 +2545,14 @@ msgid "%s part of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:52 -#, fuzzy, c-format +#, c-format msgid "unlock %s" -msgstr "Hodiny" +msgstr "odemknout %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." -msgstr "%1 koliduje s %2" +msgid "Unlock these resolvables" +msgstr "%s koliduje" #: zypp/CountryCode.cc:135 msgid "Unknown country: " @@ -3681,23 +3649,3 @@ msgstr "Zambia" #: zypp/CountryCode.cc:457 msgid "Zimbabwe" msgstr "Zimbabwe" - -#~ msgid "unknown" -#~ msgstr "neznámý" - -#, fuzzy -#~ msgid "installed" -#~ msgstr "Instalovat:" - -#, fuzzy -#~ msgid "uninstalled" -#~ msgstr "Automatická instalace" - -# -#, fuzzy -#~ msgid "to be installed (soft)" -#~ msgstr "Nenainstalováno (%1)" - -#, fuzzy -#~ msgid "to be uninstalled" -#~ msgstr "je potřeba přeinstalovat" diff --git a/po/cy.po b/po/cy.po index 625379f..89c9df1 100644 --- a/po/cy.po +++ b/po/cy.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2003-09-23 10:33+0200\n" "Last-Translator: Kevin Donnelly \n" "Language-Team: Welsh \n" @@ -2161,7 +2161,7 @@ msgstr "" msgid "%s install failed" msgstr "Methodd yr arsefydliad." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2170,61 +2170,61 @@ msgstr "" msgid "%s installed ok" msgstr "&Ie, gosod" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "Methodd rpm." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Iawn" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Mae llofnod annilys gan yr RPM." -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Bydd pecyn %1 yn cael ei arsefydlu" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Mae llofnod annilys gan yr RPM." -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Mae llofnod annilys gan yr RPM." -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2321,7 +2321,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Arsefydlu %s: \"%s\"" @@ -2348,83 +2348,83 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Rhaid arsefydlu'r pecynnau yma:" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "&Ie, gosod" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Saerniaeth:" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2434,10 +2434,11 @@ msgid "delete %s" msgstr "&Dileu" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." -msgstr "" +#, fuzzy +msgid "Delete conflicting resolvables" +msgstr "Gosod gyrrydd..." -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2447,193 +2448,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Gweithred" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Arsefydlu %s: \"%s\"" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Arsefydlu %s: \"%s\"" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Rhaid arsefydlu'r pecynnau yma:" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Gwall" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2644,8 +2645,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Gosod gyrrydd..." #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2655,7 +2657,7 @@ msgstr "Arsefydlu %s: \"%s\"" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Gosod gyrrydd..." #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2685,8 +2687,9 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." -msgstr "" +#, fuzzy +msgid "Unlock these resolvables" +msgstr "Gosod gyrrydd..." #: zypp/CountryCode.cc:135 msgid "Unknown country: " diff --git a/po/da.po b/po/da.po index 41b0f9e..414935e 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2002-07-01 14:35+0200\n" "Last-Translator: H. Merethe Eriksen \n" "Language-Team: Danish \n" @@ -2263,7 +2263,7 @@ msgstr "" msgid "%s install failed" msgstr "Installation fejlet." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "" @@ -2275,65 +2275,65 @@ msgstr "" msgid "%s installed ok" msgstr "&Ja, installér" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "Yderligere gruppe indstillinger" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm fejlede." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Ok" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Pakker som skal fjernes" # -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Pakker som skal genoprettes" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 #, fuzzy msgid "The package has no MD5 sum" msgstr "Pakker som skal fjernes" # -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Pakker som skal genoprettes" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Pakker som skal fjernes" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Opret ikke sikkerhedskopier" @@ -2430,7 +2430,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Installerer på:" @@ -2457,85 +2457,86 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Denne pakke er ikke installeret og vil heller ikke blive installeret." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" # -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Afhængighedskonflikter:" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "behøver at blive reinstalleret" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 konflikter med %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "har uløste krav..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "har uløste krav..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 konflikter med %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Startarkitektur" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Kataloget %1 findes allerede i listen." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2546,10 +2547,10 @@ msgstr "Slet %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 konflikter med %2" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2559,194 +2560,194 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Handling" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" # -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "opgradér" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Installerer på:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Installerer på:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Checker allerede installeret skannere" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Denne pakke er ikke installeret og vil heller ikke blive installeret." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Fejl" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Importér data" @@ -2757,9 +2758,11 @@ msgstr "Importér data" msgid "keep %s" msgstr "" +# #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Installér manglende pakker" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2770,7 +2773,7 @@ msgstr "Installer %1" # #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Installér manglende pakker" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2801,7 +2804,7 @@ msgstr "Ure" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 konflikter med %2" #: zypp/CountryCode.cc:135 diff --git a/po/de.po b/po/de.po index 0bd36f5..622d92f 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2003-02-12 09:27+0100\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -1965,7 +1965,7 @@ msgstr "" msgid "%s install failed" msgstr "Fehler bei der Installation von %s" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "rpm-Ausgabe:" @@ -1974,57 +1974,57 @@ msgstr "rpm-Ausgabe:" msgid "%s installed ok" msgstr "%s ordnungsgemäß installiert" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "Zusätzliche rpm-Ausgabe:" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "Fehler beim Entfernen von %s" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "%s ordnungsgemäß entfernt" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "OK" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "Das Paket ist aus folgenden Gründen nicht in Ordnung:" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "Das Paket enthält eine andere Version als erwartet" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "Die Paketdatei weist eine falsche MD5-Summe auf" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "Das Paket ist nicht signiert" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "Das Paket weist keine MD5-Summe auf" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "Das Paket weist eine falsche Signatur auf" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "Das Paketarchiv weist eine falsche MD5-Summe auf" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "rpm-Fehler aus unbekanntem Grund, siehe Protokolldatei" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "Sicherung %s erstellt" @@ -2127,7 +2127,7 @@ msgid "Child of" msgstr "Untergeordnetes Element von" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "Installation von %s nicht möglich" @@ -2158,87 +2158,87 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "%s ist nicht installiert und als nicht installierbar gekennzeichnet" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "Installation von %s aufgrund von Abhängigkeitsproblemen nicht möglich" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s weist nicht erfüllte Anforderungen auf" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "%s kann aufgrund fehlender Abhängigkeiten nicht installiert werden" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "%s kann aufgrund fehlender Abhängigkeiten nicht installiert werden" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s erfüllt die Abhängigkeiten von %s, wird jedoch deinstalliert" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "%s muss nicht installiert werden" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" "Installation von %s zur Erfüllung der Abhängigkeiten von %s nicht möglich" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" "Installation von %s zur Erfüllung der Abhängigkeiten von %s nicht möglich" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s wird nicht deinstalliert; wird noch immer benötigt" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "Installation von %s aufgrund eines Konflikts mit %s nicht möglich" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s kann nicht installiert werden aufgrund von Konflikten mit %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "Anforderung wird ignoriert" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s wird von anderen auflösbaren Objekten benötigt" +msgid "Ignore this requirement generally" +msgstr "Anforderung wird ignoriert" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "Konflikt von %s wird ignoriert" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Architektur wird ignoriert" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" "Es wird ignoriert, dass %s bereits für die Installation festgelegt wurde" @@ -2250,10 +2250,10 @@ msgstr "%1 löschen" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "Entfernen in Konflikt stehender auflösbarer Objekte" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "für die Voraussetzung von %s für %s beim Aufrüsten von %s" @@ -2263,60 +2263,60 @@ msgstr "für die Voraussetzung von %s für %s beim Aufrüsten von %s" msgid "%s is missing the requirement %s" msgstr "%s fehlt die Anforderung %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", Aktion:" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ", Auslöser:" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "Paket" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "Auswahl" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "Muster" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "Produkt" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "Patch" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "Skript" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "Meldung" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "System" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Auflösbar" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "Dieser Auflösungsversuch wird als ungültig gekennzeichnet." -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "Auflösbares Objekt %s wird als nicht installierbar gekennzeichnet" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " @@ -2325,87 +2325,87 @@ msgstr "" "Installation von %s ist geplant, jedoch aufgrund von Abhängigkeitsproblemen " "nicht möglich." -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" "%s kann nicht installiert werden, da schon für Deinstallation gekennzeichnet" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "Installation von %s nicht möglich; gilt nicht für dieses System." -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" "%s kann nicht installiert werden, da %s bereits für die Installation " "gekennzeichnet ist" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "Dies würde %s ungültig machen." -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "Festlegen von %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "Installation von %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "Aktualisierung von %s auf %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "%s wird übersprungen: bereits installiert" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "Es sind keine alternativen installierten Anbieter von %s verfügbar" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "für %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "Es sind keine installierbaren Anbieter von %s verfügbar" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" "Es ist nicht möglich, auf %s aufzurüsten, um das Entfernen von %s zu " "vermeiden." -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" "%s stellt %s zur Verfügung, soll jedoch planmäßig deinstalliert werden." -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" "%s stellt %s zur Verfügung; es ist jedoch bereits eine andere Version des " "entsprechenden %s installiert." -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2414,17 +2414,17 @@ msgstr "" "%s stellt %s zur Verfügung, ist aber nicht installierbar. Versuchen Sie das " "Objekt separat zu installieren, um weitere Details zu erhalten." -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s stellt %s zur Verfügung, ist aber gesperrt." -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "Anforderung %s für %s kann nicht erfüllt werden" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." @@ -2432,41 +2432,41 @@ msgstr "" "%s wird von anderem zu installierenden auflösbaren Objekt benötigt. " "Demzufolge wird Verbindung nicht aufgehoben." -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" "%s wird von anderem installierten auflösbaren Objekt benötigt. Demzufolge " "wird Verbindung nicht aufgehoben." -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s ist gesperrt und kann nicht deinstalliert werden." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" "Aufgrund eines Konflikts mit %s (%s) muss das zu installierende %s entfernt " "werden" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" "%s wird aufgrund von Konflikten mit %s als nicht installierbar gekennzeichnet" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "von %s" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "Fehler!" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "Wichtig!" @@ -2478,7 +2478,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "Fehlende auflösbare Objekte werden installiert" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2489,7 +2489,7 @@ msgstr "%1 installieren" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Fehlende auflösbare Objekte werden installiert" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2520,7 +2520,7 @@ msgstr "%s entsperren" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "Entsperren dieser auflösbaren Objekte" #: zypp/CountryCode.cc:135 @@ -3475,6 +3475,10 @@ msgstr "Sambia" msgid "Zimbabwe" msgstr "Simbabwe" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s wird von anderen auflösbaren Objekten benötigt" + #~ msgid "%s cannot be uninstalled due missing dependencies" #~ msgstr "" #~ "%s kann aufgrund fehlender Abhängigkeiten nicht deinstalliert werden" diff --git a/po/el_GR.po b/po/el_GR.po index 51262a5..ffa9ce6 100644 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-07-17 16:12+0200\n" "Last-Translator: Bill Giannakopoulos \n" "Language-Team: Greek \n" @@ -1987,7 +1987,7 @@ msgstr "" msgid "%s install failed" msgstr "Η εγκατάσταση απέτυχε." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "" @@ -1999,63 +1999,63 @@ msgstr "" msgid "%s installed ok" msgstr "Μη Εγκατεστημένο (%1)" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "Επιπλέον Ρυθμίσεις Ομάδας" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "το rpm απέτυχε." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Εντάξει" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Πακέτα προς Αφαίρεση" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Πακέτα για Επαναφορά" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 #, fuzzy msgid "The package has no MD5 sum" msgstr "Πακέτα προς Αφαίρεση" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Πακέτα για επαναφορά" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Πακέτα προς Αφαίρεση" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "&Δημιουργία Αντιγράφων Ασφαλείας" @@ -2152,7 +2152,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Εγκατάσταση σε:" @@ -2179,84 +2179,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Το πακέτο %1 απαιτείται και πρέπει να εγκατασταθεί." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Ανολοκλήρωτες Εξαρτήσεις:" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "χρειάζεται να ξανά εγκατασταθεί" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 συγκρούεται με %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "έχει άλυτες απαιτήσεις..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "έχει άλυτες απαιτήσεις..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 συγκρούεται με %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Αρχιτεκτονική εκκίνησης" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Ο κατάλογος %1 είναι ήδη στη λίστα." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2267,10 +2268,10 @@ msgstr "Διαγραφή %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 συγκρούεται με %2" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2280,193 +2281,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Δράση" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "πακέτο-διόρθωσης" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Εγκατάσταση σε:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Εγκατάσταση σε:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Ελέγχοντας τους ήδη εγκατεστημένους σαρωτές" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Το πακέτο %1 απαιτείται και πρέπει να εγκατασταθεί." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Σφάλμα" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Εισαγωγή δεδομένων" @@ -2478,8 +2479,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Εγκατάσταση Χαμένων Πακέτων" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2489,7 +2491,7 @@ msgstr "Εγκατάσταση %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Εγκατάσταση Χαμένων Πακέτων" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2520,7 +2522,7 @@ msgstr "Ρολόγια" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 συγκρούεται με %2" #: zypp/CountryCode.cc:135 diff --git a/po/en_GB.po b/po/en_GB.po index 233a359..875c76d 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-07-17 16:27+0200\n" "Last-Translator: James Ogley \n" "Language-Team: English \n" @@ -1984,7 +1984,7 @@ msgstr "" msgid "%s install failed" msgstr "Installation failed." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "" @@ -1996,62 +1996,62 @@ msgstr "" msgid "%s installed ok" msgstr "&Yes, install" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "Additional Group Settings" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm failed." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Ok" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Packages to restore" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Packages to restore" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Packages to restore" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Packages to restore" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Do Not Create Backups" @@ -2148,7 +2148,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Installing on:" @@ -2175,84 +2175,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "This package is not installed and it will not be installed." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Unsatisfied Dependencies:" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "needs to be reinstalled" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 conflicts with %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "has unresolved requirements..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "has unresolved requirements..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 conflicts with %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Boot architecture" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Directory %1 is already in the list." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2263,10 +2264,10 @@ msgstr "Delete %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 conflicts with %2" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2276,193 +2277,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Action" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "patch" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Installing on:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Installing on:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Checking already installed scanners" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "This package is not installed and it will not be installed." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Error" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Import data" @@ -2474,8 +2475,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Install Missing Packages" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2485,7 +2487,7 @@ msgstr "Install %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Install Missing Packages" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2516,7 +2518,7 @@ msgstr "Clocks" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 conflicts with %2" #: zypp/CountryCode.cc:135 diff --git a/po/en_US.po b/po/en_US.po index 4607496..71a8629 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2002-07-18 14:04+0200\n" "Last-Translator: proofreader \n" "Language-Team: English \n" @@ -1953,7 +1953,7 @@ msgstr "" msgid "%s install failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -1962,57 +1962,57 @@ msgstr "" msgid "%s installed ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2109,7 +2109,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "" @@ -2136,82 +2136,82 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2221,10 +2221,10 @@ msgid "delete %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2234,191 +2234,191 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2429,7 +2429,7 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2439,7 +2439,7 @@ msgid "install %s" msgstr "" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2469,7 +2469,7 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "" #: zypp/CountryCode.cc:135 diff --git a/po/es.po b/po/es.po index 412cc3c..f1d2f2b 100644 --- a/po/es.po +++ b/po/es.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2003-02-12 10:23+0100\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -1972,7 +1972,7 @@ msgstr "" msgid "%s install failed" msgstr "Error al instalar %s" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "Salida de rpm:" @@ -1981,62 +1981,62 @@ msgstr "Salida de rpm:" msgid "%s installed ok" msgstr "Instalación correcta de %s" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "Salida de rpm adicional:" # clients/inst_prepdisk.ycp:482 clients/inst_prepdisk.ycp:501 # clients/inst_prepdisk.ycp:482 clients/inst_prepdisk.ycp:501 # clients/inst_prepdisk.ycp:507 clients/inst_prepdisk.ycp:526 -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "Error al eliminar %s" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "Eliminación de %s correcta" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Aceptar" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "El paquete no es aceptable por los siguientes motivos:" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "El paquete contiene una versión diferente de la esperada" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "La suma MD5 del archivo de paquete no es correcta" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "El paquete no está firmado" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "El paquete no tiene suma MD5" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "El paquete tiene una firma incorrecta" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "La suma MD5 del archivo de paquete no es correcta" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "Error de rpm por motivos desconocidos, consulte el archivo de registro" # include/nis_server/io.ycp:582 # include/backup/ui.ycp:1286 -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "creada copia de seguridad %s" @@ -2142,7 +2142,7 @@ msgstr "Elemento secundario de" # 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 #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "No es posible instalar %s" @@ -2173,81 +2173,81 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "%s no se ha instalado y se ha marcado como no instalable" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "No es posible instalar %s debido a problemas de dependencias" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s tiene requisitos que no se cumplen" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "%s no se puede instalar debido a dependencias que no están presentes" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "%s no se puede instalar debido a dependencias que no están presentes" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s satisface las dependencias de %s, pero se desinstalará" # clients/online_update_load.ycp:1004 -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "No es necesario instalar %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "No es posible instalar %s para satisfacer las dependencias de %s" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "No es posible instalar %s para satisfacer las dependencias de %s" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s no se desinstalará porque aún es necesario" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "No es posible instalar %s porque entra en conflicto con %s" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s no es instalable debido a conflictos con %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "Omitiendo este requisito" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "Otras resoluciones necesitan %s" +msgid "Ignore this requirement generally" +msgstr "Omitiendo este requisito" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "Omitiendo el conflicto de %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Omitiendo arquitectura" # include/scanner/scanner_start.ycp:185 @@ -2255,7 +2255,7 @@ msgstr "Omitiendo arquitectura" # include/scanner/scanner_start.ycp:180 #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Omitiendo que %s ya está configurado para la instalación" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2266,10 +2266,10 @@ msgstr "Borrar %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "Eliminando resoluciones en conflicto" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "para requerir %s para %s al actualizar %s" @@ -2279,60 +2279,60 @@ msgstr "para requerir %s para %s al actualizar %s" msgid "%s is missing the requirement %s" msgstr "%s no dispone del requisito %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", Acción:" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ", Activación:" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "paquete " -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "selección" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "patrón" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "producto" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "revisión" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "guión" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "mensaje" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "sistema" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Resolución" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "Marcando el intento de resolución como no válido." -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "Marcando la resolución %s como no instalable" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " @@ -2341,7 +2341,7 @@ msgstr "" "%s está programado para instalarse, pero no es posible debido a problemas de " "dependencias." -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" @@ -2349,19 +2349,19 @@ msgstr "" "No es posible instalar %s, dado que su desinstalación está marcada como " "necesaria" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "No es posible instalar %s, dado que no es aplicable al sistema." -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" "No es posible instalar %s, dado que %s ya está marcado como instalación " "necesaria" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "Esto invalidaría %s." @@ -2369,7 +2369,7 @@ msgstr "Esto invalidaría %s." # 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 # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "Estableciendo %s" @@ -2377,12 +2377,12 @@ msgstr "Estableciendo %s" # 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 # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "Instalando %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "Actualizando %s a %s" @@ -2390,43 +2390,43 @@ msgstr "Actualizando %s a %s" # include/scanner/scanner_start.ycp:185 # include/scanner/scanner_start.ycp:180 # include/scanner/scanner_start.ycp:180 -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "Omitiendo %s: ya instalado" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "No hay proveedores alternativos instalados de %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "para %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "No hay proveedores instalables de %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "No es posible actualizar a %s para evitar la eliminación de %s." -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "%s proporciona %s, pero está programado para su desinstalación." -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "%s proporciona %s, pero ya hay otra versión de ese %s instalada." -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2435,17 +2435,17 @@ msgstr "" "%s proporciona %s, pero no se puede instalar. Intente instalarlo por " "separado para obtener más detalles." -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s proporciona %s, pero está bloqueado." -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "No es posible cumplir el requisito %s para %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." @@ -2453,41 +2453,41 @@ msgstr "" "Otra resolución que se instalará requiere %s, por lo que no se anulará el " "enlace." -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" "Otra resolución instalada requiere %s, por lo que no se anulará el enlace." -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s está bloqueado y no es posible desinstalarlo." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" "Un conflicto en %s (%s) requiere eliminar la resolución %s incluida para la " "instalación" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "Marcando %s como no instalable debido a conflictos en %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "de %s" # include/ui/common_messages.ycp:95 # include/ui/common_messages.ycp:99 -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "Error" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "Importante" @@ -2499,7 +2499,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "Instalando resoluciones que faltan" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2510,7 +2510,7 @@ msgstr "Instalar %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Instalando resoluciones que faltan" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2541,7 +2541,7 @@ msgstr "Desbloquear %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "Desbloqueando las resoluciones" #: zypp/CountryCode.cc:135 @@ -3496,6 +3496,10 @@ msgstr "Zambia" msgid "Zimbabwe" msgstr "Zimbabue" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "Otras resoluciones necesitan %s" + #~ msgid "%s cannot be uninstalled due missing dependencies" #~ msgstr "" #~ "%s no se puede desinstalar debido a dependencias que no están presentes" diff --git a/po/fi.po b/po/fi.po index c684856..c760ffe 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,32 +1,32 @@ -# translation of zypp.po to Finnish +# translation of zypp.fi.po to # Copyright (C) 2005 SUSE Linux Products GmbH. # Finnish message file for YaST2 (@memory@). # Copyright (C) 2003 SuSE Linux AG. # # Michael Hintsala , 2003. 2001. # Ilkka Pirskanen , 2006. +# Jyri Palokangas , 2006. msgid "" msgstr "" -"Project-Id-Version: zypp\n" +"Project-Id-Version: zypp.fi\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" -"PO-Revision-Date: 2006-02-07 23:22+0200\n" -"Last-Translator: Ilkka Pirskanen \n" -"Language-Team: Finnish \n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" +"PO-Revision-Date: 2006-02-27 08:10+0200\n" +"Last-Translator: Jyri Palokangas \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: KBabel 1.11.1\n" +"X-Generator: KBabel 1.11.2\n" #: zypp/LanguageCode.cc:145 msgid "Unknown language: " msgstr "Tuntematon kieli: " #: zypp/LanguageCode.cc:226 zypp/CountryCode.cc:215 -#, fuzzy msgid "noCode" -msgstr "Koodi" +msgstr "eikoodia" #: zypp/LanguageCode.cc:227 msgid "Default" @@ -89,7 +89,6 @@ msgid "Aleut" msgstr "aleutti" #: zypp/LanguageCode.cc:258 -#, fuzzy msgid "Algonquian languages" msgstr "algonkin-kielet" @@ -107,7 +106,6 @@ msgid "English, Old (ca.450-1100)" msgstr "muinaisenglanti" #: zypp/LanguageCode.cc:266 -#, fuzzy msgid "Apache languages" msgstr "apaššikielet" @@ -154,12 +152,10 @@ msgid "Asturian" msgstr "asturia" #: zypp/LanguageCode.cc:288 -#, fuzzy msgid "Athapascan languages" msgstr "athabasca-kielet" #: zypp/LanguageCode.cc:290 -#, fuzzy msgid "Australian languages" msgstr "australialaiset kielet" @@ -192,7 +188,6 @@ msgid "Banda" msgstr "banda" #: zypp/LanguageCode.cc:304 -#, fuzzy msgid "Bamileke languages" msgstr "bamileke-kielet" @@ -377,7 +372,6 @@ msgid "Mari" msgstr "mari" #: zypp/LanguageCode.cc:390 -#, fuzzy msgid "Chinook jargon" msgstr "chinook-jargon" @@ -406,7 +400,6 @@ msgid "Cheyenne" msgstr "cheyenne" #: zypp/LanguageCode.cc:404 -#, fuzzy msgid "Chamic languages" msgstr "cham-kielet" @@ -423,17 +416,14 @@ msgid "Corsican" msgstr "korsika" #: zypp/LanguageCode.cc:412 -#, fuzzy msgid "Creoles and pidgins, English based (Other)" msgstr "muut englantiin perustuvat kreolit ja pidginit" #: zypp/LanguageCode.cc:414 -#, fuzzy msgid "Creoles and pidgins, French-based (Other)" msgstr "muut ranskaan perustuvat kreolit ja pidginit" #: zypp/LanguageCode.cc:416 -#, fuzzy msgid "Creoles and pidgins, Portuguese-based (Other)" msgstr "muut portugaliin perustuvat kreolit ja pidginit" @@ -446,7 +436,6 @@ msgid "Crimean Tatar" msgstr "krimintataari" #: zypp/LanguageCode.cc:422 -#, fuzzy msgid "Creoles and pidgins (Other)" msgstr "muut kreolit ja pidginit" @@ -858,7 +847,6 @@ msgid "Iranian (Other)" msgstr "muut iranilaiset kielet" #: zypp/LanguageCode.cc:620 -#, fuzzy msgid "Iroquoian languages" msgstr "irokeesikielet" @@ -1104,7 +1092,6 @@ msgid "Luo (Kenya and Tanzania)" msgstr "luo" #: zypp/LanguageCode.cc:738 -#, fuzzy msgid "lushai" msgstr "lushai" @@ -1198,7 +1185,6 @@ msgid "Minangkabau" msgstr "minangkabau" #: zypp/LanguageCode.cc:778 -#, fuzzy msgid "Miscellaneous languages" msgstr "luokittelemattomat kielet" @@ -1229,7 +1215,6 @@ msgid "Manipuri" msgstr "manipuri" #: zypp/LanguageCode.cc:790 -#, fuzzy msgid "Manobo languages" msgstr "manobo-kielet" @@ -1250,12 +1235,10 @@ msgid "Mossi" msgstr "mossi" #: zypp/LanguageCode.cc:800 -#, fuzzy msgid "Multiple languages" msgstr "monia kieliä" #: zypp/LanguageCode.cc:802 -#, fuzzy msgid "Munda languages" msgstr "mundakielet" @@ -1276,7 +1259,6 @@ msgid "Marwari" msgstr "marwari" #: zypp/LanguageCode.cc:810 -#, fuzzy msgid "Mayan languages" msgstr "maya-kielet" @@ -1372,7 +1354,6 @@ msgid "Northern Sotho" msgstr "sotho, pohjois-" #: zypp/LanguageCode.cc:854 -#, fuzzy msgid "Nubian languages" msgstr "nubialaiset kielet" @@ -1431,7 +1412,6 @@ msgid "Turkish, Ottoman (1500-1928)" msgstr "osmani" #: zypp/LanguageCode.cc:882 -#, fuzzy msgid "Otomian languages" msgstr "otomi-kielet" @@ -1504,7 +1484,6 @@ msgid "Portuguese" msgstr "portugali" #: zypp/LanguageCode.cc:914 -#, fuzzy msgid "Prakrit languages" msgstr "prakrit-kielet" @@ -1583,7 +1562,6 @@ msgid "South American Indian (Other)" msgstr "muut Etelä-Amerikan intiaanikielet" #: zypp/LanguageCode.cc:948 -#, fuzzy msgid "Salishan languages" msgstr "sališilaiset kielet" @@ -1648,7 +1626,6 @@ msgid "Sinhala" msgstr "sinhali" #: zypp/LanguageCode.cc:980 -#, fuzzy msgid "Siouan languages" msgstr "sioux-kielet" @@ -1677,7 +1654,6 @@ msgid "Northern Sami" msgstr "saame, pohjois-" #: zypp/LanguageCode.cc:994 -#, fuzzy msgid "Sami languages (Other)" msgstr "muut saamelaiskielet" @@ -1909,7 +1885,6 @@ msgid "Tumbuka" msgstr "tumbuka" #: zypp/LanguageCode.cc:1096 -#, fuzzy msgid "Tupi languages" msgstr "tupi-kielet" @@ -1989,7 +1964,6 @@ msgid "Votic" msgstr "vatja" #: zypp/LanguageCode.cc:1134 -#, fuzzy msgid "Wakashan languages" msgstr "wakash-kielet" @@ -2010,7 +1984,6 @@ msgid "Welsh" msgstr "kymri" #: zypp/LanguageCode.cc:1144 -#, fuzzy msgid "Sorbian languages" msgstr "sorbin kielet" @@ -2049,7 +2022,6 @@ msgid "Yoruba" msgstr "joruba" #: zypp/LanguageCode.cc:1162 -#, fuzzy msgid "Yupik languages" msgstr "jupikkikielet" @@ -2103,8 +2075,7 @@ msgstr "" #: zypp/target/rpm/RpmDb.cc:1812 #, c-format msgid "rpm created %s as %s but it was impossible to determine the difference" -msgstr "" -"rpm loi tiedoston %s tiedostona %s, mutta erojen selivttäminen on mahdotonta" +msgstr "rpm loi tiedoston %s tiedostona %s, mutta erojen selivttäminen on mahdotonta" #: zypp/target/rpm/RpmDb.cc:1814 #, c-format @@ -2120,7 +2091,7 @@ msgstr "" msgid "%s install failed" msgstr "%s asennus epäonnistui" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "rpm-tuloste:" @@ -2129,57 +2100,57 @@ msgstr "rpm-tuloste:" msgid "%s installed ok" msgstr "%s asentui" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "rpm-lisätuloste:" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "%s poistaminen epäonnistui" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "%s poistaminen onnistui" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Ok" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "Paketti ei ole kunnossa seuraavista syistä:" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "Paketti sisälsi eri version kuin odotettiin" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "Pakettitiedoston MD5-summa on väärä" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "Paketti ei ole allekirjoitettu" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "Paketissa ei ole MD5-summaa" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "Paketin allekirjoitus on virheellinen" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "Pakettiarkistolla on väärä MD5-summa" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "rpm epäonnistui tuntemattomasta syystä, katso lokitiedosto" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "luotiin varmuuskopio %s" @@ -2190,7 +2161,7 @@ msgid "%s is replaced by %s" msgstr "%s korvataan osalla %s" #: zypp/solver/detail/ResolverInfoObsoletes.cc:69 -#, fuzzy, c-format +#, c-format msgid "%s replaced by %s" msgstr "%s korvataan osalla %s" @@ -2282,7 +2253,7 @@ msgid "Child of" msgstr "Vanhempi" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "Ei voida asentaa %s" @@ -2313,99 +2284,95 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "%s ei asennettu ja se on merkitty ei asennettavissa olevaksi" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "Ei voida asentaa %s riippuvuusongelmien takia" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "Osalla %s on täyttämättömiä vaatimuksia" -#: zypp/solver/detail/Resolver_problems.cc:346 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:349 +#, c-format msgid "%s has missing dependencies" -msgstr "Osaa %s ei voida asentaa puuttuvien riippuvuuksien takia" +msgstr "Osalla %s on puuttuvia riippuvuuksia" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "Osaa %s ei voida asentaa puuttuvien riippuvuuksien takia" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "Osa %s täyttää osan %s riippuvuudet, mutta se poistetaan" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "Ei tarvetta asentaa %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Ei voida asentaa osaa %s täyttämään osan %s riippuvuudet" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "Ei voida asentaa osaa %s täyttämään osan %s riippuvuudet" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s ei poisteta, koska sitä tarvitaan edelleen" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "Ei voida asentaa osaa %s, koska se on ristiriidassa osan %s kanssa" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s ei ole poistettavissa, koska se on ristiriidassa osan %s kanssa" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -#, fuzzy -msgid "Ignore this requirement." -msgstr "Tätä vaatimusta ei huomoida" +msgid "Ignore this requirement just here" +msgstr "Jätä tämä vaatimus huomiotta vain tässä" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -#, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "Muut osat tarvitsevat osaa %s" +msgid "Ignore this requirement generally" +msgstr "Jätä tämä vaatimus huomiotta yleisesti" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 -#, fuzzy, c-format -msgid "Ignore this conflict of %s." -msgstr "Osan %s ristiriitaa ei huomioida" +#, c-format +msgid "Ignore this conflict of %s" +msgstr "Jätä osan %s ristiriitaa huomiotta" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -#, fuzzy -msgid "ignore architecture" -msgstr "Käynnistysarkkitehtuuri" +msgid "Ignore architecture" +msgstr "Jätä arkkitehtuuri huomiotta" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 -#, fuzzy, c-format -msgid "Ignore that %s is already set to install." -msgstr "Hakemisto %1 on jo luettelossa." +#, c-format +msgid "Ignore that %s is already set to install" +msgstr "Jätä huomiotta että %s on jo asetettu asennettavaksi" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 #: zypp/solver/detail/ProblemSolutionUninstall.cc:56 -#, fuzzy, c-format +#, c-format msgid "delete %s" -msgstr "Poista %1" +msgstr "poista %s" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -#, fuzzy -msgid "Delete conflicting resolvables." -msgstr "Poistetaan ristiriitaiset osat" +msgid "Delete conflicting resolvables" +msgstr "Poista ristiriitaa aiheuttavat osat" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "tarvitaan %s %s varten kun päivitetään %s" @@ -2415,60 +2382,60 @@ msgstr "tarvitaan %s %s varten kun päivitetään %s" msgid "%s is missing the requirement %s" msgstr "%s puuttuu vaatimus %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", Toimenpide: " -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ", Laukaisu: " -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "paketti" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "esivalinta" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "käyttötarkoitus" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "tuote" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "korjaus" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "komentojono" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "sanoma" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "järjestelmä" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Resolvable" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "Merkitään tämä ratkaisuyritys epäkelvoksi." -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "Merkitään osa %s ei asennettavissa olevaksi" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " @@ -2477,79 +2444,78 @@ msgstr "" "%s on tarkoitus asentaa, mutta se ei ole mahdollista riippuvuusongelmien " "vuoksi." -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format -msgid "" -"Can't install %s since it is already marked as needing to be uninstalled" +msgid "Can't install %s since it is already marked as needing to be uninstalled" msgstr "Ei voida asentaa osaa %s, koska se on jo merkitty poistetttavaksi" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "Ei voida asentaa osaa %s, koska sitä ei käytetä tässä järjestelmässä." -#: zypp/solver/detail/ResolverInfoMisc.cc:184 -#, fuzzy, c-format +#: zypp/solver/detail/ResolverInfoMisc.cc:180 +#, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" -msgstr "Ei voida asentaa osaa %s, koska se on jo merkitty poistetttavaksi" +msgstr "Ei voida asentaa osaa %s, koska %s on jo merkitty tarvitaan asennettavaksi" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "Tämä muuttaisi osan %s epäkelvoksi." -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "Valmistellaan %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "Asennetaan %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "Päivitetään %s --> %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "Ohitetaan %s: jo asennettu" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "Mikään muu osa ei tarjoa osaa %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "%s:lle" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "Mikään osa ei tarjoa osaa %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "Päivitä osaan %s välttääksesi osan %s poistamisen, mikäli mahdollista." -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "Osa %s tarjoaa osan %s, mutta se on tarkoitus poistaa." -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "Osa %s tarjoaa osan %s, mutta toinen versio %s on jo asennettu." -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2558,55 +2524,51 @@ msgstr "" "Osa %s tarjoaa osan %s, mutta sitä ei voida poistaa. Yritä asentaa se " "yksinään saadaksesi lisätietoja." -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "Osa %s tarjoaa osan %s, mutta se on lukittu." -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "Ei voida tyydyttää vaatimusta %s osalle %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format -msgid "" -"%s is required by other to-be-installed resolvable, so it won't be unlinked." -msgstr "" -"Muut asennettavat osat vaativat osan %s, joten sen linkitystä ei pureta." +msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked." +msgstr "Muut asennettavat osat vaativat osan %s, joten sen linkitystä ei pureta." -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "Muu asennettava osa vaatii osan %s, joten sen linkitystä ei pureta." -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s on lukittu ja sitä ei voida poistaa." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" -msgstr "" -"Ristiriita osasta %s (%s) vaatii asennettavaksi päätetyn %s poistamista" +msgstr "Ristiriita osasta %s (%s) vaatii asennettavaksi päätetyn %s poistamista" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" -msgstr "" -"Merkitään %s ei asennettavissa olevaksi osasta %s olevan ristiriidan takia" +msgstr "Merkitään %s ei asennettavissa olevaksi osasta %s olevan ristiriidan takia" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "%s:sta" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr " Virhe!" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr " Tärkeä!" @@ -2614,23 +2576,21 @@ msgstr " Tärkeä!" #: zypp/solver/detail/ProblemSolutionKeep.cc:57 #, c-format msgid "keep %s" -msgstr "" +msgstr "pidä %s" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -#, fuzzy -msgid "Keep missing resolvables." -msgstr "Asennetaan puuttuvat osat" +msgid "Keep missing resolvables" +msgstr "Pidä puuttuvat osat" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 -#, fuzzy, c-format +#, c-format msgid "install %s" -msgstr "Asenna %1" +msgstr "asenna %s" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 -#, fuzzy -msgid "Install missing resolvables." -msgstr "Asennetaan puuttuvat osat" +msgid "Install missing resolvables" +msgstr "Asenna puuttuvat osat" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -2638,12 +2598,12 @@ msgid "%s depended on %s" msgstr "%s on riippuvainen osasta %s" #: zypp/solver/detail/ResolverInfoDependsOn.cc:69 -#, fuzzy, c-format +#, c-format msgid "%s dependend on %s" -msgstr "%s on riippuvainen osasta %s" +msgstr "%s riippuu osasta %s" #: zypp/solver/detail/ResolverInfoNeededBy.cc:70 -#, fuzzy, c-format +#, c-format msgid "%s needed by %s" msgstr "Osaa %s tarvitaan %s toimesta" @@ -2654,13 +2614,12 @@ msgid "%s part of %s" msgstr "Osa %s kuuluu osaan %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:52 -#, fuzzy, c-format +#, c-format msgid "unlock %s" msgstr "Poista osan %s lukitus" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -#, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "Poistetaan näiden osien lukitus" #: zypp/CountryCode.cc:135 @@ -3818,15 +3777,3 @@ msgstr "Sambia" msgid "Zimbabwe" msgstr "Zimbabwe" -#~ msgid "Deleting %s" -#~ msgstr "Poistetaan %s" - -#~ msgid "" -#~ "Can't install %s, since a resolvable of the same name is already marked " -#~ "as needing to be installed" -#~ msgstr "" -#~ "Ei voida asentaa osaa %s, koska samanniminen osa on jo merkitty " -#~ "asennettavaksi" - -#~ msgid "%s cannot be uninstalled due missing dependencies" -#~ msgstr "Osaa %s ei voida poistaa puuttuvien riippuvuuksien takia" diff --git a/po/fr.po b/po/fr.po index 6089f6a..3de5606 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2003-02-12 09:50+0100\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -1969,7 +1969,7 @@ msgid "%s install failed" msgstr "Échec de l'installation de %s" # TLABEL firewall_2002_03_14_2340__2 -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "Sortie rpm :" @@ -1980,63 +1980,63 @@ msgid "%s installed ok" msgstr "%s installé." # TLABEL firewall_2002_03_14_2340__51 -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "Sortie rpm supplémentaire :" # TLABEL partitioning_2002_01_04_0147__99 -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "Échec du retrait de %s" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "Réussite du retrait de %s" # TLABEL menu_2002_01_04_0147__28 -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "OK" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "Le package ne convient pas pour les raisons suivantes :" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "La version du package n'est pas celle attendue" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "Le fichier du package présente une somme MD5 incorrecte" # TLABEL restore_2002_08_07_0216__79 -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "Le package n'est pas signé" # TLABEL restore_2002_08_07_0216__79 -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "Le package ne présente aucune somme MD5" # TLABEL restore_2002_08_07_0216__79 -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "La signature du package est incorrecte" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "L'archive du package présente une somme MD5 incorrecte" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "Échec de rpm pour une raison inconnue (voir fichier journal)" # TLABEL backup_2002_03_14_2340__102 -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "- sauvegarde %s créée" @@ -2140,7 +2140,7 @@ msgstr "Enfant de" # TLABEL partitioning_2002_01_04_0147__180 #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "Impossible d'installer %s" @@ -2172,87 +2172,87 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "%s n'est pas installé et est marqué comme non installable" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "Impossible d'installer %s à cause de problèmes de dépendance" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s possède des exigences non satisfaites" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "%s ne peut pas être installé à cause de dépendances manquantes" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "%s ne peut pas être installé à cause de dépendances manquantes" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s satisfait les dépendances de %s mais sera désinstallé" # TLABEL online_update_2002_01_04_0147__92 -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "Aucune nécessité d'installer %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Impossible d'installer %s pour satisfaire les dépendances de %s" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "Impossible d'installer %s pour satisfaire les dépendances de %s" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s ne sera pas désinstallé car il est toujours requis" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "Impossible d'installer %s car il est en conflit avec %s" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s est non installable car il est en conflit avec %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "Non prise en compte de cette exigence" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s est requis par d'autres correctifs" +msgid "Ignore this requirement generally" +msgstr "Non prise en compte de cette exigence" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "Non prise en compte du conflit de %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Non prise en compte de l'architecture" # TLABEL scanner_2002_01_04_0147__15 #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Non prise en compte que %s est déjà prêt pour l'installation" # TLABEL packages_2002_01_04_0147__198 @@ -2264,10 +2264,10 @@ msgstr "Suppression de %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "Suppression des correctifs en conflit" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "pour l'exigence %s destinée à %s lors de la mise à niveau de %s" @@ -2278,60 +2278,60 @@ msgid "%s is missing the requirement %s" msgstr "%s manque de l'exigence %s" # TLABEL rpm-groups_2002_03_14_2340__3 -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ". Action :" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ". Déclencheur :" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "package" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "sélection" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "modèle" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "produit" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "correctif" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "script" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "message" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "système" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Correctif" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "Marquage de cette tentative de résolution comme étant incorrecte." -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "Marquage du correctif %s comme étant non installable" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " @@ -2340,7 +2340,7 @@ msgstr "" "L'installation de %s est planifiée mais elle est impossible en raison de " "problèmes de dépendance." -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" @@ -2348,80 +2348,80 @@ msgstr "" "Impossible de mettre en place %s car le fichier est déjà marqué comme étant " "à désinstaller" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "Impossible d'installer %s parce qu'il ne s'applique pas à ce système." -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" "Impossible d'installer %s car %s est déjà marqué comme étant à installer" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "Cela invaliderait %s." # TLABEL partitioning_2002_01_04_0147__180 -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "Mise en place de %s" # TLABEL partitioning_2002_01_04_0147__180 -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "Installation de %s..." -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "Mise à jour de %s vers %s" # TLABEL scanner_2002_01_04_0147__15 -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "%s ignoré : déjà installé." -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "Aucun autre fournisseur de %s n'est défini" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "pour %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "Aucun fournisseur de %s définissable" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" "Impossible de procéder à une mise à niveau vers %s pour éviter de retirer %s." -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" "%s fournit %s mais un problème lié à la planification de la désinstallation " "se pose." -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "%s fournit %s, mais une autre version de %s est déjà installée." -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2430,17 +2430,17 @@ msgstr "" "%s fournit %s mais un problème d'installation se pose. Pour identifier le " "problème, tentez de l'installer indépendamment." -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s fournit %s mais un problème de verrouillage se pose." -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "Impossible de satisfaire l'exigence %s pour %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." @@ -2448,7 +2448,7 @@ msgstr "" "%s est requis par un autre correctif à installer, donc sa liaison ne sera " "pas supprimée." -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" @@ -2456,33 +2456,33 @@ msgstr "" "liaison." # TLABEL autoinst_2002_08_07_0216__335 -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s est verrouillé et ne peut pas être désinstallé." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "Un conflit sur %s (%s) nécessite le retrait de %s à installer." -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "Marquage de %s comme non installable en raison de conflits sur %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "à partir de %s" # TLABEL wizard_2002_01_04_0147__40 -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "Erreur !" # TLABEL autoinst_2002_08_07_0216__135 -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "Important !" @@ -2494,7 +2494,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "Installation des correctifs manquants" # TLABEL online_update_2002_01_04_0147__8 @@ -2506,7 +2506,7 @@ msgstr "Installer %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Installation des correctifs manquants" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2537,7 +2537,7 @@ msgstr "Déverrouiller %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "Déverrouillage de ces correctifs" #: zypp/CountryCode.cc:135 @@ -3492,6 +3492,10 @@ msgstr "Zambie" msgid "Zimbabwe" msgstr "Zimbabwe" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s est requis par d'autres correctifs" + #~ msgid "%s cannot be uninstalled due missing dependencies" #~ msgstr "%s ne peut pas être désinstallé à cause de dépendances manquantes" diff --git a/po/gl.po b/po/gl.po index 13497eb..3c3933b 100644 --- a/po/gl.po +++ b/po/gl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2002-07-23 11:51+0200\n" "Last-Translator: Jesús Bravo Álvarez \n" "Language-Team: Galician \n" @@ -2318,7 +2318,7 @@ msgstr "" msgid "%s install failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2327,57 +2327,57 @@ msgstr "" msgid "%s installed ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Aceptar" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2474,7 +2474,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Instalando en:" @@ -2501,82 +2501,82 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2586,10 +2586,11 @@ msgid "delete %s" msgstr "Eliminar" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." -msgstr "" +#, fuzzy +msgid "Delete conflicting resolvables" +msgstr "Instalando o controlador..." -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2599,192 +2600,192 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Instalando en:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Instalando en:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Erro" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2795,8 +2796,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Instalando o controlador..." #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2806,7 +2808,7 @@ msgstr "Instalando en:" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Instalando o controlador..." #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2836,8 +2838,9 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." -msgstr "" +#, fuzzy +msgid "Unlock these resolvables" +msgstr "Instalando o controlador..." #: zypp/CountryCode.cc:135 msgid "Unknown country: " diff --git a/po/he.po b/po/he.po index d753237..ce6daaf 100644 --- a/po/he.po +++ b/po/he.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2004-08-09 10:24+0200\n" "Last-Translator: xxx \n" "Language-Team: Hebrew \n" @@ -2256,7 +2256,7 @@ msgstr "" msgid "%s install failed" msgstr "התקנה נכשלה" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2265,58 +2265,58 @@ msgstr "" msgid "%s installed ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "מידע נוסף" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm נכשל." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "בסדר" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "אל תיצור גיבויים" @@ -2414,7 +2414,7 @@ msgstr "" # Frame title for installation target hard disk / partition(s) #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "מתקין על:" @@ -2441,83 +2441,83 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "&בוט מערכת קיימת" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "ארכיטקטורה:" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" # main dialog: Button Delete partition @@ -2528,10 +2528,11 @@ msgid "delete %s" msgstr "&מחק" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." -msgstr "" +#, fuzzy +msgid "Delete conflicting resolvables" +msgstr "מתקין דריבר..." -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2541,195 +2542,195 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "פעולה" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "מתקין על:" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "מתקין על:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "שגיאה" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2740,8 +2741,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "מתקין דריבר..." # Frame title for installation target hard disk / partition(s) #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2752,7 +2754,7 @@ msgstr "מתקין על:" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "מתקין דריבר..." #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2782,8 +2784,9 @@ msgid "unlock %s" msgstr "שעונים" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." -msgstr "" +#, fuzzy +msgid "Unlock these resolvables" +msgstr "מתקין דריבר..." #: zypp/CountryCode.cc:135 msgid "Unknown country: " diff --git a/po/hi.po b/po/hi.po index f906fb2..ea71c2e 100644 --- a/po/hi.po +++ b/po/hi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: Prasanth Kurian \n" "Language-Team: Hindi \n" @@ -1955,7 +1955,7 @@ msgstr "" msgid "%s install failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -1964,57 +1964,57 @@ msgstr "" msgid "%s installed ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2111,7 +2111,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "" @@ -2138,82 +2138,82 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2223,10 +2223,10 @@ msgid "delete %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2236,191 +2236,191 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2431,7 +2431,7 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2441,7 +2441,7 @@ msgid "install %s" msgstr "" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2471,7 +2471,7 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "" #: zypp/CountryCode.cc:135 diff --git a/po/hr.po b/po/hr.po index bd47e4c..64571d1 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-07-17 16:22+0200\n" "Last-Translator: Vlatko Kosturjak \n" "Language-Team: Croatian \n" @@ -2272,7 +2272,7 @@ msgstr "" msgid "%s install failed" msgstr "Instaliraj &inetd" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2281,57 +2281,57 @@ msgstr "" msgid "%s installed ok" msgstr "će biti instaliran kao:" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "U redu" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Stvori Arhiv Pohrane Podataka" @@ -2428,7 +2428,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Instaliram na:" @@ -2455,83 +2455,83 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Ovi paketi trebaju biti instalirani:" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "će biti instaliran kao:" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Arhitektura" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Direktorij %1 je već na listi." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2542,10 +2542,10 @@ msgstr "&Obriši" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "Postaviti konfiguracijske vrijednosti." -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2555,193 +2555,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Akcija" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Instaliram na:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Instaliram na:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Provjeravam već instalirane skenere" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Ovi paketi trebaju biti instalirani:" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Greška" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Uvoz podataka" @@ -2753,8 +2753,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Instaliram upravljački program..." #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2764,7 +2765,7 @@ msgstr "Instaliram na:" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Instaliram upravljački program..." #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2794,8 +2795,9 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." -msgstr "" +#, fuzzy +msgid "Unlock these resolvables" +msgstr "Instaliram upravljački program..." #: zypp/CountryCode.cc:135 msgid "Unknown country: " diff --git a/po/hu.po b/po/hu.po index 2ebb2d3..c671dd5 100644 --- a/po/hu.po +++ b/po/hu.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" -"PO-Revision-Date: 2006-01-30 23:23+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" +"PO-Revision-Date: 2006-02-21 10:08+0100\n" "Last-Translator: Szabolcs Varga \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" @@ -23,10 +23,10 @@ msgstr "" msgid "Unknown language: " msgstr "Ismeretlen nyelv:" -#: zypp/LanguageCode.cc:226 zypp/CountryCode.cc:215 -#, fuzzy +#: zypp/LanguageCode.cc:226 +#: zypp/CountryCode.cc:215 msgid "noCode" -msgstr "Kód" +msgstr "noCode" # clients/printconf.ycp:305 #: zypp/LanguageCode.cc:227 @@ -157,14 +157,12 @@ msgid "Asturian" msgstr "asztúriai" #: zypp/LanguageCode.cc:288 -#, fuzzy msgid "Athapascan languages" msgstr "athapaszka nyelvek" # modules/inst_sw_single.ycp:117 # clients/inst_sw_single.ycp:1072 #: zypp/LanguageCode.cc:290 -#, fuzzy msgid "Australian languages" msgstr "ausztrál nyelvek" @@ -197,7 +195,6 @@ msgstr "banda" # modules/inst_sw_single.ycp:117 # clients/inst_sw_single.ycp:1072 #: zypp/LanguageCode.cc:304 -#, fuzzy msgid "Bamileke languages" msgstr "bamileke nyelvek" @@ -381,7 +378,6 @@ msgid "Mari" msgstr "mari" #: zypp/LanguageCode.cc:390 -#, fuzzy msgid "Chinook jargon" msgstr "csinuk zsargon" @@ -410,7 +406,6 @@ msgid "Cheyenne" msgstr "sájenn" #: zypp/LanguageCode.cc:404 -#, fuzzy msgid "Chamic languages" msgstr "hámi nyelvek" @@ -428,17 +423,14 @@ msgid "Corsican" msgstr "korzikai" #: zypp/LanguageCode.cc:412 -#, fuzzy msgid "Creoles and pidgins, English based (Other)" msgstr "angol alapú kreol és pidgin (egyéb)" #: zypp/LanguageCode.cc:414 -#, fuzzy msgid "Creoles and pidgins, French-based (Other)" msgstr "francia alapú kreol és pidgin (egyéb)" #: zypp/LanguageCode.cc:416 -#, fuzzy msgid "Creoles and pidgins, Portuguese-based (Other)" msgstr "portugál alapú kreol és pidgin (egyéb)" @@ -454,7 +446,6 @@ msgid "Crimean Tatar" msgstr "krími tatár" #: zypp/LanguageCode.cc:422 -#, fuzzy msgid "Creoles and pidgins (Other)" msgstr "kreol és pidgin (egyéb)" @@ -571,7 +562,7 @@ msgstr "eszperantó" #: zypp/LanguageCode.cc:478 msgid "Estonian" -msgstr "Észt" +msgstr "észt" #: zypp/LanguageCode.cc:480 msgid "Ewe" @@ -608,7 +599,7 @@ msgstr "fülöp-szigeteki" #: zypp/LanguageCode.cc:494 msgid "Finnish" -msgstr "Finn" +msgstr "finn" #: zypp/LanguageCode.cc:496 msgid "Finno-Ugrian (Other)" @@ -620,7 +611,7 @@ msgstr "fon" #: zypp/LanguageCode.cc:500 msgid "French" -msgstr "Francia" +msgstr "francia" #: zypp/LanguageCode.cc:502 msgid "French, Middle (ca.1400-1600)" @@ -668,7 +659,7 @@ msgstr "grúz" #: zypp/LanguageCode.cc:522 msgid "German" -msgstr "Német" +msgstr "német" #: zypp/LanguageCode.cc:524 msgid "Geez" @@ -806,7 +797,7 @@ msgstr "felső-szorbiai" #: zypp/LanguageCode.cc:584 msgid "Hungarian" -msgstr "Magyar" +msgstr "magyar" #: zypp/LanguageCode.cc:586 msgid "Hupa" @@ -824,7 +815,7 @@ msgstr "igbo" #: zypp/LanguageCode.cc:592 msgid "Icelandic" -msgstr "Izlandi" +msgstr "izlandi" #: zypp/LanguageCode.cc:594 msgid "Ido" @@ -882,13 +873,12 @@ msgid "Iranian (Other)" msgstr "iráni (egyéb)" #: zypp/LanguageCode.cc:620 -#, fuzzy msgid "Iroquoian languages" msgstr "irokéz nyelvek" #: zypp/LanguageCode.cc:622 msgid "Italian" -msgstr "Olasz" +msgstr "olasz" # src/trans.h:222 #: zypp/LanguageCode.cc:624 @@ -964,7 +954,7 @@ msgstr "kabardi" #: zypp/LanguageCode.cc:658 msgid "Khasi" -msgstr "Hászi" +msgstr "hászi" #: zypp/LanguageCode.cc:660 msgid "Khoisan (Other)" @@ -1133,7 +1123,6 @@ msgid "Luo (Kenya and Tanzania)" msgstr "luo (Kenya és Tanzania)" #: zypp/LanguageCode.cc:738 -#, fuzzy msgid "lushai" msgstr "lushai" @@ -1219,7 +1208,6 @@ msgid "Minangkabau" msgstr "minangkabau" #: zypp/LanguageCode.cc:778 -#, fuzzy msgid "Miscellaneous languages" msgstr "vegyes nyelvek" @@ -1248,7 +1236,6 @@ msgid "Manipuri" msgstr "manipuri" #: zypp/LanguageCode.cc:790 -#, fuzzy msgid "Manobo languages" msgstr "manobo nyelvek" @@ -1271,12 +1258,10 @@ msgstr "mossi" # modules/inst_sw_single.ycp:117 # clients/inst_sw_single.ycp:1072 #: zypp/LanguageCode.cc:800 -#, fuzzy msgid "Multiple languages" msgstr "több nyelv" #: zypp/LanguageCode.cc:802 -#, fuzzy msgid "Munda languages" msgstr "munda nyelvek" @@ -1294,7 +1279,6 @@ msgid "Marwari" msgstr "marvari" #: zypp/LanguageCode.cc:810 -#, fuzzy msgid "Mayan languages" msgstr "maja nyelvek" @@ -1317,7 +1301,8 @@ msgstr "észak-amerikai indián" msgid "Neapolitan" msgstr "nápolyi" -#: zypp/LanguageCode.cc:820 zypp/CountryCode.cc:380 +#: zypp/LanguageCode.cc:820 +#: zypp/CountryCode.cc:380 msgid "Nauru" msgstr "Nauru" @@ -1390,7 +1375,6 @@ msgid "Northern Sotho" msgstr "északi sotho" #: zypp/LanguageCode.cc:854 -#, fuzzy msgid "Nubian languages" msgstr "núbiai nyelvek" @@ -1448,7 +1432,6 @@ msgid "Turkish, Ottoman (1500-1928)" msgstr "török, ottomán (1500-1928)" #: zypp/LanguageCode.cc:882 -#, fuzzy msgid "Otomian languages" msgstr "otomi nyelvek" @@ -1516,7 +1499,6 @@ msgid "Portuguese" msgstr "Portugál" #: zypp/LanguageCode.cc:914 -#, fuzzy msgid "Prakrit languages" msgstr "prakrit nyelvek" @@ -1588,7 +1570,6 @@ msgid "South American Indian (Other)" msgstr "dél-amerikai indián (egyéb)" #: zypp/LanguageCode.cc:948 -#, fuzzy msgid "Salishan languages" msgstr "salishi nyelvek" @@ -1625,7 +1606,7 @@ msgstr "skót" #: zypp/LanguageCode.cc:964 msgid "Croatian" -msgstr "Horvát" +msgstr "horvát" #: zypp/LanguageCode.cc:966 msgid "Selkup" @@ -1657,7 +1638,6 @@ msgid "Sinhala" msgstr "szinhala" #: zypp/LanguageCode.cc:980 -#, fuzzy msgid "Siouan languages" msgstr "sziú nyelvek" @@ -1686,7 +1666,6 @@ msgid "Northern Sami" msgstr "északi lapp" #: zypp/LanguageCode.cc:994 -#, fuzzy msgid "Sami languages (Other)" msgstr "számi nyelvek (egyéb)" @@ -1852,7 +1831,8 @@ msgid "Tiv" msgstr "tiv" # TK -#: zypp/LanguageCode.cc:1072 zypp/CountryCode.cc:428 +#: zypp/LanguageCode.cc:1072 +#: zypp/CountryCode.cc:428 msgid "Tokelau" msgstr "Tokelau" @@ -1903,7 +1883,6 @@ msgid "Tumbuka" msgstr "tumbuka" #: zypp/LanguageCode.cc:1096 -#, fuzzy msgid "Tupi languages" msgstr "tupi nyelvek" @@ -1916,7 +1895,8 @@ msgid "Altaic (Other)" msgstr "altáji (egyéb)" # TV -#: zypp/LanguageCode.cc:1102 zypp/CountryCode.cc:435 +#: zypp/LanguageCode.cc:1102 +#: zypp/CountryCode.cc:435 msgid "Tuvalu" msgstr "Tuvalu" @@ -1983,7 +1963,6 @@ msgid "Votic" msgstr "vóti" #: zypp/LanguageCode.cc:1134 -#, fuzzy msgid "Wakashan languages" msgstr "vakasai nyelvek" @@ -2008,7 +1987,6 @@ msgid "Welsh" msgstr "velszi" #: zypp/LanguageCode.cc:1144 -#, fuzzy msgid "Sorbian languages" msgstr "szorbiai nyelvek" @@ -2046,7 +2024,6 @@ msgid "Yoruba" msgstr "joruba" #: zypp/LanguageCode.cc:1162 -#, fuzzy msgid "Yupik languages" msgstr "jupik nyelvek" @@ -2086,8 +2063,7 @@ msgstr "%s módosított konfigurációs fájljai:" #: zypp/target/rpm/RpmDb.cc:1807 #, c-format msgid "rpm saved %s as %s but it was impossible to determine the difference" -msgstr "" -"Az rpm elmentette %s-t, mint %s, de nem sikerült megállapítani a különbséget" +msgstr "Az rpm elmentette %s-t, mint %s, de nem sikerült megállapítani a különbséget" #: zypp/target/rpm/RpmDb.cc:1809 #, c-format @@ -2101,8 +2077,7 @@ msgstr "" #: zypp/target/rpm/RpmDb.cc:1812 #, c-format msgid "rpm created %s as %s but it was impossible to determine the difference" -msgstr "" -"Az rpm létrehozta %s-t, mint %s, de nem sikerült megállapítani a különbséget" +msgstr "Az rpm létrehozta %s-t, mint %s, de nem sikerült megállapítani a különbséget" #: zypp/target/rpm/RpmDb.cc:1814 #, c-format @@ -2118,7 +2093,8 @@ msgstr "" msgid "%s install failed" msgstr "%s telepítése nem sikerült" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 +#: zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "Az rpm parancs kimenete:" @@ -2127,57 +2103,58 @@ msgstr "Az rpm parancs kimenete:" msgid "%s installed ok" msgstr "%s telepítése OK" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 +#: zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "További rpm kimenet:" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "%s eltávolítása meghiúsult" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "%s eltávolítása OK" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "OK" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "A csomag nem OK a következő okok miatt:" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "A csomag nem a várt verziót tartalmazza" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "A csomag MD5 ellenőrzőösszege helytelen" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "A csomag nincs aláírva" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "A csomagnak nincs MD5 ellenőrzőösszege" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "A csomag aláírása helytelen" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "A csomagarchívum MD5 ellenőrzőösszege helytelen" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "Az rpm leállt ismeretlen okból, tekintse meg a naplófájlt" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "%s másolata létrehozva" @@ -2188,7 +2165,7 @@ msgid "%s is replaced by %s" msgstr "A(z) %s csomagot felváltja %s" #: zypp/solver/detail/ResolverInfoObsoletes.cc:69 -#, fuzzy, c-format +#, c-format msgid "%s replaced by %s" msgstr "A(z) %s csomagot felváltja %s" @@ -2281,7 +2258,7 @@ msgstr "Szülője " # modules/inst_target_part.ycp:676 #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "%s nem telepíthető" @@ -2300,111 +2277,103 @@ msgstr "" "Nem áll rendelkezésre ezt a követelményt kielégítő erőforrás." #: zypp/solver/detail/Resolver_problems.cc:244 -msgid "" -"Due problems which are described above/below this resolution will not solve " -"all dependencies" -msgstr "" -"A fent/lent leírt problémák miatt ez a feloldás nem oldja fel az összes " -"függőséget" +msgid "Due problems which are described above/below this resolution will not solve all dependencies" +msgstr "A fent/lent leírt problémák miatt ez a feloldás nem oldja fel az összes függőséget" #: zypp/solver/detail/Resolver_problems.cc:252 #, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s nincs telepítve és eltávolíthatónak lett megjelölve" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "%s nem telepíthető függőségi problémák miatt" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s egyes követelményei nincsenek kielégítve" -#: zypp/solver/detail/Resolver_problems.cc:346 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:349 +#, c-format msgid "%s has missing dependencies" -msgstr "%s nem telepíthető hiányzó függőségek miatt" +msgstr "%s függőségei hiányoznak" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "%s nem telepíthető hiányzó függőségek miatt" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s kielégíti %s függőségeit, de eltávolításra kerül" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "Nincs szükség %s telepítésére" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "%s nem telepíthető %s függőségeinek teljesítéséhez" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "%s nem telepíthető %s függőségeinek teljesítéséhez" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s nem távolítható el, mert még mindig szükséges" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "%s nem telepíthető, mert ütközik (%s)" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s eltávolítható, mivel ütközik (%s)" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -#, fuzzy -msgid "Ignore this requirement." -msgstr "Követelmény figyelmen kívül hagyása" +msgid "Ignore this requirement just here" +msgstr "Követelmény figyelmen kívül hagyása csak itt" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -#, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "A(z) %s csomagot más feloldandók igénylik" +msgid "Ignore this requirement generally" +msgstr "Követelmény figyelmen kívül hagyása általában" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 -#, fuzzy, c-format -msgid "Ignore this conflict of %s." -msgstr "%s ütközése figyelmen kívül marad" +#, c-format +msgid "Ignore this conflict of %s" +msgstr "%s ezen ütközése figyelmen kívül marad" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -#, fuzzy -msgid "ignore architecture" -msgstr "Rendszertöltés architektúrája" +msgid "Ignore architecture" +msgstr "Architektúra figyelmen kívül marad" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 -#, fuzzy, c-format -msgid "Ignore that %s is already set to install." -msgstr "A %1 könyvtár már szerepel a listán." +#, c-format +msgid "Ignore that %s is already set to install" +msgstr "%s telepítésre megjelölése figyelmen kívül marad" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 #: zypp/solver/detail/ProblemSolutionUninstall.cc:56 -#, fuzzy, c-format +#, c-format msgid "delete %s" -msgstr "%1 törlése" +msgstr "%s törlése" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -#, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "Ütköző feloldhatók eltávolítása" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "mert %s szükséges %s esetén, %s frissítésekor" @@ -2414,202 +2383,187 @@ msgstr "mert %s szükséges %s esetén, %s frissítésekor" msgid "%s is missing the requirement %s" msgstr "%s követelménye (%s) hiányzik" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", Művelet" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ", trigger: " -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "csomag" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "kiválasztás" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "minta" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "termék" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "javítás" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "parancsfájl" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "üzenet" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "rendszer" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Feloldható" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "A feloldási kísérlet érvénytelennek jelölése." -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "%s feloldható telepíthetetlennek jelölése" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format -msgid "" -"%s is scheduled to be installed, but this is not possible because of " -"dependency problems." -msgstr "" -"%s telepítésre van ütemezve, de ez függőségi problémák miatt nem lehetséges." +msgid "%s is scheduled to be installed, but this is not possible because of dependency problems." +msgstr "%s telepítésre van ütemezve, de ez függőségi problémák miatt nem lehetséges." -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format -msgid "" -"Can't install %s since it is already marked as needing to be uninstalled" +msgid "Can't install %s since it is already marked as needing to be uninstalled" msgstr "%s nem telepíthető, mert már meg van jelölve eltávolításra" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "%s nem telepíthető, mert nem ehhez a rendszerhez való." -#: zypp/solver/detail/ResolverInfoMisc.cc:184 -#, fuzzy, c-format +#: zypp/solver/detail/ResolverInfoMisc.cc:180 +#, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" -msgstr "%s nem telepíthető, mert már meg van jelölve eltávolításra" +msgstr "%s nem telepíthető, mert %s már meg van jelölve telepítésre" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "Ennek hatására %s érvénytelenné válna." # modules/inst_target_part.ycp:676 -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "%s előfeldolgozása" # modules/inst_target_part.ycp:676 -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "%s telepítése" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "%s frissítése; az új: %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "%s kimarad: már telepítve van" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "%s számára nincs alternatív telepített szolgáltató" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "%s számára" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "%s számára nincs telepíthető szolgáltató" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." -msgstr "" -"A(z) %s csomagra frissítés %s eltávolításának elkerülése érdekében nem " -"lehetséges." +msgstr "A(z) %s csomagra frissítés %s eltávolításának elkerülése érdekében nem lehetséges." -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "%s biztosítja %s-t, de eltávolításra van ütemezve." -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "%s biztosítja %s-t, de %s egy másik verziója már telepítve van." -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format -msgid "" -"%s provides %s, but it is uninstallable. Try installing it on its own for " -"more details." -msgstr "" -"%s biztosítja %s-t, de eltávolítható. Próbálja meg telepíteni magában a " -"további részletek érdekében." +msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details." +msgstr "%s biztosítja %s-t, de eltávolítható. Próbálja meg telepíteni magában a további részletek érdekében." -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s biztosítja %s-t, de zárolva van." -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "%s %s követelménye nem elégíthető ki" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format -msgid "" -"%s is required by other to-be-installed resolvable, so it won't be unlinked." -msgstr "" -"%s egy másik telepítendő feloldható igényli, ezért a csatolása nem lesz " -"megszüntetve." +msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked." +msgstr "%s egy másik telepítendő feloldható igényli, ezért a csatolása nem lesz megszüntetve." -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." -msgstr "" -"%s egy másik telepítendő feloldható igényli, ezért a csatolása nem lesz " -"megszüntetve." +msgstr "%s egy másik telepítendő feloldható igényli, ezért a csatolása nem lesz megszüntetve." -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s zárolva van, ezért nem távolítható el." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "%s ütközése (%s) a telepítendő %s eltávolítását igényli" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "%s telepíthetlennek lesz jelölve, mert ütközik a(z) %s csomaggal" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "%s csomagból" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "Hiba!" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "Fontos!" @@ -2617,22 +2571,20 @@ msgstr "Fontos!" #: zypp/solver/detail/ProblemSolutionKeep.cc:57 #, c-format msgid "keep %s" -msgstr "" +msgstr "%s megtartása" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -#, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "Hiányzó feloldhatók telepítése" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 -#, fuzzy, c-format +#, c-format msgid "install %s" -msgstr "%1 telepítése" +msgstr "%s telepítése" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 -#, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Hiányzó feloldhatók telepítése" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2641,12 +2593,12 @@ msgid "%s depended on %s" msgstr "%s ettől függött: %s" #: zypp/solver/detail/ResolverInfoDependsOn.cc:69 -#, fuzzy, c-format +#, c-format msgid "%s dependend on %s" msgstr "%s ettől függött: %s" #: zypp/solver/detail/ResolverInfoNeededBy.cc:70 -#, fuzzy, c-format +#, c-format msgid "%s needed by %s" msgstr "A(z) %s csomagot igényli %s" @@ -2657,13 +2609,12 @@ msgid "%s part of %s" msgstr "%s %s része" #: zypp/solver/detail/ProblemSolutionUnlock.cc:52 -#, fuzzy, c-format +#, c-format msgid "unlock %s" msgstr "%s zárolásának feloldása" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -#, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "E feloldhatók zárolásának feloldása" #: zypp/CountryCode.cc:135 @@ -2846,7 +2797,8 @@ msgid "Cocos (Keeling) Islands" msgstr "Cocos (Keeling) -szigetek" # CG -#: zypp/CountryCode.cc:255 zypp/CountryCode.cc:257 +#: zypp/CountryCode.cc:255 +#: zypp/CountryCode.cc:257 msgid "Congo" msgstr "Kongó" @@ -3764,19 +3716,19 @@ msgstr "Zambia" msgid "Zimbabwe" msgstr "Zimbabwe" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "A(z) %s csomagot más feloldandók igénylik" #~ msgid "Deleting %s" #~ msgstr "%s törlése" - #~ msgid "" #~ "Can't install %s, since a resolvable of the same name is already marked " #~ "as needing to be installed" #~ msgstr "" #~ "%s nem telepíthető, mert egy ugyanilyen nevű feloldható már meg van " #~ "jelölve telepítésre" - #~ msgid "%s cannot be uninstalled due missing dependencies" #~ msgstr "%s nem távolítható el hiányzó függőségek miatt" - #~ msgid "unknown" #~ msgstr "ismeretlen" @@ -3795,3 +3747,4 @@ msgstr "Zimbabwe" #, fuzzy #~ msgid "to be uninstalled" #~ msgstr "újbóli telepítésre van szüksége" + diff --git a/po/id.po b/po/id.po index a84ac13..6591f8c 100644 --- a/po/id.po +++ b/po/id.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2002-10-08 13:38+0200\n" "Last-Translator: I Made Wiryana \n" "Language-Team: Indonesian \n" @@ -2311,7 +2311,7 @@ msgstr "" msgid "%s install failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2320,57 +2320,57 @@ msgstr "" msgid "%s installed ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2467,7 +2467,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Italia" @@ -2494,82 +2494,82 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2579,10 +2579,10 @@ msgid "delete %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2592,191 +2592,191 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Italia" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Italia" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2787,7 +2787,7 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2797,8 +2797,9 @@ msgid "install %s" msgstr "Italia" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 -msgid "Install missing resolvables." -msgstr "" +#, fuzzy +msgid "Install missing resolvables" +msgstr "Italia" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -2827,7 +2828,7 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "" #: zypp/CountryCode.cc:135 diff --git a/po/it.po b/po/it.po index cdc9e43..38e0b2c 100644 --- a/po/it.po +++ b/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-07-18 11:04+0200\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -1965,7 +1965,7 @@ msgstr "" msgid "%s install failed" msgstr "Impossibile installare %s " -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "Output rpm:" @@ -1975,62 +1975,62 @@ msgstr "Output rpm:" msgid "%s installed ok" msgstr "Installazione di %s completata" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "Output aggiuntivo di rpm:" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "Impossibile rimuovere %s" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "Rimozione di %s completata" # TLABEL modules/logcontrol.ycp:20 -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "OK" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "Il pacchetto non è corretto per i seguenti motivi:" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "Il pacchetto contiene una versione diversa da quella prevista" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "Il file del pacchetto contiene un MD5 sum non corretto" # TLABEL modules/inst_rpmcopy.ycp:57 -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "Il pacchetto non è firmato" # TLABEL modules/inst_rpmcopy.ycp:57 -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "Il pacchetto non contiene alcuna sum MD5" # TLABEL modules/inst_rpmcopy.ycp:57 -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "Il pacchetto presenta una firma non corretta" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "L'archivio del pacchetto contiene una sum MD5 non corretta" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" "Impossibile eseguire rpm per cause sconosciute. Consultare il file di log" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "Copia di backup di %s creata" @@ -2134,7 +2134,7 @@ msgstr "Figlio di" # TLABEL modules/inst_target_part.ycp:680 #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "Impossibile installare %s" @@ -2165,85 +2165,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "%s non è installato ed è stato contrassegnato come non installabile" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "Impossibile installare %s a causa di problemi di dipendenze" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s presenta requisiti non soddisfatti" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Impossibile installare %s. Alcune dipendenze sono mancanti" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "Impossibile installare %s. Alcune dipendenze sono mancanti" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s soddisfa le dipendenze di %s ma verrà disinstallato" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "Non è necessario installare %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Impossibile installare %s per soddisfare le dipendenze di %s" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "Impossibile installare %s per soddisfare le dipendenze di %s" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s non verrà disinstallato perché ancora richiesto" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "Impossibile installare %s perché in conflitto con %s" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s non può essere installato perché in conflitto con %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "Richiesta ignorata" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s è richiesto da altri risolvibili" +msgid "Ignore this requirement generally" +msgstr "Richiesta ignorata" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "Conflitto di %s ignorato" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Architettura ignorata" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr " %s già impostato per l'installazione verrà ignorato" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2254,10 +2254,10 @@ msgstr "Elimina %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "Rimozione dei risolvibili in conflitto" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "affinché %s richieda %s durante l'aggiornamento di %s" @@ -2267,61 +2267,61 @@ msgstr "affinché %s richieda %s durante l'aggiornamento di %s" msgid "%s is missing the requirement %s" msgstr "%s manca il requisito %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", Azione:" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ", Trigger:" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "pacchetto " -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "selezione" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "modello" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "prodotto" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "patch" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "script" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "messaggio" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "sistema" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Risolvibile" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" "Contrassegno in corso di questo tentativo di risoluzione come non valido." -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "Contrassegno in corso del risolvibile %s come disinstallabile" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " @@ -2330,86 +2330,86 @@ msgstr "" "%s è pianificato per la disinstallazione. Tuttavia ciò non è possibile a " "causa di problemi di dipendenza." -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" "Impossibile installare %s perché è già contrassegnato come da disinstallare" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" "Impossibile installare %s perché non può essere applicato a questo sistema." -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, fuzzy, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" "Impossibile installare %s perché è già contrassegnato come da disinstallare" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "Ciò annullerebbe %s." # TLABEL modules/inst_target_part.ycp:680 -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "Connessione a %s" # TLABEL modules/inst_target_part.ycp:680 -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "Installazione in corso di %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "Aggiornamento di %s in %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "Salto di %s: già installato" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "Non sono installati provider alternativi di %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "per %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "Non esistono provider installabili di %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" "Non è possibile effettuare l'aggiornamento a %s per evitare di rimuovere %s." -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "%s fornisce %s, tuttavia ne è stata pianificata la disinstallazione." -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" "%s fornisce %s, tuttavia è già installata un'altra versione di questo %s." -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2418,17 +2418,17 @@ msgstr "" "%s fornisce %s, ma è disinstallabile. Per ulteriori dettagli, provare a " "installarlo indipendentemente." -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s fornisce %s, ma è bloccato." -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "Impossibile soddisfare i requisiti %s per %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." @@ -2436,41 +2436,41 @@ msgstr "" "%s è richiesto da un altro risolvibile installato, pertanto non verrà " "scollegato." -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" "%s è richiesto da un altro risolvibile installato, pertanto non verrà " "scollegato." -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s è bloccato e non può essere disinstallato." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" "Un conflitto su %s (%s) richiede la rimozione del risolvibile %s da " "installare." -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" "Contrassegno in corso di %s come disinstallabile a causa di conflitti su %s." -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "da %s" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "Errore" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "Importante" @@ -2482,7 +2482,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "Installazione dei risolvibili mancanti" # TLABEL modules/inst_target_part.ycp:680 @@ -2494,7 +2494,7 @@ msgstr "Installa %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Installazione dei risolvibili mancanti" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2525,7 +2525,7 @@ msgstr "Sblocca %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "Sblocco di questi risolvibili" #: zypp/CountryCode.cc:135 @@ -3480,6 +3480,10 @@ msgstr "Zambia" msgid "Zimbabwe" msgstr "Zimbabwe" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s è richiesto da altri risolvibili" + #~ msgid "%s cannot be uninstalled due missing dependencies" #~ msgstr "Impossibile disinstallare %s. Alcune dipendenze sono mancanti" diff --git a/po/ja.po b/po/ja.po index 7ff413a..da0b1cd 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-09-24 20:04+02:00\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -1959,7 +1959,7 @@ msgstr "" msgid "%s install failed" msgstr "%s のインストールが失敗しました" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "rpm出力:" @@ -1968,57 +1968,57 @@ msgstr "rpm出力:" msgid "%s installed ok" msgstr "%s は問題なくインストールされました" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "追加のrpm出力:" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "%s の削除に失敗しました" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "%s は問題なく削除されました" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "??‰?" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "次の理由から、パッケージに問題があります。" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "パッケージには予期されたものと異なるバージョンが含まれています" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "パッケージファイルには不正なMD5 sumが含まれています。" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "パッケージが署名されていません" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "パッケージはMD 5 sumを含んでいません" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "パッケージは不正な署名を含んでいます" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "パッケージアーカイブには不正なMD5 sumが含まれています。" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "不明な理由によりrpmは失敗しました。ログファイルを参照してください" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "バックアップ %s が作成されました" @@ -2121,7 +2121,7 @@ msgid "Child of" msgstr "の子" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "%s をインストールできません" @@ -2151,85 +2151,85 @@ msgid "%s is not installed and has been marked as uninstallable" msgstr "" "%s がインストールされておらず、アンインストール不可能とマークされています" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "依存関係の問題により、%s をインストールできません" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s は要求を満たしていません" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "依存関係が不足しているため、%s をインストールできません" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "依存関係が不足しているため、%s をインストールできません" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s は %s の依存関係を満たしていますが、アンインストールされます" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "%s をインストールする必要はありません" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "%s をインストールして %s の依存関係を満たすことができません" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "%s をインストールして %s の依存関係を満たすことができません" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s はまだ必要なので、アンインストールされません" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "%s は %s と競合しているので、インストールできません" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s は %s と競合しているため、アンインストールできます" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "この要求を無視します" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s は他のresolvableが必要としています" +msgid "Ignore this requirement generally" +msgstr "この要求を無視します" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%s の競合を無視します" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "アーキテクチャの無視" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "%s をインストールするように既に設定されているのを無視します" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2240,10 +2240,10 @@ msgstr "%1 を削除します" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "競合するresolvableを削除しています" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "%s の %s 向けのものを要求するため(%s を更新)" @@ -2253,60 +2253,60 @@ msgstr "%s の %s 向けのものを要求するため(%s を更新)" msgid "%s is missing the requirement %s" msgstr "%s には要求 %s が不足しています" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "、アクション:" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "、トリガ:" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "パッケージ" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "選択" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "パターン" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "製品" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "パッチ" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "スクリプト" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "メッセージ" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "システム" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Resolvable" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "この解決の試みを無効にマークします。" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "resolvable %s をアンインストール不可にマークします" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " @@ -2315,7 +2315,7 @@ msgstr "" "%s のインストールがスケジュールされていますが、依存関係の問題のためインストー" "ル不可能です。" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" @@ -2323,79 +2323,79 @@ msgstr "" "アンインストールが必要であるとマークされているので、%s をインストールできませ" "ん。" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "%s はこのシステムに適用しため、インストールできません。" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" "%s はインストールが必要であるとマークされているので、%s をインストールできま" "せん。" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "こうすると %s が無効になります。" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "%s を確立しています" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "%s をインストールしています" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "%s を %s に更新しています" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "%s をスキップ:すでにインストールされています" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "%s には、別のインストールされたプロバイダがありません。" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "%s 用" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "%s には、インストール可能なプロバイダがありません。" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "%s へアップグレードして %s の削除を回避することは不可能です。" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" "%s は %s を提供しますが、アンインストールされるようにスケジュールされていま" "す。" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" "%s は %s を提供しますが、その %s の他のバージョンがすでにインストールされてい" "ます。" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2404,17 +2404,17 @@ msgstr "" "%s は %s を提供しますが、アンインストール不可能です。詳細については、単独イン" "ストールを試みてください。" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s は %s を提供しますが、ロックされています。" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "%s の要求 %s を満たすことができません" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." @@ -2422,39 +2422,39 @@ msgstr "" "%s はインストール予定の他のresolvableが必要とするものなので、アンリンクできま" "せん。" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" "%s はインストールされた他のresolvableが必要とするものなので、アンリンクできま" "せん。" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s はロックされており、アンインストールできません。" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" "%s (%s)に関する競合により、インストール予定の %s を削除する必要があります" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "%s をインストール不可にします(%s に関する競合のため)" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "%s から" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "エラー!" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "重要!" @@ -2466,7 +2466,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "不足しているresolvableをインストールしています" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2477,7 +2477,7 @@ msgstr "%1 をインストールします" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "不足しているresolvableをインストールしています" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2508,7 +2508,7 @@ msgstr "%s をアンロックします" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "これらのresolvableをアンロックしています" #: zypp/CountryCode.cc:135 @@ -3463,6 +3463,10 @@ msgstr "ザンビア" msgid "Zimbabwe" msgstr "ジンバブエ" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s は他のresolvableが必要としています" + #~ msgid "%s cannot be uninstalled due missing dependencies" #~ msgstr "依存関係が不足しているため、%s をアンインストールできません" diff --git a/po/ka.po b/po/ka.po index 776a40b..240bc60 100644 --- a/po/ka.po +++ b/po/ka.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2005-05-18 10:33+0200\n" "Last-Translator: Aiet Kolkhi \n" "Language-Team: Georgian \n" @@ -1954,7 +1954,7 @@ msgstr "" msgid "%s install failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -1963,57 +1963,57 @@ msgstr "" msgid "%s installed ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2110,7 +2110,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "" @@ -2137,82 +2137,82 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2222,10 +2222,10 @@ msgid "delete %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2235,191 +2235,191 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2430,7 +2430,7 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2440,7 +2440,7 @@ msgid "install %s" msgstr "" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2470,7 +2470,7 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "" #: zypp/CountryCode.cc:135 diff --git a/po/km.po b/po/km.po index 2f664c1..b663ea4 100644 --- a/po/km.po +++ b/po/km.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.km\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2006-02-04 10:47+0700\n" "Last-Translator: Hok Kakada \n" "Language-Team: Khmer \n" @@ -1987,7 +1987,7 @@ msgstr "" msgid "%s install failed" msgstr "ការ​ដំឡើង %s បាន​បរាជ័យ" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "លទ្ធផល rpm ៖" @@ -1996,57 +1996,57 @@ msgstr "លទ្ធផល rpm ៖" msgid "%s installed ok" msgstr "បាន​ដំឡើង %s ដោយ​ជោគជ័យ" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "លទ្ធផល​ rpm បន្ថែម​ទៀត ៖" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "ការ​យក %s ចេញ​បាន​បរាជ័យ" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "បាន​យក %s ចេញ​ដោយ​ជោគជ័យ" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "យល់ព្រម" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "កញ្ចប់​មិន​យល់ព្រម​នឹង​ហេតុផល​ខាងក្រោម​នេះ ៖" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "កញ្ចប់​មាន​កំណែ​ខុស​គ្នា​មិន​ដូច​ការ​ដែល​រំពឹង​គិត" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "ឯកសារកញ្ចប់​មាន​ MD5 sum មិន​ត្រឹមត្រូវ" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "កញ្ចប់​មិន​ត្រូវ​បាន​ចុះហត្ថលេខា" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "កញ្ចប់​មិន​មាន​ MD5 sum" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "កញ្ចប់​មិន​មាន​ហត្ថលេខា​ត្រឹមត្រូវ" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "ប័ណ្ណសារ​កញ្ចប់​មាន​ MD5 sum មិន​ត្រឹមត្រូវ" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "rpm បាន​បរាជ័យ​ដោយមិន​ដឹង​ហេតុផល សូម​មើល​ឯកសារ​កំណត់​ហេតុ​" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "បាន​បង្កើត​ព័ត៌មាន​បម្រុង​ %s" @@ -2149,7 +2149,7 @@ msgid "Child of" msgstr "កូន​របស់" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "មិន​អាច​ដំឡើង​ %s" @@ -2178,85 +2178,85 @@ msgstr "បញ្ហាដែល​បានពណ៌នា​ខាងលើ/ msgid "%s is not installed and has been marked as uninstallable" msgstr "%s មិន​ត្រូវ​បាន​ដំឡើង និង​ត្រូវ​បាន​សម្គាល់​ជា​មិន​ដំឡើង" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "មិន​អាច​ដំឡើង​ %s ដោយសារ​បញ្ហា​ភាព​អាស្រ័យគ្នា" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s មាន​តម្រូវការ​មិន​គ្រប់គ្រាន់" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "%s មិន​អាច​ដំឡើង ដោយ​សារ​បាត់កញ្ចប់​អាស្រ័យ" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "%s មិន​អាច​ដំឡើង ដោយ​សារ​បាត់កញ្ចប់​អាស្រ័យ" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s បំពេញ​តាម​ភាព​អាស្រ័យរបស់​ %s ប៉ុន្តែ​នឹង​ត្រូវ​បាន​មិន​ដំឡើងវិញ" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "មិន​ចាំបាច់​ដំឡើង​ %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "មិន​អាច​ដំឡើង​ %s ដើម្បី​បំពេញ​តាម​ភាព​អាស្រ័យ​នៃ​ %s" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "មិន​អាច​ដំឡើង​ %s ដើម្បី​បំពេញ​ភាព​អាស្រ័យ​របស់​ %s" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s នឹង​មិន​ត្រូវ​បាន​មិន​ដំឡើង​វិញ ព្រោះ​គេ​នៅ​តែ​ត្រូវការ​វា" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "មិន​អាច​ដំឡើង​ %s ព្រោះ​វា​កំពុង​ប៉ះ​ទង្គិច​ជាមួយ​ %s" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "មិន​អាច​មិន​ដំឡើង %s វិញ​បាន ដោយសារ​ភាពអាស្រ័យ​ជាមួយ %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "មិន​អើពើ​តម្រូវ​ការ​នេះ" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s ត្រូវការ​ដោយ​កញ្ចប់​អាស្រ័យ​ផ្សេងៗ" +msgid "Ignore this requirement generally" +msgstr "មិន​អើពើ​តម្រូវ​ការ​នេះ" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "​​មិន​អើពើ​ការ​ប៉ះ​ទង្គិច​​ %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "ស្ថាបត្យកម្ម ៖" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "ថត %1 មាន​ក្នុង​បញ្ជី​រួច​ហើយ ។" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2267,10 +2267,10 @@ msgstr "លុប %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "កំពុង​យក​កញ្ចប់​អាស្រ័យ​ដែល​ប៉ះ​ទង្គិច​គ្នា​ចេញ" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "ចំពោះ​តម្រូវការ​ %s សម្រាប់ %s ខណៈពេល​ធ្វើ​ឲ្យ​ %s ទាន់​សម័យ" @@ -2280,139 +2280,139 @@ msgstr "ចំពោះ​តម្រូវការ​ %s សម្រាប msgid "%s is missing the requirement %s" msgstr "%s កំពុង​បាត់​តម្រូវការ​ %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", សកម្មភាព ៖ " -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ", គន្លឺះ ៖ " -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "កញ្ចប់" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "ជម្រើស" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "លំនាំ" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "ផលិតផល" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "បំណះ" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "ស្គ្រីប" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "សារ" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "ប្រព័ន្ធ" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "ដែល​អាច​ដោះស្រាយ​បាន" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "សម្គាល់​ការ​ប៉ុងប៉ង​គុណភាពបង្ហាញ​នេះជា មិន​ត្រឹមត្រូវ ។" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "សម្គាល់​​ %s ដែល​អាចដោះស្រាយ​បាន​នេះ ជា​មិន​ដំឡើង​វិញ" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "%s ត្រូវ​បាន​កំណត់​ឲ្យ​ត្រូវ​ដំឡើង ប៉ុន្តែ​មិន​អាច​ដំឡើង​បាន​ដោយសារ​បញ្ហា​ភាព​អាស្រ័យ​គ្នា ។" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "មិន​អាច​ដំឡើង​ %s ព្រោះ​វា​បាន​សម្គាល់​ថា​មិន​ចាំបាច់​ដំឡើង" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "មិន​អាច​ដំឡើង​ %s ព្រោះ​វា​មិន​អាច​អនុវត្ត​បាន​លើ​ប្រព័ន្ធ​នេះ ។​" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, fuzzy, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "មិន​អាច​ដំឡើង​ %s ព្រោះ​វា​បាន​សម្គាល់​ថា​មិន​ចាំបាច់​ដំឡើង" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "នេះ​នឹង​ធ្វើ​ទុព្វលកម្ម​ %s ។" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "កំពុង​ស្ថាបនា​ %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "កំពុង​ដំឡើង​ %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "កំពុង​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ពី​ %s ទៅ %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "កំពុង​រំលង​ %s ៖ បាន​ដំឡើង​រួច​ហើយ" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "មិន​មាន​ជម្រើស​អ្នក​ផ្ដល់​ %s ដែល​បាន​ដំឡើង" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "សម្រាប់ %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "មិន​មាន​អ្នក​ផ្ដល់​ %s ដែល​អាច​ដំឡើង​បាន" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "ការ​ធ្វើ​ឲ្យ​ទាន់​សម័យ​ទៅ​ %s ដើម្បី​ជៀសវាង​ការ​យក​ %s ចេញ​មិន​អាច​ធ្វើ​បាន ។" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "%s ផ្ដល់​ %s ប៉ុន្តែ​ត្រូវ​បាន​កំណត់​ថា​មិន​ដំឡើង​វិញ ។" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "%s ផ្ដល់​ %s ប៉ុន្តែ​កំណែ​មួយ​ផ្សេងរបស់​ %s នោះ​ត្រូវ​បាន​ដំឡើង​រួច​ហើយ ។" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2420,55 +2420,55 @@ msgid "" msgstr "" "%s ផ្ដល់​ %s ប៉ុន្តែ​វា​មិន​អាច​មិន​ដំឡើង​វិញ​បាន ។ ព្យាយាម​ដំឡើង​ដោយ​ផ្ទាល់​សម្រាប់​ព័តមាន​លម្អិតបន្ថែម ។" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s ផ្ដល់​ %s ប៉ុន្តែ​វា​ជាប់​សោរ​ហើយ ។" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "មិន​អាច​បំពេញ​តាម​តម្រូវការ​ %s សម្រាប់ %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" "%s ត្រូវការ​ដោយ​កញ្ចប់​ផ្សេង​ដើម្បី​ដំឡើង​កញ្ចប់អាស្រ័យ​ដែល​អាច​ដោះស្រាយ​បាន ដូច្នេះ​វា​នឹង​​ត្រូវ​​បានតភ្ជាប់​​ ។" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" "%s ត្រូវ​ការ​ដោយ​កញ្ចប់​អាស្រ័យ​ដែល​អាច​ដោះស្រាយ​បាន និងដែល​បាន​ដំឡើង​ហើយ​ផ្សេង ដូចនេះ វា​នឹង​ត្រូវ​បាន​ត​" "ភ្ជាប់ ។​" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s ជាប់​សោរ និង​មិន​អាច​មិន​ដំឡើង​វិញ​បាន ។" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "ការ​ប៉ះ​ទង្គិច​លើ​ %s (%s) ត្រូវការ​យក​ចេញ​ដើម្បី​ដំឡើង %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "សម្គាល់​ %s ជា​មិន​ដំឡើង ដោយ​សារ​តែ​ការ​ប៉ះទង្គិចលើ​ %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "ពី %s" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr " កំហុស!" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr " សំខាន់!" @@ -2480,7 +2480,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "កំពុង​ដំឡើង​កញ្ចប់​ដែល​បាត់" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2491,7 +2491,7 @@ msgstr "ដំឡើង %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "កំពុង​ដំឡើង​កញ្ចប់​ដែល​បាត់" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2522,7 +2522,7 @@ msgstr "ដោះសារ​ %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "កំពុងដោះសោ​កញ្ចប់​អាស្រ័យ​ទាំងនេះ" #: zypp/CountryCode.cc:135 @@ -3477,6 +3477,10 @@ msgstr "ហ្សាំប៊ី" msgid "Zimbabwe" msgstr "ហ្ស៊ីមបាវ៉េ" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s ត្រូវការ​ដោយ​កញ្ចប់​អាស្រ័យ​ផ្សេងៗ" + #~ msgid "Deleting %s" #~ msgstr "កំពុង​លុប​ %s" diff --git a/po/ko.po b/po/ko.po index 10b11d9..5c8ca5d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-07-18 11:05+0200\n" "Last-Translator: Hwang, Sang-Jin \n" "Language-Team: Korean \n" @@ -2366,7 +2366,7 @@ msgstr "" msgid "%s install failed" msgstr "설치 실패." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "" @@ -2379,63 +2379,63 @@ msgid "%s installed ok" msgstr "예, 설치진행(&Y)" # dialog caption -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "추가 그룹 설정" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm이 실패했습니다." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" # button for message box with help text -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "확인" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "복구될 패키지" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "복구될 패키지" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "복구될 패키지" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "복구될 패키지" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "백업을 생성하지 않음" @@ -2533,7 +2533,7 @@ msgstr "" # Frame title for installation target hard disk / partition(s) #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "설치중:" @@ -2560,59 +2560,59 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "이 패키지는 이미 설치되어 있어서 설치가 되지 않습니다." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "의존성을 만족하지 못함:" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" # text is shown in a line of a package list -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "다시 설치해야 합니다." -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1은 %2와 충돌합니다" @@ -2620,27 +2620,29 @@ msgstr "%1은 %2와 충돌합니다" # text is shown in a column of a package list entry #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "해결할수 없는 요구사항..." +# text is shown in a column of a package list entry #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "해결할수 없는 요구사항..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1은 %2와 충돌합니다" # tree node string #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "부트 아키텍쳐" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "%1 디렉토리는 이미 목록에 있습니다." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2651,10 +2653,10 @@ msgstr "%1 삭제" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1은 %2와 충돌합니다" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2664,195 +2666,195 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "작동" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "패치" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "설치중:" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "설치중:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "이미 설치된 스캐너 검사중" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "이 패키지는 이미 설치되어 있어서 설치가 되지 않습니다." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "에러" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "데이터 불러오기" @@ -2864,8 +2866,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "누락된 패키지 설치" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2875,7 +2878,7 @@ msgstr "%1 설치" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "누락된 패키지 설치" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2906,7 +2909,7 @@ msgstr "시계" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1은 %2와 충돌합니다" #: zypp/CountryCode.cc:135 diff --git a/po/lt.po b/po/lt.po index e71fbce..4b08c53 100644 --- a/po/lt.po +++ b/po/lt.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-10-18 09:54+0200\n" "Last-Translator: Jonas Gocentas \n" "Language-Team: Lithuanian \n" @@ -2290,7 +2290,7 @@ msgstr "" msgid "%s install failed" msgstr "Diegimas nutrūko." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "" @@ -2302,62 +2302,62 @@ msgstr "" msgid "%s installed ok" msgstr "&Taip, įdiegti" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "P&apildomos ipppd parinktys" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm nepavyko." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Gerai" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Paketai atkūrimui" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Paketai atkūrimui" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Paketai atkūrimui" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Paketai atkūrimui" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Nekurti atsarginių kopijų" @@ -2454,7 +2454,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Diegiama į:" @@ -2481,84 +2481,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Turi būti įdiegti šie paketai:" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Netenkinami ryšiai:" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "reikia perinstaliuoti" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 konfliktuoja su %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "turi neišsprendžiamų reikalavimų..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "turi neišsprendžiamų reikalavimų..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 konfliktuoja su %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Įkrovos architektūra" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Katalogas %1 jau yra sąraše." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2569,10 +2570,10 @@ msgstr "Pašalinti %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 konfliktuoja su %2" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2582,193 +2583,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Veiksmo" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "pataisa" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Diegiama į:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Diegiama į:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Tikrinami jau įdiegti skeneriai" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Turi būti įdiegti šie paketai:" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Klaida" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Importuoti duomenis" @@ -2780,8 +2781,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Įdiegti trūkstamus paketus" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2791,7 +2793,7 @@ msgstr "Įdiegti %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Įdiegti trūkstamus paketus" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2822,7 +2824,7 @@ msgstr "Laikrodžiai" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 konfliktuoja su %2" #: zypp/CountryCode.cc:135 diff --git a/po/nb.po b/po/nb.po index 27e9c32..2bbd83a 100644 --- a/po/nb.po +++ b/po/nb.po @@ -1,32 +1,30 @@ # translation of zypp.po to +# Olav Pettershagen , 2006. # Norwegian message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002 SuSE Linux AG. # Copyright (C) 2002 SuSE GmbH. -# -# Olav Pettershagen , 2006. msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" -"PO-Revision-Date: 2006-02-04 11:35+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" +"PO-Revision-Date: 2006-02-21 23:12+0100\n" "Last-Translator: Olav Pettershagen \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: KBabel 1.11.1\n" +"X-Generator: KBabel 1.11.2\n" #: zypp/LanguageCode.cc:145 msgid "Unknown language: " msgstr "Ukjent språk: " #: zypp/LanguageCode.cc:226 zypp/CountryCode.cc:215 -#, fuzzy msgid "noCode" -msgstr "Kode" +msgstr "noCode" #: zypp/LanguageCode.cc:227 msgid "Default" @@ -92,7 +90,6 @@ msgid "Aleut" msgstr "Aleutisk" #: zypp/LanguageCode.cc:258 -#, fuzzy msgid "Algonquian languages" msgstr "Algonquianske språk" @@ -109,7 +106,6 @@ msgid "English, Old (ca.450-1100)" msgstr "Engelsk, gammelengelsk (ca. 450-1100)" #: zypp/LanguageCode.cc:266 -#, fuzzy msgid "Apache languages" msgstr "Apache-språk" @@ -156,12 +152,10 @@ msgid "Asturian" msgstr "Asturiansk" #: zypp/LanguageCode.cc:288 -#, fuzzy msgid "Athapascan languages" msgstr "Athapascanske språk" #: zypp/LanguageCode.cc:290 -#, fuzzy msgid "Australian languages" msgstr "Australske språk" @@ -194,7 +188,6 @@ msgid "Banda" msgstr "Banda" #: zypp/LanguageCode.cc:304 -#, fuzzy msgid "Bamileke languages" msgstr "Bamileke-språk" @@ -368,7 +361,6 @@ msgid "Mari" msgstr "Mari" #: zypp/LanguageCode.cc:390 -#, fuzzy msgid "Chinook jargon" msgstr "Chinook-sjargong" @@ -397,7 +389,6 @@ msgid "Cheyenne" msgstr "Cheyenne" #: zypp/LanguageCode.cc:404 -#, fuzzy msgid "Chamic languages" msgstr "Chamiske språk" @@ -414,17 +405,14 @@ msgid "Corsican" msgstr "Korsikansk" #: zypp/LanguageCode.cc:412 -#, fuzzy msgid "Creoles and pidgins, English based (Other)" msgstr "Kreolsk og pidgin, engelskbasert (annet)" #: zypp/LanguageCode.cc:414 -#, fuzzy msgid "Creoles and pidgins, French-based (Other)" msgstr "Kreolsk og pidgin, franskbasert (annet)" #: zypp/LanguageCode.cc:416 -#, fuzzy msgid "Creoles and pidgins, Portuguese-based (Other)" msgstr "Kreolsk og pidgin, portugisiskbasert (annet)" @@ -437,7 +425,6 @@ msgid "Crimean Tatar" msgstr "Krim-tatar" #: zypp/LanguageCode.cc:422 -#, fuzzy msgid "Creoles and pidgins (Other)" msgstr "Kreolsk og pidgin (annet)" @@ -838,7 +825,6 @@ msgid "Iranian (Other)" msgstr "Iransk (annet)" #: zypp/LanguageCode.cc:620 -#, fuzzy msgid "Iroquoian languages" msgstr "Irokesiske språk" @@ -1079,7 +1065,6 @@ msgid "Luo (Kenya and Tanzania)" msgstr "Luo (Kenya og Tanzania)" #: zypp/LanguageCode.cc:738 -#, fuzzy msgid "lushai" msgstr "Lushai" @@ -1164,7 +1149,6 @@ msgid "Minangkabau" msgstr "Minangkabau" #: zypp/LanguageCode.cc:778 -#, fuzzy msgid "Miscellaneous languages" msgstr "Diverse språk" @@ -1189,7 +1173,6 @@ msgid "Manipuri" msgstr "Manipuri" #: zypp/LanguageCode.cc:790 -#, fuzzy msgid "Manobo languages" msgstr "Manobo-språk" @@ -1210,12 +1193,10 @@ msgid "Mossi" msgstr "Mossi" #: zypp/LanguageCode.cc:800 -#, fuzzy msgid "Multiple languages" msgstr "Flere språk" #: zypp/LanguageCode.cc:802 -#, fuzzy msgid "Munda languages" msgstr "Munda-språk" @@ -1234,7 +1215,6 @@ msgid "Marwari" msgstr "Marwari" #: zypp/LanguageCode.cc:810 -#, fuzzy msgid "Mayan languages" msgstr "Maya-språk" @@ -1325,7 +1305,6 @@ msgid "Northern Sotho" msgstr "Sotho, nordlig" #: zypp/LanguageCode.cc:854 -#, fuzzy msgid "Nubian languages" msgstr "Nubiske språk" @@ -1384,7 +1363,6 @@ msgid "Turkish, Ottoman (1500-1928)" msgstr "Tyrkisk, ottomansk (1500-1928)" #: zypp/LanguageCode.cc:882 -#, fuzzy msgid "Otomian languages" msgstr "Otomianske språk" @@ -1449,7 +1427,6 @@ msgid "Portuguese" msgstr "Portugisisk" #: zypp/LanguageCode.cc:914 -#, fuzzy msgid "Prakrit languages" msgstr "Prakrit-språk" @@ -1520,7 +1497,6 @@ msgid "South American Indian (Other)" msgstr "Søramerikansk indiansk (annet)" #: zypp/LanguageCode.cc:948 -#, fuzzy msgid "Salishan languages" msgstr "Salisjanske språk" @@ -1585,7 +1561,6 @@ msgid "Sinhala" msgstr "Sinhala" #: zypp/LanguageCode.cc:980 -#, fuzzy msgid "Siouan languages" msgstr "Siouanske språk" @@ -1614,7 +1589,6 @@ msgid "Northern Sami" msgstr "Nordsamisk" #: zypp/LanguageCode.cc:994 -#, fuzzy msgid "Sami languages (Other)" msgstr "Samiske språk (annet)" @@ -1827,7 +1801,6 @@ msgid "Tumbuka" msgstr "Tumbuka" #: zypp/LanguageCode.cc:1096 -#, fuzzy msgid "Tupi languages" msgstr "Tupi-språk" @@ -1904,7 +1877,6 @@ msgid "Votic" msgstr "Votisk" #: zypp/LanguageCode.cc:1134 -#, fuzzy msgid "Wakashan languages" msgstr "Wakasjanske språk" @@ -1925,7 +1897,6 @@ msgid "Welsh" msgstr "Walisisk" #: zypp/LanguageCode.cc:1144 -#, fuzzy msgid "Sorbian languages" msgstr "Sorbianske språk" @@ -1964,7 +1935,6 @@ msgid "Yoruba" msgstr "Yoruba" #: zypp/LanguageCode.cc:1162 -#, fuzzy msgid "Yupik languages" msgstr "Yupik-språk" @@ -2030,7 +2000,7 @@ msgstr "" msgid "%s install failed" msgstr "%s installasjon mislyktes" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "rpm-resultat:" @@ -2039,59 +2009,57 @@ msgstr "rpm-resultat:" msgid "%s installed ok" msgstr "%s installasjon ok" -# -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "Flere rpm-resultater:" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "%s avinstallasjon mislyktes" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "%s avinstallasjon ok" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "OK" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "Pakken er ikke i orden fordi:" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "Pakken har en annen versjon enn ventet" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "Pakkens MD5-kontrollsum er feil" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "Pakken er ikke signert" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "Pakken har ingen MD5-kontrollsum" -# -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "Pakken har en ugyldig signatur" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "Pakkearkivets MD5-kontrollsum er feil" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "rpm mislyktes av ukjent årsak, se loggfilen" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "opprettet sikkerhetskopi %s" @@ -2102,9 +2070,9 @@ msgid "%s is replaced by %s" msgstr "%s er erstattet av %s" #: zypp/solver/detail/ResolverInfoObsoletes.cc:69 -#, fuzzy, c-format +#, c-format msgid "%s replaced by %s" -msgstr "%s er erstattet av %s" +msgstr "%s erstattet av %s" #: zypp/solver/detail/Resolver_problems.cc:172 msgid "Invalid information" @@ -2194,7 +2162,7 @@ msgid "Child of" msgstr "Underordnet" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "Kan ikke installere %s" @@ -2225,99 +2193,95 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "%s er ikke installert, og er merket som ikke installerbar" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "Kan ikke installere %s på grunn av konflikter" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s har krav som ikke er oppfylt" -#: zypp/solver/detail/Resolver_problems.cc:346 -#, fuzzy, c-format +#: zypp/solver/detail/Resolver_problems.cc:349 +#, c-format msgid "%s has missing dependencies" -msgstr "%s kan ikke installeres på grunn av manglende nødvendige pakker" +msgstr "%s mangler nødvendige pakker" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "%s kan ikke installeres på grunn av manglende nødvendige pakker" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s kreves av %s, men vil bli avinstallert" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "Det er ikke nødvendig å installere %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Kan ikke installere %s, som er nødvendig for %s" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "Kan ikke installere %s, som er nødvendig for %s" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s vil ikke be avinstallert fordi den fremdeles er nødvendig" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "Kan ikke installere %s fordi den er i konflikt med %s" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s kan ikke avinstalleres på grunn av konflikter med %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -#, fuzzy -msgid "Ignore this requirement." -msgstr "Ignorerer dette kravet" +msgid "Ignore this requirement just here" +msgstr "Ignorerer dette kravet, men bare her" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -#, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s kreves av andre nødvendige pakker" +msgid "Ignore this requirement generally" +msgstr "Ignorerer alltid dette kravet" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 -#, fuzzy, c-format -msgid "Ignore this conflict of %s." -msgstr "Ignorerer konflikt for %s" +#, c-format +msgid "Ignore this conflict of %s" +msgstr "Ignorerer denne konflikten for %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -#, fuzzy -msgid "ignore architecture" -msgstr "Oppstartsarkitektur" +msgid "Ignore architecture" +msgstr "Ignorer arkitektur" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 -#, fuzzy, c-format -msgid "Ignore that %s is already set to install." -msgstr "Katalogen %1 er allerede i listen." +#, c-format +msgid "Ignore that %s is already set to install" +msgstr "Ignorer at %s allerede er valgt for installasjon" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 #: zypp/solver/detail/ProblemSolutionUninstall.cc:56 -#, fuzzy, c-format +#, c-format msgid "delete %s" -msgstr "Fjern %1" +msgstr "slett %s" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -#, fuzzy -msgid "Delete conflicting resolvables." -msgstr "Fjerner nødvendige pakker på grunn av konflikt" +msgid "Delete conflicting resolvables" +msgstr "Fjern nødvendige pakker på grunn av konflikt" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "som krever %s for %s ved oppgradering av %s" @@ -2327,60 +2291,60 @@ msgstr "som krever %s for %s ved oppgradering av %s" msgid "%s is missing the requirement %s" msgstr "%s mangler den nødvendige pakken %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", Handling: " -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ", Utløser: " -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "pakke" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "utvalg" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "mønster" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "produkt" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "pakkeoppdatering" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "skript" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "melding" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "system" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Nødvendig pakke" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "Merker dette forsøket på løsning som ugyldig." -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "Merker den nødvendig pakken %s som ikke installerbar" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " @@ -2389,81 +2353,80 @@ msgstr "" "%s er merket for installasjon, men dette er ikke mulig på grunn av " "avhengighetsproblemer." -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" "Kan ikke installere %s fordi pakken allerede er merket for avinstallasjon" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "Kan ikke installere %s fordi pakken ikke er bygget for dette systemet." -#: zypp/solver/detail/ResolverInfoMisc.cc:184 -#, fuzzy, c-format +#: zypp/solver/detail/ResolverInfoMisc.cc:180 +#, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" -msgstr "" -"Kan ikke installere %s fordi pakken allerede er merket for avinstallasjon" +msgstr "Kan ikke installere %s fordi %s allerede er valgt for installasjon" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "Dette vil gjøre %s ugyldig." -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "Analyserer %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "Installerer %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "Oppgraderer %s til %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "Hopper over %s: allerede installert" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "Det er ingen installerte alternativer som inneholder %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "for %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "Det er ingen installerbare pakker som inneholder %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "Oppgradering til %s for å unngå å fjerne %s er ikke mulig." -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "%s inneholder %s, men er merket for avinstallasjon." -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "%s inneholder %s, men en annen versjon av %s er allerede installert." -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2472,17 +2435,17 @@ msgstr "" "%s inneholder %s, men kan ikke installeres. Forsøk å installere bare denne " "pakken for å få mer informasjon." -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s inneholder %s, men den er beskyttet." -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "Kan ikke oppfylle kravet %s for %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." @@ -2490,41 +2453,41 @@ msgstr "" "%s kreves av en annen nødvendig pakke som vil bli installert, så lenken vil " "ikke bli fjernet." -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" "%s kreves av en annen installert og nødvendig pakke, så lenken vil ikke bli " "fjernet." -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s er beskyttet, og kan ikke avinstalleres." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" "På grunn av en konflikt i forbindelse med %s (%s) vil ikke pakken %s bli " "installert" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" "Merker %s som ikke installerbar på grunn av konflikter i forbindelse med %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "fra %s" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr " Feil!" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr " Viktig!" @@ -2532,23 +2495,21 @@ msgstr " Viktig!" #: zypp/solver/detail/ProblemSolutionKeep.cc:57 #, c-format msgid "keep %s" -msgstr "" +msgstr "behold %s" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -#, fuzzy -msgid "Keep missing resolvables." -msgstr "Installerer manglende nødvendige pakker" +msgid "Keep missing resolvables" +msgstr "Behold manglende nødvendige pakker" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 -#, fuzzy, c-format +#, c-format msgid "install %s" -msgstr "Installer %1" +msgstr "installer %s" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 -#, fuzzy -msgid "Install missing resolvables." -msgstr "Installerer manglende nødvendige pakker" +msgid "Install missing resolvables" +msgstr "Installer manglende nødvendige pakker" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -2556,12 +2517,12 @@ msgid "%s depended on %s" msgstr "%s var avhengig av %s" #: zypp/solver/detail/ResolverInfoDependsOn.cc:69 -#, fuzzy, c-format +#, c-format msgid "%s dependend on %s" msgstr "%s var avhengig av %s" #: zypp/solver/detail/ResolverInfoNeededBy.cc:70 -#, fuzzy, c-format +#, c-format msgid "%s needed by %s" msgstr "%s kreves av %s" @@ -2572,14 +2533,13 @@ msgid "%s part of %s" msgstr "%s del av %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:52 -#, fuzzy, c-format +#, c-format msgid "unlock %s" -msgstr "Fjern beskyttelse %s" +msgstr "fjern beskyttelse %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -#, fuzzy -msgid "Unlock these resolvables." -msgstr "Fjerner beskyttelsen for disse nødvendige pakkene" +msgid "Unlock these resolvables" +msgstr "Fjern beskyttelse for disse nødvendige pakkene" #: zypp/CountryCode.cc:135 msgid "Unknown country: " @@ -3624,16 +3584,3 @@ msgstr "Jamaica" #: zypp/CountryCode.cc:457 msgid "Zimbabwe" msgstr "Zimbabwe" - -#~ msgid "Deleting %s" -#~ msgstr "Sletter %s" - -#~ msgid "" -#~ "Can't install %s, since a resolvable of the same name is already marked " -#~ "as needing to be installed" -#~ msgstr "" -#~ "Kan ikke installere %s fordi en nødvendig pakke med samme navn allerede " -#~ "er merket for installasjon" - -#~ msgid "%s cannot be uninstalled due missing dependencies" -#~ msgstr "%s kan ikke avinstalleres på grunn av manglende nødvendige pakker" diff --git a/po/nl.po b/po/nl.po index f02f02b..65d70b0 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.nl\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2006-01-29 17:57+0100\n" "Last-Translator: Rinse de Vries \n" "Language-Team: Dutch \n" @@ -2008,7 +2008,7 @@ msgstr "" msgid "%s install failed" msgstr "Installeren van %s is mislukt" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "rpm-uitvoer:" @@ -2018,57 +2018,57 @@ msgid "%s installed ok" msgstr "%s is met succes geïnstalleerd" # /usr/lib/YaST2/clients/lan_inetd_custom.ycp:162 -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "Aanvullende rpm-uitvoer:" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "Verwijderen van %s is mislukt" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "%s is met succes verwijderd" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "OK" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "Het pakket is niet OK vanwege de volgende redenen:" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "Het pakket bevat een andere versie dan verwacht" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "Het pakket heeft een onjuiste MD5-som" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "Het pakket is niet ondertekend" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "Het pakket heeft geen MD5-som" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "Het pakket heeft een onjuiste ondertekening" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "Het pakketarchief heeft een onjuiste MD5-som" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "rpm mislukte vanwege een onbekende fout. Zie logbestand." -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "reservekopie %s aangemaakt" @@ -2171,7 +2171,7 @@ msgid "Child of" msgstr "Subonderdeel van" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "Kan %s niet installeren" @@ -2202,86 +2202,86 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "%s is niet geïnstalleerd en is gemarkeerd als deïnstalleerbaar" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "Kan %s niet installeren vanwege afhankelijkheidsproblemen" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s heeft onopgeloste afhankelijkheden" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "%s kan niet worden geïnstalleerd vanwege ontbrekende afhankelijkheden" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "%s kan niet worden geïnstalleerd vanwege ontbrekende afhankelijkheden" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" "%s lost de afhankelijkheden van %s op, maar zal worden gedeïnstalleerd." -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "%s hoeft niet te worden geïnstalleerd" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Kan %s niet installeren om de afhankelijkheden van %s op te lossen" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "Kan %s niet installeren om de afhankelijkheden van %s op te lossen" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s zal niet worden gedeïnstalleerd omdat het nog steeds vereist wordt" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "Kan %s niet installeren omdat het in conflict is met %s" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s kan niet worden gedeïnstalleerd worden vanwege conflicten met %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "Deze vereiste wordt genegeerd" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s is nodig voor andere oplosbare" +msgid "Ignore this requirement generally" +msgstr "Deze vereiste wordt genegeerd" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "Conflict van %s wordt genegeerd" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Boot architectuur" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Directory '%1' staat al in de lijst." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2292,10 +2292,10 @@ msgstr "%1 verwijderen" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "Verwijdert conflicterende oplosbare pakketten" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "voor het verkrijgen van %s voor %s bij het upgraden van %s" @@ -2305,60 +2305,60 @@ msgstr "voor het verkrijgen van %s voor %s bij het upgraden van %s" msgid "%s is missing the requirement %s" msgstr "%s mist de vereiste %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", Actie: " -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ", Oorzaak: " -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "pakket" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "selectie" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "patroon" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "product" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "patch" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "script" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "bericht" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "systeem" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Oplosbaar" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "Deze oplospoging wordt als ongeldig gemarkeerd." -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "Oplosbare %s wordt als niet-installeerbaar gemarkeerd" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " @@ -2367,7 +2367,7 @@ msgstr "" "%s is aangemerkt voor installatie, maar dit is niet mogelijk vanwege " "afhankelijkheidsproblemen." -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" @@ -2375,77 +2375,77 @@ msgstr "" "Kan %s niet installeren omdat deze al is gemarkeerd als 'moet worden " "gedeïnstalleerd'" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" "Kan %s niet installeren omdat deze niet van toepassing is op dit systeem." -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, fuzzy, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" "Kan %s niet installeren omdat deze al is gemarkeerd als 'moet worden " "gedeïnstalleerd'" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "Dit zou %s ongeldig maken." -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "%s wordt opgezet" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "Installeert %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "%s wordt bijgewerkt naar %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "%s wordt overgeslagen, is al geïnstalleerd" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "Er zijn geen alternatieve geïnstalleerde aanbieders van %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "voor %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "Er zijn geen installeerbare aanbieders van %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" "Upgraden naar %s om het verwijderen van %s te vermijden is niet mogelijk." -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "%s levert %s, maar is aangemerkt voor deïnstallatie." -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "%s levert %s, maar een andere versie van %s is al geïnstalleerd." -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2454,17 +2454,17 @@ msgstr "" "%s levert %s, maar is niet-installeerbaar. Voor meer informatie, probeer het " "pakket/de patch zelfstandig te installeren." -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s levert %s, maar is vergrendeld." -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "Aan de vereiste %s voor %s kan niet worden voldaan" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." @@ -2472,39 +2472,39 @@ msgstr "" "%s is nodig voor een andere te installeren oplosbare, dus de koppeling wordt " "niet ongedaan gemaakt." -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" "%s is nodig voor andere geïnstalleerde oplosbare, dus de koppeling wordt " "niet ongedaan gemaakt." -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s is vergrendeld en kan niet worden gedeïnstalleerd." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" "Een conflict over %s (%s) vereist het verwijderen van te installeren %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "Markeert van %s als niet-installeerbaar vanwege conflicten over %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "van %s" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr " Fout!" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr " Belangrijk!" @@ -2516,7 +2516,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "Installeert ontbrekende oplosbare pakketten" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2527,7 +2527,7 @@ msgstr "%1 installeren" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Installeert ontbrekende oplosbare pakketten" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2558,7 +2558,7 @@ msgstr "Ontgrendeld %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "Ontgrendeld deze oplosbare pakketten" #: zypp/CountryCode.cc:135 @@ -3516,6 +3516,10 @@ msgstr "Zambia" msgid "Zimbabwe" msgstr "Zimbabwe" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s is nodig voor andere oplosbare" + #~ msgid "Deleting %s" #~ msgstr "Verwijdert %s" diff --git a/po/pa.po b/po/pa.po index 445ee51..d265202 100644 --- a/po/pa.po +++ b/po/pa.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2005-02-16 10:21+0100\n" "Last-Translator: Kanwaljeet Singh Brar \n" "Language-Team: Punjabi \n" @@ -2183,7 +2183,7 @@ msgstr "" msgid "%s install failed" msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2192,63 +2192,63 @@ msgstr "" msgid "%s installed ok" msgstr "(%1) ਇੰਸਟਾਲ ਨਹੀਂ" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "ਵਧੇਰੇ ਜਾਣਕਾਰੀ:" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm ਅਸਫਲ ਹੈ।" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "ਠੀਕ ਹੈ" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "ਹਟਾਉਣ ਲਈ ਪੈਕੇਜ" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "ਮੁੜ ਸੰਭਾਲ ਲਈ ਪੈਕੇਜ" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 #, fuzzy msgid "The package has no MD5 sum" msgstr "ਹਟਾਉਣ ਲਈ ਪੈਕੇਜ" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "ਮੁੜ ਸੰਭਾਲ ਲਈ ਪੈਕੇਜ਼" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "ਹਟਾਉਣ ਲਈ ਪੈਕੇਜ" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "ਬੈਕਅੱਪ ਬਣਾਓ(&C)" @@ -2345,7 +2345,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "ਇੰਸਟਾਲ:" @@ -2372,84 +2372,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "ਪੈਕੇਜ਼ %1 ਦੀ ਲੋੜ ਹੈ ਅਤੇ ਇੰਸਟਾਲ ਹੋਣੀ ਜਰੂਰੀ ਹੈ।" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "ਨਿਰਭਰਤਾ ਜਾਂਚ ਜਾਰੀ ਹੈ..." -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "ਮੁੜ-ਇੰਸਟਾਲ ਕਰਨ ਦੀ ਲੋੜ" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 ਦਾ %2 ਨਾਲ ਅਪਵਾਦ ਹੈ" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "ਨਾ-ਹੱਲ਼ ਲੋੜਾਂ ਹਨ..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "ਨਾ-ਹੱਲ਼ ਲੋੜਾਂ ਹਨ..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 ਦਾ %2 ਨਾਲ ਅਪਵਾਦ ਹੈ" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "ਬੂਟ ਢਾਂਚਾ" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "ਡਾਇਰੈਕਟਰੀ %1 ਪਹਿਲਾਂ ਹੀ ਸੂਚੀ ਵਿੱਚ ਮੌਜੂਦ ਹੈ।" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2460,10 +2461,10 @@ msgstr "%1 ਨੂੰ ਹਟਾਓ" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 ਦਾ %2 ਨਾਲ ਅਪਵਾਦ ਹੈ" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2473,193 +2474,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "ਕਾਰਵਾਈ" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "ਪੈਚ" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "ਇੰਸਟਾਲ:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "ਇੰਸਟਾਲ:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "ਇਹ ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹੈ। ਇਸ ਨੂੰ ਹਟਾਓ।" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "ਪੈਕੇਜ਼ %1 ਦੀ ਲੋੜ ਹੈ ਅਤੇ ਇੰਸਟਾਲ ਹੋਣੀ ਜਰੂਰੀ ਹੈ।" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "ਗਲਤੀ" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "ਡਾਟਾ ਅਯਾਤ" @@ -2671,8 +2672,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "ਗੁੰਮ ਪੈਕੇਜ ਇੰਸਟਾਲ" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2682,7 +2684,7 @@ msgstr "%1 ਇੰਸਟਾਲ" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "ਗੁੰਮ ਪੈਕੇਜ ਇੰਸਟਾਲ" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2713,7 +2715,7 @@ msgstr "ਘੜੀ" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 ਦਾ %2 ਨਾਲ ਅਪਵਾਦ ਹੈ" #: zypp/CountryCode.cc:135 diff --git a/po/pl.po b/po/pl.po index e759c70..4074b80 100644 --- a/po/pl.po +++ b/po/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2003-10-06 11:28+0200\n" "Last-Translator: Polish \n" "Language-Team: Polish \n" @@ -2024,7 +2024,7 @@ msgstr "" msgid "%s install failed" msgstr "Instalacja zakończona niepowodzeniem." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "Wyjście programu:\n" @@ -2034,63 +2034,63 @@ msgstr "Wyjście programu:\n" msgid "%s installed ok" msgstr "Nie zainstalowane (%1)" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "Dodatkowe ustawienia grupy" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "błąd rpm." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "OK" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Pakiety do usunięcia" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Pakiety do odtworzenia" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 #, fuzzy msgid "The package has no MD5 sum" msgstr "Pakiety do usunięcia" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Pakiety do odtworzenia" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Pakiety do usunięcia" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Utwórz &kopię zapasową" @@ -2187,7 +2187,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Instalowanie na:" @@ -2214,84 +2214,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Pakiet nie jest i nie będzie zainstalowany." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Sprawdzanie zależności" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "wymaga ponownej instalacji" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 jest w konflikcie z %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "ma nierozwiązane wymagania..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "ma nierozwiązane wymagania..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 jest w konflikcie z %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Architektura startowa" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Katalog %1 znajduje się już na liście." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2302,10 +2303,10 @@ msgstr "Usuń %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 jest w konflikcie z %2" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2315,193 +2316,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Czynność" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "Ścieżka" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Instalowanie na:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Instalowanie na:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Sprawdzanie zainstalowanych dotychczas skanerów" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Pakiet nie jest i nie będzie zainstalowany." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Błąd" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Importuj dane" @@ -2513,8 +2514,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Zainstaluj brakujące pakiety" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2524,7 +2526,7 @@ msgstr "Instaluj %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Zainstaluj brakujące pakiety" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2555,7 +2557,7 @@ msgstr "Zegary" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 jest w konflikcie z %2" #: zypp/CountryCode.cc:135 diff --git a/po/pt.po b/po/pt.po index 14b1cd9..6d59a40 100644 --- a/po/pt.po +++ b/po/pt.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.pt\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2006-02-08 00:44+0000\n" "Last-Translator: Antonio Cardoso Martins \n" "Language-Team: portuguese\n" @@ -2076,7 +2076,7 @@ msgstr "" msgid "%s install failed" msgstr "Falhou a instalação de %s" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "Resultado do rpm:" @@ -2085,59 +2085,59 @@ msgstr "Resultado do rpm:" msgid "%s installed ok" msgstr "%s instalado com sucesso" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "Resultado adicional do rpm:" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "Falha ao remover %s " -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "%s removido com sucesso" # /usr/lib/YaST2/clients/logcontrol.ycp:20 -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Ok" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "Este pacote não está OK devido às seguintes razões:" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "O pacote contém uma versão diferente da experada" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "O pacote tem um MD5 sum incorrecto" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "O pacote não está assinalado" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "O pacote não tem MD5 sum" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "O pacote tem a assinatura incorrecta" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "O pacote tem um MD5 sum incorrecto" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" "o rpm falhou por uma razão desconhecida, consulte o ficheiro de registo" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "Criar Cópia de Segurança %s" @@ -2240,7 +2240,7 @@ msgid "Child of" msgstr "Filho de" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "Não foi possível instalar %s" @@ -2271,85 +2271,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "o %s não está instalado e foi marcado como possível de desinstalar" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "Não foi possível instalar %s devido a problema com dependências" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s tem requerimentos não satisfeitos" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "%s não pode ser instalado devido à falta de dependências" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "%s não pode ser instalado devido à falta de dependências" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s satisfaz as dependências de %s mas vai ser desinstalado" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "Não é necessário instalar %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Não é possível instalar %s para satisfazer as dependências de %s" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "Não foi possível instalar %s para satisfazer as dependências de %s" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "o %s não pode ser desinstalado por ainda é requerido" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "Não foi possível instalar %s devido a um conflicto com %s" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "não é possível desinstalar %s devido a conflictos com %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "Ignorar este requisito" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s é necessário por outros resolúveis" +msgid "Ignore this requirement generally" +msgstr "Ignorar este requisito" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "A ignorar conflito de %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Arquitectura de arranque" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "O directório %1 já se encontra na lista." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2360,10 +2360,10 @@ msgstr "Apagar %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "A remover os resolúveis em conflito" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "requer %s para %s quando esta a actualizar %s" @@ -2373,60 +2373,60 @@ msgstr "requer %s para %s quando esta a actualizar %s" msgid "%s is missing the requirement %s" msgstr "%s falta o resuisito %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", Acção:" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ", Trigger: " -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "Pacote" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "selecção" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "modelo" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "producto" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "caminho" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "script" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "mensagem" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "sistema" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Resolúvel" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "Marcar esta solução como inválida." -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "A marcar o resolúvel %s como não desinstalável" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " @@ -2435,7 +2435,7 @@ msgstr "" "%s está agendado para ser instalado, mas não é possível devido a problemas " "de dependências." -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" @@ -2443,75 +2443,75 @@ msgstr "" "Não é possível instalar %s desde que este já esteja marcado como necessário " "desinstalar " -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "Não é possível instalar %s, pois não se aplica a este sistema." -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, fuzzy, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" "Não é possível instalar %s desde que este já esteja marcado como necessário " "desinstalar " -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "Isto invalida %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "A estabelecer %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "A Instalar %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "A actualizar %s para %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "A saltar %s: Já está instalado" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "Não existe nenhuma alternativa instalada que forneça %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "para %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "Não esta instalado nenhum pacote que forneça %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "Actualizar para %s removendo %s não é possivel." -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "%s fornece %s, mas está agendado para ser desinstalado." -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "%s fornece %s, mas outra versão de %s já está instalada." -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2520,17 +2520,17 @@ msgstr "" "%s fornece %s, mas não é possível desinstar. Tente instala-lo para mais " "detalhes." -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s fornece %s, mas está bloqueado." -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "Não foi possível satisfazer os requisitos %s com %s " -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." @@ -2538,40 +2538,40 @@ msgstr "" "%s é requerido por outro resolúvel a instalar, pelo que não será " "desassociado." -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" "%s é requerido por outro resolúvel instalado, pelo que não será desassociado." -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "O pacote %s está bloqueado, não pode ser desinstalado." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" "Um conflicto com %s (%s) necessita ser removido dos pacotes a ser instalados " "%s" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "Marcar %s com não instalavél devido a conflictos com %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "de %s" # /usr/lib/YaST2/clients/logcontrol.ycp:67 -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "Erro!" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "Importante!" @@ -2583,7 +2583,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "A instalar os resolúveis em falta" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2594,7 +2594,7 @@ msgstr "Instalar %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "A instalar os resolúveis em falta" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2625,7 +2625,7 @@ msgstr "Desbloquear %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "A destrancar estes resolúveis" #: zypp/CountryCode.cc:135 @@ -3720,6 +3720,10 @@ msgstr "Zâmbia" msgid "Zimbabwe" msgstr "Zimbabué" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s é necessário por outros resolúveis" + #~ msgid "Deleting %s" #~ msgstr "A eliminar %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index f9c4e82..91fbb64 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2002-07-01 14:56+0200\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -1962,7 +1962,7 @@ msgstr "" msgid "%s install failed" msgstr "Falha na instalação de %s" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "saída de rpm:" @@ -1971,58 +1971,58 @@ msgstr "saída de rpm:" msgid "%s installed ok" msgstr "%s instalado com êxito" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "Saída de rpm adicional:" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "Falha na remoção de %s" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "%s removido com êxito" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Ok" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "O pacote não está OK pelos seguintes motivos:" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "O pacote contém uma versão diferente da esperada" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "O arquivo do pacote tem soma de MD5 incorreta" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "O pacote não está assinado" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "O arquivo do pacote não tem soma de MD5" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "O pacote tem assinatura incorreta " -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "O arquivo do pacote tem soma de MD5 incorreta " -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" "Houve falha do rpm por motivo desconhecido, consulte o arquivo de registro" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "backup %s criado" @@ -2125,7 +2125,7 @@ msgid "Child of" msgstr "Filho de " #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "Não é possível instalar %s" @@ -2156,85 +2156,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "%s não está instalado e foi marcado como não instalável" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "Não é possível instalar %s devido a problemas de dependência" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s tem requisitos que não foram atendidos" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "%s não pode ser instalado devido à ausência de dependências" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "%s não pode ser instalado devido à ausência de dependências" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s preenche as dependências de %s, mas será desinstalado" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "Não é necessário instalar %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Não é possível instalar %s para preencher as dependências de %s" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "Não é possível instalar %s para preencher as dependências de %s" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s não será desinstalado porque ainda é necessário" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "Não é possível instalar %s porque ele entra em conflito com %s" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s não pode ser desinstalado devido a conflitos com %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "Ignorando esse requisito" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s é necessário a outros resolvíveis" +msgid "Ignore this requirement generally" +msgstr "Ignorando esse requisito" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "Ignorando conflito de %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Ignorando Arquitetura" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Ignorando que %s já está pronto para instalação" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2245,10 +2245,10 @@ msgstr "Deletar %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "Removendo resolvíveis conflitantes" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "para exigir %s para %s ao fazer o upgrade de %s" @@ -2258,60 +2258,60 @@ msgstr "para exigir %s para %s ao fazer o upgrade de %s" msgid "%s is missing the requirement %s" msgstr "%s não está atendendo ao requisito %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", Ação:" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ", Acionador:" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "pacote " -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "seleção" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "padrão" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "produto" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "patch" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "script" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "mensagem" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "sistema" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Resolvível" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "Marcando essa tentativa de resolução como inválida." -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "Marcando o resolvível %s como impossível de ser instalado" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " @@ -2320,7 +2320,7 @@ msgstr "" "%s está programado para ser instalado, mas isso não é possível devido a " "problemas de dependência." -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" @@ -2328,75 +2328,75 @@ msgstr "" "Impossível instalar %s porque sua desinstalação já está marcada como " "necessária" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "Não é possível instalar %s, pois ele não se aplica a este sistema." -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, fuzzy, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" "Não é possível instalar %s, pois sua instalação já está marcada como " "necessária." -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "Isso invalidaria %s." -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "Estabelecendo %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "Instalando %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "Atualizando o %s para %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "Ignorando %s: já instalado" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "Não há provedores alternativos instalados de %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "para %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "Não há provedores de %s que possam ser instalados" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "Não é possível fazer upgrade de %s para evitar a remoção de %s." -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "%s fornece %s, mas está programado para ser desinstalado." -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "%s fornece %s, mas já há outra versão desse %s instalada." -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2405,17 +2405,17 @@ msgstr "" "%s fornece %s, mas não pode ser instalado. Experimente instalá-lo sozinho " "para obter mais detalhes." -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s fornece %s, mas está bloqueado." -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "Não é possível atender ao requisito %s para %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." @@ -2423,38 +2423,38 @@ msgstr "" "%s é necessário a outro resolvível a ser instalado; por isso, não será " "desvinculado." -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" "%s é exigido por outro resolvível instalado, para não ficar desvinculado." -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s está bloqueado e não pode ser desinstalado." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" "Um conflito por causa de %s (%s) requer a remoção do %s a ser instalado" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "Marcando %s como não instalável devido a conflitos por causa de %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "de %s" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "Erro!" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "Importante!" @@ -2466,7 +2466,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "Instalando resolvíveis ausentes" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2477,7 +2477,7 @@ msgstr "Instalar %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Instalando resolvíveis ausentes" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2508,7 +2508,7 @@ msgstr "Desbloquear %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "Desbloqueando esses resolvíveis" #: zypp/CountryCode.cc:135 @@ -3463,6 +3463,10 @@ msgstr "Zâmbia" msgid "Zimbabwe" msgstr "Zimbábue" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s é necessário a outros resolvíveis" + #~ msgid "%s cannot be uninstalled due missing dependencies" #~ msgstr "%s não pode ser desinstalado devido à ausência de dependências" diff --git a/po/ro.po b/po/ro.po index 96b6738..d4a22bc 100644 --- a/po/ro.po +++ b/po/ro.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2003-02-25 15:04+0100\n" "Last-Translator: \n" "Language-Team: Romanian \n" @@ -2203,7 +2203,7 @@ msgstr "" msgid "%s install failed" msgstr "Instalează &inetd" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "" @@ -2215,60 +2215,60 @@ msgstr "" msgid "%s installed ok" msgstr "Mărime instalată:" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "&Opţiuni ipppd adiţionale" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Ok" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "&Lista de pachete" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "&Lista de pachete" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Creează arhiva backup" @@ -2365,7 +2365,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Instalează %1" @@ -2392,84 +2392,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Acest pachet nu este instalat şi nici nu va fi instalat." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Verific dependenţele..." -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "Instalare automată" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 intră în conflict cu %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "are cerinţe nerezolvate..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "are cerinţe nerezolvate..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 intră în conflict cu %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Arhitectură:" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Directorul %1 se află deja în listă." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2480,10 +2481,10 @@ msgstr "Şterge %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 intră în conflict cu %2" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2493,193 +2494,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Acţiune" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "petic" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Instalează %1" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Instalează %1" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Acest pachet este deja instalat. Va fi şters." -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Acest pachet nu este instalat şi nici nu va fi instalat." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Eroare" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Im&portă" @@ -2691,8 +2692,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Instalez driver-ul..." #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2702,7 +2704,7 @@ msgstr "Instalează %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Instalez driver-ul..." #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2733,7 +2735,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 intră în conflict cu %2" #: zypp/CountryCode.cc:135 diff --git a/po/ru.po b/po/ru.po index 09eff38..cd3d6a4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2006-01-04 08:58+0100\n" "Last-Translator: Aleksey Osipov \n" "Language-Team: Russian \n" @@ -2309,7 +2309,7 @@ msgstr "" msgid "%s install failed" msgstr "Установка не удалась." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "" @@ -2322,69 +2322,69 @@ msgid "%s installed ok" msgstr "&Да - начать" # dialog caption -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "Дополнительные настройки группы" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "ошибка при запуске rpm." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "ОК" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" # summary text heading -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Пакеты для удаления" # summary text heading -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Пакеты для восстановления" # summary text heading -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 #, fuzzy msgid "The package has no MD5 sum" msgstr "Пакеты для удаления" # summary text heading -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Пакеты для восстановления" # summary text heading -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Пакеты для удаления" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" # Proposal for backup during update -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Не создавать резервных копий" @@ -2481,7 +2481,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Установка на:" @@ -2508,84 +2508,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Этот пакет не установлен и не будет установлен." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Проверка зависимостей" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "должен быть переустановлен" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 конфликтует с %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "имеет не удовлетворенные требования..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "имеет не удовлетворенные требования..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 конфликтует с %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Архитектура начальной загрузки" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Каталог %1 уже находится в списке. " #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2596,10 +2597,10 @@ msgstr "Удалить %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 конфликтует с %2" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2610,194 +2611,194 @@ msgid "%s is missing the requirement %s" msgstr "" # Table header 5/5 -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Действие" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "обновление" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Установка на:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Установка на:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" # text for a progress bar label -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Проверка уже установленных сканеров" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Этот пакет не установлен и не будет установлен." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Ошибка" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Импорт данных" @@ -2809,8 +2810,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Установить отсутствующие пакеты" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2820,7 +2822,7 @@ msgstr "Установить %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Установить отсутствующие пакеты" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2851,7 +2853,7 @@ msgstr "Часы" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 конфликтует с %2" #: zypp/CountryCode.cc:135 diff --git a/po/sk.po b/po/sk.po index 08f213e..082d7be 100644 --- a/po/sk.po +++ b/po/sk.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2003-05-27 16:53+0200\n" "Last-Translator: Stanislav Visnovsky \n" "Language-Team: Slovak \n" @@ -2272,7 +2272,7 @@ msgstr "" msgid "%s install failed" msgstr "Inštalácia zlyhala." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "" @@ -2284,63 +2284,63 @@ msgstr "" msgid "%s installed ok" msgstr "Nenainštalovaný (%1)" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "Ďalšie nastavenie skupiny" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm zlyhalo." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "OK" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Balíky na odstránenie" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Balíky na obnovu" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 #, fuzzy msgid "The package has no MD5 sum" msgstr "Balíky na odstránenie" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Balíky na obnovu" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Balíky na odstránenie" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Nevytvárať zálohu" @@ -2437,7 +2437,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Inštalovať na:" @@ -2464,85 +2464,86 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Balík %1 je potrebný a musí byť nainštalovaný." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Nevyriešené závislosti:" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "je potrebné znovu nainštalovať" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 je v konflikte s %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "má nevyriešené požiadavky..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "má nevyriešené požiadavky..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 je v konflikte s %2" # tree node string #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Boot architektúra" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Adresár %1 je už v zozname." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2553,10 +2554,10 @@ msgstr "Odstrániť %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 je v konflikte s %2" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2568,193 +2569,193 @@ msgstr "" # Table header 5/5 # Table header 4/6 -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Akcia" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "oprava" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Inštalovať na:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Inštalovať na:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Kontrolujem už nainštalované skenery" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Balík %1 je potrebný a musí byť nainštalovaný." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Chyba" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Importovať dáta" @@ -2766,8 +2767,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Inštalácia chýbajúcich balíkov" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2777,7 +2779,7 @@ msgstr "Inštalovať %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Inštalácia chýbajúcich balíkov" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2808,7 +2810,7 @@ msgstr "Hodiny" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 je v konflikte s %2" #: zypp/CountryCode.cc:135 diff --git a/po/sl_SI.po b/po/sl_SI.po index 11e0d44..954d712 100644 --- a/po/sl_SI.po +++ b/po/sl_SI.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-10-18 11:02+0200\n" "Last-Translator: Janez Krek \n" "Language-Team: Slovenian\n" @@ -2276,7 +2276,7 @@ msgstr "" msgid "%s install failed" msgstr "Namestitev ni uspela." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "" @@ -2288,63 +2288,63 @@ msgstr "" msgid "%s installed ok" msgstr "Nameščena verzija" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "Dodatne nastavitve skupine" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm neuspešen." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "OK" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Paketi za odstranitev" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Paketi za obnovitev" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 #, fuzzy msgid "The package has no MD5 sum" msgstr "Paketi za odstranitev" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Paketi za obnovitev" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Paketi za odstranitev" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Ne Kreiraj Varnostnih Kopij" @@ -2441,7 +2441,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Nameščam na:" @@ -2468,84 +2468,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Ta paket ni nameščen in ne bo nameščen." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Nezadoščene odvisnosti:" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "potrebno je ponovno namestiti" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 je v sporu s/z %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "ima nerešene zahteve..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "ima nerešene zahteve..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 je v sporu s/z %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Zagonska arhitektura" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Imenik %1 je že na seznamu." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2556,10 +2557,10 @@ msgstr "Zbriši %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 je v sporu s/z %2" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2569,193 +2570,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Akcija" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "popravek" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Nameščam na:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Nameščam na:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Preverjam že nameščene optične bralnike" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Ta paket ni nameščen in ne bo nameščen." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Napaka" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Uvozi podatke" @@ -2767,8 +2768,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Namesti manjkajoče pakete" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2778,7 +2780,7 @@ msgstr "Namesti %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Namesti manjkajoče pakete" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2809,7 +2811,7 @@ msgstr "Ure" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 je v sporu s/z %2" #: zypp/CountryCode.cc:135 diff --git a/po/sr.po b/po/sr.po index 647c2f6..bc8981c 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST2 (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2004-03-31 11:34+0200\n" "Last-Translator: Bojan Jovanovic \n" "Language-Team: Serbian \n" @@ -2026,7 +2026,7 @@ msgstr "" msgid "%s install failed" msgstr "Instalacioni proces nije uspešno završen." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "" @@ -2041,68 +2041,68 @@ msgid "%s installed ok" msgstr "&Da, instaliraj" # TextEntry label -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "&Dodatne ipppd opcije" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm greška." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" # button for message box with help text -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "U redu" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" # summary text heading -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Paketi za obnavljanje" # summary text heading -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Paketi za obnavljanje" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" # summary text heading -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Paketi za obnavljanje" # summary text heading -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Paketi za obnavljanje" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" # Proposal for backup during update -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Ne pravite sigurnosnu kopiju" @@ -2200,7 +2200,7 @@ msgstr "" # Frame title for installation target hard disk / partition(s) #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Instaliram na:" @@ -2227,86 +2227,87 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Ovaj paket nije i neće biti instaliran." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Proveravam međuzavisnost..." -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "mora da se reinstalira" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 je u konfliktu sa %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "ima neispunjene zahteve..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "ima neispunjene zahteve..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 je u konfliktu sa %2" # tree node string #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Boot arhitektura" # error popup message #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Direktorijum %1 je već na listi." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2317,10 +2318,10 @@ msgstr "Obriši %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 je u konfliktu sa %2" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2330,195 +2331,195 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Akcija" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Instaliram na:" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Instaliram na:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Ovaj paket je već instaliran. Obrišite ga." -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Ovaj paket nije i neće biti instaliran." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Greška" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Unos podataka" @@ -2529,9 +2530,11 @@ msgstr "Unos podataka" msgid "keep %s" msgstr "" +# summary heder #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Instaliranje nedostajućih paketa" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2542,7 +2545,7 @@ msgstr "Instaliraj %1" # summary heder #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Instaliranje nedostajućih paketa" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2573,7 +2576,7 @@ msgstr "Satovi" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 je u konfliktu sa %2" #: zypp/CountryCode.cc:135 diff --git a/po/sv.po b/po/sv.po index dbfb0e2..1586d54 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2002-01-04 13:30+0100\n" "Last-Translator: Mattias Newzella \n" "Language-Team: Swedish \n" @@ -2060,7 +2060,7 @@ msgstr "" msgid "%s install failed" msgstr "Installationen misslyckades." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "Programutmatning:\n" @@ -2070,63 +2070,63 @@ msgstr "Programutmatning:\n" msgid "%s installed ok" msgstr "Inte installerad (%1)" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "Ytterligare gruppinställningar" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm misslyckades." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "OK" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Paket att ta bort" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Paket att återställa" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 #, fuzzy msgid "The package has no MD5 sum" msgstr "Paket att ta bort" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Paket att återställa" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Paket att ta bort" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Skapa säker&hetskopia" @@ -2223,7 +2223,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Installera på:" @@ -2250,84 +2250,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Det här paketet är inte installerat och kommer inte att installeras." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Olösta beroenden:" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "måste ominstalleras" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1 är i konflikt med %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "har olösta krav..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "har olösta krav..." #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1 är i konflikt med %2" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Startarkitektur" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Katalogen %1 finns redan i listan." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2338,10 +2339,10 @@ msgstr "Ta bort %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1 är i konflikt med %2" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2351,193 +2352,193 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Åtgärd" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "programfix" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Installera på:" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Installera på:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Kontrollerar redan installerade bildläsare" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Det här paketet är inte installerat och kommer inte att installeras." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Fel" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Importera data" @@ -2549,8 +2550,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Installera saknade paket" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2560,7 +2562,7 @@ msgstr "Installera %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Installera saknade paket" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2591,7 +2593,7 @@ msgstr "Klockor" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1 är i konflikt med %2" #: zypp/CountryCode.cc:135 diff --git a/po/ta.po b/po/ta.po index 1606a9c..51e61fb 100644 --- a/po/ta.po +++ b/po/ta.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2003-08-14 10:47+0200\n" "Last-Translator: xxx \n" "Language-Team: Tamil \n" @@ -2254,7 +2254,7 @@ msgstr "" msgid "%s install failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2263,57 +2263,57 @@ msgstr "" msgid "%s installed ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2410,7 +2410,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "­ò¾¡Ä¢Âý" @@ -2437,82 +2437,82 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2522,10 +2522,10 @@ msgid "delete %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2535,191 +2535,191 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "­ò¾¡Ä¢Âý" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "­ò¾¡Ä¢Âý" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2730,7 +2730,7 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2740,8 +2740,9 @@ msgid "install %s" msgstr "­ò¾¡Ä¢Âý" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 -msgid "Install missing resolvables." -msgstr "" +#, fuzzy +msgid "Install missing resolvables" +msgstr "­ò¾¡Ä¢Âý" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 #, c-format @@ -2770,7 +2771,7 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "" #: zypp/CountryCode.cc:135 diff --git a/po/tr.po b/po/tr.po index 214089d..7251595 100644 --- a/po/tr.po +++ b/po/tr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-10-18 10:13+0200\n" "Last-Translator: Görkem Çetin \n" "Language-Team: turkish \n" @@ -2456,7 +2456,7 @@ msgstr "" msgid "%s install failed" msgstr "Kurulum işlemi başarısız oldu." -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 #, fuzzy msgid "rpm output:" msgstr "Program çıktısı:\n" @@ -2466,63 +2466,63 @@ msgstr "Program çıktısı:\n" msgid "%s installed ok" msgstr "&Evet, kur" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 #, fuzzy msgid "Additional rpm output:" msgstr "Ek grıp ayarları" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, fuzzy, c-format msgid "%s remove failed" msgstr "rpm başarısız oldu." -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Tamam" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 #, fuzzy msgid "The package file has incorrect MD5 sum" msgstr "Geri yüklenecek paketler" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 #, fuzzy msgid "The package is not signed" msgstr "Geri yüklenecek paketler" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 #, fuzzy msgid "The package has incorrect signature" msgstr "Geri yüklenecek paketler" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 #, fuzzy msgid "The package archive has incorrect MD5 sum" msgstr "Geri yüklenecek paketler" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" # clients/inst_sw_backup.ycp:260 -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, fuzzy, c-format msgid "created backup %s" msgstr "Yedek oluşturma" @@ -2620,7 +2620,7 @@ msgstr "" # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "Kurulan disk:" @@ -2647,87 +2647,88 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "Bu paket kurulu değildir ve kurulmayacaktır." -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" # clients/inst_sw_single.ycp:742 -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "Yetersiz bağımlılıklar:" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" # clients/online_update_load.ycp:923 -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, fuzzy, c-format msgid "No need to install %s" msgstr "yeniden kurulmalı" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, fuzzy, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%1, %2 ile çakışıyor" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "şu çözülmemiş gereksinimlere sahip:" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." -msgstr "" +#, fuzzy +msgid "Ignore this requirement generally" +msgstr "şu çözülmemiş gereksinimlere sahip:" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "%1, %2 ile çakışıyor" # clients/hwinfo.ycp:66 #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Açılış yapısı" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "%1 dizini zaten listede." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2738,10 +2739,10 @@ msgstr "%1 paketini sil" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "%1, %2 ile çakışıyor" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2751,198 +2752,198 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 #, fuzzy msgid ", Action: " msgstr "Hareket" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" # clients/online_update_details.ycp:88 clients/online_update_select.ycp:112 -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "yama" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "Kurulan disk:" # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "Kurulan disk:" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" # include/scanner/scanner_start.ycp:138 -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, fuzzy, c-format msgid "Skipping %s: already installed" msgstr "Önceden kurulu tarayıcılar kontrol ediliyor" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, fuzzy, c-format msgid "%s is locked and cannot be uninstalled." msgstr "Bu paket kurulu değildir ve kurulmayacaktır." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" # include/ui/common_messages.ycp:95 -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 #, fuzzy msgid " Error!" msgstr "Hata" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 #, fuzzy msgid " Important!" msgstr "Dışarıdan veri al" @@ -2954,8 +2955,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "Eksik paketleri kur" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2965,7 +2967,7 @@ msgstr "%1 paketini kur" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Eksik paketleri kur" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2997,7 +2999,7 @@ msgstr "Saatler" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "%1, %2 ile çakışıyor" #: zypp/CountryCode.cc:135 diff --git a/po/uk.po b/po/uk.po index 0cd90b2..fae635b 100644 --- a/po/uk.po +++ b/po/uk.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.uk\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2006-02-03 22:23-0700\n" "Last-Translator: Ivan Petrouchtchak \n" "Language-Team: Ukrainian \n" @@ -2278,7 +2278,7 @@ msgstr "" msgid "%s install failed" msgstr "Встановлення %s зазнало невдачі" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "Вивід rpm:" @@ -2287,57 +2287,57 @@ msgstr "Вивід rpm:" msgid "%s installed ok" msgstr "%s встановлено без помилок" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "Додатковий вивід rpm:" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "Вилучення %s зазнало невдачі" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "%s вилучено без помилок" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "Гаразд" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "Пакунок не гаразд через наступні причини:" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "Пакунок має версію відмінну від тієї, що очікувалась" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "Неправильна сума MD5 пакунка" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "Пакунок не підписано" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "Пакунок немає суми MD5" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "Пакунок має неправильний підпис" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "Неправильна сума MD5 архіву пакунка" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "Помилка rpm з невідомої причини, див. файл журналу" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "створено резервну копію %s" @@ -2440,7 +2440,7 @@ msgid "Child of" msgstr "Нащадок" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "Неможливо встановити %s" @@ -2471,85 +2471,85 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "%s не встановлений і позначений як такий, що його неможливо встановити" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "Неможливо встановити %s через проблеми залежностей" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s має вимоги, які не задоволенні" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "%s неможливо встановити через відсутні залежності" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "%s неможливо встановити через відсутні залежності" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s задовольняє залежності %s, але його буде прибрано" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "Нема потреби встановлювати %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Неможливо встановити %s, щоб задовольнити залежності %s" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "Неможливо встановити %s, щоб задовольнити залежності %s" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s не буде прибрано, бо його ще потрібно" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "Неможливо встановити %s, бо він конфліктує з %s" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s неможливо встановити через конфлікт з %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "Ігнорування цієї вимоги" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s потрібний для інших пакунків" +msgid "Ignore this requirement generally" +msgstr "Ігнорування цієї вимоги" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "Ігнорується конфлікт %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "Архітектура" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "Каталог %1 вже є в списку." #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2560,10 +2560,10 @@ msgstr "Видалити %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "Вилучення конфліктних потрібних пакунків" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "потребує %s для %s, коли оновлюється %s" @@ -2573,61 +2573,61 @@ msgstr "потребує %s для %s, коли оновлюється %s" msgid "%s is missing the requirement %s" msgstr "%s не задовольняє вимогу %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", Дія: " -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr ", Тригер: " -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "пакунок" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "вибір" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "взірець" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "продукт" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "латка" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "скрипт" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "повідомлення" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "система" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "Потрібні" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "Позначення цієї спроби розв'язання як не чинної." -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" "Позначення потрібного пакета %s як такого, що його неможливо встановити" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " @@ -2635,7 +2635,7 @@ msgid "" msgstr "" "%s заплановано встановити, але це неможливо, бо є проблеми із залежностями." -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" @@ -2643,75 +2643,75 @@ msgstr "" "Неможливо встановити %s, оскільки його вже позначено як такий, що його " "потрібно прибрати" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "Неможливо встановити %s, бо він це не стосується вашої системи." -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, fuzzy, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" "Неможливо встановити %s, оскільки його вже позначено як такий, що його " "потрібно прибрати" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "Це зробить не чинним %s." -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "Встановлення %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "Встановлення %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "Оновлення %s до %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "Пропускається %s: вже встановлено" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "Нема альтернативних встановлених надавачів %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "для %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "Нема надавачів %s, які можна встановити" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "Неможливо оновити до %s, щоб уникнути вилучення %s." -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "%s надає %s, але його заплановано прибрати." -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "%s надає %s, але вже встановлена інша версія цього %s." -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " @@ -2720,17 +2720,17 @@ msgstr "" "%s надає %s, але його неможливо прибрати. Для подробиць спробуйте " "встановити його окремо." -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s надає %s, але він заблокований." -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "Неможливо задовольнити вимогу %s для %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." @@ -2738,39 +2738,39 @@ msgstr "" "%s потрібний для іншого, запланованого для встановлення, потрібного пакунка, " "отже він не буде відв'язаний." -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" "%s потрібний для іншого встановленого потрібного пакунка, отже він не буде " "відв'язаний." -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s заблоковано і його неможливо прибрати." -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "Конфлікт через %s (%s) потребує вилучення встановленого %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" "Позначення %s як такого, що його не можна встановлювати через конфлікт з %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "з %s" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr " Помилка!" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr " Важливе!" @@ -2782,7 +2782,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "Встановлення потрібних пакунків" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2793,7 +2793,7 @@ msgstr "Встановити %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "Встановлення потрібних пакунків" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2824,7 +2824,7 @@ msgstr "Розблокувати %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "Розблокувати ці потрібні пакунки" #: zypp/CountryCode.cc:135 @@ -3897,6 +3897,10 @@ msgstr "Ямайка" msgid "Zimbabwe" msgstr "Зімбабве" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s потрібний для інших пакунків" + #~ msgid "Deleting %s" #~ msgstr "Видалення %s" diff --git a/po/zh.po b/po/zh.po index f8547dc..a668d62 100644 --- a/po/zh.po +++ b/po/zh.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-06-05 18:02+02:00\n" "Last-Translator: Hartmut Pilch \n" "Language-Team: zhongwen \n" @@ -2024,7 +2024,7 @@ msgstr "" msgid "%s install failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "" @@ -2033,57 +2033,57 @@ msgstr "" msgid "%s installed ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "行" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "" @@ -2180,7 +2180,7 @@ msgid "Child of" msgstr "" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, fuzzy, c-format msgid "Cannot install %s" msgstr "安装目的地﹕" @@ -2207,82 +2207,82 @@ msgstr "" msgid "%s is not installed and has been marked as uninstallable" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, c-format msgid "%s has missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 -msgid "Ignore this requirement for all other resolvables." +msgid "Ignore this requirement generally" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2292,10 +2292,11 @@ msgid "delete %s" msgstr "刪除 (&V)" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 -msgid "Delete conflicting resolvables." -msgstr "" +#, fuzzy +msgid "Delete conflicting resolvables" +msgstr "正在安装驅動器..." -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "" @@ -2305,191 +2306,191 @@ msgstr "" msgid "%s is missing the requirement %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, fuzzy, c-format msgid "Establishing %s" msgstr "安装目的地﹕" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, fuzzy, c-format msgid "Installing %s" msgstr "安装目的地﹕" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "" @@ -2500,8 +2501,9 @@ msgid "keep %s" msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 -msgid "Keep missing resolvables." -msgstr "" +#, fuzzy +msgid "Keep missing resolvables" +msgstr "正在安装驅動器..." #: zypp/solver/detail/ProblemSolutionInstall.cc:53 #: zypp/solver/detail/ProblemSolutionInstall.cc:57 @@ -2511,7 +2513,7 @@ msgstr "安装目的地﹕" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "正在安装驅動器..." #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2541,8 +2543,9 @@ msgid "unlock %s" msgstr "" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 -msgid "Unlock these resolvables." -msgstr "" +#, fuzzy +msgid "Unlock these resolvables" +msgstr "正在安装驅動器..." #: zypp/CountryCode.cc:135 msgid "Unknown country: " diff --git a/po/zh_CN.po b/po/zh_CN.po index fcb8542..0fcf8a8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2004-04-02 10:52+0200\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -1958,7 +1958,7 @@ msgstr "" msgid "%s install failed" msgstr "%s 安装失败" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "rpm 输出：" @@ -1967,57 +1967,57 @@ msgstr "rpm 输出：" msgid "%s installed ok" msgstr "%s 安装成功" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "其他 rpm 输出：" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "%s 去除失败" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "%s 去除成功" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "确定" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "包不正确，原因如下：" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "包中含有意外的版本" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "包文件的 MD5 校验和不正确" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "包未经签名" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "包没有 MD5 校验和" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "包的签名不正确" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "包存档的 MD5 校验和不正确" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "rpm 由于未知原因而失败，请查看日志文件" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "已创建备份 %s" @@ -2120,7 +2120,7 @@ msgid "Child of" msgstr "子集" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "无法安装 %s" @@ -2149,85 +2149,85 @@ msgstr "由于上／下所述的问题，此解析将不解析所有依赖性。 msgid "%s is not installed and has been marked as uninstallable" msgstr "%s 未安装，且已被标记为不可安装" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "由于依赖性问题，所以无法安装 %s" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s 具有无法得到满足的需求" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "由于缺少依赖性，所以无法安装 %s" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "由于缺少依赖性，所以无法安装 %s" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s 将实现 %s 的依赖性，但是将会被卸装" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "无需安装 %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "无法安装 %s 以实现 %s 的依赖性" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "无法安装 %s 以实现 %s 的依赖性" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "%s 将不卸装，原因是它仍被需要" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "无法安装 %s，因为它与 %s 冲突" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s 由于与以下对象冲突所以不可卸装： %s" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "正在忽略此需求" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s 对于其它可解析对象是必需的" +msgid "Ignore this requirement generally" +msgstr "正在忽略此需求" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "正在忽略 %s 的冲突" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "正在忽略体系结构" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "正在忽略 %s 已被设置为安装的实事" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2238,10 +2238,10 @@ msgstr "删除 %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "正在去除冲突的可解析对象" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "因为需要 %s（对于 %s）－ 在升级 %s 时" @@ -2251,191 +2251,191 @@ msgstr "因为需要 %s（对于 %s）－ 在升级 %s 时" msgid "%s is missing the requirement %s" msgstr "%s 缺少需求 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "，操作：" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "，触发：" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "包" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "选择" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "模式" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "产品" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "增补" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "脚本" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "讯息" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "系统" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "可解析对象" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "将此解析尝试标记为无效。" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "将可解析的 %s 标记为可卸载" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "已计划安装 %s，但是由于依赖性问题而无法实现。" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "无法安装 %s，这是由于它已被标记为需要卸载" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "无法安装 %s，因为它不适用于此系统。" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "无法安装 %s，因为 %s 已被标记为需要安装" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "这会使 %s 无效。" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "正在建立 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "正在安装 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "正在将 %s 更新为 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "正在跳过 %s：已经安装" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "没有提供备用的已安装 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "对于 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "没有提供可安装的 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "通过升级到 %s 以避免去除 %s 是不可能的。" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "%s 提供了 %s，但是已安排将其卸载。" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "%s 提供了 %s，但是已经安装了该 %s 的另一个版本。" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "%s 提供了 %s，但是它是可卸载的。欲获取更多详细信息，请尝试自动安装它。" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s 提供了 %s，但是它已被锁定。" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "无法满足需求\"%s\"（对于 %s）" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "%s 是其他将安装的可解析对象所需要的，因此不会将其取消链接。" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "%s 是其他已安装的可解析对象所需要的，因此不会将其取消链接。" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s 已锁定，因此无法将其卸装。" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "%s (%s) 上发生冲突，需要去除将安装的 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "将 %s 标记为可卸载，这是由于 %s 上存在冲突" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "发件人 %s" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "错误！" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "重要信息！" @@ -2447,7 +2447,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "正在安装缺少的可解析对象" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2458,7 +2458,7 @@ msgstr "安装 %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "正在安装缺少的可解析对象" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2489,7 +2489,7 @@ msgstr "解除 %s 锁定" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "正在解除这些可解析对象的锁定" #: zypp/CountryCode.cc:135 @@ -3444,6 +3444,10 @@ msgstr "赞比亚" msgid "Zimbabwe" msgstr "津巴布韦" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s 对于其它可解析对象是必需的" + #~ msgid "%s cannot be uninstalled due missing dependencies" #~ msgstr "由于缺少依赖性，所以无法卸装 %s" diff --git a/po/zh_TW.po b/po/zh_TW.po index de8eb4d..f6e7056 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: translation@suse.de\n" -"POT-Creation-Date: 2006-02-14 13:29+0100\n" +"POT-Creation-Date: 2006-02-18 17:25+0100\n" "PO-Revision-Date: 2001-06-05 18:04+02:00\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -1958,7 +1958,7 @@ msgstr "" msgid "%s install failed" msgstr "%s 安裝失敗" -#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1924 +#: zypp/target/rpm/RpmDb.cc:1820 zypp/target/rpm/RpmDb.cc:1926 msgid "rpm output:" msgstr "rpm 輸出：" @@ -1967,57 +1967,57 @@ msgstr "rpm 輸出：" msgid "%s installed ok" msgstr "%s 安裝成功" -#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1929 +#: zypp/target/rpm/RpmDb.cc:1826 zypp/target/rpm/RpmDb.cc:1931 msgid "Additional rpm output:" msgstr "其他 rpm 輸出：" -#: zypp/target/rpm/RpmDb.cc:1923 +#: zypp/target/rpm/RpmDb.cc:1925 #, c-format msgid "%s remove failed" msgstr "%s 移除失敗" -#: zypp/target/rpm/RpmDb.cc:1927 +#: zypp/target/rpm/RpmDb.cc:1929 #, c-format msgid "%s remove ok" msgstr "%s 移除成功" -#: zypp/target/rpm/RpmDb.cc:1943 +#: zypp/target/rpm/RpmDb.cc:1945 msgid "Ok" msgstr "確定" -#: zypp/target/rpm/RpmDb.cc:1946 +#: zypp/target/rpm/RpmDb.cc:1948 msgid "The package is not OK for the following reasons:" msgstr "套件會因下列原因無法使用：" -#: zypp/target/rpm/RpmDb.cc:1952 +#: zypp/target/rpm/RpmDb.cc:1954 msgid "The package contains different version than expected" msgstr "套件包含的版本與所預期的版本不同" -#: zypp/target/rpm/RpmDb.cc:1958 +#: zypp/target/rpm/RpmDb.cc:1960 msgid "The package file has incorrect MD5 sum" msgstr "套件檔案的 MD5 加總程式不正確" -#: zypp/target/rpm/RpmDb.cc:1964 +#: zypp/target/rpm/RpmDb.cc:1966 msgid "The package is not signed" msgstr "套件未簽名" -#: zypp/target/rpm/RpmDb.cc:1970 +#: zypp/target/rpm/RpmDb.cc:1972 msgid "The package has no MD5 sum" msgstr "套件沒有 MD5 加總程式" -#: zypp/target/rpm/RpmDb.cc:1976 +#: zypp/target/rpm/RpmDb.cc:1978 msgid "The package has incorrect signature" msgstr "套件有的簽名不正確" -#: zypp/target/rpm/RpmDb.cc:1982 +#: zypp/target/rpm/RpmDb.cc:1984 msgid "The package archive has incorrect MD5 sum" msgstr "套件歸檔的 MD5 加總程式不正確" -#: zypp/target/rpm/RpmDb.cc:1988 +#: zypp/target/rpm/RpmDb.cc:1990 msgid "rpm failed for unkown reason, see log file" msgstr "rpm 失敗，原因不明，請參閱記錄檔" -#: zypp/target/rpm/RpmDb.cc:2132 +#: zypp/target/rpm/RpmDb.cc:2134 #, c-format msgid "created backup %s" msgstr "已建立備份 %s" @@ -2120,7 +2120,7 @@ msgid "Child of" msgstr "子件屬於" #: zypp/solver/detail/Resolver_problems.cc:233 -#: zypp/solver/detail/Resolver_problems.cc:293 +#: zypp/solver/detail/Resolver_problems.cc:296 #, c-format msgid "Cannot install %s" msgstr "無法安裝 %s" @@ -2149,85 +2149,85 @@ msgstr "因為上/下所描述的問題，導致此解析無法解決所有相 msgid "%s is not installed and has been marked as uninstallable" msgstr "未安裝 %s 且已將其標示為無法安裝" -#: zypp/solver/detail/Resolver_problems.cc:259 +#: zypp/solver/detail/Resolver_problems.cc:262 #, c-format msgid "Cannot install %s due dependency problems" msgstr "因為相依性問題，導致無法安裝 %s" -#: zypp/solver/detail/Resolver_problems.cc:308 +#: zypp/solver/detail/Resolver_problems.cc:311 #, c-format msgid "%s has unfulfiled requirements" msgstr "%s 有無法滿足的需求" -#: zypp/solver/detail/Resolver_problems.cc:346 +#: zypp/solver/detail/Resolver_problems.cc:349 #, fuzzy, c-format msgid "%s has missing dependencies" msgstr "因為缺少相依性，導致無法安裝 %s" -#: zypp/solver/detail/Resolver_problems.cc:384 +#: zypp/solver/detail/Resolver_problems.cc:387 #, c-format msgid "%s cannot be installed due missing dependencies" msgstr "因為缺少相依性，導致無法安裝 %s" -#: zypp/solver/detail/Resolver_problems.cc:406 +#: zypp/solver/detail/Resolver_problems.cc:409 #, c-format msgid "%s fulfil dependencies of %s but will be uninstalled" msgstr "%s 滿足對 %s 的相依，但是將無法解除安裝" -#: zypp/solver/detail/Resolver_problems.cc:416 +#: zypp/solver/detail/Resolver_problems.cc:419 #, c-format msgid "No need to install %s" msgstr "不需要安裝 %s" -#: zypp/solver/detail/Resolver_problems.cc:424 +#: zypp/solver/detail/Resolver_problems.cc:427 #, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "無法安裝 %s 以滿足對於 %s 的相依" -#: zypp/solver/detail/Resolver_problems.cc:434 +#: zypp/solver/detail/Resolver_problems.cc:437 #, c-format msgid "Cannot be install %s to fulfil the dependencies of %s" msgstr "無法安裝 %s 以滿足對於 %s 的相依" -#: zypp/solver/detail/Resolver_problems.cc:458 -#: zypp/solver/detail/Resolver_problems.cc:466 +#: zypp/solver/detail/Resolver_problems.cc:461 +#: zypp/solver/detail/Resolver_problems.cc:469 #, c-format msgid "%s will not be uninstalled cause it is still required" msgstr "不會解除安裝 %s，因為仍需使用它" -#: zypp/solver/detail/Resolver_problems.cc:486 +#: zypp/solver/detail/Resolver_problems.cc:489 #, c-format msgid "Cannot install %s because it is conflicting with %s" msgstr "無法安裝 %s，因為它與 %s 衝突" -#: zypp/solver/detail/Resolver_problems.cc:506 +#: zypp/solver/detail/Resolver_problems.cc:509 #, c-format msgid "%s is uninstallable due conflicts with %s" msgstr "%s 無法解除安裝，因為與 %s 衝突" #: zypp/solver/detail/ProblemSolutionIgnore.cc:54 #, fuzzy -msgid "Ignore this requirement." +msgid "Ignore this requirement just here" msgstr "忽略此需求" #: zypp/solver/detail/ProblemSolutionIgnore.cc:63 #, fuzzy -msgid "Ignore this requirement for all other resolvables." -msgstr "%s 是其他可解析檔的必要項目" +msgid "Ignore this requirement generally" +msgstr "忽略此需求" #: zypp/solver/detail/ProblemSolutionIgnore.cc:77 #, fuzzy, c-format -msgid "Ignore this conflict of %s." +msgid "Ignore this conflict of %s" msgstr "忽略 %s 的衝突" #: zypp/solver/detail/ProblemSolutionIgnore.cc:86 #, fuzzy -msgid "ignore architecture" +msgid "Ignore architecture" msgstr "忽略結構" #: zypp/solver/detail/ProblemSolutionIgnore.cc:96 #, fuzzy, c-format -msgid "Ignore that %s is already set to install." +msgid "Ignore that %s is already set to install" msgstr "忽略 %s 已設定要安裝" #: zypp/solver/detail/ProblemSolutionUninstall.cc:52 @@ -2238,10 +2238,10 @@ msgstr "刪除 %1" #: zypp/solver/detail/ProblemSolutionUninstall.cc:65 #, fuzzy -msgid "Delete conflicting resolvables." +msgid "Delete conflicting resolvables" msgstr "正在移除衝突的可解析檔" -#: zypp/solver/detail/QueueItemRequire.cc:470 +#: zypp/solver/detail/QueueItemRequire.cc:461 #, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "必須具備 %s 的 %s，才能升級 %s" @@ -2251,191 +2251,191 @@ msgstr "必須具備 %s 的 %s，才能升級 %s" msgid "%s is missing the requirement %s" msgstr "%s 缺少需求" -#: zypp/solver/detail/ResolverInfoMisc.cc:60 +#: zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr "，動作：" -#: zypp/solver/detail/ResolverInfoMisc.cc:63 +#: zypp/solver/detail/ResolverInfoMisc.cc:59 msgid ", Trigger: " msgstr "，觸發：" -#: zypp/solver/detail/ResolverInfoMisc.cc:88 +#: zypp/solver/detail/ResolverInfoMisc.cc:84 msgid "package" msgstr "套件" -#: zypp/solver/detail/ResolverInfoMisc.cc:92 +#: zypp/solver/detail/ResolverInfoMisc.cc:88 msgid "selection" msgstr "選項" -#: zypp/solver/detail/ResolverInfoMisc.cc:96 +#: zypp/solver/detail/ResolverInfoMisc.cc:92 msgid "pattern" msgstr "模式" -#: zypp/solver/detail/ResolverInfoMisc.cc:100 +#: zypp/solver/detail/ResolverInfoMisc.cc:96 msgid "product" msgstr "產品" -#: zypp/solver/detail/ResolverInfoMisc.cc:104 +#: zypp/solver/detail/ResolverInfoMisc.cc:100 msgid "patch" msgstr "修補" -#: zypp/solver/detail/ResolverInfoMisc.cc:108 +#: zypp/solver/detail/ResolverInfoMisc.cc:104 msgid "script" msgstr "程序檔" -#: zypp/solver/detail/ResolverInfoMisc.cc:112 +#: zypp/solver/detail/ResolverInfoMisc.cc:108 msgid "message" msgstr "訊息" -#: zypp/solver/detail/ResolverInfoMisc.cc:116 +#: zypp/solver/detail/ResolverInfoMisc.cc:112 msgid "system" msgstr "系統" -#: zypp/solver/detail/ResolverInfoMisc.cc:120 +#: zypp/solver/detail/ResolverInfoMisc.cc:116 msgid "Resolvable" msgstr "可解析檔" -#: zypp/solver/detail/ResolverInfoMisc.cc:138 +#: zypp/solver/detail/ResolverInfoMisc.cc:134 msgid "Marking this resolution attempt as invalid." msgstr "將這項嘗試解析標示為無效。" -#: zypp/solver/detail/ResolverInfoMisc.cc:145 +#: zypp/solver/detail/ResolverInfoMisc.cc:141 #, c-format msgid "Marking resolvable %s as uninstallable" msgstr "將可解析 %s 標示為不可安裝" -#: zypp/solver/detail/ResolverInfoMisc.cc:153 +#: zypp/solver/detail/ResolverInfoMisc.cc:149 #, c-format msgid "" "%s is scheduled to be installed, but this is not possible because of " "dependency problems." msgstr "無法安裝排定的 %s，發生相依性問題。" -#: zypp/solver/detail/ResolverInfoMisc.cc:161 +#: zypp/solver/detail/ResolverInfoMisc.cc:157 #, c-format msgid "" "Can't install %s since it is already marked as needing to be uninstalled" msgstr "無法安裝 %s，已經標示為待解除安裝" -#: zypp/solver/detail/ResolverInfoMisc.cc:173 +#: zypp/solver/detail/ResolverInfoMisc.cc:169 #, c-format msgid "Can't install %s since it is does not apply to this system." msgstr "無法安裝 %s，因為它沒有套用到此系統。" -#: zypp/solver/detail/ResolverInfoMisc.cc:184 +#: zypp/solver/detail/ResolverInfoMisc.cc:180 #, c-format msgid "Can't install %s, since %s is already marked as needing to be installed" msgstr "無法安裝 %s，因為 %s 已經標示為必須安裝" -#: zypp/solver/detail/ResolverInfoMisc.cc:192 +#: zypp/solver/detail/ResolverInfoMisc.cc:188 #, c-format msgid "This would invalidate %s." msgstr "這將會導致 %s 無效。" -#: zypp/solver/detail/ResolverInfoMisc.cc:208 +#: zypp/solver/detail/ResolverInfoMisc.cc:204 #, c-format msgid "Establishing %s" msgstr "正在建立 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:229 +#: zypp/solver/detail/ResolverInfoMisc.cc:225 #, c-format msgid "Installing %s" msgstr "正在安裝 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:246 +#: zypp/solver/detail/ResolverInfoMisc.cc:242 #, c-format msgid "Updating %s to %s" msgstr "正在將 %s 更新為 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:264 +#: zypp/solver/detail/ResolverInfoMisc.cc:260 #, c-format msgid "Skipping %s: already installed" msgstr "正在跳過 %s：已安裝" -#: zypp/solver/detail/ResolverInfoMisc.cc:286 +#: zypp/solver/detail/ResolverInfoMisc.cc:282 #, c-format msgid "There are no alternative installed providers of %s" msgstr "沒有 %s 的其他安裝提供者" -#: zypp/solver/detail/ResolverInfoMisc.cc:292 -#: zypp/solver/detail/ResolverInfoMisc.cc:317 +#: zypp/solver/detail/ResolverInfoMisc.cc:288 +#: zypp/solver/detail/ResolverInfoMisc.cc:313 #, c-format msgid "for %s" msgstr "適用於 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:311 +#: zypp/solver/detail/ResolverInfoMisc.cc:307 #, c-format msgid "There are no installable providers of %s" msgstr "沒有 %s 的可安裝提供者" -#: zypp/solver/detail/ResolverInfoMisc.cc:334 +#: zypp/solver/detail/ResolverInfoMisc.cc:330 #, c-format msgid "Upgrade to %s to avoid removing %s is not possible." msgstr "無法在升級至 %s 時，避免移除 %s。" -#: zypp/solver/detail/ResolverInfoMisc.cc:350 +#: zypp/solver/detail/ResolverInfoMisc.cc:346 #, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "已經排定解除安裝 %s 提供的 %s。" -#: zypp/solver/detail/ResolverInfoMisc.cc:366 +#: zypp/solver/detail/ResolverInfoMisc.cc:362 #, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "%s 會提供 %s，但已安裝 %s 的其他版本。" -#: zypp/solver/detail/ResolverInfoMisc.cc:383 +#: zypp/solver/detail/ResolverInfoMisc.cc:379 #, c-format msgid "" "%s provides %s, but it is uninstallable. Try installing it on its own for " "more details." msgstr "無法安裝 %s 提供的 %s。 嘗試自行安裝，瞭解更多的資訊。" -#: zypp/solver/detail/ResolverInfoMisc.cc:399 +#: zypp/solver/detail/ResolverInfoMisc.cc:395 #, c-format msgid "%s provides %s, but it is locked." msgstr "%s 提供的 %s 被鎖定。" -#: zypp/solver/detail/ResolverInfoMisc.cc:415 +#: zypp/solver/detail/ResolverInfoMisc.cc:411 #, c-format msgid "Can't satisfy requirement %s for %s" msgstr "無法滿足對 %s的 %s 需求" -#: zypp/solver/detail/ResolverInfoMisc.cc:436 +#: zypp/solver/detail/ResolverInfoMisc.cc:432 #, c-format msgid "" "%s is required by other to-be-installed resolvable, so it won't be unlinked." msgstr "其他準備安裝的可解析檔需要 %s，因此不會解除它的連結。" -#: zypp/solver/detail/ResolverInfoMisc.cc:453 +#: zypp/solver/detail/ResolverInfoMisc.cc:449 #, c-format msgid "%s is required by other installed resolvable, so it won't be unlinked." msgstr "其他安裝的可解析需要 %s，無法取消連結。" -#: zypp/solver/detail/ResolverInfoMisc.cc:470 +#: zypp/solver/detail/ResolverInfoMisc.cc:466 #, c-format msgid "%s is locked and cannot be uninstalled." msgstr "已鎖住 %s，您無法解除安裝。" -#: zypp/solver/detail/ResolverInfoMisc.cc:489 +#: zypp/solver/detail/ResolverInfoMisc.cc:485 #, c-format msgid "A conflict over %s (%s) requires the removal of to-be-installed %s" msgstr "%s (%s) 發生衝突，必須移除準備安裝的 %s" -#: zypp/solver/detail/ResolverInfoMisc.cc:507 +#: zypp/solver/detail/ResolverInfoMisc.cc:503 #, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "因為發生 %s 衝突，導致無法將 %s 標示為無法安裝" -#: zypp/solver/detail/ResolverInfoMisc.cc:515 +#: zypp/solver/detail/ResolverInfoMisc.cc:511 #, c-format msgid "from %s" msgstr "自 %s" -#: zypp/solver/detail/ResolverInfo.cc:172 +#: zypp/solver/detail/ResolverInfo.cc:189 msgid " Error!" msgstr "錯誤！" -#: zypp/solver/detail/ResolverInfo.cc:173 +#: zypp/solver/detail/ResolverInfo.cc:190 msgid " Important!" msgstr "重要！" @@ -2447,7 +2447,7 @@ msgstr "" #: zypp/solver/detail/ProblemSolutionKeep.cc:67 #, fuzzy -msgid "Keep missing resolvables." +msgid "Keep missing resolvables" msgstr "正在安裝缺少的可解析檔" #: zypp/solver/detail/ProblemSolutionInstall.cc:53 @@ -2458,7 +2458,7 @@ msgstr "安裝 %1" #: zypp/solver/detail/ProblemSolutionInstall.cc:67 #, fuzzy -msgid "Install missing resolvables." +msgid "Install missing resolvables" msgstr "正在安裝缺少的可解析檔" #: zypp/solver/detail/ResolverInfoDependsOn.cc:55 @@ -2489,7 +2489,7 @@ msgstr "取消鎖住 %s" #: zypp/solver/detail/ProblemSolutionUnlock.cc:61 #, fuzzy -msgid "Unlock these resolvables." +msgid "Unlock these resolvables" msgstr "正在取消鎖住這些可解析檔" #: zypp/CountryCode.cc:135 @@ -3444,6 +3444,10 @@ msgstr "尚比亞" msgid "Zimbabwe" msgstr "辛巴威" +#, fuzzy +#~ msgid "Ignore this requirement for all other resolvables." +#~ msgstr "%s 是其他可解析檔的必要項目" + #~ msgid "%s cannot be uninstalled due missing dependencies" #~ msgstr "因為缺少相依性，導致無法解除安裝 %s" -- 2.7.4