Zypp Commits
Threads by month
- ----- 2024 -----
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
September 2007
- 12 participants
- 325 discussions
[zypp-commit] r7196 - in /trunk/zypper/po: cs.po da.po en_GB.po fi.po hu.po it.po km.po nb.po nl.po pa.po pl.po pt.po ru.po uk.po zh_TW.po
by jkupec@svn.opensuse.org 11 Sep '07
by jkupec@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: jkupec
Date: Tue Sep 11 20:41:01 2007
New Revision: 7196
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7196&view=rev
Log:
- translations update
Modified:
trunk/zypper/po/cs.po
trunk/zypper/po/da.po
trunk/zypper/po/en_GB.po
trunk/zypper/po/fi.po
trunk/zypper/po/hu.po
trunk/zypper/po/it.po
trunk/zypper/po/km.po
trunk/zypper/po/nb.po
trunk/zypper/po/nl.po
trunk/zypper/po/pa.po
trunk/zypper/po/pl.po
trunk/zypper/po/pt.po
trunk/zypper/po/ru.po
trunk/zypper/po/uk.po
trunk/zypper/po/zh_TW.po
Modified: trunk/zypper/po/cs.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/cs.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/cs.po (original)
+++ trunk/zypper/po/cs.po Tue Sep 11 20:41:01 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-09-06 18:49+0200\n"
"Last-Translator: Jakub Hegenbart <jhegenbart(a)suse.cz>\n"
"Language-Team: <cs(a)li.org>\n"
@@ -84,7 +84,7 @@
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "PokraÄovat?"
@@ -103,192 +103,326 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "OvÄÅenà pÅehledu pro soubor %s se nezdaÅilo. OÄekáváno %s, nalezeno %s."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "ProbÃhá inicializace cÃle"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "balÃÄek"
+msgstr[1] "balÃÄek"
+msgstr[2] "balÃÄek"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "výbÄr"
+msgstr[1] "výbÄr"
+msgstr[2] "výbÄr"
+
+#: ../src/zypper-misc.cc:87
+#, fuzzy
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "vzor"
+msgstr[1] "vzor"
+msgstr[2] "vzor"
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "produkt"
+msgstr[1] "produkt"
+msgstr[2] "produkt"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "patch"
+msgstr[1] "patch"
+msgstr[2] "patch"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "skript"
+msgstr[1] "skript"
+msgstr[2] "skript"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "zpráva"
+msgstr[1] "zpráva"
+msgstr[2] "zpráva"
+
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "jazyk: "
+msgstr[1] "jazyk: "
+msgstr[2] "jazyk: "
+
+#: ../src/zypper-misc.cc:99
+#, fuzzy
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "atom"
+msgstr[1] "atom"
+msgstr[2] "atom"
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "systém"
+msgstr[1] "systém"
+msgstr[2] "systém"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "balÃÄek: "
+msgstr[1] "balÃÄek: "
+msgstr[2] "balÃÄek: "
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "Rozhodnuté"
+msgstr[1] "Rozhodnuté"
+msgstr[2] "Rozhodnuté"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Nelze analyzovat schopnost '%s'."
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s '%s' nelze nalézt"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "PÅeskakuji %s '%s' (již nainstalován)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "NepodaÅilo se pÅidat %s do seznamu balÃÄků k instalaci."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "NepodaÅilo se pÅidat '%s' do seznamu balÃÄků k instalaci."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Nenalezeno"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "Problém: "
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " ÅeÅ¡enà %d: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "ÄÃslo, (o)pakovat nebo (z)ruÅ¡it> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "o"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "z"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "Aplikuje se ÅeÅ¡enà %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s problémy:"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "Požadovaná schopnost nebyla nalezena"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "Nic k provedenÃ."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, fuzzy, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "NásledujÃcà balÃky budou aktualizovány:"
+msgstr[1] "NásledujÃcà balÃky budou aktualizovány:"
+msgstr[2] "NásledujÃcà balÃky budou aktualizovány:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, fuzzy, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "NásledujÃcà balÃky budou staženy:"
+msgstr[1] "NásledujÃcà balÃky budou staženy:"
+msgstr[2] "NásledujÃcà balÃky budou staženy:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, fuzzy, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "Budou nainstalovány následujÃcà skupiny:"
+msgstr[1] "Budou nainstalovány následujÃcà skupiny:"
+msgstr[2] "Budou nainstalovány následujÃcà skupiny:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "Velková stahovaná velikost: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Po operaci bude dodateÄnÄ využito %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Po operaci bude uvolnÄno %s."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "ZamÄené položky: %s"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "ZjiÅ¡Å¥uje se stav agregacÃ"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "ProbÃhá ÅeÅ¡enà závislostÃ..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "Vyžadované opravy: %d (bezpeÄnostnà opravy: %d)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Nainstalováno"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Odinstalováno"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Již nepoužitelné"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Nepoužitelné"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Použito"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Nenà tÅeba"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Poškozeno"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Je potÅeba"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "chyba"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Katalog: "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "RepozitáÅ: "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Jméno"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "Verze"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "Kategorie"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Stav"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "Nebyly nalezeny žádné vyžadované opravy."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -296,46 +430,46 @@
"VAROVÃNÃ: Tyto pouze opravy majà vliv na samotný aktualizátor.\n"
"K dispozici jsou také jiné aktualizace.\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "Nebyly nalezeny žádné aktualizace."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Skupina"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "VAROVÃNÃ: %s je interaktivnÃ, pÅeskakuje se."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "potvrzuje se"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
msgid "Problem downloading the package file from the repository:"
msgstr "Problém pÅi stahovánà souboru balÃÄku z repozitáÅe:"
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "NápovÄdu naleznete v uvedené chybové zprávÄ."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -351,63 +485,63 @@
" - použÃt jiné instalaÄnà médium (napÅÃklad pokud je poÅ¡kozeno)\n"
" - použÃt jiný repozitáÅ"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "VAROVÃNÃ: Jedna z nainstalovaných oprav vyžaduje restartovánà poÄÃtaÄe. Restartujte poÄÃtaÄ co nejdÅÃve."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "VAROVÃNÃ: Jedna z nainstalovaných oprav vyžaduje restartovánà poÄÃtaÄe. Restartujte poÄÃtaÄ co nejdÅÃve."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "VAROVÃNÃ: Jedna z nainstalovaných oprav se týká samotného správce balÃÄků. Ten proto musà být pÅed spuÅ¡tÄnÃm dalÅ¡Ãch operacà restartován."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Automatický souhlas s licencà %s %s."
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "Licence %s %s:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Chcete-li nainstalovat tento balÃÄek, musÃte souhlasit s výše uvedenými licenÄnÃmi podmÃnkami. PokraÄovat?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Instalace se pÅeruÅ¡uje, protože je tÅeba potvrdit licence."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Restartujte operaci v interaktivnÃm režimu a potvrÄte souhlas s požadovanými licencemi nebo použijte volbu --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Instalace se pÅeruÅ¡uje, protože uživatel nesouhlasil s licencà %s %s."
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "Instaluje se zdrojový balÃk %s-%s"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Zdrojový balÃk %s-%s byl nainstalován úspÄÅ¡nÄ."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problém pÅi instalaci zdrojového balÃku %s-%s:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "Zdrojový balÃk '%s' nebyl nalezen."
@@ -832,6 +966,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr "Neplatná odpovÄÄ '%s'. Pokud jsou jiné volby odmÃtány, odpovÄzte 'y' mÃsto '%s' nebo 'n' mÃsto '%s'."
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "PÅÃliÅ¡ mnoho argumentů"
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "Osage"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "Neznámá možnost"
@@ -957,7 +1102,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "Jedná se o chybu, uložte, prosÃm, v aplikaci zypper zprávu o chybÄ do souboru."
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "Zadaná adresa URL je neplatná."
@@ -1450,95 +1595,95 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "Ke zmÄnÄ systémových repozitáÅů je tÅeba mÃt oprávnÄnà uživatele root."
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "PÅÃliÅ¡ málo argumentů. Je vyžadována pÅinejmenÅ¡Ãm adresa URL a alias."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "Zadaný typ nenà platný typ repozitáÅe:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Seznam známých typů repozitáÅů zÃskáte pÅÃkazem 'zypper -h' nebo v manuálové stránce programu zypper."
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "Chybà vyžadovaný argument."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "RepozitáŠnebyl pod aliasem nalezen. Pokus o odstranÄnà repozitáÅe podle URL..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "RepozitáŠnebyl pod zadaným aliasem nebo adresou URL nalezen."
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "Alias je vyžadovaný argument."
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "K aktualizaci systémových repozitáÅů je tÅeba mÃt oprávnÄnà uživatele root."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "K instalovánà a odinstalovánà balÃků je tÅeba mÃt oprávnÄnà uživatele root."
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Neznámý typ závislosti: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "VarovánÃ: Nenà definován žádný repozitáÅ. Pracuje se pouze s nainstalovanými závislostmi. Nebude možné provádÄt instalaci."
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "Generuje se test pro ÅeÅ¡itel závislostÃ..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "Test pro ÅeÅ¡itel událostà byl vygenerován úspÄÅ¡nÄ."
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "PÅi vytváÅenà testu pro ÅeÅ¡itel závislostà doÅ¡lo k chybÄ."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "Název zdrojového balÃÄku je vyžadovaný argument."
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "Neznámý typ závislosti"
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "Nebyly nalezeny žádné závislosti."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "SpuÅ¡tÄn jako 'rug', aktualizaci nelze provést metodou nejlepÅ¡Ãho úsilÃ."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "K aktualizaci balÃků je tÅeba mÃt oprávnÄnà uživatele root."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "NeoÄekávaná výjimka."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "Interpret pÅÃkazů programu zypper je již spuÅ¡tÄn."
@@ -1570,12 +1715,12 @@
msgid "Error"
msgstr "Chyba"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Vložte médium [%s] # %d a zadejte 'y' pro pokraÄovánÃ, nebo operaci zruÅ¡te zadánÃm 'n'."
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "Stahuje se: "
@@ -1624,32 +1769,31 @@
msgid "Reading installed packages"
msgstr "NaÄÃtajà se nainstalované balÃky"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "OdstraÅuje se "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "OdstranÄnà %s selhalo:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(s volbou --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(s volbou --nodeps --force) "
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "Instaluje se: %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "Instalace %s selhala:"
@@ -1661,4 +1805,3 @@
#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "RepozitáÅ"
-
Modified: trunk/zypper/po/da.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/da.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/da.po (original)
+++ trunk/zypper/po/da.po Tue Sep 11 20:41:01 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-09-07 14:15+0200\n"
"Last-Translator: Martin Schlander <suse(a)linuxin.dk>\n"
"Language-Team: <opensuse-translation(a)opensuse.org>\n"
@@ -85,7 +85,7 @@
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "Fortsæt?"
@@ -105,194 +105,303 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Oversigts-verifikation mislykkedes for %s. Forventede %s, fandt %s."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "Initialiserer målet"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+msgid "package"
+msgid_plural "packages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:85
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:87
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:89
+msgid "product"
+msgid_plural "product"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:91
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "Beskrivelse: "
+msgstr[1] "Beskrivelse: "
+
+#: ../src/zypper-misc.cc:95
+msgid "message"
+msgid_plural "messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:97
+msgid "language"
+msgid_plural "languages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:99
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:101
+msgid "system"
+msgid_plural "systems"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:103
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] ""
+msgstr[1] ""
+
+#
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "(%s resolvables)"
+msgstr[1] "(%s resolvables)"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Kan ikke kapabilitet '%s'."
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s '%s' blev ikke fundet"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "Springer over %s'%s' (der allerede er installeret)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "Det mislykkedes at tilføje '%s' til listen over pakker der skal installeres."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "Det mislykkedes at tilføje '%s' til listen over pakker der skal slettes."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Ikke fundet"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "Problem: "
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " Løsning %d: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "tal, (f)orsøg igen eller (a)nullér> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "f"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "a"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "Udfører løsning %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s problemer:"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "Angivet kapabilitet ikke fundet"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "Intet at gøre."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "Samlet downloadstørrelse: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Efter transaktionen vil yderligere %s blive brugt."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Efter transaktionen vil %s være frigjort."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "%s elementer er låst"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "Fastslår status af sammenfatninger"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "Løser afhængigheder..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d rettelser nødvendige (%d sikkerhedsrettelser)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Installeret"
#
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Afinstalleret"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Ikke længere anvendelig"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Ikke anvendelig"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Anvendt"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Ikke nødvendig"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Brudt"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Nødvendig"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "fejl"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Katalog: "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Softwarekilde: "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Navn"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "Version"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "Kategori"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Status"
#
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "Ingen nødvendige rettelser fundet."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -301,46 +410,46 @@
"Der er andre tilgængelige også.\n"
#
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "Ingen opdateringer fundet."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Bundt"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arkitektur"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "ADVARSEL: %s er interaktiv, undladt."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "udfører"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
msgid "Problem downloading the package file from the repository:"
msgstr "Problem med download af pakke-filen fra softwarekilden:"
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "Se venligst fejlmeddelelsen ovenfor for at få et vink."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -356,63 +465,63 @@
"- brug et andet installationsmedie ( f.eks. hvis det er beskadiget)\n"
"- brug en anden softwarekilde"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "En af de installerede rettelser kræver genstart af din maskine. Gør det venligst så snart som muligt."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "ADVARSEL: En af de installerede rettelser kræver genstart af din maskine. Gør det venligst så snart som muligt."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "ADVARSEL: En af de installerede rettelser påvirker selve pakkehåndteringen, derfor kræves den genstartet før udførsel af yderligere transaktioner."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Automatisk accept af %s %s licensaftale."
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "%s %s licensaftale:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "For at installere denne pakke, mÃ¥ du acceptere betingelserne for ovenstÃ¥ende licensaftale. Ãnsker du at fortsætte?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Afbryder installationen fordi der kræves licensbekræftelse."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Genstart venligst transaktionen i interaktiv tilstand og bekræft at du er indforstået med påkrævede licensaftale(r), eller anvend valgmuligheden --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Afbryder installationen fordi bruger ikke er indforstået med %s %s licensaftale."
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "Installerer kildepakke %s-%s"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Installation af kildepakke %s-%s gennemført."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problem med installation af kildepakke %s-%s:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "Kildepakken '%s' blev ikke fundet."
@@ -835,6 +944,15 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr "Ugyldigt svar '%s'. Tast 'y' for '%s' eller 'n' for '%s' hvis intet andet virker for dig"
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+msgid "Too many arguments"
+msgstr ""
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+msgid "Usage"
+msgstr ""
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "Ukendt 'valgmulighed "
@@ -962,7 +1080,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "Dette er en fejl. Udfyld venligst en fejlrapport mod zypper."
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "Den givne URL er ugyldig."
@@ -1476,96 +1594,96 @@
" #@@@@@@@@# \n"
" +@@@@#` "
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "Der kræves root-rettigheder for at ændre systemets softwarekilder."
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "For få argumenter. Der kræves mindst URL og alias."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "Den specificerede type er ikke en gyldig type af softwarekilde:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Se 'zypper -h addrepo' eller man zypper for at få en liste over kendte typer af softwarekilder."
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "Krævet argument mangler."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Softwarekilde er ikke fundet ved alias, prøver at slette ved brug af URL..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "Softwarekilde ikke fundet ved givet alias eller URL."
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "Alias er et krævet argument."
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "Der kræves root-rettigheder for at genopfriske systemets softwarekilder."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Der kræves root-rettigheder for at installere eller afinstallere pakker."
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Ukendt resolvable-type: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Advarsel: Ingen softwarekilder defineret. Der anvendes kun installerede resolvables. Det er ikke muligt at installere noget."
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "Genererer solver-test-case..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "Generering af solver-test-case gennemført."
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "Fejl under oprettelse af solver-test-case."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "Kildepakkens navn er et påkrævet argument."
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "Ukendt resolvable-type"
#
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "Ingen resolvables fundet."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Kører som 'rug'. Kan ikke bruge 'så godt som muligt'-tilgang til opdatering."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "Der kræves root-rettigheder for at opdatere pakker."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "Uventet undtagelse."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "Du kører allerede zyppers skal."
@@ -1597,12 +1715,12 @@
msgid "Error"
msgstr "Fejl"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Indsæt venligst mediet [%s] # %d og tast 'j' for at fortsætte eller 'n' for at afbryde operationen."
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "Downloader: "
@@ -1652,32 +1770,31 @@
msgid "Reading installed packages"
msgstr "Læser installerede pakker"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "Fjerner "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "Fjernelse af %s fejlede"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(med --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(med --nodeps --force)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "Installerer: %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "Installation af %s fejlede:"
@@ -1689,4 +1806,3 @@
#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "Softwarekilde"
-
Modified: trunk/zypper/po/en_GB.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/en_GB.po?rev=7196&r1=7…
==============================================================================
--- trunk/zypper/po/en_GB.po (original)
+++ trunk/zypper/po/en_GB.po Tue Sep 11 20:41:01 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-08-19 16:18+0100\n"
"Last-Translator: Benjamin Weber <b.weber(a)warwick.ac.uk>\n"
"Language-Team: <en(a)li.org>\n"
@@ -83,7 +83,7 @@
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "Continue?"
@@ -102,192 +102,310 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Digest verification failed for %s. Expected %s, found %s."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "Initialising Target"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "package"
+msgstr[1] "package"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "selection"
+msgstr[1] "selection"
+
+#: ../src/zypper-misc.cc:87
+#, fuzzy
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "pattern"
+msgstr[1] "pattern"
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "product"
+msgstr[1] "product"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "patch"
+msgstr[1] "patch"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "script"
+msgstr[1] "script"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "message"
+msgstr[1] "message"
+
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "Language"
+msgstr[1] "Language"
+
+#: ../src/zypper-misc.cc:99
+#, fuzzy
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "atom"
+msgstr[1] "atom"
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "system"
+msgstr[1] "system"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "package"
+msgstr[1] "package"
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "Resolvable"
+msgstr[1] "Resolvable"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Cannot parse capability '%s'."
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s '%s' not found"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "skipping %s '%s' (already installed)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "Failed to add '%s' to the list of packages to be installed."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "Failed to add '%s' to the list of packages to be removed."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Not found"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "Problem: "
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " Solution %d: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "number, (r)etry or (c)ancel> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "Applying solution %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s Problems:"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "Specified capability not found"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "Nothing to do."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, fuzzy, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "The following packages will be updated:\n"
+msgstr[1] "The following packages will be updated:\n"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, fuzzy, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "The following packages will be updated:\n"
+msgstr[1] "The following packages will be updated:\n"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, fuzzy, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "The following packages will be installed:\n"
+msgstr[1] "The following packages will be installed:\n"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "Overall download size: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "After the operation, additional %s will be used."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "After the operation, %s will be freed."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "%s items locked"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "Establishing status of aggregates"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "Resolving dependencies..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d patches needed (%d security patches)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Installed"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Uninstalled"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "No Longer Applicable"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Not Applicable"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Applied"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Not Needed"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Broken"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Needed"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "error"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Catalogue: "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Repository: "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Name"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "Version"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "Category"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Status"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "No needed patches found."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -295,47 +413,47 @@
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "No updates found."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Bundle"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "WARNING: %s is interactive, skipped."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "committing"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
#, fuzzy
msgid "Problem downloading the package file from the repository:"
msgstr "Problem downloading files from '%s'."
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "Please, see the above error message to for a hint."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -351,63 +469,63 @@
"- use another installation medium (if e.g. damaged)\n"
"- use another repository"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Automatically agreeing with %s %s licence."
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "%s %s licence:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "In order to install this package, you must agree to terms of the above licence. Continue?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Aborting installation due to the need for licence(s) confirmation."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Please, restart the operation in interactive mode and confirm your agreement with required licence(s), or use the --auto-agree-with-licenses option."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Aborting installation due to user disagreement with %s %s licence."
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "Installing source package %s-%s"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Source package %s-%s successfully installed."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problem installing source package %s-%s:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "Source package '%s' not found."
@@ -831,6 +949,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr ""
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "%s: Too many arguments.\n"
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "Osage"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "Unknown option "
@@ -956,7 +1085,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "This is a bug, please file a bug report against zypper."
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "Given URL is invalid."
@@ -1449,95 +1578,95 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "Root privileges are required for modifying system repositories."
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "Too few arguments. At least URL and alias are required."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "Specified type is not a valid repository type:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "Required argument missing."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Repository not found by alias, trying delete by URL..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "Repository not found by given alias or URL."
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "Alias is a required argument."
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "Root privileges are required for refreshing system repositories."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Root privileges are required for installing or uninstalling packages."
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Unknown resolvable type: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "Generating solver test case..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "Solver test case generated successfully."
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "Error creating the solver test case."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "Source package name is a required argument."
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "Unknown resolvable type "
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "No resolvables found."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Running as 'rug', can't do 'best-effort' approach to update."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "Root privileges are required for updating packages."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "Unexpected exception."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "You already are running zypper's shell."
@@ -1568,12 +1697,12 @@
msgid "Error"
msgstr "Error"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "Downloading: "
@@ -1622,32 +1751,31 @@
msgid "Reading installed packages"
msgstr "Reading installed packages"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "Removing "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "Removal of %s failed:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(with --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(with --nodeps --force)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "Installing: %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "Installation of %s failed:"
Modified: trunk/zypper/po/fi.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/fi.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/fi.po (original)
+++ trunk/zypper/po/fi.po Tue Sep 11 20:41:01 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-08-25 15:22+0300\n"
"Last-Translator: Jyri Palokangas <jmp(a)opensuse.fi>\n"
"Language-Team: Suomi <fi(a)li.org>\n"
@@ -84,7 +84,7 @@
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "Jatketaanko?"
@@ -103,192 +103,310 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "%s koostetarkistus epäonnistui. Odotettiin %s, saatiin %s."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "Alustetaan kohdetta"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "paketti"
+msgstr[1] "paketti"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "esivalinta"
+msgstr[1] "esivalinta"
+
+#: ../src/zypper-misc.cc:87
+#, fuzzy
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "käyttötarkoitus"
+msgstr[1] "käyttötarkoitus"
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "tuote"
+msgstr[1] "tuote"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "korjaa"
+msgstr[1] "korjaa"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "komentojono"
+msgstr[1] "komentojono"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "sanoma"
+msgstr[1] "sanoma"
+
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "kieli: "
+msgstr[1] "kieli: "
+
+#: ../src/zypper-misc.cc:99
+#, fuzzy
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "atomi"
+msgstr[1] "atomi"
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "järjestelmä"
+msgstr[1] "järjestelmä"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "paketti: "
+msgstr[1] "paketti: "
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "Resolvable"
+msgstr[1] "Resolvable"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Ei voitu koostaa päiväystä '%s'."
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s '%s' Ei löytynyt"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "Ohitettiin %s '%s' (on jo asennettu)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "Kohteen '%s' merkitseminen asennettavaksi epäonnistui."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "Kohteen '%s' merkitseminen poistettavaksi epäonnistui."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Ei löytynyt"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "Ongelma: "
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " Ratkaisu %d: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "numero, y(r)itä uudelleen tai k(e)skeytä> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "e"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "Ratkaistaan %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s ongelmat:"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "Annettua määritystä ei löydetty"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "Ei mitään tehtävää."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, fuzzy, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "Seuraavat paketit päivitetään:"
+msgstr[1] "Seuraavat paketit päivitetään:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, fuzzy, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "Seuraavat paketit ladataan:"
+msgstr[1] "Seuraavat paketit ladataan:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, fuzzy, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "Seuraavat pakettiniput asennetaan:"
+msgstr[1] "Seuraavat pakettiniput asennetaan:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "Ladattava määrä yhteensä: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Operaation jälkeen tilaa on %s vähemmän."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Operaation jälkeen tilaa on %s enemmän."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "%s kohdetta lukittu"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "Muodostetaan yhdistettyjen kohteiden tiloja"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "Ratkaistaan riippuvuuksia..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d paikkausta (%d tietoturvapaikkausta)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Asennettu"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Poistettiin"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Ei enää käyttökelpoinen"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Ei käyttökelpoinen"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Käytettiin"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Ei tarvita"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Rikki"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Tarvitaan"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "virhe"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Luettelo: "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Asennuslähde: "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Nimi"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "Versio"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "Luokka"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Tila"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "Ei löydetty paikattavaa."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -296,47 +414,47 @@
"VAROITUS: Nämä ovat ainoastaan itse päivitystoimintoon vaikuttavia päivityksiä.\n"
"Myös muita päivityksiä on saatavilla.\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "Ei päivitettävää."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "T"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Nippu"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arkkitehtuuri"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "VAROITUS: %s on vuorovaikutteinen, ohitetaan."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "suoritetaan"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
#, fuzzy
msgid "Problem downloading the package file from the repository:"
msgstr "Ongelma ladattaessa tietoja kohteesta '%s'."
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "Tarkista ylläoleva virheviesti."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -352,63 +470,63 @@
"- käytä jotakin toista tietovälinettä (nykyinen voi olla esim. vaurioitunut)\n"
"- käytä jotakin toista asennuslähdettä"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Jokin asennetuista päivityksistä edellyttää tietokoneen uudelleenkäynnistämistä. Käynnistä tietokone uudelleen mahdollisimman pian."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "VAROITUS: Jokin asennetuista päivityksistä edellyttää tietokoneen uudelleenkäynnistämistä. Käynnistä tietokone uudelleen mahdollisimman pian."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "VAROITUS: Jokin asennetuista korjauksista vaikuttaa itse paketinhallintasovellukseen. Tästä syystä paketinhallintasovellus on käynnistettävä uudelleen ennen seuraavien toimintojen tekemistä."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "%s %s lisenssi hyväksyttiin automaattisesti."
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "%s %s käyttöoikeussopimus:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Tämän paketin asentaminen edellyttää, että hyväksyt yllä olevan käyttöoikeussopimuksen ehdot. Haluatko jatkaa?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Keskeytetään asennus, koska jokin paketti vaatii käyttöoikeussopimuksen vahvistamista."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Käynnistä toiminto vuorovaikutteisessa tilassa ja vahvista tarvittavien käyttöoikeussopimusten hyväksyminen, tai käytä --auto-agree-with-licences -valintaa."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Keskeytetään asennus, koska käyttäjä ei hyväksynyt %s %s käyttöoikeussopimusta."
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "Asennetaan lähdekoodipaketti %s-%s"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Lähdekoodipaketti %s-%s asennettiin onnistuneesti."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Virhe asennettaessa lähdekoodipakettia %s-%s:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "Lähdekoodipakettia '%s' ei löydetty."
@@ -833,6 +951,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr ""
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "Liian monta argumenttia."
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "osage"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "Virheellinen valinta "
@@ -958,7 +1087,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "Tämä on ohjelmavirhe. Tee ilmoitus zypper-ohjelmavirheestä."
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "Verkko-osoite ei kelpaa."
@@ -1444,95 +1573,95 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "Järjestelmän asennuslähteiden muokkaaminen vaatii pääkäyttäjän oikeudet."
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "Liian vähän valintoja. Määrittele vähintään URL-osoite ja alias."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "Virheellinen asennuslähteen tyyppi:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Tarkista 'zypper -h addrepo' tai 'man zypper' saadaksesi listan tunnetuista asennuslähteen tyypeistä"
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "Tarvittava valinta puuttuu."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Aliaksella määriteltyä asennuslähdettä ei löydy. Kokeile poistaa URL-osoitteen perusteella."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "Määriteltyä asennuslähdettä ei löydy."
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "Alias on pakollinen valinta."
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "Järjestelmän asennuslähteiden päivittämiseen vaaditaan pääkäyttäjän oikeudet."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Pakettien asentamiseen tai poistamiseen vaaditaan pääkäyttäjän oikeudet."
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Tuntematon tyyppi: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Varoitus: Asennuslähteitä ei ole määritelty. Käytetään ainoastaan asennettuja osia. Mitään ei voida asentaa."
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "Luodaan asennuslähteen ratkaisintestiä..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "Ratkaisintesti luotiin onnistuneesti."
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "Virhe ratkaisintestin luonnissa."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "Lähdekoodipaketin nimi on pakollinen valinta"
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "Tuntematon tyyppi "
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "Ei löytynyt."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "'best-effort'-ratkaisumalli ei ole käytettävissä rug-yhteensopivuustilassa."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "Pakettien päivittämiseen vaaditaan pääkäyttäjän oikeudet."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "Odottamaton poikkeus."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "Olet jo zypperin komentokehoitteessa."
@@ -1564,12 +1693,12 @@
msgid "Error"
msgstr "Virhe"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Aseta media [%s] # %d ja kirjoita 'k' jatkaaksesi tai 'e' peruuttaaksesi toiminnon."
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "Ladataan: "
@@ -1618,32 +1747,31 @@
msgid "Reading installed packages"
msgstr "Luetaan asennettuja paketteja"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "Poistetaan "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "%s poisto epäonnistui:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(--nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(--nodeps --force)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "Asennetaan %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "%s asennus epäonnistui:"
Modified: trunk/zypper/po/hu.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/hu.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/hu.po (original)
+++ trunk/zypper/po/hu.po Tue Sep 11 20:41:01 2007
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: zypper.hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-09-07 09:18+0200\n"
"Last-Translator: Kalman Kemenczy <kkemenczy(a)novell.com>\n"
"Language-Team: <hu(a)li.org>\n"
@@ -86,7 +86,7 @@
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "Folytatja?"
@@ -105,195 +105,313 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "A kivonatellenÅrzés meghiúsult ehhez: %s. A várt %s helyett a kapott érték: %s."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "Cél inicializálása"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "csomag"
+msgstr[1] "csomag"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "kiválasztás"
+msgstr[1] "kiválasztás"
+
+#: ../src/zypper-misc.cc:87
+#, fuzzy
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "minta"
+msgstr[1] "minta"
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "termék"
+msgstr[1] "termék"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "javÃtás"
+msgstr[1] "javÃtás"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "parancsfájl"
+msgstr[1] "parancsfájl"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "üzenet"
+msgstr[1] "üzenet"
+
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "nyelv: "
+msgstr[1] "nyelv: "
+
+#: ../src/zypper-misc.cc:99
+#, fuzzy
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "atom"
+msgstr[1] "atom"
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "rendszer"
+msgstr[1] "rendszer"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "csomag: "
+msgstr[1] "csomag: "
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "Feloldható"
+msgstr[1] "Feloldható"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "A képesség feldolgozása sikertelen: %s."
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "A(z) %s '%s' nem található"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "a(z) %s '%s' kihagyása (már telepÃtve van)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "\"%s\" hozzáadása a telepÃtendÅ alkalmazások listájához meghiúsult."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "\"%s\" hozzáadása az eltávolÃtandó alkalmazások listájához meghiúsult."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Nem található"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "Problém: "
# /tmp/intro:68 /tmp/xapi:465
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " %d. megoldás: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "darab, új(r)a vagy (m)égsem> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "m"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "Megoldás végrehajtása %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s Problémák:"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "A megadott képesség nem található"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "Nincs teendÅ."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, fuzzy, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "Az alábbi csomagok kerülnek frissÃtésre:"
+msgstr[1] "Az alábbi csomagok kerülnek frissÃtésre:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, fuzzy, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "Az alábbi csomagok kerülnek letöltésre:"
+msgstr[1] "Az alábbi csomagok kerülnek letöltésre:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, fuzzy, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "A következÅ kötegek kerülnek telepÃtésre:"
+msgstr[1] "A következÅ kötegek kerülnek telepÃtésre:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "Letöltés mérete: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "A művelet után további %s kerül felhasználásra."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "A művelet után további %s szabadul fel."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "%s elem zárolt"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "Gyűjtemények állapotának kialakÃtása"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "FüggÅségek feloldása..."
# modules/inst_config_x11.ycp:216
# /usr/lib/YaST2/clients/inst_config_x11.ycp:865
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d frissÃtés szükséges (%d biztonsági frissÃtés)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "TelepÃtve"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "EltávolÃtva"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "A továbbiakban nem érvényes"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Nem alkalmazható"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Alkalmazva"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Nem szükséges"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Hibás"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Szükséges"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "hiba"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Katalógus: "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "TelepÃtési forrás: "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Név"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "Verzió"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "Kategória"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Ãllapot"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "Nem találhatók frissÃtések."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -301,46 +419,46 @@
"FIGYELMEZTETÃS: Ezek a frissÃtések csak a frissÃtÅt érintik.\n"
"Ezen kÃvül mások is elérhetÅk.\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "Nem találhatók frissÃtések."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Köteg"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Architektúra"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "FIGYELMEZTETÃS: %s interaktÃv, kihagyva."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "véglegesÃtés"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
msgid "Problem downloading the package file from the repository:"
msgstr "Hiba történt az adatok letöltésekor a következÅ telepÃtési forrásról:"
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "Tekintse meg a fent található hibaüzenetet."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -356,63 +474,63 @@
" - használjon másik telepÃtÅ adathordozót (ha az sérült)\n"
" - használjon másik telepÃtési forrást"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "A telepÃtett frissÃtések egyike a számÃtógép újraindÃtását igényli. Ezt amint lehet, tegye meg."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "FIGYELMEZTETÃS: A telepÃtett frissÃtések egyike a számÃtógép újraindÃtását igényli. Ezt amint lehet, tegye meg."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "FIGYELMEZTETÃS: A telepÃtett frissÃtések egyike magát a csomagkezelÅt érinti, Ãgy az az új műveletek végrehajtása elÅtt újraindÃtást igényel."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "A(z) %s %s licencének automatikus elfogadása."
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "%s %s licenc:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "A csomag telepÃtése érdekében el kell fogadnia a fenti licenc feltételeit. Folytatja?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "A telepÃtés megszakÃtva a licencek elfogadásának szükségessége miatt."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "IndÃtsa újra a folyamatot interaktÃv módban és fogadja el a szükséges licenceket, vagy használja az '--auto-agree-with-licenses' kapcsolót."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "TelepÃtés megszakÃtva a felhasználó a %s %s licencekkel való egyet nem értése miatt."
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "A(z) %s-%s forráscsomag telepÃtése"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "A(z) %s-%s forráscsomag telepÃtése sikeresen befejezÅdött."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Hiba történt a(z) %s-%s forráscsomag telepÃtése közben:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "A(z) %s forráscsomag nem található."
@@ -833,6 +951,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr "Hibás válasz: '%s'. Válassza az 'y'-t az '%s'-hez vagy az 'n'-t a '%s'-hez."
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "Túl sok paraméter."
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "osage"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "Ismeretlen kapcsoló: "
@@ -959,7 +1088,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "Ez hiba, küldjön errÅl egy hibajelentést a zypper fejlesztÅinek."
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "A megadott URL érvénytelen."
@@ -1451,95 +1580,95 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "A rendszer forrásainak módosÃtásához root jogosultság szükséges."
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "Kevés paraméter. Az URL és az álnév megadása szükséges."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "A megadott tÃpus nem érvényes telepÃtési forrástÃpus:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Az ismert telepÃtési forrás tÃpusainak listázásához használja a 'zypper -h addrepo' vagy a man zypper parancsot."
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "Szükséges paraméter hiányzik."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "A megadott álnév alapján nem található telepÃtési forrás, kÃsérlet a törlésre az URL alapján..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "A megadott álnéven vagy URL-en nem található telepÃtési forrás."
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "Az álnév megadása szükséges."
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "A rendszer telepÃtÅ forrásainak frissÃtéséhez root jogosultság szükséges."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "A csomagok telepÃtéséhez és eltávolÃtásához root jogosultság szükséges."
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Ismeretlen feloldható tÃpus: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Figyelem: Nincsenek források. Csak a telepÃtett feloldhatókkal lehet dolgozni. Semmi sem telepÃthetÅ."
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "Feloldási tesztesét létrehozása..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "A feloldási teszteset sikeresen létrejött."
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "A feloldási teszteset létrehozása sikertelen."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "A forráscsomag nevének megadása szükséges."
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "Ismeretlen feloldható tÃpus: "
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "Nem található feloldandó."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "A 'rug' futtatásával nem alkalmazható a 'best-effort'."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "A csomagok frissÃtéséhez root jogosultság szükséges."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "Váratlan kivétel."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "A zypper shell már fut."
@@ -1571,12 +1700,12 @@
msgid "Error"
msgstr "Hiba"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Tegye be a(z) [%s] # %d adathordozót és nyomja meg a folytatáshoz az 'i', a megszakÃtáshoz az 'n' billentyűt."
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "Letöltés: "
@@ -1625,33 +1754,32 @@
msgid "Reading installed packages"
msgstr "TelepÃtett csomagok beolvasása"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "EltávolÃtás "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "%s eltávolÃtása meghiúsult:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(--nodeps használatával)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(--nodeps --force használatával)"
# modules/inst_target_part.ycp:676
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "%s-%s telepÃtése"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "%s telepÃtése meghiúsult:"
@@ -1663,4 +1791,3 @@
#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "TelepÃtési forrás"
-
Modified: trunk/zypper/po/it.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/it.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/it.po (original)
+++ trunk/zypper/po/it.po Tue Sep 11 20:41:01 2007
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
-"PO-Revision-Date: 2007-09-06 19:40+0100\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
+"PO-Revision-Date: 2007-09-11 13:57+0100\n"
"Last-Translator: Alberto Passalacqua <alberto.passalacqua(a)tin.it>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
"MIME-Version: 1.0\n"
@@ -87,7 +87,7 @@
#: ../src/zypper-keyring-callbacks.h:136
#: ../src/zypper-keyring-callbacks.h:144
#: ../src/zypper-keyring-callbacks.h:163
-#: ../src/zypper-misc.cc:1371
+#: ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "Continuare?"
@@ -106,184 +106,291 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Verifica del sommario fallita per %s. Era atteso %s, è stato trovato %s."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "Inizializzazione della destinazione in corso"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "pacchetto"
+msgstr[1] "pacchetti"
+
+#: ../src/zypper-misc.cc:85
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "selezione"
+msgstr[1] "selezioni"
+
+#: ../src/zypper-misc.cc:87
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "modello"
+msgstr[1] "modelli"
+
+#: ../src/zypper-misc.cc:89
+msgid "product"
+msgid_plural "product"
+msgstr[0] "prodotto"
+msgstr[1] "prodotti"
+
+#: ../src/zypper-misc.cc:91
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "patch"
+msgstr[1] "patch"
+
+#: ../src/zypper-misc.cc:93
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "script"
+msgstr[1] "script"
+
+#: ../src/zypper-misc.cc:95
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "messaggio"
+msgstr[1] "messaggi"
+
+#: ../src/zypper-misc.cc:97
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "lingua"
+msgstr[1] "lingue"
+
+#: ../src/zypper-misc.cc:99
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "atomo"
+msgstr[1] "atomi"
+
+#: ../src/zypper-misc.cc:101
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "sistema"
+msgstr[1] "sistemi"
+
+#: ../src/zypper-misc.cc:103
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "pacchetto src"
+msgstr[1] "pacchetti src"
+
+#. default
+#: ../src/zypper-misc.cc:105
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "Risolubile"
+msgstr[1] "Risolubili"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Impossibile analizzare sintatticamente la capacità '%s'."
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s '%s' non trovato"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "Esclusione di %s '%s' (già installato)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "Impossibile aggiungere '%s' allâelenco dei pacchetti da installare."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "Impossibile aggiungere '%s' allâelenco dei pacchetti da installare."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355
+#: ../src/zypper-misc.cc:356
#: ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Non trovato"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422
+#: ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "Problema:"
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr "Soluzione %d:"
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "numero, (r)iprova o (c)ancella>"
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "Applicazione della soluzione %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s Problemi:"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "La capacità specificata non è stata trovata"
-#: ../src/zypper-misc.cc:621
-#: ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637
+#: ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "Nessuna operazione da eseguire."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "Il %s seguente sarà aggiornato:"
+msgstr[1] "I %s seguenti saranno aggiornati:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "Il %s pacchetto sarà scaricato:"
+msgstr[1] "I %s seguenti saranno scaricati:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "Il seguente NUOVO %s sarà installato:"
+msgstr[1] "I seguenti NUOVI %s saranno installati:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] "Il %s seguente sarà RIMOSSO:"
+msgstr[1] "I %s seguenti saranno RIMOSSI:"
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "Dimensione complessiva del download: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Dopo l'operazione, sarà utilizzato %s addizionale."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Dopo l'operazione saranno liberati %s."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "elementi %s bloccati"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "Definizione dello stato dei componenti aggregati"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "Risoluzione delle dipendenze in corsoâ¦"
# TLABEL modules/inst_config_x11.ycp:578
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d patch richieste (%d patch di sicurezza)"
-#: ../src/zypper-misc.cc:840
+#: ../src/zypper-misc.cc:871
#: ../src/zypper-info.cc:148
msgid "Installed"
msgstr "installato"
-#: ../src/zypper-misc.cc:840
+#: ../src/zypper-misc.cc:871
#: ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "disinstallato"
-#: ../src/zypper-misc.cc:842
+#: ../src/zypper-misc.cc:873
#: ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Non più applicabile"
-#: ../src/zypper-misc.cc:842
+#: ../src/zypper-misc.cc:873
#: ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Non applicabile"
-#: ../src/zypper-misc.cc:844
+#: ../src/zypper-misc.cc:875
#: ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Applicato"
-#: ../src/zypper-misc.cc:844
+#: ../src/zypper-misc.cc:875
#: ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Non necessario"
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:877
#: ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Danneggiato"
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:877
#: ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Necessario"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "errore"
-#: ../src/zypper-misc.cc:877
-#: ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146
+#: ../src/zypper-misc.cc:908
+#: ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177
#: ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Catalogo:"
-#: ../src/zypper-misc.cc:877
-#: ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146
+#: ../src/zypper-misc.cc:908
+#: ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177
#: ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Sorgente di installazione:"
-#: ../src/zypper-misc.cc:878
-#: ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152
+#: ../src/zypper-misc.cc:909
+#: ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183
#: ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357
#: ../src/zypper-search.h:299
@@ -291,29 +398,29 @@
msgstr "Nome"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878
-#: ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154
+#: ../src/zypper-misc.cc:909
+#: ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185
#: ../src/zypper-search.h:299
msgid "Version"
msgstr "Versione"
-#: ../src/zypper-misc.cc:878
-#: ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909
+#: ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "Categoria"
-#: ../src/zypper-misc.cc:878
-#: ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909
+#: ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Stato"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "Nessuna patch necessaria trovata."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -321,25 +428,25 @@
"AVVISO: questi aggiornamenti riguardano solo il programma di aggiornamento.\n"
"Sono tuttavia disponibili anche altri aggiornamenti.\n"
-#: ../src/zypper-misc.cc:1042
-#: ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073
+#: ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "Nessun aggiornamento trovato."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144
+#: ../src/zypper-misc.cc:1175
#: ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149
+#: ../src/zypper-misc.cc:1180
#: ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Pacchetto"
-#: ../src/zypper-misc.cc:1154
+#: ../src/zypper-misc.cc:1185
#: ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch."
@@ -347,26 +454,26 @@
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "AVVISO: %s è interattivo e verrà ignorato."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "commit"
# TLABEL modules/inst_config_x11.ycp:578
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
msgid "Problem downloading the package file from the repository:"
msgstr "Si è verificato un problema scaricando il file del pacchetto dalla sorgente di installazione:"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1422
#: ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "Per favore, vedere il messaggio di errore precedente per un suggerimento."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -382,63 +489,63 @@
" â utilizzare un altro supporto di installazione (se ad es. quello in uso è danneggiato)\n"
" â utilizzare unâaltra sorgente di installazione"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Una delle patch installate richiede di riavviare il computer. Riavviarlo il più presto possibile."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "ATTENZIONE: Una delle patch installate richiede di riavviare il computer. Riavviarlo il più presto possibile."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "ATTENZIONE: una delle patch installate riguarda il gestore pacchetti. Pertanto, è necessario riavviarlo prima di eseguire le operazioni successive."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Accetta automaticamente la licenza di %s %s."
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "%s %s licenza:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Per installare questo pacchetto, è necessario accettare i termini del contratto di licenza. Continuare?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Installazione interrotta a causa della necessità di conferma di una o più licenze."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Per favore, riavviare l'operazione in modalità interattiva e conferma l'accettazione delle licenze richieste, oppure usa l'opzione --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Interruzione dellâinstallazione a causa di un disaccordo dellâutente con la licenza %s %s."
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "Installazione dei pacchetti sorgente %s-%s"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Il pacchetto sorgente %s-%s è stato installato con successo."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Si è verificato un problema durante l'installazione del pacchetto sorgente %s-%s:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "Pacchetto sorgente '%s' non trovato."
@@ -880,6 +987,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr "Risposta non valida '%s'. Inserire 'y' per '%s' o 'n' per '%s' se null'altro funziona"
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+msgid "Too many arguments"
+msgstr "Troppi argomenti"
+
+#: ../src/zypper-callbacks.cc:223
+#: ../src/zypper.cc:888
+#: ../src/zypper.cc:1475
+msgid "Usage"
+msgstr "Uso"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "Opzione sconosciuta"
@@ -1014,7 +1132,7 @@
msgstr "Questo è un bug. Compilare un rapporto relativo ai bug in zypper."
#: ../src/zypper.cc:76
-#: ../src/zypper.cc:899
+#: ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "L'URL fornito non è valido."
@@ -1527,103 +1645,104 @@
" +@@@@#` "
#: ../src/zypper.cc:795
-#: ../src/zypper.cc:873
-#: ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:880
+#: ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "Per modificare le sorgenti di installazione del sistema sono necessari i privilegi di utente root."
-#: ../src/zypper.cc:822
-#: ../src/zypper.cc:950
+#: ../src/zypper.cc:829
+#: ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "Troppi pochi argomento. E' necessario inserire almeno l'URL e l'alias."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "Il tipo specificato non è un tipo valido di sorgente di installazione:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Vedere 'zypper -h addrepo' o 'man zypper' per ottenere una lista dei tipi conosciuti di sorgente di installazione."
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886
+#: ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "Mancano degli argomenti richiesti."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Sorgente di installazione non trovata tramite l'alias, tentativo di rimozione in corso tramite URL..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "Sorgente di installazione non trovata tramite l'alias o l'URL."
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "L'alias è un argomento richiesto."
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "Per aggiornare le sorgenti di installazione del sistema sono necessari i privilegi dell'utente root."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Per visualizzare le origini del sistema sono necessari i privilegi dell'utente root."
-#: ../src/zypper.cc:1063
-#: ../src/zypper.cc:1282
-#: ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091
+#: ../src/zypper.cc:1334
+#: ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Tipo di risolubile sconosciuto: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Attenzione: Nessuna sorgente di installazione definita. Si opererà solo con i risolubili installati. Nulla potrà essere installato."
-#: ../src/zypper.cc:1101
-#: ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129
+#: ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "Generazione del caso di prova del risolutore..."
-#: ../src/zypper.cc:1103
-#: ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131
+#: ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "Generazione del caso di prova del risolutore avvenuta con successo."
-#: ../src/zypper.cc:1106
-#: ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134
+#: ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "Errore durante la creazione del caso di prova per il risolutore."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "Il nome del pacchetto sorgente è richiesto come parametro."
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "Tipo di risolvibile sconosciuto"
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "Nessun risolubile trovato."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292
-#: ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344
+#: ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Esecuzione in emulazione 'rug', impossibile utilizzare il metodo 'best-effort' per l'aggiornamento."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "Per aggiornare i pacchetti sono necessari i privilegi dell'utente root."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "Eccezione imprevista."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "Zypper è già in esecuzione in una shell."
@@ -1655,13 +1774,13 @@
msgid "Error"
msgstr "Errore"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Per favore, inserire il supporto [%s] # %d e premere 's' per continuare o 'n' per annullare l'operazione."
-#: ../src/zypper-media-callbacks.h:76
-#: ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77
+#: ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "Download:"
@@ -1712,35 +1831,34 @@
msgid "Reading installed packages"
msgstr "Lettura dei pacchetti installati"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140
-#: ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142
+#: ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "Rimozione"
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "Rimozione di %s fallita:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(con --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(con --nodeps --force)"
# TLABEL modules/inst_target_part.ycp:680
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181
-#: ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184
+#: ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "Installazione di: %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "Installazione di %s fallita:"
Modified: trunk/zypper/po/km.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/km.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/km.po (original)
+++ trunk/zypper/po/km.po Tue Sep 11 20:41:01 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypper.km\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-09-07 08:58+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n"
"Language-Team: Khmer <support(a)khmeros.info>\n"
@@ -83,7 +83,7 @@
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "áááá ?"
@@ -102,192 +102,310 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "áá¶áâááááááááá¶ááâáá¶áâáááá¹ááááá¼áââá¢áááááâááááááâáá¶áâááá¶áááâááááá¶áá %s á %s áááâáááá¹áâáá»á ááâáá¾á %s á"
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "á
á¶áááááá¾áâááááá
"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "áááá
áá"
+msgstr[1] "áááá
áá"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "áá¶ááááá¾áâáá¾á"
+msgstr[1] "áá¶ááááá¾áâáá¾á"
+
+#: ../src/zypper-misc.cc:87
+#, fuzzy
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "áááá¶á"
+msgstr[1] "áááá¶á"
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "ááá·ááá"
+msgstr[1] "ááá·ááá"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "áááá"
+msgstr[1] "áááá"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "áááááá¸á"
+msgstr[1] "áááááá¸á"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "áá¶á"
+msgstr[1] "áá¶á"
+
+# label for language selection
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "áá¶áá¶"
+msgstr[1] "áá¶áá¶"
+
+#: ../src/zypper-misc.cc:99
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "áááááááá"
+msgstr[1] "áááááááá"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "áááá
áá"
+msgstr[1] "áááá
áá"
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "áááá
ááâááááááá¶á"
+msgstr[1] "áááá
ááâááááááá¶á"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "áá·áâá¢á¶á
âáááâáá¶áâáááááᶠ'%s' á"
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "ááâáá·áâáá¾á %s '%s'"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "áááá %s '%s' (áá¶áâááá¡á¾áâáá½á
âá á¾á)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "ááá¶áááâáááá»ááá¶áâáááááá '%s' áá
áá¶ááâááááá¸âáááá
áá áááâáááá¼áâááá¡á¾á á"
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "áá¶áâááá¶áááâáááá»áâáá¶âááááááá '%s' áá
âáá¶ááâááááá¸âááááâáááá
ááâáááâáááá¼áâááâá
áá á"
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "ááâáá·ááá¾á"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "áááá á¶Â á "
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " ááááááááá¶á %d á "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "ááá áááá¶áá¶(á)âááááááá á¬âááá(á)áá> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "á"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "á"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "áááá»áâá¢áá»ááááâááááááááá¶á %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s áááá á¶Â á"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "ááâáá·áááâáá¶áâáááááá¶âáááâáá¶áâááááá¶áá"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "áááá¶áâá¢ááá¸âáááá¼áâáááá¾Â á"
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "ááá áâáá¶áááâááá»á á %s á"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "ááááá¶ááâáá¸âááááá·ááááá·áá¶á %s ááááááâáá¹áâáááá¼áâáá¶áâáááá¾Â á"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "ááááá¶ááâáá¸âááááá·ááááá·áá¶á %s áá¹áâááááá á"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "áá¶áá» %s áá¶áááá"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "ááááá¾áâáááá¶ááá¶áâááâáá¶áâáááá»á"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "áááá»áâááááááá¶áâáá¶áâá¢á¶ááááá..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "áááá¼áâáá¶áâáááá %d (%d ááááâáá»ááááá·áá¶á)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "áá¶áâááá¡á¾á"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "áá¶áâáá»á"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "áá·áá¢áá»ááááâáá¶áâáááâáá"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "áá·áâá¢áá»ááááâáá¶á"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "áá¶áâá¢áá»áááá"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "áá·áâáááá¼ááá¶á"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "áá¼á
"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "áááá¼ááá¶á"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "ááá á»á"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "áá¶áá¶á¡á»á á "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "áááá¶áá á "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "ááááá"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "áááá"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "áááááá"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "áááá¶ááá¶á"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "ááâáá·áâáá¾áâááááâáááâáááá¼ááá¶á á"
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -295,46 +413,46 @@
"ááááá¶á á áá¶áááááâáá¶âáá¶áâáá¶áááááâáááâááááá¶ááâáááâááááâáá·áá¸âáááá¾á²ááâáá¶ááááááâáááá½ááá¶Â á\n"
"áááá¶áâáá¶áâáá¶áááááâááááááááâááááá á\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "ááâáá·áâáá¾áâáá¶áâáá¶ááâáááá á"
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "á"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "áá¶á
á"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "áááá¶áááááááá"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "ááááá¶á á %s ááºâáá¶âá¢ááááááááá áá¶áâáááá á"
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "áá¶ááâáááá¾"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
msgid "Problem downloading the package file from the repository:"
msgstr "áááá á¶âáááá»áâáá¶áâáá¶áâááâá¯ááá¶áâáááá
ááâáá¸âáááá¶áá á"
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "áá¼áâ áá¾áâáá¶áâááá á»áâáá¶áâáá¾â ááááá¶ááâáá¶âáááá½á á"
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -350,63 +468,63 @@
"- áááá¾âá§áááááâáááá»áâááá¡á¾áâááááá (á§. ááááá·áâáá¾âáá¶âáá¼á
)\n"
"- áááá¾âáááá¶ááâááááá"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "ááááâáá½áâáááá»áâá
ááááâááááâáááâáá¶áâááá¡á¾á âááááá¼áâá²ááâá
á¶áááááá¾áâááá¶ááá¸áâááááâá¢áááâá¡á¾áâáá·á á áá¼áâáááá¾âáá¶âá²ááâáá¶áâáá¶ááâáá¶áâáááá¢á¶á
âáááá¾âáá¶á á"
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "áá¶áááááá¶á á ááááâáá½áâáááá»áâá
ááááâááááâáááâáá¶áâááá¡á¾á ááááá¼áâá²ááâá
á¶áááááá¾áâááá¶ááá¸áâááááâá¢áááâá¡á¾áâáá·á á áá¼áâáááá¾âáá¶âá²ááâáá¶áâáá¶ááâáá¶áâáááâá¢á¶á
âáááá¾âáá
âáá¶á á"
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "áá¶áâááááá¶á á ááááâáá½áâáááá»áâá
ááááâááááâáááâáá¶áâááá¡á¾áâááááá¶ááâáááááá·áá¸âáááááááááâáááá
ááâáááá½áâá¯á áá¼á
ááááâáá¶âááááá¼áâá²ááâá
á¶áááááá¾áâá¡á¾áâáá·á áá»áâáááâáá·áá·áááâááááá·ááááá·âááááááâáá¶âáá½á á"
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "áááâááááâáá¶âá¢á¶áááá¶ááááâ %s %s áááâáááááâáááááááá·Â á"
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "á¢á¶áááá¶áááá %s %s á"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "áá¾áááá¸âááá¡á¾áâáááá
ááâááá á¢áááâáááá¼áâááâáááááááâáá¹áâááááááááâááááâá¢á¶áááá¶ááááâáá¶ááá¾Â á áááá ?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "ááááááâáá¶áâááá¡á¾á áááâáá¶áâááâáááá¼áâáá¶áâáá¶áâá¢áá¢á¶áâá¢á¶áááá¶áááá á"
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "áá¼áââá
á¶áááááá¾áâááááá·ááááá·áá¶áâá¡á¾áââáá·áâáá
âáááá»áâááááâá¢áááááááá á á¾áá¢áá¢á¶áâáá·á
áá
áááááááááâááááâá¢áááâáá¶âáá½áâá¢á¶áááá¶ááááâáááâáááá¼áâáá¶á á¬âáááá¾áááááá¾á --auto-agree-with-licenses á"
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "ááááááâáá¶áâááá¡á¾á áááâáá¶áâááâáá¶áâáá·áâáááááááááâááááâá¢áááâáááá¾âáá¶âáá½áâá¢á¶áááá¶áááá %s %s á"
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "ááá¡á¾áâáááá
ááâááááá %s-%s"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "áá¶áâááá¡á¾áâáááá
ááâááááá %s-%s áááâáááááá á"
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "áááá á¶âáááá»áâáá¶áâááá¡á¾áâáááá
ááâááááá %s-%s á"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "ááâáá·áââáá¾áâáááá
ááâááááá '%s'Â á"
@@ -827,6 +945,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr "á
áááá¾áâáá·áâáááá¹ááááá¼á '%s' á áááá
á»á 'y' ááááá¶áá '%s' ᬠ'n' ááááá¶áá '%s' ááááá·áâáá¾âáááá¶áâá¢ááá¸âáááááâáááá¾ááá¶áâááááá¶ááâá¢ááá"
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "copy áááá¼ááá¶áâá¢á¶áá»ááááá á¢"
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "áá¶á"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "áá·áâáááá¶ááâááááá¾á "
@@ -952,7 +1081,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "áááâáá¶âááá á»á áá¼áâáááá
áâááá¶ááá¶áááâááá á»áâáááâááááá¶ááâáá¹á zypper á"
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "URL áááâáá¶áâáááááâáá·áâáááá¹ááááá¼á á"
@@ -1442,95 +1571,95 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "áááá¼áâáá¶áâáá·áááá·áᶠRoot áá¾áááá¸âááááááâáááá¶ááâáááááááá á"
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "á¢á¶áá»áááááâá
ááá¾áâááá á ááá¶áâá áá
áá¶ááâáááá¼áâáá¶á URL áá·áâáááááâáááááâáááá¶áâáá½á á"
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "ááááááâáááâáá¶áâááááá¶ááâáá·áâáááâáá¶âááááááâáááá¶ááâáááá¹ááááá¼áâáá á"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "áá¾á 'zypper -h addrepo' ᬠman zypper áá¾áááá¸âááá½áâááááá¸âááááááâáááá¶ááâáááâáááá¶áá á"
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "áá¶ááâá¢á¶áá»áááááâáááâáááá¼áâáá¶á á"
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "ááâáá·áâáá¾áâáááá¶ááâáá¶áâáááááâááááááááá¶á áááá¶áá¶áâáá»áâáá¶á URL..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "ááâáá·áâáá¾áâáááá¶ááâáá¶áâáááááâááááááááá¶áâ ᬠURL áááâáá¶áâááááá á"
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "áááááâááááááááá¶áâááºâáá¶âá¢á¶áá»áááááâáááâáááá¼áâáá¶á á"
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "áááá¼ááá¶áâáá·áááá·âáᶠRoot áá¾áááá¸âáááá¾âá²ááâáááá¶ááâááááááááâááááá á"
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "áááá¼ááá¶áâáá·áááá·âáᶠRoot áá¾áááá¸âááá¡á¾á á¬âáá»áâáááá
áá á"
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "áá·áâáááá¶ááâááááááâáááâá¢á¶á
âááááááá¶áâáá¶á á %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "áá¶áâááááá¶á á áá·áâáá¶áâáááááâáááá¶áá á ááááá·ááááá·áá¶áâááâáá¶âáá½áâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áâáááâáá¶áâááá¡á¾áâááá»ááááá á áááá¶áâá¢ááá¸âáááá¼áâáá¶áâááá¡á¾áâáá á"
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "áááá»áâááááá¾áâáá¶áâáá¶áááááâáááááá·áá¸âááááááá¶á..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "áá¶áâáá¶áááááâáááááá·áá¸âááááááá¶áâáá¶áâááááá¾áâááááááááá á"
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "ááá á»áâáááá»áâáá¶áâááááá¾áâáá¶áâáá¶áááááâáááááá·áá¸âááááááá¶á á"
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "áááááâáááá
ááâáááááâáááá¼ááá¶áâá¢á¶áá»ááááá á"
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "áá·ááááá¶ááâááááááâáááá
ááâááááááá¶á "
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "ááâáá·áâáá¾áâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶á á"
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "áááâáᶠ'rug' áá·áâá¢á¶á
âáááá¶áá¶áâ 'á¢ááâáá¸âááááááá¶á' áá¾áááá¸áááá¾âá²ááâáá¶áááááá á"
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "áááá¼áâáá¶áâáá·áááá·âáᶠRoot áá¾áááá¸âáááá¾âá²ááâáááá
ááâáá¶áááááá á"
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "áááá¸âáá¾ááááâáááâáá·ááá¶áâáááá¹áâáá»á á"
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "á¢áááâáááá»áâáááâáááâáááá zypper áá½á
âá á¾á á"
@@ -1562,12 +1691,12 @@
msgid "Error"
msgstr "ááá á»á"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "áá¼áâáááá
á¼áâáááá [%s] # %d áá·áâáááááá 'y' áá¾áááá¸âáááá 'n' áá¾áááá¸âááááááâááááá·ááááá·áá¶á á"
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "áááá»áâáá¶ááá á "
@@ -1616,32 +1745,31 @@
msgid "Reading installed packages"
msgstr "áááá»áâá¢á¶áâáááá
ááâáááâáá¶áâááá¡á¾á"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "ááá
áá "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "áá¶áâáá %s á
ááâáá¶áâááá¶ááá á"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(with --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(with --nodeps --force)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "ááá¡á¾á á %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "áá¶áâááá¡á¾á %s áá¶áâááá¶ááá á"
@@ -1653,4 +1781,3 @@
#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "áááá¶áá"
-
Modified: trunk/zypper/po/nb.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/nb.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/nb.po (original)
+++ trunk/zypper/po/nb.po Tue Sep 11 20:41:01 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypper.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-08-17 22:54+0200\n"
"Last-Translator: Rune Nordbøe Skillingstad <rune(a)skillingstad.no>\n"
"Language-Team: Norwegian\n"
@@ -83,7 +83,7 @@
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "Vil du fortsette?"
@@ -102,192 +102,310 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Mislykket sammendragskontroll for %s. Forventet %s, fant %s."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "Initialiserer mål"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "pakke"
+msgstr[1] "pakke"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "utvalg"
+msgstr[1] "utvalg"
+
+#: ../src/zypper-misc.cc:87
+#, fuzzy
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "mønster"
+msgstr[1] "mønster"
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "produkt"
+msgstr[1] "produkt"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "patch"
+msgstr[1] "patch"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "skript"
+msgstr[1] "skript"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "melding"
+msgstr[1] "melding"
+
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "Språk: "
+msgstr[1] "Språk: "
+
+#: ../src/zypper-misc.cc:99
+#, fuzzy
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "atom"
+msgstr[1] "atom"
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "system"
+msgstr[1] "system"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "pakke"
+msgstr[1] "pakke"
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "Nødvendig pakke"
+msgstr[1] "Nødvendig pakke"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Kan ikke analysere evnen '%s'."
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s '%s' mangler"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "hopper over %s '%s' (allerede installert)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "Kan ikke legge til %s i listen over pakker som skal installeres."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "Kan ikke legge til %s i listen over pakker som skal fjernes."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Ikke funnet"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "Problem: "
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " Løsning %d: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "nummer, (g)jenta eller (a)vbryt> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "g"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "a"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "Bruker løsning %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s-problemer:"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "Den spesifiserte evnen ble ikke funnet"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "Ingenting å gjøre."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, fuzzy, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "Følgende pakker vil bli oppgradert:"
+msgstr[1] "Følgende pakker vil bli oppgradert:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, fuzzy, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "Følgende pakker vil bli lastet ned:"
+msgstr[1] "Følgende pakker vil bli lastet ned:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, fuzzy, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "Følgende samlinger vil bli installert:"
+msgstr[1] "Følgende samlinger vil bli installert:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "Total nedlastingsstørrelse: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Operasjonen vil gi et tillegg på %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Operasjonen vil frigjøre %s."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "%s låste enheter"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "Etablerer status for aggregerte"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "Kontrollerer avhengigheter..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "Behøver %d oppdateringer (%d sikkerhetsoppdateringer)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Installert"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Avinstallert"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Kan ikke lenger brukes"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Kan ikke brukes"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Brukt"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Ikke nødvendig"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Skadet"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Nødvendig"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "feil"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Katalog: "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Arkiv: "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Navn"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "Versjon"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "Kategori"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Status"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "Ingen pakkeoppdateringer ble funnet."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -295,47 +413,47 @@
"ADVARSEL: Dette er de eneste oppdateringene som virker inn på oppdateringsprogrammet.\n"
"Andre oppdateringer er også tilgjengelig.\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "Ingen pakkeoppdateringer ble funnet."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Samling"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Ark."
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "ADVARSEL: Hopper over %s, som er interaktiv."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "skriver"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
#, fuzzy
msgid "Problem downloading the package file from the repository:"
msgstr "Kunne ikke laste filer fra '%s'."
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "Se overstående feilmelding for et hit."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -351,63 +469,63 @@
" - bruk et annet installasjonsmedium (f.eks. hvis skadet)\n"
" - bruk en annen installasjonskilde"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Ãn av de installerte oppdateringene krever at datamaskinen startes pÃ¥ nytt. Gjør dette sÃ¥ snart som mulig."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "ADVARSEL: Ãn av de installerte oppdateringene krever at datamaskinen startes pÃ¥ nytt. Gjør dette sÃ¥ snart som mulig."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "ADVARSEL: Ãn av de installerte oppdateringene virker inn pÃ¥ pakkebehandleren, og krever derfor omstart før ytterligere operasjoner kan utføres."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Godtar automatisk lisens for %s %s."
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "%s %s lisens: "
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Du må godta lisensvilkårene for å kunne installere denne pakken. Vil du fortsette?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Avbryter installasjonen på grunn av manglende lisensbekreftelse."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Start operasjonen på nytt i interaktiv modus og bekreft at du godtar nødvendig(e) lisens(er) eller benytt \"--auto-agree-with-licenses\"-alternativet."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Avbryter installasjonen på grunn av manglende brukergodkjennelse av %s %s lisensen."
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "Installerer pakke %s-%s"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Kildekodepakken %s-%s ble installert."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problemer med å Installerer kildekodepakken %s-%s:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "Kildekodepakken '%s' ble ikke funnet."
@@ -831,6 +949,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr ""
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "For mange argumenter."
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "Osage"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "Ukjent alternativ"
@@ -956,7 +1085,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "Dette er en feil, send om mulig inn en zypper-feilrapport."
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "Nettadressen er ugyldig."
@@ -1472,95 +1601,95 @@
" )4QQQQQQQQP\n"
" )?QQQQ?'"
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "Administratorrettigheter (rottilgang) er påkrevd for endre systemarkivene."
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "For få argument. Både en nettadresse og et kortnavn er obligatorisk."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "Angitte type er ikke en gyldig arkivtype:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Se 'zypper -h addrepo' eller man zypper for å få en liste over kjente arkivtyper."
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "Mangler obligatorisk argument."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Kunne ikke finner arkivet angitt med kortnavn, forsøk å fjern med nettadresse..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "Kunne ikke finne arkiv angitt med kortnavn eller nettadresse."
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "Alias er et obligatorisk argument."
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "Administratorrettigheter (rottilgang) er påkrevd for oppdaterer systemarkivene."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Administratorrettigheter (rottilgang) er påkrevd for å installere eller fjerne pakker."
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Ukjent nødvendig pakketype: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Advarsel: Mangler arkiv. Arbeider bare med installerte nødvendige pakker. Ingenting kan installeres."
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "Oppretter løsningstestoppgave..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "Løsningstestoppgave ble opprettet."
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "Feil ved oppretting av løsningstestoppgave."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "Kildekodepakkens navn er et obligatorisk argument."
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "Ukjent nødvendig pakketype"
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "Ingen nødvendige pakker funnet."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Kjører som 'rug', kan ikke utføre \"etter beste evne\"-oppdatering."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "Administratorrettigheter (rottilgang) er påkrevd for å oppdatere pakker."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "Uventet unntak."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "Du kjører allerede zyppers kommandolinjetolker."
@@ -1592,12 +1721,12 @@
msgid "Error"
msgstr "Feil"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Sett inn media [%s] # %d og trykk 'j' for å fortsette eller 'n' for å avbryte kjøringen."
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "Laster ned: "
@@ -1646,32 +1775,31 @@
msgid "Reading installed packages"
msgstr "Leser installerte pakker"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "Fjerner "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "%s kunne ikke fjernes:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(med --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(med --nodeps--force)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "Installerer: %s- %s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "Installasjon av %s mislyktes:"
Modified: trunk/zypper/po/nl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/nl.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/nl.po (original)
+++ trunk/zypper/po/nl.po Tue Sep 11 20:41:01 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-08-22 22:48+0200\n"
"Last-Translator: Rinse de Vries <rinsedevries(a)kde.nl>\n"
"Language-Team: Nederlands <kde-i18n-nl(a)kde.org>\n"
@@ -84,7 +84,7 @@
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "Doorgaan?"
@@ -103,194 +103,312 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Verificatie van de samenvatting is mislukt voor %s. %s werd verwacht, %s werd gevonden."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "Doel initialiseren"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "pakket"
+msgstr[1] "pakket"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "selectie"
+msgstr[1] "selectie"
+
+#: ../src/zypper-misc.cc:87
+#, fuzzy
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "patroon"
+msgstr[1] "patroon"
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "product"
+msgstr[1] "product"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "wijzigingen aanbrengen"
+msgstr[1] "wijzigingen aanbrengen"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "script"
+msgstr[1] "script"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "bericht"
+msgstr[1] "bericht"
+
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "taal: "
+msgstr[1] "taal: "
+
+#: ../src/zypper-misc.cc:99
+#, fuzzy
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "atom"
+msgstr[1] "atom"
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "systeem"
+msgstr[1] "systeem"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "pakket"
+msgstr[1] "pakket"
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "Oplosbaar"
+msgstr[1] "Oplosbaar"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Kan capaciteit '%s' niet ontleden."
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s '%s' niet gevonden"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "%s '%s' wordt overgeslagen (is al geïnstalleerd)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "Kan '%s' niet toevoegen aan de lijst met te installeren pakketten."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "Kon '%s' niet toevoegen aan de lijst met te verwijderen pakketten."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Niet gevonden"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "Probleem: "
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " Oplossing %d: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "getal, (o)pnieuw of (a)nnuleren > "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "o"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "a"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "Oplossing %s wordt toegepast"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s problemen:"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "Opgegeven capaciteit is niet gevonden"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "Niets te doen."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, fuzzy, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "De volgende pakketten zullen worden opgewaardeerd:"
+msgstr[1] "De volgende pakketten zullen worden opgewaardeerd:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, fuzzy, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "De volgende pakketten zullen worden gedownload:"
+msgstr[1] "De volgende pakketten zullen worden gedownload:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, fuzzy, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "De volgende bundels zullen worden geïnstalleerd:"
+msgstr[1] "De volgende bundels zullen worden geïnstalleerd:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "Totale downloadgrootte: %s"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Na de operatie zal aanvullend %s worden gebruikt."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Na de operatie zal %s worden vrijgemaakt."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "%s items vergrendeld"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "Status van samenstellingen vaststellen"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "Afhankelijkheden oplossen..."
# /usr/lib/YaST2/clients/inst_config_x11.ycp:947
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d patches nodig (%d veiligheidspatches)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Geïnstalleerd"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Niet geïnstalleerd"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Niet langer van toepassing"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Niet toepasbaar"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Toegepast"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Niet nodig"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Gebroken"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Nodig"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "fout"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Catalogus: "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Installatiebron: "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Naam"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "Versie"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "Categorie"
# /usr/lib/YaST2/clients/lan_inetd_custom.ycp:754
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Status"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "Geen noodzakelijke patches gevonden."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -298,47 +416,47 @@
"WAARSCHUWING: dit zijn alleen de opwaarderingen die betrekking hebben op het opwaardeerprogramma zelf.\n"
"Er zijn ook andere opwaarderingen beschikbaar.\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "Geen opwaarderingen gevonden."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Bundel"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "WAARSCHUWING: %s is interactief, overgeslagen."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "toewijzen"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
#, fuzzy
msgid "Problem downloading the package file from the repository:"
msgstr "Probleem bij downloaden van bestanden van '%s'"
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "Zie bovenstaande foutmelding voor een hint."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -354,63 +472,63 @@
" - gebruik een ander installatiemedium (bijvoorbeeld bij beschadiging)\n"
" - gebruik een andere installatiebron"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Een van de geïnstalleerde patches vereist dat u de computer opnieuw opstart. Doe dit zo snel mogelijk."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "WAARSCHUWING: een van de geïnstalleerde patches vereist dat u de computer opnieuw opstart. Doe dit zo snel mogelijk."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "WAARSCHUWING: een van de geïnstalleerde patches is van invloed op het pakketbeheer zelf. Opnieuw starten is daarom vereist voordat de volgende operaties worden uitgevoerd."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Gaat automatisch akkoord met licentie van %s %s."
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "%s %s licentie:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Als u dit pakket wilt installeren dient u akkoord te gaan met de voorwaarden van de bovenstaande licentie. Doorgaan?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Installatie wordt afgebroken omdat de licentie(s) moet(en) worden bevestigd."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Start a.u.b. de bewerking opnieuw in de interactieve modus en ga akkoord met de vereiste licentie(s) of gebruik de optie --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Installatie wordt afgebroken omdat gebruiker niet akkoord gaat met %s %s licentie."
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "Bronpakket %s-%s wordt geïnstalleerd"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Bronpakket %s-%s is geïnstalleerd."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Probleem bij installeren van bronpakket %s-%s:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "Bronpakket '%s' niet gevonden."
@@ -835,6 +953,18 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr ""
+# /usr/lib/YaST2/clients/lan_inetd_custom.ycp:764
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "Teveel argumenten."
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "Osaags"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "Onbekende optie "
@@ -962,7 +1092,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "Dit is een bug, stuur een bugrapport in voor zypper."
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "Opgegeven URL-adres is ongeldig."
@@ -1453,95 +1583,95 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "Er zijn root-privileges nodig om de systeembronnen te wijzigen."
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "Onvoldoende argumenten. Er is tenminste één URL-adres en alias nodig."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "Gespecificeerd type is geen geldig brontype:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Zie 'zypper -h addrepo' of man zypper voor een lijst met bekende brontypen."
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "Vereist argument ontbreekt."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Bron niet gevonden aan de hand van de alias, probeert nu te verwijderen op URL-adres..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "Bron niet gevonden aan de hand van opgegeven alias of URL-adres"
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "Alias is een vereist argument."
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "Er zijn root-privileges vereist voor het vernieuwen van de systeeminstallatiebronnen."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Er zijn root-privileges vereist voor het installeren en deïnstalleren van pakketten."
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Onbekend type oplosbare: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Waarschuwing: geen bronnen gedefinieerd. Er wordt nu alleen gewerkt met de geïnstalleerde oplosbare pakketten. Er kan niets worden geïnstalleerd."
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "Genereert een test..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "Test is met succes gegenereerd."
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "Fout bij genereren van test."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "Naam van bronpakket is een vereist argument."
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "Onbekend type oplosbaar pakket"
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "Geen oplosbaren gevonden."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Draaiend als 'rug' kan het argument 'best-effort' niet worden gebruikt bij het opwaarderen."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "Er zijn root-privileges vereist voor het bijwerken van pakketten."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "Onverwachte uitzondering."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "U draait al een shell van zypper."
@@ -1573,12 +1703,12 @@
msgid "Error"
msgstr "Fout"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Plaats medium [%s] # %d en typ 'y' om verder te gaan of 'n' om de operatie te annuleren."
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "Downloadt: "
@@ -1627,32 +1757,31 @@
msgid "Reading installed packages"
msgstr "Geïnstalleerde pakketten worden gelezen"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "Verwijdert "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "Verwijderen van %s is mislukt:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(met --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(met --nodeps --force)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "Installeert %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "Installatie van %s is mislukt:"
Modified: trunk/zypper/po/pa.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/pa.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/pa.po (original)
+++ trunk/zypper/po/pa.po Tue Sep 11 20:41:01 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypper.pa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-08-18 08:46+0530\n"
"Last-Translator: A S Alam <aalam(a)users.sf.net>\n"
"Language-Team: Panjabi <punjabi-l10n(a)lists.sf.net>\n"
@@ -83,7 +83,7 @@
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "à¨à¨¾à¨°à© ਰੱà¨à¨£à¨¾ ਹà©?"
@@ -102,192 +102,309 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "%s ਲਠਡਿà¨à¨¼à¨ ਵà©à¨§à¨¤à¨¾ ਫà©à¨²à©à¨¹à¥¤ %s ਦ੠ਲà©à© ਸà©, %s ਮਿਲਿà¨à¥¤"
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "à¨à¨¾à¨°à¨à©à¨ ਸ਼à©à¨°à© à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "ਪà©à¨à©à©"
+msgstr[1] "ਪà©à¨à©à©"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "à¨à©à¨¨à©à¨à¨¶à¨¨"
+msgstr[1] "à¨à©à¨¨à©à¨à¨¶à¨¨"
+
+#: ../src/zypper-misc.cc:87
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "@product@"
+msgstr[1] "@product@"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "ਪà©à¨"
+msgstr[1] "ਪà©à¨"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "ਸà¨à¨°à¨¿à¨ªà¨à¨¾à¨"
+msgstr[1] "ਸà¨à¨°à¨¿à¨ªà¨à¨¾à¨"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "ਸà©à¨¨à©à¨¹à¨¾"
+msgstr[1] "ਸà©à¨¨à©à¨¹à¨¾"
+
+# label for language selection
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "à¨à¨¾à¨¶à¨¾"
+msgstr[1] "à¨à¨¾à¨¶à¨¾"
+
+#: ../src/zypper-misc.cc:99
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "ਫਾà¨à¨² ਸਿਸà¨à¨®"
+msgstr[1] "ਫਾà¨à¨² ਸਿਸà¨à¨®"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "ਪà©à¨à©à©"
+msgstr[1] "ਪà©à¨à©à©"
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "(%s ਹੱਲ) "
+msgstr[1] "(%s ਹੱਲ) "
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "ਸਮੱਰਥਾ '%s' ਪਾਰਸ ਨਹà©à¨ à¨à©à¨¤à© à¨à¨¾ ਸà¨à¨¦à©à¥¤"
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s '%s' ਨਹà©à¨ ਲੱà¨à©"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "%s '%s' à¨à©±à¨¡à© à¨à¨¾ ਰਹ੠ਹ੠(ਪਹਿਲਾਠਹ੠à¨à©°à¨¸à¨à¨¾à¨² ਹà©)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "'%s' ਨà©à©° à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¨£ ਵਾਲ੠ਪà©à¨à©à¨à¨¾à¨ ਦ੠ਲਿਸਠ'ਠà¨à©à©à¨¨ ਲਠਫà©à¨²à©à¨¹ ਹà©à¥¤"
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "'%s' ਨà©à©° ਹà¨à¨¾à¨à¨£ ਵਾਲ੠ਪà©à¨à©à¨à¨¾à¨ ਦ੠ਲਿਸਠ'ਠà¨à©à©à¨¨ ਲਠਫà©à¨²à©à¨¹ ਹà©à¥¤"
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "ਨਹà©à¨ ਲੱà¨à¨¿à¨"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "ਸਮੱਸਿà¨: "
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " ਹੱਲ %d: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "number, (r)etry or (c)ancel> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "ਹੱਲ਼ %s ਲਾà¨à© à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s ਸਮੱਸਿà¨à¨µà¨¾à¨:"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "ਦਿੱਤ੠ਸਮਰੱਥਾ ਨਹà©à¨ ਲੱà¨à©"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "à¨à©à¨ ਵ੠ਨਹà©à¨ ਹà©à¥¤"
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, fuzzy, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "ਹà©à¨ ਦਿੱਤ੠ਪà©à¨à©à¨ à¨
ੱਪਡà©à¨ à¨à©à¨¤à© à¨à¨¾à¨£à¨à©:\n"
+msgstr[1] "ਹà©à¨ ਦਿੱਤ੠ਪà©à¨à©à¨ à¨
ੱਪਡà©à¨ à¨à©à¨¤à© à¨à¨¾à¨£à¨à©:\n"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, fuzzy, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "ਹà©à¨ ਦਿੱਤ੠ਪà©à¨à©à¨ à¨
ੱਪਡà©à¨ à¨à©à¨¤à© à¨à¨¾à¨£à¨à©:\n"
+msgstr[1] "ਹà©à¨ ਦਿੱਤ੠ਪà©à¨à©à¨ à¨
ੱਪਡà©à¨ à¨à©à¨¤à© à¨à¨¾à¨£à¨à©:\n"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, fuzzy, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "ਹà©à¨ ਦਿੱਤ੠ਪà©à¨à©à¨ à¨à©°à¨¸à¨à¨¾à¨² à¨à©à¨¤à© à¨à¨¾à¨£à¨à©:\n"
+msgstr[1] "ਹà©à¨ ਦਿੱਤ੠ਪà©à¨à©à¨ à¨à©°à¨¸à¨à¨¾à¨² à¨à©à¨¤à© à¨à¨¾à¨£à¨à©:\n"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "à¨à©à©±à¨² ਡਾà¨à¨¨à¨²à©à¨¡ à¨à¨à¨¾à¨°: %s"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "à¨à¨¾à¨°à¨µà¨¾à¨ ਦ੠ਬਾà¨
ਦ, ਹà©à¨° %s ਵਰਤ੠à¨à¨¾à¨µà©à¨à©à¥¤"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "à¨à¨¾à¨°à¨µà¨¾à¨ ਬਾà¨
ਦ, %s à¨à¨¾à¨²à© ਹà©à¨µà©à¨à©à¥¤"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "%s à¨à¨à¨à¨®à¨¾à¨ ਲਾਠਹਨ"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr ""
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "ਨਿਰà¨à¨°à¨¤à¨¾ ਹੱਲ਼ à¨à©à¨¤à© à¨à¨¾ ਰਹ੠ਹà©..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d ਪà©à¨à¨ ਲà©à©à©à¨¦à© (%d ਸà©à¨°à©±à¨à¨¿à¨ ਪà©à¨à¨)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "à¨à©°à¨¸à¨à¨¾à¨² à¨à©à¨¤à¨¾"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨² à¨à©à¨¤à¨¾"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "ਹà©à¨£ ਢà©à©±à¨à¨µà¨¾à¨ ਨਹà©à¨"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "ਢà©à©±à¨à¨µà¨¾à¨ ਨਹà©à¨"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "ਲਾà¨à© à¨à©à¨¤à¨¾"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "ਲà©à© ਨਹà©à¨"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "ਨਿà¨à¨¾à¨°à¨¾"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "ਲà©à© ਹà©"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "à¨à¨²à¨¤à©"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "à¨à©à¨à¨¾à¨²à¨¾à¨: "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à©: "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "ਨਾà¨"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "ਵਰà¨à¨¨"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "à¨à©à¨à¨¾à¨à¨°à©"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "ਹਾਲਤ"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "à¨à©à¨ ਲà©à©à©à¨¦à¨¾ ਪà©à¨à¨ ਨਹà©à¨ ਮਿਲਿà¨à¥¤"
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -295,47 +412,47 @@
"à¨à©à¨¤à¨¾à¨µà¨¨à©: à¨à©à¨µà¨² à¨
ੱਪਡà©à¨à¨° ਨà©à©° ਪਰà¨à¨¾à¨µà¨¿à¨¤ à¨à¨°à¨¨ ਲਠਹ੠à¨
ੱਪਡà©à¨ à¨à¨ªà¨²à©±à¨¬à¨§ ਹਨ।\n"
"ਹà©à¨° ਵ੠à¨à¨ªà¨²à©±à¨¬à¨§ ਹਨ।\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "à¨à©à¨ à¨
ੱਪਡà©à¨ ਨਹà©à¨ ਲੱà¨à¨¿à¨à¥¤"
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "ਬੰਡਲ"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "ਢਾà¨à¨à¨¾"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "à¨à©à¨¤à¨¾à¨µà¨¨à©: %s à¨à©°à¨à¨°à¨à¨à¨à¨¿à¨µ ਹà©, à¨à©±à¨¡à¨¿à¨ à¨à¨¾ ਰਿਹਾ ਹà©à¥¤"
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "à¨à¨®à¨¿à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
#, fuzzy
msgid "Problem downloading the package file from the repository:"
msgstr "'%s' ਤà©à¨ ਫਾà¨à¨²à¨¾à¨ ਡਾà¨à¨¨à¨²à©à¨¡ à¨à¨°à¨¨ ਦà©à¨°à¨¾à¨¨ ਸਮੱਸਿà¨à¥¤"
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "à¨à¨¸à¨¼à¨¾à¨°à© ਲਠà¨à©±à¨¤à© ਦਿੱਤਾ à¨à¨²à¨¤à© ਸà©à¨¨à©à¨¹à¨¾ ਵà©à¨à© à¨à©à¥¤"
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -351,63 +468,63 @@
"- à¨à©à¨ ਹà©à¨° à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ ਮà©à¨¡à¨¿à¨ (à¨à© à¨à¨¹ à¨à¨°à¨¾à¨¬ ਹà©à¨µà©)\n"
" - ਹà©à¨° ਰਿਪà©à¨à¨¼à¨à¨°à© ਸ਼ਾਮਲ à¨à¨°à©"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "à¨à©±à¨ à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¨ ਪà©à¨à¨ ਲਠਤà©à¨¹à¨¾à¨¡à© ਮਸ਼à©à¨¨ ਨà©à©° ਮà©à©-à¨à¨¾à¨²à© à¨à¨°à¨¨à¨¾ ਪਵà©à¨à¨¾à¥¤ à¨à¨¿à©°à¨¨à©à¨¹à¨¾à¨ à¨à©à¨¤à© ਹ੠ਸà¨à© à¨à¨°à© à¨à©à¥¤"
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "à¨à©à¨¤à¨¾à¨µà¨¨à©: à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¨ ਪà©à¨à¨à¨¾à¨ ਵਿੱਠà¨à©±à¨ ਲਠਤà©à¨¹à¨¾à¨¨à©à©° à¨à¨ªà¨£à© ਮਸ਼à©à¨¨ ਨà©à©° ਮà©à©-à¨à¨¾à¨²à© à¨à¨°à¨¨à¨¾ ਪਵà©à¨à¨¾à¥¤ à¨à¨¿à©°à¨¨à©à¨¹à¨¾à¨ à¨à©à¨¤à© ਹ੠ਸà¨à© à¨à¨°à©à¥¤"
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "à¨à©à¨¤à¨¾à¨µà¨¨à©: à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¨ ਪà©à¨à¨à¨¾à¨ ਵਿੱਠà¨à©±à¨ ਪà©à¨à©à¨ ਮà©à¨¨à©à¨à¨° ਨà©à©° ਪਰà¨à¨¾à¨µà¨¿à¨¤ à¨à¨° ਰਿਹਾ ਹà©, à¨à¨¸à¨à¨°à¨à© à¨
à¨à¨²à© à¨à¨¾à¨°à¨µà¨¾à¨ à¨à¨°à¨¨ ਲਠà¨à¨¸ ਨà©à©° ਮà©à©-à¨à¨¾à¨²à© à¨à¨°à¨¨à¨¾ ਲਾà¨à¨¼à¨®à© ਹà©à¥¤"
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "%s %s ਲਾà¨à¨¸à©à¨à¨¸ ਨਾਲ à¨à¨à©à¨®à©à¨à¨¿à¨ ਹ੠ਸਹਿਮਤ।"
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "%s %s ਲਾà¨à¨¸à©à¨à¨¸:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "à¨à¨¹ ਪà©à¨à©à¨ à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਲਠਤà©à¨¹à¨¾à¨¨à©à©° à¨à©±à¨¤à© ਦਿੱਤ੠ਲਾà¨à¨¸à©à¨à¨¸ ਦà©à¨à¨ ਸ਼ਰਤਾਠਨਾਲ ਸਹਿਮਤ ਹà©à¨£à¨¾ ਪਵà©à¨à¨¾à¥¤ à¨à© à¨à¨¾à¨°à© ਰੱà¨à¨£à¨¾ ਹà©?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "ਲà©à©à©à¨¦à© ਲਾà¨à¨¸à©à¨à¨¸ ਪà©à¨¸à¨¼à¨à© ਦ੠ਲà©à© ਹà©à¨£ à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ à¨
ਧà©à¨°à© à¨à©±à¨¡à© à¨à¨¾ ਰਹ੠ਹà©à¥¤"
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "à¨à¨¾à¨°à¨µà¨¾à¨ ਨà©à©° à¨à©°à¨à¨°à¨à¨à¨à¨¿à¨µ ਮà©à¨¡ ਵਿੱਠਮà©à© à¨à¨¾à¨²à© à¨à¨°à© à¨à© à¨
ਤ੠ਲà©à©à©à¨¦à© ਲਾà¨à¨¸à©à¨à¨¸ ਨਾਲ ਸਹਿਮਤ੠ਦਿਠà¨à¨¾à¨ --auto-agree-with-licenses à¨à©à¨£ ਦਿà¨à¥¤"
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "%s %s ਲਾà¨à¨¸à©à¨à¨¸ ਨਾਲ ਯà©à¨à¨¼à¨° ਨਾ-ਸਹਿਮਤ੠à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ à¨
ਧà©à¨°à© à¨à©±à¨¡à© à¨à¨¾ ਰਹ੠ਹà©à¥¤"
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "ਸà©à¨°à¨¸ ਪà©à¨à©à¨ %s-%s à¨à©°à¨¸à¨à¨¾à¨² à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "ਸà©à¨°à¨¸ ਪà©à¨à©à¨ %s-%s ਠà©à¨ ਤਰà©à¨¹à¨¾à¨ à¨à©°à¨¸à¨à¨¾à¨² ਹ੠à¨à¨¿à¨à¥¤"
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "ਸà©à¨°à¨¸ ਪà©à¨à©à¨ %s-%s à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਦà©à¨°à¨¾à¨¨ ਸਮੱਸਿà¨:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "ਸà©à¨°à¨¸ ਪà©à¨à©à¨ '%s' ਨਹà©à¨ ਲੱà¨à¨¿à¨à¥¤"
@@ -831,6 +948,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr ""
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "%s: ਬਹà©à¨¤ ਵੱਧ à¨à¨°à¨à©à¨®à¨¿à©°à¨à¥¤\n"
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "ਸà©à¨¨à©à¨¹à¨¾"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "à¨
ਣà¨à¨¾à¨£ à¨à©à¨£ "
@@ -956,7 +1084,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "à¨à¨¹ ਬੱਠਹà©, zypper ਲਠà¨à©±à¨ ਬੱਠà¨à¨¾à¨£à¨à¨¾à¨°à© ਦਿਠà¨à©à¥¤"
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "ਦਿੱਤਾ URL à¨à¨²à¨¤ ਹà©à¥¤"
@@ -1449,95 +1577,95 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "ਸਿਸà¨à¨® ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਸà©à¨§à¨£ ਲਠroot à¨
ਧਿà¨à¨¾à¨° à¨à¨¾à¨¹à©à¨¦à© ਹਨ।"
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "ਬਹà©à¨¤ ਥà©à©à©à¨¹à© à¨à¨°à¨à©à¨®à¨¿à©°à¨ ਹਨ। à¨à©±à¨à©-à¨à©±à¨ URL à¨
ਤ੠à¨à¨²à©à¨à¨¸ ਲà©à©à©à¨¦à¨¾ ਹà©à¥¤"
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "ਦਿੱਤ੠à¨à¨¿à¨¸à¨® à¨à©±à¨ ਵà©à¨§ ਰਿਪà©à¨à¨¼à¨à¨°à© à¨à¨¿à¨¸à¨® ਨਹà©à¨ ਹà©:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr ""
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "ਲà©à©à©à¨¦à¨¾ à¨à¨°à¨à©à¨®à¨¿à©°à¨ à¨à©à©°à¨® ਹà©à¥¤"
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "à¨à¨²à©à¨à¨¸ ਨਾਲ ਰਿਪà©à¨à¨¼à¨à¨°à© ਨਹà©à¨ ਮਿਲà©, URL ਨਾਲ ਹà¨à¨¾à¨à¨£ ਦ੠à¨à©à¨¸à¨¼à¨¿à¨¸à¨¼ à¨à¨¾à¨°à©..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "ਦਿੱਤ੠à¨à¨²à©à¨à¨¸ à¨à¨¾à¨ URL ਨਾਲ ਰਿਪà©à¨à¨¼à¨à¨°à© ਨਹà©à¨ ਮਿਲ੠ਹà©à¥¤"
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "à¨à¨²à©à¨à¨¸ ਲà©à©à©à¨¦à¨¾ à¨à¨°à¨à©à¨®à¨¿à©°à¨ ਹà©à¥¤"
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "ਸਿਸà¨à¨® ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਤਾà¨à¨¼à¨¾ à¨à¨°à¨¨ ਲਠroot à¨
ਧਿà¨à¨¾à¨° ਲà©à©à©à¨¦à© ਹਨ।"
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "ਪà©à¨à©à¨ à¨à©°à¨¸à¨à¨¾à¨² à¨
ਤ੠à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਲਠroot à¨
ਧਿà¨à¨¾à¨° ਲà©à©à©à¨¦à© ਹਨ।"
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "à¨
ਣà¨à¨¾à¨£ ਹੱਲ-ਯà©à¨ à¨à¨¿à¨¸à¨®: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "à¨à©à¨¤à¨¾à¨µà¨¨à©: ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਦਿੱਤà©à¨à¨ ਨਹà©à¨ ਹਨ। à¨à©°à¨¸à¨à¨¾à¨² ਹੱਲ਼ਯà©à¨ ਨਾਲ ਹ੠à¨à¨¾à¨°à¨µà¨¾à¨ ਹà©à¨µà©à¨à©à¥¤ à¨à©à¨ ਵ੠à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ ਹà©à¨µà©à¨à¨¾à¥¤"
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "ਸਲà©à¨µà¨° à¨à©à¨¸à¨ à¨à©à¨¸ ਤਿà¨à¨° à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "ਸà©à¨²à¨µà¨° à¨à©à¨¸à¨ à¨à©à¨¸ ਬਣਾà¨à¨ à¨à¨¿à¨à¥¤"
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "ਸà©à¨²à¨µà¨° à¨à©à¨¸à¨ à¨à©à¨¸à¨ª ਬਣਾà¨à¨£ ਦà©à¨°à¨¾à¨¨ à¨à¨²à¨¤à©à¥¤"
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "ਸà©à¨°à¨¸ ਪà©à¨à©à¨ ਨਾਠà¨à©±à¨ ਲà©à©à©à¨¦à¨¾ à¨à¨°à¨à©à¨®à¨¿à©°à¨ ਹà©à¥¤"
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "à¨
ਣà¨à¨¾à¨£ ਹੱਲਯà©à¨ à¨à¨¿à¨¸à¨® "
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "à¨à©à¨ ਹੱਲ਼ ਨਹà©à¨ ਲੱà¨à¨¿à¨à¥¤"
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "'rug' ਵਾà¨à¨ à¨à©±à¨² ਰਿਹਾ ਹà©, à¨à¨¸à¨à¨°à¨à© à¨
ੱਪਡà©à¨ ਨà©à©° 'best-effort' ਢੰਠਨਾਲ ਨਹà©à¨ à¨à¨²à¨¾à¨à¨ à¨à¨¾ ਸà¨à¨¦à¨¾à¥¤"
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "ਪà©à¨à©à¨ à¨
ੱਪਡà©à¨ à¨à¨°à¨¨ ਲਠroot à¨
ਧਿà¨à¨¾à¨° ਲà©à©à©à¨¦à© ਹਨ।"
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "à¨
à¨à¨¾à¨¨à¨ à¨
ਪਵਾਦ à¨à¨à¨ ਹà©à¥¤"
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "ਤà©à¨¸à©à¨ zypper ਦ੠ਸ਼à©à¨² ਪਹਿਲਾਠਹ੠à¨à¨²à¨¾ ਰਹ੠ਹà©à¥¤"
@@ -1569,12 +1697,12 @@
msgid "Error"
msgstr "à¨à¨²à¨¤à©"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "ਮà©à¨¡à¨¿à¨ [%s] # %d ਪਾਠà¨
ਤ੠à¨à¨¾à¨°à© ਰੱà¨à¨£ ਲਠ'y' à¨à¨¾à¨ à¨à¨¾à¨°à¨µà¨¾à¨ ਰੱਦ à¨à¨°à¨¨ ਲਠ'n' ਦੱਬà©à¥¤"
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "ਡਾà¨à¨¨à¨²à©à¨¡ à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©: "
@@ -1623,33 +1751,32 @@
msgid "Reading installed packages"
msgstr "à¨à©°à¨¸à¨à¨¾à¨² ਪà©à¨à©à¨ ਪà©à©à¨¹à© à¨à¨¾ ਰਹ੠ਹਨ"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "ਹà¨à¨¾à¨à¨ à¨à¨¾ ਰਿਹਾ ਹ੠"
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "%s ਨà©à©° ਹà¨à¨¾à¨à¨£à¨¾ ਫà©à¨²à©à¨¹:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(--nodeps ਨਾਲ)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(--nodeps --force ਨਾਲ)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "à¨à©°à¨¸à¨à¨¾à¨² à¨à©à¨¤à¨¾ à¨à¨¾à¨à¨¦à¨¾ ਹà©: %s-%s"
# %s is either BOOTP or DHCP
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "%s ਦ੠à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ ਫà©à¨²à©à¨¹ ਹà©à¨:"
Modified: trunk/zypper/po/pl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/pl.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/pl.po (original)
+++ trunk/zypper/po/pl.po Tue Sep 11 20:41:01 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-08-21 21:29+0100\n"
"Last-Translator: wadim dziedzic <nikdo(a)aviary.pl>\n"
"Language-Team: <pl(a)li.org>\n"
@@ -83,7 +83,7 @@
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "Czy kontynuowaÄ?"
@@ -102,192 +102,326 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Weryfikacja podsumowania dla %s nie powiodÅa siÄ. Oczekiwano %s, napotkano %s."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "Inicjalizacja celu"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "pakiet"
+msgstr[1] "pakiet"
+msgstr[2] "pakiet"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "wybór"
+msgstr[1] "wybór"
+msgstr[2] "wybór"
+
+#: ../src/zypper-misc.cc:87
+#, fuzzy
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "wzorzec"
+msgstr[1] "wzorzec"
+msgstr[2] "wzorzec"
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "produkt"
+msgstr[1] "produkt"
+msgstr[2] "produkt"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "poprawka"
+msgstr[1] "poprawka"
+msgstr[2] "poprawka"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "skrypt"
+msgstr[1] "skrypt"
+msgstr[2] "skrypt"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "wiadomoÅÄ"
+msgstr[1] "wiadomoÅÄ"
+msgstr[2] "wiadomoÅÄ"
+
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "jÄzyk:"
+msgstr[1] "jÄzyk:"
+msgstr[2] "jÄzyk:"
+
+#: ../src/zypper-misc.cc:99
+#, fuzzy
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "atom"
+msgstr[1] "atom"
+msgstr[2] "atom"
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "system"
+msgstr[1] "system"
+msgstr[2] "system"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "pakiet"
+msgstr[1] "pakiet"
+msgstr[2] "pakiet"
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "Pakiet rozwiÄ
zywalny"
+msgstr[1] "Pakiet rozwiÄ
zywalny"
+msgstr[2] "Pakiet rozwiÄ
zywalny"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Nie można zanalizowaÄ wÅaÅciwoÅci \"%s\""
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "Nie znaleziono: %s %s"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "PominiÄto: %s %s (już zainstalowane)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "Dodanie \"%s\" do listy pakietów przeznaczonych do instalacji nie powiodÅo siÄ."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "Dodanie \"%s\" do listy pakietów przeznaczonych do usuniÄcia nie powiodÅo siÄ."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Nie znaleziono"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "Problem:"
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " RozwiÄ
zanie %d: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "liczba, (p)onów lub (a)nuluj"
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "p"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "a"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "Zastosowanie rozwiÄ
zania %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "Problemy (%s): "
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "Nie znaleziono podanej wÅaÅciwoÅci"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "Brak zadaÅ."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, fuzzy, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "Zaktualizowane zostanÄ
nastÄpujÄ
ce pakiety:"
+msgstr[1] "Zaktualizowane zostanÄ
nastÄpujÄ
ce pakiety:"
+msgstr[2] "Zaktualizowane zostanÄ
nastÄpujÄ
ce pakiety:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, fuzzy, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "Pobrane zostanÄ
nastÄpujÄ
ce pakiety:"
+msgstr[1] "Pobrane zostanÄ
nastÄpujÄ
ce pakiety:"
+msgstr[2] "Pobrane zostanÄ
nastÄpujÄ
ce pakiety:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, fuzzy, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "NastÄpujÄ
ce zestawy zostanÄ
zainstalowane:"
+msgstr[1] "NastÄpujÄ
ce zestawy zostanÄ
zainstalowane:"
+msgstr[2] "NastÄpujÄ
ce zestawy zostanÄ
zainstalowane:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "CaÅkowity rozmiar danych do pobrania: %s"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Po wykonaniu operacji użyte zostanie dodatkowo %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Po wykonaniu operacji zwolnione zostanie %s."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "Elementów zablokowanych: %s"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "Ustalanie statusu agregatów"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "RozwiÄ
zywanie zależnoÅci..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "potrzebnych poprawek: %d (poprawki bezpieczeÅstwa: %d)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Zainstalowano"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "UsuniÄto"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Już nieodpowiednia"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Nieodpowiednia"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Zastosowana"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Niepotrzebna"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Uszkodzona"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Potrzebna"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "bÅÄ
d"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Katalog: "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Repozytorium:"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Nazwa"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "Wersja"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "Kategoria"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Status"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "Nie znaleziono potrzebnych poprawek."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -295,47 +429,47 @@
"UWAGA: Te uaktualnienia dotyczÄ
samego programu uaktualniajÄ
cego.\n"
"DostÄpne sÄ
także inne uaktualnienia.\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "Nie znaleziono aktualizacji."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Zestaw"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "UWAGA: %s jest interaktywna, pominiÄto."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "zatwierdzanie"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
#, fuzzy
msgid "Problem downloading the package file from the repository:"
msgstr "Problem podczas pobierania plików z \"%s\"."
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "WiÄcej informacji można znaleÅºÄ w powyższym komunikacie bÅÄdów."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -352,63 +486,63 @@
"- użycie innego noÅnika instalacyjnego,\n"
"- użycie innego repozytorium."
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Jedna z zainstalowanych poprawek wymaga ponownego uruchomienia komputera. ProszÄ wykonaÄ to jak najszybciej."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "UWAGA: Jedna z zainstalowanych poprawek wymaga ponownego uruchomienia komputera. ProszÄ wykonaÄ to jak najszybciej."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "UWAGA: Jedna z zainstalowanych poprawek dotyczy menedżera pakietów. Należy uruchomiÄ go ponownie przed dalszym użyciem."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Automatycznie zaakceptowano licencjÄ obiektu \"%s\" typu \"%s\""
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "licencja %s %s:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Aby zainstalowaÄ ten pakiet, należy zaakceptowaÄ warunki powyższej licencji. KontynuowaÄ?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Przerwanie instalacji z powodu braku akceptacji licencji."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "ProszÄ wykonaÄ operacjÄ w trybie interaktywnym i zgodziÄ siÄ z warunkami licencji lub użyÄ opcji --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Przerwanie instalacji z powodu braku akceptacji licencji %s %s."
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "Insalowanie pakietu z kodem źródÅowym %s-%s"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Pakiet z kodem źródÅowym %s-%s zostaÅ zainstalowany pomyÅlnie."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problem podczas instalacji pakietu z kodem źródÅowym %s-%s"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "Pakiet z kodem źródÅowym \"%s\" nie zostaÅ znaleziony."
@@ -834,6 +968,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr ""
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "Zbyt wiele argumentów."
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "osage"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "Nieznana opcja"
@@ -959,7 +1104,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "Jest to bÅÄ
d, proszÄ wypeÅniÄ raport bÅÄdu w tej sprawie."
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "Podany adres URL jest nieprawidlowy."
@@ -1449,95 +1594,95 @@
" ___ _ e. __ ,o\n"
" \" \""
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "Do modyfikacji repozytoriów konieczne sÄ
uprawnienia administratora."
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "Zbyt maÅo parametrów. Wymagany jest conajmniej alias i adres URL."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "Podany typ repozytorium nie jest poprawny:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Polecenie \"zypper -h addrepo\" wyÅwietla listÄ znanych typów repozytoriów."
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "Brak wymaganego parametru."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Nie znaleziono repozytorium wg aliasu. Próba usuniÄcia wg adresu URL..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "Nie znaleziono repozytorium o danym aliasie i/lub adresie URL."
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "Alias jest wymaganym parametrem"
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "Do odÅwieżania repozytoriów konieczne sÄ
uprawnienia administratora."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Do instalacji/usuwania pakietów konieczne sÄ
uprawnienia administratora."
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Nieznany typ pakietu: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Ostrzeżenie: Brak repozytorów. Operacja obejmie tylko zainstalowane pakiety. Nic nowego nie może zostaÄ zainstalowane."
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "Tworzenie testu dla mechanizmu zarzÄ
dzania pakietami..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "Test mechanizmu rozwiÄ
zywania zależnoÅci zostaÅ poprawnie wygenerowany."
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "BÅÄ
d podczas tworzenia testu dla mechanizmu zarzÄ
dzania pakietami."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "Nazwa pakietu jest wymaganym parametrem."
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "Nieznany typ pakietu rozwiÄ
zywalnego"
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "Nie znaleziono pakietów."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Uruchomiono jako \"rug\". Nie można wykonaÄ \"najlepszej\" aktualizacji."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "Do aktualizacji pakietów konieczne sÄ
uprawnienia administratora."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "Niespodziewany wyjÄ
tek."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "PowÅoka zyppera jest już uruchomiona."
@@ -1570,12 +1715,12 @@
msgid "Error"
msgstr "bÅÄ
d"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "ProszÄ wÅożyÄ noÅnik [%s] # %d i nacisnÄ
Ä 't' aby kontynuowaÄ lub 'n' aby przerwaÄ operacjÄ."
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "Pobieranie:"
@@ -1624,32 +1769,31 @@
msgid "Reading installed packages"
msgstr "Odczytywanie zainstalowanych pakietów"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "Usuwanie"
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "BÅÄ
d podczas usuwania %s:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(z --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(z --nodeps --force)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "Instalowanie: %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "BÅÄ
d podczas instalacji %s:"
Modified: trunk/zypper/po/pt.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/pt.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/pt.po (original)
+++ trunk/zypper/po/pt.po Tue Sep 11 20:41:01 2007
@@ -11,10 +11,10 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
-"PO-Revision-Date: 2007-09-10 21:55+0100\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
+"PO-Revision-Date: 2007-09-11 11:20+0100\n"
"Last-Translator: Carlos Gonçalves <carlos(a)pinguix.com>\n"
-"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
+"Language-Team: Portuguese <kde-i18n-pt(a)kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -86,7 +86,7 @@
# internal key used: Ok
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "Continuar?"
@@ -105,192 +105,299 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Falhou a verificação 'digest' para %s. à espera de %s, %s encontrado."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "A inicializar o Destino"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "pacote"
+msgstr[1] "pacotes"
+
+#: ../src/zypper-misc.cc:85
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "selecção"
+msgstr[1] "selecções"
+
+#: ../src/zypper-misc.cc:87
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "padrão"
+msgstr[1] "padrões"
+
+#: ../src/zypper-misc.cc:89
+msgid "product"
+msgid_plural "product"
+msgstr[0] "produto"
+msgstr[1] "produtos"
+
+#: ../src/zypper-misc.cc:91
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "correcção"
+msgstr[1] "correcções"
+
+#: ../src/zypper-misc.cc:93
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "script"
+msgstr[1] "scripts"
+
+#: ../src/zypper-misc.cc:95
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "mensagem"
+msgstr[1] "mensagens"
+
+# label for language selection
+#: ../src/zypper-misc.cc:97
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "idioma"
+msgstr[1] "idiomas"
+
+#: ../src/zypper-misc.cc:99
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "atom"
+msgstr[1] "atoms"
+
+#: ../src/zypper-misc.cc:101
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "sistema"
+msgstr[1] "sistemas"
+
+#: ../src/zypper-misc.cc:103
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "srcpackage"
+msgstr[1] "srcpackages"
+
+#. default
+#: ../src/zypper-misc.cc:105
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "resolúvel"
+msgstr[1] "resolúveis"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Não é possÃvel interpretar a capacidade '%s'."
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s '%s' não encontrado"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "a saltar %s '%s' (já está instalado)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "Falhou a adição de '%s' à lista de pacotes a instalar."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "Falhou a adição de '%s' à lista de pacotes a remover."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Não encontrado"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "Problema: "
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " Solução %d: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "número, (r)epetir ou (c)ancelar> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "A aplicar solução %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s Problemas:"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "Não foi encontrada a capacidade especÃficada"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "Nada para fazer."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "O seguinte %s irá ser actualizado:"
+msgstr[1] "Os seguintes %s irão ser actualizados:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "O seguinte %s irá ser desactualizado:"
+msgstr[1] "Os seguintes %s irão ser desactualizados:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "O seguinte NOVO %s irá ser instalado:"
+msgstr[1] "Os seguintes NOVOS %s irão ser instalados:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] "O seguinte %s irá ser REMOVIDO:"
+msgstr[1] "Os seguintes %s irão ser REMOVIDOS:"
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "Tamanho total da descarga: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Depois da operação, %s adicionais serão utilizados."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Depois da operação, %s irão ser libertados."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "%s itens bloqueados"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "A estabelecer o estado dos agregados"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "A resolver dependências..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d correcções necessárias (%d correcções de segurança)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Instalado"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Desinstalado"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Já Não Aplicável"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Não Aplicável"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Aplicado"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Desnecessário"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Quebrado"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Necessário"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "erro"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Catálogo: "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Repositório: "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Nome"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "Versão"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "Categoria"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Estado"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "Nenhuma correcção necessária encontrada."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -298,46 +405,46 @@
"AVISO: Estes são apenas as actualizações que afectam o actualizador propriamente dito.\n"
"Também existem outras disponÃveis.\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "Nenhuma actualização encontrada."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Conjunto"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "AVISO: %s é interactivo, ignorado."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "a enviar"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
msgid "Problem downloading the package file from the repository:"
msgstr "Problema ao descarregar o ficheiro do pacote do repositório:"
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "Por favor, veja a mensagem acima para uma sugestão."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -353,64 +460,64 @@
"- utilize outro suporte de instalação (se por exemplo estiver danificado)\n"
"- utilize outro repositório"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Uma das correcções instaladas requer a reinicialização da sua máquina. Por favor, faça-o tão cedo quanto possÃvel."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "AVISO: Uma das correcções instaladas requer a reinicialização da sua máquina. Por favor, faça-o tão cedo quanto possÃvel."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "AVISO: Uma das correcções instaladas afecta o gestor de pacotes propriamente dito, pelo que este necessita de ser reiniciado antes de executar as operações seguintes."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Automaticamente concordar com a licença %s %s."
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "%s %s licença:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Por forma a instalar este pacote, deve concordar com os termos da licença acima. Continuar?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "A interromper a instalação devido à necessidade de confirmação do(s) licenciamento(s)."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Por favor, reinicie a operação em modo interactivo e confirme a concordância com a(s) licença(s) necessária(s) ou utilize a opção --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "A interromper a instalação devido a desacordo do utilizador com a licença %s %s."
# /usr/lib/YaST2/clients/sw_single.ycp:12
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "A instalar o pacote de código %s-%s"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "O pacote de código %s-%s foi instalado com sucesso."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problema ao instalar o pacote de código %s-%s:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "Pacote de código '%s' não encontrado."
@@ -831,6 +938,15 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr "Resposta '%s' inválida. Introduza 'y' para '%s' ou 'n' para '%s', se nada mais funcionar"
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+msgid "Too many arguments"
+msgstr "Demasiados argumentos"
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+msgid "Usage"
+msgstr "Uso"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "Opção desconhecida "
@@ -956,7 +1072,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "Este é um bug, por favor submeta um relatório de erro do zypper."
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "O URL dado é inválido."
@@ -1471,95 +1587,95 @@
" #@@@@@@@@# \n"
" +@@@@#` "
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "São necessários privilégios de administrador para modificar os repositórios do sistema."
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "Argumentos insuficientes. à necessário, pelo menos, o URL e alcunha."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "O tipo especificado não é um tipo de repositório válido:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Veja 'zypper -h addrepo' ou man zypper para obter a lista dos tipos de repositórios conhecidos."
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "Argumentos necessários em falta."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Repositório não encontrado pela alcunha, a tentar apagar pelo URL..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "Repositório não encontrado pela alcunha ou URL dado."
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "A alcunha é um argumento necessário."
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "São necessários privilégios de administrador para refrescar os repositórios do sistema."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "São necessários privilégios de administrador para instalar ou remover pacotes."
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Tipo de resolúvel desconhecido: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Aviso: Nenhum repositório definido. A operar apenas com os resolúveis instalados. Nada pode ser instalado."
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "A gerar o caso de teste de resolução..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "O caso de teste de resolução foi generado com sucesso."
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "Erro ao criar o caso de teste de resolução."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "O nome do pacote de código é um argumento requirido."
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "Tipo de resolúvel desconhecido "
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "Resolúveis não encontrados."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "A correr como 'rug', não pode fazer uma abordagem 'best-effort' para actualizar."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "São necessários privilégios de administrador para actualizar os pacotes."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "Excepção inesperada."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "Você já está a correr o zypper na consola."
@@ -1591,12 +1707,12 @@
msgid "Error"
msgstr "Erro"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Insira o suporte [%s] # %d e digite 's' para continuar ou 'n' para cancelar a operação."
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "A descarregar: "
@@ -1646,32 +1762,31 @@
msgid "Reading installed packages"
msgstr "A ler pacotes instalados"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "A remover "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "A remoção de%s falhou:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(com --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(com --nodeps --force)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "A Instalar: %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "A instalação de %s falhou:"
Modified: trunk/zypper/po/ru.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/ru.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/ru.po (original)
+++ trunk/zypper/po/ru.po Tue Sep 11 20:41:01 2007
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-09-09 12:04+0400\n"
"Last-Translator: Nikolay Derkach <nderkach(a)gmail.com>\n"
"Language-Team: <opensuse-ru(a)opensuse.org>\n"
@@ -86,7 +86,7 @@
# continue button label
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "ÐÑодолжиÑÑ?"
@@ -105,196 +105,330 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "ÐÑовеÑка дайждеÑÑа Ð´Ð»Ñ %s завеÑÑилаÑÑ Ð½ÐµÑдаÑей. ÐжидалоÑÑ %s, найдено %s."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "ÐниÑиализаÑÐ¸Ñ Ñели"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "пакеÑ"
+msgstr[1] "пакеÑ"
+msgstr[2] "пакеÑ"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "вÑбоÑ"
+msgstr[1] "вÑбоÑ"
+msgstr[2] "вÑбоÑ"
+
+#: ../src/zypper-misc.cc:87
+#, fuzzy
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "обÑазеÑ"
+msgstr[1] "обÑазеÑ"
+msgstr[2] "обÑазеÑ"
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "пÑодÑкÑ"
+msgstr[1] "пÑодÑкÑ"
+msgstr[2] "пÑодÑкÑ"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "обновление"
+msgstr[1] "обновление"
+msgstr[2] "обновление"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "ÑкÑипÑ"
+msgstr[1] "ÑкÑипÑ"
+msgstr[2] "ÑкÑипÑ"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "ÑообÑение"
+msgstr[1] "ÑообÑение"
+msgstr[2] "ÑообÑение"
+
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "ÑзÑк: "
+msgstr[1] "ÑзÑк: "
+msgstr[2] "ÑзÑк: "
+
+#: ../src/zypper-misc.cc:99
+#, fuzzy
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "аÑом"
+msgstr[1] "аÑом"
+msgstr[2] "аÑом"
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "ÑиÑÑема"
+msgstr[1] "ÑиÑÑема"
+msgstr[2] "ÑиÑÑема"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "пакеÑ"
+msgstr[1] "пакеÑ"
+msgstr[2] "пакеÑ"
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "ÐбÑÐµÐºÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
+msgstr[1] "ÐбÑÐµÐºÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
+msgstr[2] "ÐбÑÐµÐºÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Ðевозможно обÑабоÑаÑÑ ÑпоÑобноÑÑÑ '%s'."
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s '%s' не найдено"
# text for a progress bar label
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "пÑопÑÑк %s '%s' (Ñже ÑÑÑановлен)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "Ðе ÑдалоÑÑ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ '%s' в ÑпиÑок пакеÑов Ð´Ð»Ñ ÑÑÑановки."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "Ðе ÑдалоÑÑ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ '%s' в ÑпиÑок пакеÑов Ð´Ð»Ñ ÑдалениÑ."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Ðе найден"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "ÐÑоблема:"
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " РеÑение %d: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "номеÑ, (r)повÑÐ¾Ñ Ð¸Ð»Ð¸ (c)оÑмена>"
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "ÐÑименение ÑеÑÐµÐ½Ð¸Ñ %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s ÐÑоблемÑ:"
# popup message
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð°Ñ ÑпоÑобноÑÑÑ Ð½Ðµ найдена."
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "ÐеÑего вÑполнÑÑÑ."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, fuzzy, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "ÐÑдÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ ÑледÑÑÑие пакеÑÑ:"
+msgstr[1] "ÐÑдÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ ÑледÑÑÑие пакеÑÑ:"
+msgstr[2] "ÐÑдÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ ÑледÑÑÑие пакеÑÑ:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, fuzzy, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "ÐÑдÑÑ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ñ ÑледÑÑÑие пакеÑÑ:"
+msgstr[1] "ÐÑдÑÑ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ñ ÑледÑÑÑие пакеÑÑ:"
+msgstr[2] "ÐÑдÑÑ Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ñ ÑледÑÑÑие пакеÑÑ:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, fuzzy, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "ÐÑдÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ ÑледÑÑÑие ÑбоÑки:"
+msgstr[1] "ÐÑдÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ ÑледÑÑÑие ÑбоÑки:"
+msgstr[2] "ÐÑдÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ñ ÑледÑÑÑие ÑбоÑки:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "ÐолнÑй ÑÐ°Ð·Ð¼ÐµÑ Ð·Ð°Ð³ÑÑзки: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "ÐоÑле ÑÑой опеÑаÑии бÑÐ´ÐµÑ Ð¸ÑполÑзовано дополниÑелÑно %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "ÐоÑле ÑÑой опеÑаÑии бÑÐ´ÐµÑ Ð¾Ñвобождено %s."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "%s ÑлеменÑов заблокиÑовано"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "УÑÑановка ÑоÑÑоÑÐ½Ð¸Ñ Ð°Ð³ÑегаÑов"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "РазÑеÑение завиÑимоÑÑей..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "необÑ
одимо %d иÑпÑавлений (%d иÑпÑавлений безопаÑноÑÑи)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "УÑÑановлено"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Ðе ÑÑÑановлен"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Ðолее непÑименимо"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "ÐепÑименимо"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "ÐÑименено"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Ðе нÑжен"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "ÐÑпоÑÑено"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "ÐеобÑ
одимо"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "оÑибка"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "ÐаÑалог:"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "РепозиÑаÑий: "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "ÐмÑ"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "ÐеÑÑиÑ"
# frame label, around checkbuttons
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "ÐаÑегоÑиÑ"
# table header: module status
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "СоÑÑоÑние"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "Ðе найдено необÑ
одимÑÑ
иÑпÑавлений."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -302,46 +436,46 @@
"ÐÐ ÐÐУÐÐ ÐÐÐÐÐÐÐ: ÑÑо ÑолÑко обновлениÑ, оÑноÑÑÑиеÑÑ Ðº ÑÐ°Ð¼Ð¾Ð¼Ñ ÑÑедÑÑÐ²Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ.\n"
"ÐмеÑÑÑÑ Ð¸ дÑÑгие.\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "Ðе найдено обновлений."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "СбоÑка"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "ÐÑÑ
."
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "ÐÐ ÐÐУÐÐ ÐÐÐÐÐÐÐ: %s инÑеÑакÑивен, пÑопÑÑен."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "ÑикÑиÑование"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
msgid "Problem downloading the package file from the repository:"
msgstr "ÐÑоблема пÑи загÑÑзке Ñайла пакеÑа из 'ÑепозиÑаÑиÑ:"
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "РекомендаÑÐ¸Ñ Ð¸Ð¼ÐµÐµÑÑÑ Ð² вÑданном Ñанее ÑообÑении об оÑибке."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -357,64 +491,64 @@
" - иÑполÑзÑйÑе Ð´Ð»Ñ ÑÑÑановки дÑÑгие ноÑиÑели (напÑимеÑ, из-за повÑеждениÑ)\n"
" - иÑполÑзÑйÑе дÑÑгой ÑепозиÑаÑий"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "ÐÐ»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ из ÑÑÑановленнÑÑ
иÑпÑавлений ÑÑебÑеÑÑÑ Ð¿ÐµÑезагÑÑзка компÑÑÑеÑа. ÐÑполниÑе ее как можно бÑÑÑÑее."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "ÐÐ ÐÐУÐÐ ÐÐÐÐÐÐÐ: Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ из ÑÑÑановленнÑÑ
иÑпÑавлений ÑÑебÑеÑÑÑ Ð¿ÐµÑезагÑÑзка компÑÑÑеÑа. ÐÑполниÑе ее как можно бÑÑÑÑее."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "ÐÐ ÐÐУÐÐ ÐÐÐÐÐÐÐ: одно из ÑÑÑановленнÑÑ
иÑпÑавлений заÑÑÐ°Ð³Ð¸Ð²Ð°ÐµÑ Ñам Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿Ð°ÐºÐµÑов, поÑÑÐ¾Ð¼Ñ ÑÑебÑеÑÑÑ ÐµÐ³Ð¾ пеÑезапÑÑк пеÑед вÑполнением какиÑ
-либо далÑнейÑиÑ
опеÑаÑий."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "ÐвÑомаÑиÑеÑкое ÑоглаÑие Ñ Ð»Ð¸Ñензией %s %s."
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "лиÑÐµÐ½Ð·Ð¸Ñ %s %s:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "ЧÑÐ¾Ð±Ñ ÑÑÑановиÑÑ ÑÑÐ¾Ñ Ð¿Ð°ÐºÐµÑ, необÑ
одимо ÑоглаÑиÑÑÑÑ Ñ ÑÑловиÑми вÑÑепÑиведенной лиÑензии. ÐÑодолжиÑÑ?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "УÑÑановка пÑеÑвана в ÑвÑзи Ñ Ð½ÐµÐ¾Ð±Ñ
одимоÑÑÑÑ Ð¿Ð¾Ð´ÑвеÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð»Ð¸Ñензии(й)."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "ÐÑполниÑе опеÑаÑÐ¸Ñ Ð¿Ð¾Ð²ÑоÑно в инÑеÑакÑивном Ñежиме и подÑвеÑдиÑе ÑоглаÑие Ñ ÑÑебÑемой лиÑензией(Ñми), или же иÑполÑзÑйÑе паÑамеÑÑ --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "УÑÑановка пÑеÑвана из-за неÑоглаÑÐ¸Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ñ Ð»Ð¸Ñензией %s %s."
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "УÑÑановка пакеÑа Ñ Ð¸ÑÑ
однÑм кодом %s-%s"
# summary text heading
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "ÐÐ°ÐºÐµÑ Ñ Ð¸ÑÑ
однÑм кодом %s-%s ÑÑпеÑно ÑÑÑановлен."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "ÐÑоблема пÑи ÑÑÑановки пакеÑа Ñ Ð¸ÑÑ
однÑм кодом %s-%s:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "ÐÐ°ÐºÐµÑ Ñ Ð¸ÑÑ
однÑм кодом '%s' не найден."
@@ -479,7 +613,7 @@
#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
-msgstr "ÐÑинÑдиÑелÑное поÑÑÑоение кÑÑа ÑепозиÑаÑиÑ"
+msgstr "ÐÑинÑдиÑелÑное поÑÑÑоение кеÑа ÑепозиÑаÑиÑ"
#: ../src/zypper-sources.cc:166
#, c-format
@@ -494,11 +628,11 @@
#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
-msgstr "ÐеÑаданнÑе Ð´Ð»Ñ ÑепозиÑаÑÐ¸Ñ '%s' не Ð½Ð°Ð¹Ð´ÐµÐ½Ñ Ð² локалÑном кÑÑе."
+msgstr "ÐеÑаданнÑе Ð´Ð»Ñ ÑепозиÑаÑÐ¸Ñ '%s' не Ð½Ð°Ð¹Ð´ÐµÐ½Ñ Ð² локалÑном кеÑе."
#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
-msgstr "ÐÑибка пÑи поÑÑÑоении Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
кÑÑа:"
+msgstr "ÐÑибка пÑи поÑÑÑоении Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
кеÑа:"
#: ../src/zypper-sources.cc:222
#, c-format
@@ -752,7 +886,7 @@
#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
-msgstr "РепозиÑаÑий '%s' не кÑÑиÑован. ÐÑÑиÑование..."
+msgstr "РепозиÑаÑий '%s' не кеÑиÑован. ÐеÑиÑование..."
#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
@@ -836,6 +970,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr "ÐедопÑÑÑимÑй оÑÐ²ÐµÑ '%s'. ÐÑли ниÑего дÑÑгого не полÑÑаеÑÑÑ, введиÑе 'y' Ð´Ð»Ñ '%s' или 'n' Ð´Ð»Ñ '%s'"
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "СлиÑком много аÑгÑменÑов."
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "СообÑение"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "ÐеизвеÑÑнÑй паÑамеÑÑ"
@@ -946,7 +1091,7 @@
#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
-msgstr "ÐÑедваÑиÑелÑное кÑÑиÑование ÑÑÑановленнÑÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей, оÑвеÑаÑÑиÑ
даннÑм кÑиÑеÑиÑм поиÑкаâ¦"
+msgstr "ÐÑедваÑиÑелÑное кеÑиÑование ÑÑÑановленнÑÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей, оÑвеÑаÑÑиÑ
даннÑм кÑиÑеÑиÑм поиÑкаâ¦"
#: ../src/zypper-search.cc:242
msgid " out of ("
@@ -954,7 +1099,7 @@
#: ../src/zypper-search.cc:243
msgid "cached."
-msgstr "кÑÑиÑовано."
+msgstr "кеÑиÑовано."
#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
@@ -964,7 +1109,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "ÐÑо оÑибка, ÑообÑиÑе о ней в оÑÑеÑе, каÑаÑÑемÑÑ zypper."
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "ÐаннÑй URL-адÑÐµÑ Ð½ÐµÐ´Ð¾Ð¿ÑÑÑим."
@@ -1455,95 +1600,95 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "ÐÐ»Ñ Ð¿ÑоÑмоÑÑа ÑиÑÑемнÑÑ
ÑепозиÑаÑиев ÑÑебÑÑÑÑÑ Ð¿Ñивилегии ÑÑпеÑполÑзоваÑелÑ."
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "СлиÑком мало аÑгÑменÑов. Ðо кÑайней меÑе ÑÑебÑÑÑÑÑ URL-адÑÐµÑ Ð¸ пÑевдоним."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "УказаннÑй Ñип не ÑвлÑеÑÑÑ Ð´Ð¾Ð¿ÑÑÑимÑм Ñипом ÑепозиÑаÑиÑ:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "ÐÐ»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑпиÑка извеÑÑнÑÑ
Ñипов ÑепозиÑаÑиев воÑполÑзÑйÑеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ð¼Ð¸ 'zypper -h addrepo' или man zypper."
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "ТÑебÑемÑй аÑгÑÐ¼ÐµÐ½Ñ Ð¾ÑÑÑÑÑÑвÑеÑ."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "РепозиÑаÑий не бÑл найден по пÑевдонимÑ, попÑÑка ÑдалиÑÑ Ð¿Ð¾ URL-адÑеÑÑ..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "РепозиÑаÑий не бÑл найден по Ð´Ð°Ð½Ð½Ð¾Ð¼Ñ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ñ Ð¸Ð»Ð¸ URL-адÑеÑÑ."
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "ÐÑевдоним ÑвлÑеÑÑÑ ÑÑебÑемÑм аÑгÑменÑом."
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "ÐÐ»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑиÑÑемнÑÑ
ÑепозиÑаÑиев ÑÑебÑÑÑÑÑ Ð¿Ñивилегии ÑÑпеÑполÑзоваÑелÑ."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "ÐÐ»Ñ ÑÑÑановки или ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°ÐºÐµÑов ÑÑебÑÑÑÑÑ Ð¿Ñивилегии ÑÑпеÑполÑзоваÑелÑ."
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "ÐеизвеÑÑнÑй Ñип обÑекÑа ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "ÐÑедÑпÑеждение: не опÑеделено никакиÑ
ÑепозиÑаÑиев. РабоÑа ведеÑÑÑ ÑолÑко Ñ ÑÑÑановленнÑми обÑекÑами ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей. ÐелÑÐ·Ñ Ð½Ð¸Ñего ÑÑÑановливаÑÑ."
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "СоздаеÑÑÑ Ð½Ð°Ð±Ð¾Ñ ÑеÑÑовÑÑ
даннÑÑ
Ð´Ð»Ñ ÑеÑаÑÑей пÑогÑаммÑ..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "ÐÐ°Ð±Ð¾Ñ ÑеÑÑовÑÑ
даннÑÑ
ÑеÑаÑÑей пÑогÑÐ°Ð¼Ð¼Ñ ÑÑпеÑно Ñоздан."
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "ÐÑибка пÑи Ñоздании набоÑа ÑеÑÑовÑÑ
даннÑÑ
Ð´Ð»Ñ ÑеÑаÑÑей пÑогÑаммÑ."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "ÐÐ¼Ñ Ð¿Ð°ÐºÐµÑа Ñ Ð¸ÑÑ
однÑм кодом ÑвлÑеÑÑÑ ÑÑебÑемÑм аÑгÑменÑом."
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "ÐеизвеÑÑнÑй Ñип обÑекÑа ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "Ðе найдено никакиÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "ÐÑполнÑеÑÑÑ ÐºÐ°Ðº 'rug', не полÑÑаеÑÑÑ Ð¸ÑполÑзоваÑÑ Ð¿Ð¾Ð´Ñ
од 'наидÑÑÑиÑ
дейÑÑвий' Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "ÐÐ»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°ÐºÐµÑов ÑÑебÑÑÑÑÑ Ð¿Ñивилегии ÑÑпеÑполÑзоваÑелÑ."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "Ðеожиданное иÑклÑÑение."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "У Ð²Ð°Ñ Ñже запÑÑена оболоÑка zypper."
@@ -1575,12 +1720,12 @@
msgid "Error"
msgstr "ÐÑибка"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "ÐÑÑавÑÑе ноÑиÑÐµÐ»Ñ [%s] # %d и введиÑе 'y' Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ 'n' Ð´Ð»Ñ Ð¿ÑекÑаÑÐµÐ½Ð¸Ñ Ð¾Ð¿ÐµÑаÑии."
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "ÐагÑÑжаеÑÑÑ: "
@@ -1630,32 +1775,31 @@
msgid "Reading installed packages"
msgstr "ЧÑение ÑÑÑановленнÑÑ
пакеÑов"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "Удаление "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "Сбой пÑи Ñдалении %s:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(c --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(c --nodeps --force)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "УÑÑанавливаеÑÑÑ: %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "Сбой пÑи ÑÑÑановке %s:"
@@ -1667,4 +1811,3 @@
#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "РепозиÑаÑий"
-
Modified: trunk/zypper/po/uk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/uk.po?rev=7196&r1=7195…
==============================================================================
--- trunk/zypper/po/uk.po (original)
+++ trunk/zypper/po/uk.po Tue Sep 11 20:41:01 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypper.uk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2007-08-19 19:21-0700\n"
"Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>\n"
"Language-Team: Ukrainian <translation(a)linux.org.ua>\n"
@@ -84,7 +84,7 @@
# continue button label
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "ÐÑодовжиÑи?"
@@ -103,192 +103,326 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "ÐеÑевÑÑка дайджеÑÑÑ Ð´Ð»Ñ %s зазнала невдаÑÑ. ÐÑÑкÑвалоÑÑ %s, знайдено %s."
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "ÐапоÑаÑкÑÐ²Ð°Ð½Ð½Ñ ÑÑлÑ"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "пакÑнок"
+msgstr[1] "пакÑнок"
+msgstr[2] "пакÑнок"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "вибÑÑ"
+msgstr[1] "вибÑÑ"
+msgstr[2] "вибÑÑ"
+
+#: ../src/zypper-misc.cc:87
+#, fuzzy
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "взÑÑеÑÑ"
+msgstr[1] "взÑÑеÑÑ"
+msgstr[2] "взÑÑеÑÑ"
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "пÑодÑкÑ"
+msgstr[1] "пÑодÑкÑ"
+msgstr[2] "пÑодÑкÑ"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "лаÑка"
+msgstr[1] "лаÑка"
+msgstr[2] "лаÑка"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "ÑкÑипÑ"
+msgstr[1] "ÑкÑипÑ"
+msgstr[2] "ÑкÑипÑ"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "повÑдомленнÑ"
+msgstr[1] "повÑдомленнÑ"
+msgstr[2] "повÑдомленнÑ"
+
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "мова: "
+msgstr[1] "мова: "
+msgstr[2] "мова: "
+
+#: ../src/zypper-misc.cc:99
+#, fuzzy
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "аÑом"
+msgstr[1] "аÑом"
+msgstr[2] "аÑом"
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "ÑиÑÑема"
+msgstr[1] "ÑиÑÑема"
+msgstr[2] "ÑиÑÑема"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "пакÑнок"
+msgstr[1] "пакÑнок"
+msgstr[2] "пакÑнок"
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "ÐоÑÑÑбнÑ"
+msgstr[1] "ÐоÑÑÑбнÑ"
+msgstr[2] "ÐоÑÑÑбнÑ"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "Ðе вдалоÑÑ ÑозÑбÑаÑи ÑÑнкÑÑоналÑнÑÑÑÑ \"%s\"."
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s \"%s\" не знайдено"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "пÑопÑÑкаÑÑÑÑÑ %s \"%s\" (вже вÑÑановлено)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñи \"%s\" до ÑпиÑÐºÑ Ð²ÑÑановлениÑ
пакÑнкÑв."
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñи \"%s\" до ÑпиÑÐºÑ Ð¿Ð°ÐºÑнкÑв Ð´Ð»Ñ Ð²Ð¸Ð»ÑÑеннÑ."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Ðе знайдено"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "ÐÑоблема: "
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr " ÐиÑÑÑÐµÐ½Ð½Ñ %d: "
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "номеÑ, (r)повÑоÑно або (c)cкаÑÑваÑи> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "п"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "Ñ"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "ÐаÑÑоÑÑÐ²Ð°Ð½Ð½Ñ ÑÑÑÐµÐ½Ð½Ñ %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "ÐÑоблеми %s:"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "ÐÐºÐ°Ð·Ð°Ð½Ñ ÑÑнкÑÑоналÑнÑÑÑÑ Ð½Ðµ знайдено"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "Ðема Ñо ÑобиÑи."
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, fuzzy, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "ÐÑдÑÑÑ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð½Ð°ÑÑÑÐ¿Ð½Ñ Ð¿Ð°ÐºÑнки:"
+msgstr[1] "ÐÑдÑÑÑ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð½Ð°ÑÑÑÐ¿Ð½Ñ Ð¿Ð°ÐºÑнки:"
+msgstr[2] "ÐÑдÑÑÑ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð½Ð°ÑÑÑÐ¿Ð½Ñ Ð¿Ð°ÐºÑнки:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, fuzzy, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "ÐÑдÑÑÑ Ð·Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ñ Ð½Ð°ÑÑÑÐ¿Ð½Ñ Ð¿Ð°ÐºÑнки:"
+msgstr[1] "ÐÑдÑÑÑ Ð·Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ñ Ð½Ð°ÑÑÑÐ¿Ð½Ñ Ð¿Ð°ÐºÑнки:"
+msgstr[2] "ÐÑдÑÑÑ Ð·Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ñ Ð½Ð°ÑÑÑÐ¿Ð½Ñ Ð¿Ð°ÐºÑнки:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, fuzzy, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "ÐÑде вÑÑановлено наÑÑÑÐ¿Ð½Ñ Ð·Ð±ÑÑки:"
+msgstr[1] "ÐÑде вÑÑановлено наÑÑÑÐ¿Ð½Ñ Ð·Ð±ÑÑки:"
+msgstr[2] "ÐÑде вÑÑановлено наÑÑÑÐ¿Ð½Ñ Ð·Ð±ÑÑки:"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../src/zypper-misc.cc:762
#, c-format
msgid "Overall download size: %s."
msgstr "ÐагалÑний ÑозмÑÑ Ð·Ð²Ð°Ð½ÑаженнÑ: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "ÐÑÑÐ»Ñ Ð´ÑÑ, бÑде додаÑково вжиÑо %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "ÐÑÑÐ»Ñ Ð´ÑÑ, %s бÑде вивÑлÑнено."
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "%s елеменÑÑв заблоковано"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "ÐÑÑановлÑÑÑÑÑÑ ÑÑан агÑегованого"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "Розв'ÑÐ·Ð°Ð½Ð½Ñ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑей..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d поÑÑÑбно лаÑок (%d лаÑки безпеки)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "ÐÑÑановленÑ"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "ÐÑибÑанÑ"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "ÐÑлÑÑ Ð½Ðµ пÑдÑ
одиÑÑ"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Ðе ÑÑоÑÑÑÑÑÑÑ"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "ÐаÑÑоÑовано"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Ðе поÑÑÑбнÑ"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "ÐоламанÑ"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "ÐоÑÑÑбнÑ"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "помилка"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "ÐаÑалог: "
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "СÑ
овиÑе: "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Ðазва"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "ÐеÑÑÑÑ"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "ÐаÑегоÑÑÑ"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "СÑан"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "Ðе знайдено поÑÑÑбниÑ
лаÑок."
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -296,47 +430,47 @@
"УÐÐÐÐ: Ð¦Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑÑоÑÑÑÑÑÑÑ ÑÑлÑки пÑогÑами оновленнÑ.\n"
"Ðле Ñ Ñакож ÑнÑÑ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ.\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "Ðе знайдено оновленÑ."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "ÐбÑÑка"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "ÐÑÑ
."
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "УÐÐÐÐ: %s Ñ ÑнÑеÑакÑивноÑ, пÑопÑÑкаÑÑÑÑÑ."
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "пеÑедаÑÑÑÑÑ"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
#, fuzzy
msgid "Problem downloading the package file from the repository:"
msgstr "ÐÑоблема Ð·Ñ Ð·Ð²Ð°Ð½ÑаженнÑм ÑайлÑв з \"%s\"."
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "ÐÑÐ´Ñ Ð»Ð°Ñка, див. повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñо Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ Ð´Ð»Ñ Ð¿Ñдказки."
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -352,63 +486,63 @@
"- замÑнÑÑÑ Ð½Ð¾ÑÑй вÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ (ÑкÑо поÑкоджений)\n"
"- ÑкоÑиÑÑайÑеÑÑ ÑнÑим ÑÑ
овиÑем"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Ðдна з вÑÑановлениÑ
лаÑок поÑÑебÑÑ Ð¿ÐµÑезапÑÑÐºÑ Ð²Ð°Ñого комп'ÑÑеÑа. ÐÑÐ´Ñ Ð»Ð°Ñка, зÑобÑÑÑ Ñе Ñкомога ÑвидÑе."
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "Ðдна з вÑÑановлениÑ
лаÑок поÑÑебÑÑ Ð¿ÐµÑезапÑÑÐºÑ Ð²Ð°Ñого комп'ÑÑеÑа. ÐÑÐ´Ñ Ð»Ð°Ñка, зÑобÑÑÑ Ñе Ñкомога ÑвидÑе."
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "Ðдна з вÑÑановлениÑ
лаÑок ÑÑоÑÑÑÑÑÑÑ Ñамого менеджеÑа пакÑнкÑв, Ñ ÑÐ¾Ð¼Ñ Ð¿Ð¾ÑÑÑбний пеÑезапÑÑк пеÑед наÑÑÑпними дÑÑми."
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "ÐвÑомаÑиÑно погоджÑÑÑÑÑÑ Ð· лÑÑензÑÑÑ %s %s."
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "ÐÑÑензÑÑ %s %s:"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Щоб вÑÑановиÑи Ñей пакÑнок, ви мÑÑиÑе погодиÑиÑÑ Ð· Ñмовами ÑÑÑÑ Ð»ÑÑензÑÑ. ÐÑодовжиÑи?"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÐµÑеÑиваÑÑÑÑÑ, бо поÑÑÑбно пÑийнÑÑи лÑÑензÑÑ(Ñ)."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "ÐÑÐ´Ñ Ð»Ð°Ñка, пеÑезапÑÑÑÑÑÑ Ð´ÑÑ Ð² ÑнÑеÑакÑÐ¸Ð²Ð½Ð¾Ð¼Ñ ÑÐµÐ¶Ð¸Ð¼Ñ Ð¹ погодÑÑеÑÑ Ð· поÑÑÑбними лÑÑензÑÑми або ÑкоÑиÑÑайÑеÑÑ Ð¿Ð°ÑамеÑÑом --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÐµÑеÑиваÑÑÑÑÑ, бо коÑиÑÑÑÐ²Ð°Ñ Ð½Ðµ погодивÑÑ Ð· лÑÑензÑÑÑ %s %s."
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°ÐºÑнка джеÑела %s-%s"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "ÐакÑнок джеÑела %s-%s бÑло ÑÑпÑÑно вÑÑановлено."
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "ÐÑоблема з вÑÑановленнÑм пакÑнка джеÑела %s-%s:"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "ÐакÑнок джеÑела \"%s\" не знайдено."
@@ -834,6 +968,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr ""
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "ÐабагаÑо аÑгÑменÑÑв."
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "ÐÑаге"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "ÐевÑдомий паÑамеÑÑ "
@@ -959,7 +1104,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "Це вада в кодÑ, бÑÐ´Ñ Ð»Ð°Ñка, напиÑÑÑÑ Ð·Ð²ÑÑ Ð¿Ñо Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ Ð² пÑогÑÐ°Ð¼Ñ zypper."
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "Ðана адÑеÑа URL не Ñ ÑинноÑ."
@@ -1385,95 +1530,95 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "ÐÐ»Ñ Ð·Ð¼Ñни ÑиÑÑемниÑ
ÑÑ
Ð¾Ð²Ð¸Ñ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð¿ÑивÑÐ»ÐµÑ Ð°Ð´Ð¼ÑнÑÑÑÑаÑоÑа."
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "Ðамало аÑгÑменÑÑв. ÐоÑÑÑбнÑ, пÑинаймнÑ, адÑеÑа URL Ñ Ð¿ÑевдонÑм."
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "Ðказаний Ñип не Ñ Ñинним Ñипом ÑÑ
овиÑа:"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Щоб оÑÑимаÑи ÑпиÑок вÑдомиÑ
ÑипÑв ÑÑ
овиÑ, ÑкоÑиÑÑайÑеÑÑ \"zypper -h addrepo\" або \"man zypper\"."
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "ÐоÑÑÑбний аÑгÑÐ¼ÐµÐ½Ñ Ð²ÑдÑÑÑнÑй."
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "СÑ
овиÑе не знайдено за даним пÑевдонÑмом, ÑпÑоба вилÑÑÐµÐ½Ð½Ñ Ð·Ð° адÑеÑÐ¾Ñ URL..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "СÑ
овиÑе не знайдено за даним пÑевдонÑмом або адÑеÑÐ¾Ñ URL."
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "ÐÑевдонÑм - Ñе поÑÑÑбний аÑгÑменÑ."
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "ÐÐ»Ñ Ð¾ÑвÑÐ¶ÐµÐ½Ð½Ñ ÑиÑÑемниÑ
ÑÑ
Ð¾Ð²Ð¸Ñ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð¿ÑивÑÐ»ÐµÑ Ð°Ð´Ð¼ÑнÑÑÑÑаÑоÑа."
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "ÐÐ»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ Ð²Ð¸Ð»ÑÑÐµÐ½Ð½Ñ Ð¿Ð°ÐºÑнкÑв поÑÑÑÐ±Ð½Ñ Ð¿ÑивÑÐ»ÐµÑ Ð°Ð´Ð¼ÑнÑÑÑÑаÑоÑа."
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "ÐевÑдомий Ñип поÑÑÑбного пакÑнка: %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Увага: Ð½ÐµÐ¼Ð°Ñ Ð²Ð¸Ð·Ð½Ð°ÑениÑ
ÑÑ
овиÑ. ÐÑÑ ÑÑлÑки з вÑÑановленими поÑÑÑбними пакÑнками. ÐÑÑого неможливо вÑÑановиÑи."
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "СÑвоÑÐµÐ½Ð½Ñ ÑеÑÑÑ..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "ТеÑÑ ÑÑвоÑено ÑÑпÑÑно."
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "Ðомилка ÑÑвоÑÐµÐ½Ð½Ñ ÑеÑÑÑ."
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "Ðазва пакÑнка джеÑела - Ñе поÑÑÑбний аÑгÑменÑ."
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "ÐевÑдомий Ñип поÑÑÑбного пакÑнка "
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "Ðе знайдено пакÑнкÑв Ð´Ð»Ñ Ð²Ð¸ÑÑÑеннÑ."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "ÐиконÑÑÑÑÑÑ Ñк \"rug\", до Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¸Ð¹ пÑдÑ
Ñд Ñк \"best-effort\"."
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "ÐÐ»Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°ÐºÑнкÑв поÑÑÑÐ±Ð½Ñ Ð¿ÑивÑÐ»ÐµÑ Ð°Ð´Ð¼ÑнÑÑÑÑаÑоÑа."
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "ÐепеÑедбаÑений винÑÑок."
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "У Ð²Ð°Ñ Ð²Ð¶Ðµ запÑÑено Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÑ zypper."
@@ -1505,12 +1650,12 @@
msgid "Error"
msgstr "Ðомилка"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "ÐÑÐ´Ñ Ð»Ð°Ñка, вÑÑавÑе ноÑÑй [%s] # %d Ñ Ð²Ð²ÐµÐ´ÑÑÑ \"Ñ\", Ñоб пÑодовжиÑи або \"н\", Ñоб ÑкаÑÑваÑи дÑÑ."
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "ÐванÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð·Ð½Ð°Ð»Ð¾: "
@@ -1559,32 +1704,31 @@
msgid "Reading installed packages"
msgstr "ЧиÑÐ°Ð½Ð½Ñ Ð²ÑÑановлениÑ
пакÑнкÑв"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "ÐилÑÑÐµÐ½Ð½Ñ "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "ÐилÑÑÐµÐ½Ð½Ñ %s зазнало невдаÑÑ:"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(з --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(з --nodeps --force)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "ÐÑÑановленнÑ: %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ %s зазнало невдаÑÑ:"
Modified: trunk/zypper/po/zh_TW.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/zh_TW.po?rev=7196&r1=7…
==============================================================================
--- trunk/zypper/po/zh_TW.po (original)
+++ trunk/zypper/po/zh_TW.po Tue Sep 11 20:41:01 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"POT-Creation-Date: 2007-09-11 11:12+0200\n"
"PO-Revision-Date: 2005-03-09 13:54+0100\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -84,7 +84,7 @@
# internal key used: Ok
#. there are resolvables to install/uninstall
#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
-#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1402
msgid "Continue?"
msgstr "è¦ç¹¼çºåï¼"
@@ -103,192 +103,294 @@
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "%s çæè¦ç¢ºèªå¤±æãææ %sï¼æ¾å° %sã"
-#: ../src/zypper-misc.cc:41
+#: ../src/zypper-misc.cc:42
msgid "Initializing Target"
msgstr "åå§åç®æ¨"
-#: ../src/zypper-misc.cc:270
+#: ../src/zypper-misc.cc:83
+#, fuzzy
+msgid "package"
+msgid_plural "packages"
+msgstr[0] "å¥ä»¶"
+
+#: ../src/zypper-misc.cc:85
+#, fuzzy
+msgid "selection"
+msgid_plural "selections"
+msgstr[0] "é¸é
"
+
+#: ../src/zypper-misc.cc:87
+#, fuzzy
+msgid "pattern"
+msgid_plural "patterns"
+msgstr[0] "模å¼"
+
+#: ../src/zypper-misc.cc:89
+#, fuzzy
+msgid "product"
+msgid_plural "product"
+msgstr[0] "ç¢å"
+
+#: ../src/zypper-misc.cc:91
+#, fuzzy
+msgid "patch"
+msgid_plural "patches"
+msgstr[0] "ä¿®è£"
+
+#: ../src/zypper-misc.cc:93
+#, fuzzy
+msgid "script"
+msgid_plural "scripts"
+msgstr[0] "ç¨åºæª"
+
+#: ../src/zypper-misc.cc:95
+#, fuzzy
+msgid "message"
+msgid_plural "messages"
+msgstr[0] "è¨æ¯"
+
+#: ../src/zypper-misc.cc:97
+#, fuzzy
+msgid "language"
+msgid_plural "languages"
+msgstr[0] "èªè¨ï¼ "
+
+#: ../src/zypper-misc.cc:99
+#, fuzzy
+msgid "atom"
+msgid_plural "atoms"
+msgstr[0] "åå"
+
+#: ../src/zypper-misc.cc:101
+#, fuzzy
+msgid "system"
+msgid_plural "systems"
+msgstr[0] "系統"
+
+#: ../src/zypper-misc.cc:103
+#, fuzzy
+msgid "srcpackage"
+msgid_plural "srcpackages"
+msgstr[0] "å¥ä»¶ï¼"
+
+#. default
+#: ../src/zypper-misc.cc:105
+#, fuzzy
+msgid "resolvable"
+msgid_plural "resolvables"
+msgstr[0] "å¯è§£ææª"
+
+#: ../src/zypper-misc.cc:271
#, c-format
msgid "Cannot parse capability '%s'."
msgstr "ç¡æ³åæç¸å®¹æ§ '%s'ã"
#. TranslatorExplanation e.g. "package 'pornview' not found"
-#: ../src/zypper-misc.cc:294
+#: ../src/zypper-misc.cc:295
#, c-format
msgid "%s '%s' not found"
msgstr "%s '%s' æ¾ä¸å°"
-#: ../src/zypper-misc.cc:303
+#: ../src/zypper-misc.cc:304
#, c-format
msgid "skipping %s '%s' (already installed)"
msgstr "æ£å¨è·³é %s '%s' (å·²å®è£)"
-#: ../src/zypper-misc.cc:309
+#: ../src/zypper-misc.cc:310
#, c-format
msgid "Failed to add '%s' to the list of packages to be installed."
msgstr "ç¡æ³å° '%s' æ°å¢å°è¦å®è£çå¥ä»¶æ¸
å®ä¸ã"
-#: ../src/zypper-misc.cc:329
+#: ../src/zypper-misc.cc:330
#, c-format
msgid "Failed to add '%s' to the list of packages to be removed."
msgstr "ç¡æ³å° '%s' æ°å¢å°è¦ç§»é¤çå¥ä»¶æ¸
å®ä¸ã"
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
+#: ../src/zypper-misc.cc:356 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "æ¾ä¸å°"
-#: ../src/zypper-misc.cc:421
+#: ../src/zypper-misc.cc:422 ../src/zypper-misc.cc:506
msgid "Problem: "
msgstr "åé¡ï¼ "
#. TranslatorExplanation %d is the solution number
-#: ../src/zypper-misc.cc:434
+#: ../src/zypper-misc.cc:435
#, c-format
msgid " Solution %d: "
msgstr "解決æ¹æ¡ %dï¼"
#. input prompt
-#: ../src/zypper-misc.cc:449
+#: ../src/zypper-misc.cc:450
msgid "number, (r)etry or (c)ancel> "
msgstr "æ¸åï¼é試(r)æåæ¶(c)> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:461
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:460
+#: ../src/zypper-misc.cc:464
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:466
+#: ../src/zypper-misc.cc:470
#, c-format
msgid "Applying solution %s"
msgstr "å¥ç¨è§£æ±ºæ¹æ¡ %s"
-#: ../src/zypper-misc.cc:488
+#: ../src/zypper-misc.cc:494
#, c-format
msgid "%s Problems:"
msgstr "%s åé¡"
-#: ../src/zypper-misc.cc:491
+#. should not happen! If solve() failed at least one problem must be set!
+#: ../src/zypper-misc.cc:498
msgid "Specified capability not found"
msgstr "æ¾ä¸å°æå®çç¸å®¹æ§"
-#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
+#: ../src/zypper-misc.cc:637 ../src/zypper-misc.cc:639
msgid "Nothing to do."
msgstr "ç¡å·è¡åä½ã"
-#: ../src/zypper-misc.cc:737
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:708
+#, fuzzy, c-format
+msgid "The following %s is going to be upgraded:"
+msgid_plural "The following %s are going to be upgraded:"
+msgstr[0] "å°æåç´ä¸åå¥ä»¶ï¼"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:721
+#, fuzzy, c-format
+msgid "The following %s is going to be downgraded:"
+msgid_plural "The following %s are going to be downgraded:"
+msgstr[0] "å°æä¸è¼ä¸åå¥ä»¶ï¼"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:735
+#, fuzzy, c-format
+msgid "The following NEW %s is going to be installed:"
+msgid_plural "The following NEW %s are going to be installed:"
+msgstr[0] "å°æå®è£ä¸åé
å¥ï¼"
+
+#. TranslatorExplanation %s is a "package", "patch", "pattern", etc
+#: ../src/zypper-misc.cc:749
+#, c-format
+msgid "The following %s is going to be REMOVED:"
+msgid_plural "The following %s are going to be REMOVED:"
+msgstr[0] ""
+
+#: ../src/zypper-misc.cc:762
#, fuzzy, c-format
msgid "Overall download size: %s."
msgstr "å
¨é¨ä¸è¼å¤§å°ï¼ %1ã"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:741
+#: ../src/zypper-misc.cc:767
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "å®ææä½å¾ï¼å°å¢å %s ç使ç¨ã"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:749
+#: ../src/zypper-misc.cc:779
#, c-format
msgid "After the operation, %s will be freed."
msgstr "å®ææä½å¾ï¼å°éåº %sã"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:827
#, c-format
msgid "%s items locked"
msgstr "%s é
ç®éå®"
-#: ../src/zypper-misc.cc:797
+#: ../src/zypper-misc.cc:828
msgid "Establishing status of aggregates"
msgstr "æ£å¨å»ºç«æ´åçæ
"
-#: ../src/zypper-misc.cc:805
+#: ../src/zypper-misc.cc:836
msgid "Resolving dependencies..."
msgstr "æ£å¨è§£æç¸ä¾æ§..."
-#: ../src/zypper-misc.cc:831
+#: ../src/zypper-misc.cc:862
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "éè¦ %d åä¿®è£ç¨å¼(%d åå®å
¨æ§ä¿®æ£)"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "å·²å®è£"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:871 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "已解é¤å®è£"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "ä¸åé©ç¨"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:873 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "ä¸é©ç¨"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "å·²å¥ç¨"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:875 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "ä¸éè¦"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "å·²ææ¯"
-#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:877 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "éè¦"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:848
+#: ../src/zypper-misc.cc:879
msgid "error"
msgstr "é¯èª¤"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "ç®éï¼"
-#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
-#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:908 ../src/zypper-misc.cc:1028
+#: ../src/zypper-misc.cc:1177 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "å¥ä»¶åº«ï¼ "
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1183 ../src/zypper-sources.cc:316
#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "å稱"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Version"
msgstr "çæ¬"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
msgid "Category"
msgstr "åé¡"
-#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:909 ../src/zypper-misc.cc:1029
#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "çæ
"
-#: ../src/zypper-misc.cc:904
+#: ../src/zypper-misc.cc:935
msgid "No needed patches found."
msgstr "æ²æéè¦çä¿®è£ç¨å¼ã"
-#: ../src/zypper-misc.cc:1032
+#: ../src/zypper-misc.cc:1063
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -296,47 +398,47 @@
"è¦åï¼ éäºæ¯åªå½±é¿æ´æ°ç¨å¼æ¬èº«çæ´æ°ã\n"
"éæå
¶ä»çæ´æ°ã\n"
-#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
+#: ../src/zypper-misc.cc:1073 ../src/zypper-misc.cc:1219
msgid "No updates found."
msgstr "æ²æç¼ç¾æ´æ°ã"
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
+#: ../src/zypper-misc.cc:1175 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
+#: ../src/zypper-misc.cc:1180 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "é
å¥"
-#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
+#: ../src/zypper-misc.cc:1185 ../src/zypper-search.h:299
msgid "Arch"
msgstr "çµæ§"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1312
+#: ../src/zypper-misc.cc:1343
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "è¦åï¼ %s æ¯äºå模å¼ï¼ç¥éã"
-#: ../src/zypper-misc.cc:1375
+#: ../src/zypper-misc.cc:1406
msgid "committing"
msgstr "æ交"
-#: ../src/zypper-misc.cc:1390
+#: ../src/zypper-misc.cc:1421
#, fuzzy
msgid "Problem downloading the package file from the repository:"
msgstr "å¾ '%s' ä¸è¼æªæ¡åºç¾åé¡ã"
-#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+#: ../src/zypper-misc.cc:1422 ../src/zypper-sources.cc:89
msgid "Please, see the above error message to for a hint."
msgstr "è«æª¢è¦ä¸é¢çé¯èª¤è¨æ¯ä»¥ç²å¾æ示ã"
-#: ../src/zypper-misc.cc:1401
+#: ../src/zypper-misc.cc:1432
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -352,63 +454,63 @@
" â 使ç¨å¦ä¸åå®è£åªé« (ä¾å¦åªé«æå£æ)\n"
" â 使ç¨å¦ä¸åå¥ä»¶åº«"
-#: ../src/zypper-misc.cc:1421
+#: ../src/zypper-misc.cc:1452
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "å
¶ä¸ä¸åå®è£çä¿®è£ç¨å¼éè¦éæ°ååæ¨çæ©å¨ã è«ç¡å¿«éæ°ååé»è
¦ã"
-#: ../src/zypper-misc.cc:1424
+#: ../src/zypper-misc.cc:1455
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "è¦åï¼ å
¶ä¸ä¸åå®è£çä¿®è£ç¨å¼éè¦éæ°ååæ¨çæ©å¨ã è«ç¡å¿«éæ°ååé»è
¦ã"
-#: ../src/zypper-misc.cc:1430
+#: ../src/zypper-misc.cc:1461
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "è¦åï¼ å
¶ä¸ä¸åå®è£çä¿®è£ç¨å¼æå½±é¿å¥ä»¶ç®¡çå¡æ¬èº«ï¼å æ¤å¿
é éæ°ååï¼æè½å·è¡ä¸ä¸åä½æ¥ã"
-#: ../src/zypper-misc.cc:1456
+#: ../src/zypper-misc.cc:1487
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "èªååæ %s %s ææ¬ã"
-#: ../src/zypper-misc.cc:1467
+#: ../src/zypper-misc.cc:1498
#, c-format
msgid "%s %s license:"
msgstr "%s %s ææ¬ï¼"
-#: ../src/zypper-misc.cc:1471
+#: ../src/zypper-misc.cc:1502
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "è¥è¦å®è£æ¤å¥ä»¶ï¼æ¨å¿
é æ¥åä¸è¿°ææ¬æ¢æ¬¾ã è¦ç¹¼çºåï¼"
-#: ../src/zypper-misc.cc:1482
+#: ../src/zypper-misc.cc:1513
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "å çºå¿
é 確èªææ¬æ¢æ¬¾ï¼æ以ä¸æ¢å®è£ã"
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1486
+#: ../src/zypper-misc.cc:1517
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "è«å¨äºå模å¼ä¸éæ°ååä½æ¥ï¼ä¸¦ç¢ºèªæ¨åæææ¬åç´ï¼æä½¿ç¨ --auto-agree-with-licenses çé¸é
ã"
-#: ../src/zypper-misc.cc:1497
+#: ../src/zypper-misc.cc:1528
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "ä¸æ¢å®è£ï¼å çºä½¿ç¨è
ä¸æ¥å %s %s ææ¬ã"
-#: ../src/zypper-misc.cc:1567
+#: ../src/zypper-misc.cc:1598
#, c-format
msgid "Installing source package %s-%s"
msgstr "æ£å¨å®è£ä¾æºå¥ä»¶ %s-%s"
-#: ../src/zypper-misc.cc:1575
+#: ../src/zypper-misc.cc:1606
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "ä¾æºå¥ä»¶ %s-%s å·²æåå®è£ã"
-#: ../src/zypper-misc.cc:1581
+#: ../src/zypper-misc.cc:1612
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "å®è£ä¾æºå¥ä»¶ %s-%s ç¼çåé¡ï¼"
-#: ../src/zypper-misc.cc:1589
+#: ../src/zypper-misc.cc:1620
#, c-format
msgid "Source package '%s' not found."
msgstr "æ¾ä¸å°ä¾æºå¥ä»¶ '%s'ã"
@@ -832,6 +934,17 @@
msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
msgstr ""
+#. ! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+#: ../src/zypper-callbacks.cc:222
+#, fuzzy
+msgid "Too many arguments"
+msgstr "å¼æ¸å¤ªå¤ã"
+
+#: ../src/zypper-callbacks.cc:223 ../src/zypper.cc:888 ../src/zypper.cc:1475
+#, fuzzy
+msgid "Usage"
+msgstr "æå¡å¥èª"
+
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
msgstr "æªç¥é¸é
"
@@ -957,7 +1070,7 @@
msgid "This is a bug, please file a bug report against zypper."
msgstr "éæ¯ä¸åé¯èª¤ï¼è«å°æ¤æå ±å° zipper çé¯èª¤åå ±ä¸ã"
-#: ../src/zypper.cc:76 ../src/zypper.cc:899
+#: ../src/zypper.cc:76 ../src/zypper.cc:915
msgid "Given URL is invalid."
msgstr "æå®ç URL ç¡æã"
@@ -1448,95 +1561,95 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
-#: ../src/zypper.cc:984
+#: ../src/zypper.cc:795 ../src/zypper.cc:880 ../src/zypper.cc:960
+#: ../src/zypper.cc:1006
msgid "Root privileges are required for modifying system repositories."
msgstr "éè¦æ Root æ¬éæè½ä¿®æ¹ç³»çµ±å¥ä»¶åº«ã"
-#: ../src/zypper.cc:822 ../src/zypper.cc:950
+#: ../src/zypper.cc:829 ../src/zypper.cc:966
msgid "Too few arguments. At least URL and alias are required."
msgstr "åæ¸éå°ãè³å°è¦æ URL åå¥åã"
-#: ../src/zypper.cc:854
+#: ../src/zypper.cc:861
msgid "Specified type is not a valid repository type:"
msgstr "æå®çé¡åä¸æ¯é©ç¨çå¥ä»¶åº«é¡åï¼"
-#: ../src/zypper.cc:855
+#: ../src/zypper.cc:862
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "åé± 'zypper -h addrepo' æ man zypper åå¾å·²ç¥çå¥ä»¶åº«é¡åã"
-#: ../src/zypper.cc:879
+#: ../src/zypper.cc:886 ../src/zypper.cc:1473
msgid "Required argument missing."
msgstr "缺å°éè¦çåæ¸ã"
-#: ../src/zypper.cc:892
+#: ../src/zypper.cc:908
msgid "Repository not found by alias, trying delete by URL..."
msgstr "æ¾ä¸å°è©²å¥åçå¥ä»¶åº«ï¼åè©¦ç¨ URL..."
-#: ../src/zypper.cc:925
+#: ../src/zypper.cc:941
msgid "Repository not found by given alias or URL."
msgstr "æ¾ä¸å°æå®å¥åæ URL çå¥ä»¶åº«ã"
-#: ../src/zypper.cc:990
+#: ../src/zypper.cc:1012
msgid "Alias is a required argument."
msgstr "å¥åçºå¿
è¦çåæ¸ã"
-#: ../src/zypper.cc:1012
+#: ../src/zypper.cc:1040
msgid "Root privileges are required for refreshing system repositories."
msgstr "éè¦æ Root æ¬éæè½éæ°æ´ç系統å¥ä»¶åº«ã"
-#: ../src/zypper.cc:1049
+#: ../src/zypper.cc:1077
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "éè¦æ Root æ¬éæè½å®è£æ移é¤å¥ä»¶ã"
-#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#: ../src/zypper.cc:1091 ../src/zypper.cc:1334 ../src/zypper.cc:1421
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "ä¸æç解決æ¹æ¡é¡åï¼ %s"
-#: ../src/zypper.cc:1081
+#: ../src/zypper.cc:1109
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "è¦åï¼æ²æå·²å®ç¾©çå¥ä»¶åº«ãæ¨åªè½ä½¿ç¨å·²å®è£ç解決æ¹æ¡æä½ãç¡æ³å®è£ä»»ä½é
ç®ã"
-#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
+#: ../src/zypper.cc:1129 ../src/zypper.cc:1446
msgid "Generating solver test case..."
msgstr "æ£å¨ç¢ç解決測試æ¹æ¡..."
-#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
+#: ../src/zypper.cc:1131 ../src/zypper.cc:1448
msgid "Solver test case generated successfully."
msgstr "ç¢ç解決測試æ¹æ¡æåã"
-#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
+#: ../src/zypper.cc:1134 ../src/zypper.cc:1450
msgid "Error creating the solver test case."
msgstr "建ç«è§£æ±ºæ¸¬è©¦æ¹æ¡æç¼çé¯èª¤ã"
-#: ../src/zypper.cc:1128
+#: ../src/zypper.cc:1156
msgid "Source package name is a required argument."
msgstr "ä¾æºå¥ä»¶çå稱çºå¿
è¦çåæ¸ã"
-#: ../src/zypper.cc:1169
+#: ../src/zypper.cc:1198
msgid "Unknown resolvable type "
msgstr "ä¸æç解決æ¹æ¡é¡å"
-#: ../src/zypper.cc:1206
+#: ../src/zypper.cc:1235
msgid "No resolvables found."
msgstr "æªç¼ç¾è§£æ±ºæ¹æ¡ã"
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
+#: ../src/zypper.cc:1344 ../src/zypper.cc:1431
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "å°±å¦ 'rug' ä¸è¬å·è¡ï¼ç¡æ³é²è¡ 'best-effort' 趨è¿å®å
¨æ´æ°ã"
-#: ../src/zypper.cc:1338
+#: ../src/zypper.cc:1397
msgid "Root privileges are required for updating packages."
msgstr "éè¦æ Root æ¬éæè½æ´æ°å¥ä»¶ã"
-#: ../src/zypper.cc:1441
+#: ../src/zypper.cc:1517
msgid "Unexpected exception."
msgstr "éé æçä¾å¤ã"
-#: ../src/zypper.cc:1526
+#: ../src/zypper.cc:1602
msgid "You already are running zypper's shell."
msgstr "æ¨å·²ç¶æ£å¨å·è¡ zypper's shellã"
@@ -1568,12 +1681,12 @@
msgid "Error"
msgstr "é¯èª¤"
-#: ../src/zypper-media-callbacks.h:56
+#: ../src/zypper-media-callbacks.h:57
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "è«æ¾å
¥åªé« [%s] # %d ç¶å¾éµå
¥ 'y' ç¹¼çºï¼æ 'n' 以åæ¶æ¤æä½ã"
-#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
+#: ../src/zypper-media-callbacks.h:77 ../src/zypper-media-callbacks.h:83
msgid "Downloading: "
msgstr "æ£å¨ä¸è¼ï¼ "
@@ -1622,32 +1735,31 @@
msgid "Reading installed packages"
msgstr "è®åå·²å®è£çå¥ä»¶"
-#. TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
-#: ../src/zypper-rpm-callbacks.h:140 ../src/zypper-rpm-callbacks.h:146
+#: ../src/zypper-rpm-callbacks.h:142 ../src/zypper-rpm-callbacks.h:149
msgid "Removing "
msgstr "æ£å¨ç§»é¤ "
-#: ../src/zypper-rpm-callbacks.h:152
+#: ../src/zypper-rpm-callbacks.h:155
#, c-format
msgid "Removal of %s failed:"
msgstr "ç§»é¤ %s 失æï¼"
#. TranslatorExplanation --nodeps and --force are options of the rpm command, don't translate
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps)"
msgstr "(with --nodeps)"
-#: ../src/zypper-rpm-callbacks.h:167
+#: ../src/zypper-rpm-callbacks.h:170
msgid "(with --nodeps --force)"
msgstr "(with --nodeps --force)"
-#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
-#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#. TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
+#: ../src/zypper-rpm-callbacks.h:184 ../src/zypper-rpm-callbacks.h:194
#, c-format
msgid "Installing: %s-%s"
msgstr "æ£å¨å®è£ï¼ %s-%s"
-#: ../src/zypper-rpm-callbacks.h:212
+#: ../src/zypper-rpm-callbacks.h:215
#, c-format
msgid "Installation of %s failed:"
msgstr "å®è£ %s 失æï¼"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
11 Sep '07
Author: jkupec
Date: Tue Sep 11 19:47:56 2007
New Revision: 7195
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7195&view=rev
Log:
changes
Modified:
trunk/zypper/package/zypper.changes
Modified: trunk/zypper/package/zypper.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re…
==============================================================================
--- trunk/zypper/package/zypper.changes (original)
+++ trunk/zypper/package/zypper.changes Tue Sep 11 19:47:56 2007
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Tue Sep 11 13:04:04 CEST 2007 - jkupec(a)suse.cz
+
+- always display name instead of alias (except for the renamerepo
+ command, which works with alias) (#308669)
+- don't display the number of problems if only one found (#304283)
+- r7194
+
+-------------------------------------------------------------------
Tue Sep 11 10:58:16 CEST 2007 - jkupec(a)suse.cz
- translations update
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7194 - in /trunk/zypper/src: zypper-misc.cc zypper-search.h zypper-source-callbacks.h zypper-sources.cc zypper.cc
by jkupec@svn.opensuse.org 11 Sep '07
by jkupec@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: jkupec
Date: Tue Sep 11 19:10:33 2007
New Revision: 7194
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7194&view=rev
Log:
- use name instead of alias everywhere except for the renamerepo command (#308669)
Modified:
trunk/zypper/src/zypper-misc.cc
trunk/zypper/src/zypper-search.h
trunk/zypper/src/zypper-source-callbacks.h
trunk/zypper/src/zypper-sources.cc
trunk/zypper/src/zypper.cc
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=71…
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Tue Sep 11 19:10:33 2007
@@ -567,7 +567,7 @@
cout_v << "-" << res->edition() << "." << res->arch();
// plus repo providing this package
if (res->repository() != Repository::noRepository)
- cout_v << " (" << res->repository().info().alias() << ")";
+ cout_v << " (" << res->repository().info().name() << ")";
// new line after each package in the verbose mode
cout_v << endl;
}
@@ -923,7 +923,7 @@
Patch::constPtr patch = asKind<Patch>(res);
TableRow tr;
- tr << patch->repository().info().alias ();
+ tr << patch->repository().info().name();
tr << res->name () << res->edition ().asString();
tr << patch->category();
tr << string_status (it->status ());
@@ -1043,7 +1043,7 @@
if (true) {
TableRow tr (cols);
- tr << patch->repository().info().alias ();
+ tr << patch->repository().info().name();
tr << res->name () << res->edition ().asString();
tr << patch->category();
tr << string_status (it->status ());
@@ -1199,7 +1199,7 @@
TableRow tr (cols);
tr << "v";
if (!hide_repo) {
- tr << res->repository().info().alias();
+ tr << res->repository().info().name();
}
if (gSettings.is_rug_compatible)
tr << ""; // Bundle
Modified: trunk/zypper/src/zypper-search.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-search.h?rev=7…
==============================================================================
--- trunk/zypper/src/zypper-search.h (original)
+++ trunk/zypper/src/zypper-search.h Tue Sep 11 19:10:33 2007
@@ -314,7 +314,7 @@
{
// add other fields to the result table
row << "i"
- << pool_item.resolvable()->repository().info().alias()
+ << pool_item.resolvable()->repository().info().name()
// TODO what about rug's Bundle?
<< (gSettings.is_rug_compatible ? "" : pool_item.resolvable()->kind().asString())
<< pool_item.resolvable()->name()
Modified: trunk/zypper/src/zypper-source-callbacks.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-source-callbac…
==============================================================================
--- trunk/zypper/src/zypper-source-callbacks.h (original)
+++ trunk/zypper/src/zypper-source-callbacks.h Tue Sep 11 19:10:33 2007
@@ -260,7 +260,7 @@
void display_step( int value )
{
- display_progress ( "repo", cout, "(" + _repo.info().alias() + ") " + _task , value);
+ display_progress ( "repo", cout, "(" + _repo.info().name() + ") " + _task , value);
}
virtual bool progress( int value )
Modified: trunk/zypper/src/zypper-sources.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-sources.cc?rev…
==============================================================================
--- trunk/zypper/src/zypper-sources.cc (original)
+++ trunk/zypper/src/zypper-sources.cc Tue Sep 11 19:10:33 2007
@@ -49,7 +49,7 @@
// check whether libzypp indicates a refresh is needed, and if so,
// print a message
cout_v << format(
- _("Checking whether to refresh metadata for %s")) % repo.alias()
+ _("Checking whether to refresh metadata for %s")) % repo.name()
<< endl;
for(RepoInfo::urls_const_iterator it = repo.baseUrlsBegin();
it != repo.baseUrlsEnd(); ++it)
@@ -58,14 +58,14 @@
{
if (manager.checkIfToRefreshMetadata(repo, *it))
{
- cout_n << format(_("Refreshing '%s'")) % repo.alias();
+ cout_n << format(_("Refreshing '%s'")) % repo.name();
if (command == ZypperCommand::REFRESH && copts.count("force"))
cout_n << " " << _("(forced)");
cout_n << endl;
}
else if (command == ZypperCommand::REFRESH)
{
- cout_n << format(_("Repository '%s' is up to date.")) % repo.alias() << endl;
+ cout_n << format(_("Repository '%s' is up to date.")) % repo.name() << endl;
}
break; // don't check all the urls, just the first succussfull.
}
@@ -85,7 +85,7 @@
catch (const MediaException & e)
{
report_problem(e,
- boost::str(format(_("Problem downloading files from '%s'.")) % repo.alias()),
+ boost::str(format(_("Problem downloading files from '%s'.")) % repo.name()),
_("Please, see the above error message to for a hint."));
return true; // error
@@ -93,12 +93,12 @@
catch (const RepoNoUrlException & e)
{
ZYPP_CAUGHT(e);
- cerr << format(_("No URLs defined for '%s'.")) % repo.alias() << endl;
+ cerr << format(_("No URLs defined for '%s'.")) % repo.name() << endl;
if (!repo.filepath().empty())
cerr << format(
// TranslatorExplanation the first %s is a .repo file path
_("Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."))
- % repo.filepath() % repo.alias() << endl;
+ % repo.filepath() % repo.name() << endl;
return true; // error
}
@@ -114,7 +114,7 @@
{
ZYPP_CAUGHT(e);
report_problem(e,
- boost::str(format(_("Repository '%s' is invalid.")) % repo.alias()),
+ boost::str(format(_("Repository '%s' is invalid.")) % repo.name()),
_("Please, check if the URLs defined for this repository are pointing to a valid repository."));
return true; // error
@@ -123,9 +123,9 @@
{
ZYPP_CAUGHT(e);
report_problem(e,
- boost::str(format(_("Error downloading metadata for '%s':")) % repo.alias()));
+ boost::str(format(_("Error downloading metadata for '%s':")) % repo.name()));
// log untranslated message
- ERR << format("Error reading repository '%s':") % repo.alias() << endl;
+ ERR << format("Error reading repository '%s':") % repo.name() << endl;
return true; // error
}
@@ -163,7 +163,7 @@
ZYPP_CAUGHT(e);
report_problem(e,
- boost::str(format(_("Error parsing metadata for '%s':")) % repo.alias()),
+ boost::str(format(_("Error parsing metadata for '%s':")) % repo.name()),
// TranslatorExplanation Don't translate the URL unless it is translated, too
_("This may be caused by invalid metadata in the repository,"
" or by a bug in the metadata parser. In the latter case,"
@@ -171,7 +171,7 @@
" instructions at http://en.opensuse.org/Zypper#Troubleshooting"));
// log untranslated message
- ERR << format("Error parsing metadata for '%s':") % repo.alias() << endl;
+ ERR << format("Error parsing metadata for '%s':") % repo.name() << endl;
return true; // error
}
@@ -179,7 +179,7 @@
{
ZYPP_CAUGHT(e);
report_problem(e,
- boost::str(format(_("Repository metadata for '%s' not found in local cache.")) % repo.alias()));
+ boost::str(format(_("Repository metadata for '%s' not found in local cache.")) % repo.name()));
// this should not happend and is probably a bug, rethrowing
ZYPP_RETHROW(e);
}
@@ -240,14 +240,14 @@
it != gData.repos.end(); ++it)
{
RepoInfo repo(*it);
- MIL << "checking if to refresh " << repo.alias() << endl;
+ MIL << "checking if to refresh " << repo.name() << endl;
//! \todo honor command line options/commands
bool do_refresh = repo.enabled() && repo.autorefresh();
if (do_refresh)
{
- MIL << "calling refresh for " << repo.alias() << endl;
+ MIL << "calling refresh for " << repo.name() << endl;
// handle root user differently
if (geteuid() == 0)
@@ -255,9 +255,9 @@
if (refresh_raw_metadata(repo, false) || build_cache(repo, false))
{
cerr << format(_("Disabling repository '%s' because of the above error."))
- % repo.alias() << endl;
+ % repo.name() << endl;
ERR << format("Disabling repository '%s' because of the above error.")
- % repo.alias() << endl;
+ % repo.name() << endl;
it->setEnabled(false);
}
@@ -273,11 +273,11 @@
{
cout << format(_(
"Repository '%s' is out-of-date. You can run 'zypper refresh'"
- " as root to update it.")) % repo.alias()
+ " as root to update it.")) % repo.name()
<< endl;
string nonroot =
- "We're running as non-root, skipping refresh of " + repo.alias();
+ "We're running as non-root, skipping refresh of " + repo.name();
MIL << nonroot << endl;
cout_vv << nonroot << endl;
}
@@ -548,7 +548,7 @@
if (!repo.enabled())
{
string msg = boost::str(
- format(_("Skipping disabled repository '%s'")) % repo.alias());
+ format(_("Skipping disabled repository '%s'")) % repo.name());
if (argc)
cerr << msg << endl;
@@ -585,9 +585,9 @@
if (error)
{
cerr << format(_("Skipping repository '%s' because of the above error."))
- % repo.alias() << endl;
+ % repo.name() << endl;
ERR << format("Skipping repository '%s' because of the above error.")
- % repo.alias() << endl;
+ % repo.name() << endl;
error_count++;
}
}
@@ -684,7 +684,7 @@
ZYPP_CAUGHT(e);
cerr << format(_("Repository named '%s' already exists. Please, use another alias."))
% repo.alias() << endl;
- ERR << "Repository named '%s' already exists." << endl;
+ ERR << "Repository named '" << repo.alias() << "' already exists." << endl;
return ZYPPER_EXIT_ERR_ZYPP;
}
catch (const RepoUnknownTypeException & e)
@@ -714,7 +714,7 @@
return ZYPPER_EXIT_ERR_BUG;
}
- cout << format(_("Repository '%s' successfully added")) % repo.alias();
+ cout << format(_("Repository '%s' successfully added")) % repo.name();
cout_n << ":";
cout << endl;
@@ -737,13 +737,13 @@
if(is_cd)
{
- cout_n << format(_("Reading data from '%s' media")) % repo.alias() << endl;
+ cout_n << format(_("Reading data from '%s' media")) % repo.name() << endl;
bool error = refresh_raw_metadata(repo, false);
if (!error)
error = build_cache(repo, false);
if (error)
{
- cerr << format(_("Problem reading data from '%s' media")) % repo.alias() << endl;
+ cerr << format(_("Problem reading data from '%s' media")) % repo.name() << endl;
cerr << _("Please, check if your installation media is valid and readable.") << endl;
return ZYPPER_EXIT_ERR_ZYPP;
}
@@ -867,8 +867,8 @@
try
{
manager.removeRepository(repoinfo);
- cout << format(_("Repository %s has been removed.")) % repoinfo.alias() << endl;
- MIL << format("Repository %s has been removed.") % repoinfo.alias() << endl;
+ cout << format(_("Repository %s has been removed.")) % repoinfo.name() << endl;
+ MIL << format("Repository %s has been removed.") % repoinfo.name() << endl;
}
catch (const repo::RepoNotFoundException & ex)
{
@@ -1045,22 +1045,22 @@
if ( manager.metadataStatus(repo).empty() )
{
cout_v << format(_("Retrieving repository '%s' data..."))
- % repo.alias() << endl;
+ % repo.name() << endl;
error = refresh_raw_metadata(repo, false);
}
if (!error && !manager.isCached(repo))
{
cout_v << format(_("Repository '%s' not cached. Caching..."))
- % repo.alias() << endl;
+ % repo.name() << endl;
error = build_cache(repo, false);
}
if (error)
{
- cerr << format(_("Problem loading data from '%s'")) % repo.alias() << endl;
+ cerr << format(_("Problem loading data from '%s'")) % repo.name() << endl;
cerr << format(_("Resolvables from '%s' not loaded because of error."))
- % repo.alias() << endl;
+ % repo.name() << endl;
continue;
}
@@ -1077,10 +1077,10 @@
{
ZYPP_CAUGHT(e);
report_problem(e,
- boost::str(format(_("Problem loading data from '%s'")) % repo.alias()),
+ boost::str(format(_("Problem loading data from '%s'")) % repo.name()),
_("Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."));
cerr << format(_("Resolvables from '%s' not loaded because of error."))
- % repo.alias() << endl;
+ % repo.name() << endl;
}
}
}
Modified: trunk/zypper/src/zypper.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=7194&r1…
==============================================================================
--- trunk/zypper/src/zypper.cc (original)
+++ trunk/zypper/src/zypper.cc Tue Sep 11 19:10:33 2007
@@ -1624,7 +1624,7 @@
}
} say_goodbye __attribute__ ((__unused__));
- // set locale
+ // set locale
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7193 - in /trunk/zypper/src: zypper-misc.cc zypper.h
by jkupec@svn.opensuse.org 11 Sep '07
by jkupec@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: jkupec
Date: Tue Sep 11 18:10:44 2007
New Revision: 7193
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7193&view=rev
Log:
- removed the limit_to_verbosity nonsense
- backup for media callback hack (#309043)
Modified:
trunk/zypper/src/zypper-misc.cc
trunk/zypper/src/zypper.h
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=71…
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Tue Sep 11 18:10:44 2007
@@ -1404,12 +1404,16 @@
if (!confirm_licenses()) return ZYPPER_EXIT_OK;
cerr_v << _("committing") << endl;
-
+
try {
- // FIXME do resync if in shell mode, how
- // do I know if in shell mode?
+ //! \todo fix the media reporting correctly
+ gData.show_media_progress_hack = true;
+
+ // FIXME do resync if in shell mode, how do I know if in shell mode?
ZYppCommitResult result = God->commit( ZYppCommitPolicy().syncPoolAfterCommit(false) );
+ gData.show_media_progress_hack = false;
+
if (!result._errors.empty())
retv = ZYPPER_EXIT_ERR_ZYPP;
Modified: trunk/zypper/src/zypper.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=7193&r1=…
==============================================================================
--- trunk/zypper/src/zypper.h (original)
+++ trunk/zypper/src/zypper.h Tue Sep 11 18:10:44 2007
@@ -93,7 +93,7 @@
struct RuntimeData
{
RuntimeData()
- : patches_count(0), security_patches_count(0), limit_to_verbosity(0)
+ : patches_count(0), security_patches_count(0), show_media_progress_hack(false)
{}
std::list<Error> errors;
@@ -106,26 +106,9 @@
zypp::ResStore target_resolvables;
zypp::RepoInfo current_repo;
- /**
- * Limit output to and above specified verbosity level.
- *
- * Use this variable to control whether to print the output or not,
- * wherever the desired verbosity level is variable. Then set the limit
- * before the code where the output is generated and reset it afterwards:
- *
- * <code>
- *
- * // set verbosity limit
- * gData.limit_to_verbosity = VERBOSITY_MEDIUM;
- *
- * ... code generating the output but respecting the verbosity limit goes here ...
- *
- * // restore verbosity limit
- * gData.limit_to_verbosity = VERBOSITY_NORMAL;
- *
- * </code>
- */
- int limit_to_verbosity;
+ // hack to enable media progress reporting in the commit phase in normal
+ // output level
+ bool show_media_progress_hack;
};
extern RuntimeData gData;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
11 Sep '07
Author: schubi2
Date: Tue Sep 11 17:26:31 2007
New Revision: 7192
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7192&view=rev
Log:
7191
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Tue Sep 11 17:26:31 2007
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Sep 11 17:25:35 CEST 2007 - schubi(a)suse.de
+
+- Update: rename language packages --> take that package which fits to the
+ selected language Bug 308098
+- r 7919
+
+-------------------------------------------------------------------
Tue Sep 11 16:11:20 CEST 2007 - dmacvicar(a)suse.de
- restore deltas and patch rpms from the cache (#309124)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7191 - /trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
by schubi2@svn.opensuse.org 11 Sep '07
by schubi2@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: schubi2
Date: Tue Sep 11 17:25:16 2007
New Revision: 7191
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7191&view=rev
Log:
Update: rename language packages --> take that package which fits to the
selected language Bug 308098
Modified:
trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original)
+++ trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Tue Sep 11 17:25:16 2007
@@ -776,6 +776,60 @@
}
}
}
+
+ if ( guess ) {
+ // Checking if the selected provider depends on language, if yes try to find out the
+ // correct language package
+ bool requested_locale_match = false;
+ CapSet freshens( guess->dep( Dep::FRESHENS ) );
+
+ // is this a language package ?
+ for (CapSet::const_iterator cit = freshens.begin(); cit != freshens.end(); ++cit) {
+ if (cit->refers() == ResTraits<Language>::kind) {
+ requested_locale_match = true;
+ break;
+ }
+ }
+
+ if (requested_locale_match) {
+ // searching the best language
+ PoolItemOrderSet & gset( it->second );
+ requested_locale_match = false;
+
+ for ( PoolItemOrderSet::iterator git = gset.begin(); git != gset.end(); ++git ) {
+ PoolItem_Ref item (*git);
+
+ if ( item.status().isToBeInstalled()) {
+ MIL << " ==> (pass 2: meanwhile set to install): " << item << endl;
+ if ( ! doesObsoleteItem (item, it->first ) ) {
+ it->first.status().setToBeUninstalled( ResStatus::APPL_HIGH );
+ }
+ guess = PoolItem_Ref();
+ break;
+ } else {
+ freshens = item->dep( Dep::FRESHENS );
+ ZYpp::Ptr z = zypp::getZYpp();
+ ZYpp::LocaleSet requested_locales = z->getRequestedLocales();
+
+ // try to find a match of the locale freshens with one of the requested locales
+
+ for (CapSet::const_iterator cit = freshens.begin(); cit != freshens.end(); ++cit) {
+ if (cit->refers() == ResTraits<Language>::kind) {
+ string loc = cit->index();
+ MIL << "Look for language fallback " << loc << ":" << item << endl;
+ if (requested_locales.find( Locale( loc ) ) != requested_locales.end()) {
+ MIL << "Locale '" << loc << "' is requested" << endl;
+ requested_locale_match = true;
+ guess = item;
+ break;
+ }
+ }
+ }
+ }
+ if (requested_locale_match) break;
+ }
+ }
+ }
if ( guess ) {
guess.status().setToBeInstalled( ResStatus::APPL_HIGH );
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7190 - in /trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests: bug308098-1-package.xml.gz bug308098-system.xml.gz bug308098-test.solution bug308098-test.xml
by schubi2@svn.opensuse.org 11 Sep '07
by schubi2@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: schubi2
Date: Tue Sep 11 17:20:38 2007
New Revision: 7190
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7190&view=rev
Log:
testcase for bug308098
Added:
trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-1-package.xml.gz (with props)
trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-system.xml.gz (with props)
trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.solution
trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.xml
Added: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-1-package.xml.gz
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
Binary file - no diff available.
Added: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-system.xml.gz
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
Binary file - no diff available.
Added: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.solution
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.solution (added)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.solution Tue Sep 11 17:20:38 2007
@@ -0,0 +1,9201 @@
+>!> Requesting locale en_US
+>!> Requesting locale en
+>!> Establishing state ...
+>!> Established context
+>!> koffice-1.6.3-38.i586[1] U_Ts_
+>!> koffice-illustration-1.6.3-38.i586[1] U_TsS
+>!> kscpm-0.5.3-124.i586[1] U_TsS
+>!> libGraphicsMagick1-1.1.8-12.i586[1] U_Ts_
+>!> libMagick10-6.3.5.3-20.i586[1] U_Ts_
+>!> libWand10-6.3.5.3-20.i586[1] U_Ts_
+>!> pattern:apparmor-10.3-100.i586 IS_s_
+>!> pattern:base-10.3-100.i586 IS_s_
+>!> pattern:base-10.3-133.i586[1] US_s_
+>!> pattern:default-10.3-133.i586[1] US_s_
+>!> pattern:devel_perl-10.3-133.i586[1] US_s_
+>!> pattern:enhanced_base-10.3-100.i586 IS_s_
+>!> pattern:enhanced_base_opt-10.3-133.i586[1] US_s_
+>!> pattern:fonts-10.3-100.i586 IS_s_
+>!> pattern:fonts-10.3-133.i586[1] US_s_
+>!> pattern:fonts_opt-10.3-133.i586[1] US_s_
+>!> pattern:games-10.3-100.i586 IS_s_
+>!> pattern:games-10.3-133.i586[1] US_s_
+>!> pattern:games_opt-10.3-133.i586[1] US_s_
+>!> pattern:gateway_server-10.3-133.i586[1] US_s_
+>!> pattern:gnome_basis_opt-10.3-133.i586[1] US_s_
+>!> pattern:gnome_games-10.3-133.i586[1] UU_s_
+>!> pattern:gnome_ide-10.3-133.i586[1] UU_s_
+>!> pattern:gnome_imaging-10.3-133.i586[1] UU_s_
+>!> pattern:gnome_imaging_opt-10.3-133.i586[1] UU_s_
+>!> pattern:gnome_laptop-10.3-133.i586[1] UU_s_
+>!> pattern:gnome_multimedia-10.3-133.i586[1] UU_s_
+>!> pattern:gnome_multimedia_opt-10.3-133.i586[1] UU_s_
+>!> pattern:gnome_office-10.3-133.i586[1] UU_s_
+>!> pattern:gnome_office_opt-10.3-133.i586[1] UU_s_
+>!> pattern:gnome_xgl-10.3-133.i586[1] UU_s_
+>!> pattern:gnome_yast-10.3-133.i586[1] UU_s_
+>!> pattern:imaging-10.3-100.i586 IS_s_
+>!> pattern:imaging-10.3-133.i586[1] US_s_
+>!> pattern:imaging_opt-10.3-133.i586[1] US_s_
+>!> pattern:kde-10.3-100.i586 IS_s_
+>!> pattern:kde-10.3-133.i586[1] US_s_
+>!> pattern:kde_basis-10.3-100.i586 IS_s_
+>!> pattern:kde_basis-10.3-133.i586[1] US_s_
+>!> pattern:kde_basis_opt-10.3-133.i586[1] US_s_
+>!> pattern:kde_games-10.3-100.i586 IS_s_
+>!> pattern:kde_games-10.3-133.i586[1] US_s_
+>!> pattern:kde_ide-10.3-133.i586[1] UU_s_
+>!> pattern:kde_imaging-10.3-100.i586 IS_s_
+>!> pattern:kde_imaging-10.3-133.i586[1] US_s_
+>!> pattern:kde_imaging_opt-10.3-133.i586[1] U_TsS
+>!> pattern:kde_internet-10.3-100.i586 IS_s_
+>!> pattern:kde_internet-10.3-133.i586[1] US_s_
+>!> pattern:kde_laptop-10.3-133.i586[1] U_TsS
+>!> pattern:kde_multimedia-10.3-100.i586 IS_s_
+>!> pattern:kde_office-10.3-100.i586 IS_s_
+>!> pattern:kde_office-10.3-133.i586[1] US_s_
+>!> pattern:kde_office_opt-10.3-133.i586[1] U_TsS
+>!> pattern:kde_utilities-10.3-100.i586 IS_s_
+>!> pattern:kde_utilities-10.3-133.i586[1] US_s_
+>!> pattern:kde_xgl-10.3-100.i586 IS_s_
+>!> pattern:kde_xgl-10.3-133.i586[1] US_s_
+>!> pattern:laptop-10.3-100.i586 IS_s_
+>!> pattern:laptop-10.3-133.i586[1] US_s_
+>!> pattern:mail_server-10.3-133.i586[1] US_s_
+>!> pattern:misc_server-10.3-133.i586[1] US_s_
+>!> pattern:multimedia-10.3-100.i586 IS_s_
+>!> pattern:multimedia-10.3-133.i586[1] US_s_
+>!> pattern:multimedia_opt-10.3-133.i586[1] US_s_
+>!> pattern:non_oss-10.3-133.i586[1] US_s_
+>!> pattern:office-10.3-100.i586 IS_s_
+>!> pattern:office-10.3-133.i586[1] US_s_
+>!> pattern:office_opt-10.3-133.i586[1] US_s_
+>!> pattern:remote_desktop-10.3-133.i586[1] US_s_
+>!> pattern:sw_management-10.3-100.i586 IS_s_
+>!> pattern:sw_management-10.3-133.i586[1] US_s_
+>!> pattern:sw_management_gnome-10.3-133.i586[1] UU_s_
+>!> pattern:sw_management_kde-10.3-100.i586 IS_s_
+>!> pattern:sw_management_kde-10.3-133.i586[1] US_s_
+>!> pattern:voip-10.3-133.i586[1] US_s_
+>!> pattern:x11-10.3-100.i586 IS_s_
+>!> pattern:x11-10.3-133.i586[1] US_s_
+>!> pattern:x11_opt-10.3-133.i586[1] US_s_
+>!> pattern:xgl-10.3-100.i586 IS_s_
+>!> pattern:xgl-10.3-133.i586[1] US_s_
+>!> pattern:yast2_basis-10.3-100.i586 IS_s_
+>!> pattern:yast2_install_wf-10.3-100.i586 IS_s_
+>!> pattern:yast2_install_wf-10.3-133.i586[1] US_s_
+>!> product:openSUSE-DVD5-download-10.3.i686[1] US_s_
+>!> python-2.5.1-32.i586[1] U_Ts_
+>!> xfsprogs-2.8.21-17.i586[1] U_TsS
+>!> ESTABLISHED:1: U__s_[S2:0][package]3ddiag-0.740-73.i586
+>!> ESTABLISHED:2: I__s_[S1:0][package]915resolution-0.5.3-21.i586
+>!> ESTABLISHED:3: U__s_[S2:0][package]915resolution-0.5.3-28.i586
+>!> ESTABLISHED:4: U__s_[S2:0][package]AdobeICCProfiles-2.0-71.noarch
+>!> ESTABLISHED:5: U__s_[S2:0][package]BitTorrent-4.0.3-107.i586
+>!> ESTABLISHED:6: U__s_[S2:0][package]CID-keyed-fonts-MOE-20021114-272.noarch
+>!> ESTABLISHED:7: U__s_[S2:0][package]CID-keyed-fonts-Wada-20021114-272.noarch
+>!> ESTABLISHED:8: U__s_[S2:0][package]CID-keyed-fonts-WadaH-20021114-272.noarch
+>!> ESTABLISHED:9: I__s_[S1:0][package]CheckHardware-0.1-1071.i586
+>!> ESTABLISHED:10: U__s_[S2:0][package]CheckHardware-0.1-1080.i586
+>!> ESTABLISHED:11: U__s_[S2:0][package]ConsoleKit-0.2.1-48.i586
+>!> ESTABLISHED:12: U__s_[S2:0][package]Crystalcursors-0.5-124.noarch
+>!> ESTABLISHED:13: I__s_[S1:0][package]DirectFB-1.0.0-47.i586
+>!> ESTABLISHED:14: U__s_[S2:0][package]DirectFB-1.0.0-57.i586
+>!> ESTABLISHED:15: U__s_[S2:0][package]DirectFB-devel-1.0.0-57.i586
+>!> ESTABLISHED:16: U__s_[S2:0][package]ElectricFence-2.2.2-600.i586
+>!> ESTABLISHED:17: U__s_[S2:0][package]FA_clalsadrv-1.1.0-75.i586
+>!> ESTABLISHED:18: U__s_[S2:0][package]FA_clthreads-2.2.1-40.i586
+>!> ESTABLISHED:19: U__s_[S2:0][package]FA_clxclient-3.3.1-53.i586
+>!> ESTABLISHED:20: U__s_[S2:0][package]FreeNX-0.7.0-15.i586
+>!> ESTABLISHED:21: U__s_[S2:0][package]GraphicsMagick-1.1.8-12.i586
+>!> ESTABLISHED:22: U__s_[S2:0][package]IPAGothic-001.000-98.noarch
+>!> ESTABLISHED:23: U__s_[S2:0][package]IPAMincho-001.000-98.noarch
+>!> ESTABLISHED:24: U__s_[S2:0][package]IPAPGothic-5.0.3-86.noarch
+>!> ESTABLISHED:25: U__s_[S2:0][package]IPAPMincho-001.000-98.noarch
+>!> ESTABLISHED:26: U__s_[S2:0][package]IPAUIGothic-001.000-98.noarch
+>!> ESTABLISHED:27: U__s_[S2:0][package]ImageMagick-6.3.5.3-20.i586
+>!> ESTABLISHED:28: U__s_[S2:0][package]ImageMagick-devel-6.3.5.3-20.i586
+>!> ESTABLISHED:29: I__s_[S1:0][package]LibVNCServer-0.9.1-11.i586
+>!> ESTABLISHED:30: U__s_[S2:0][package]LibVNCServer-0.9.1-20.i586
+>!> ESTABLISHED:31: U__s_[S2:0][package]Maelstrom-3.0.6-106.i586
+>!> ESTABLISHED:32: U__s_[S2:0][package]Mesa-7.0.1-12.i586
+>!> ESTABLISHED:33: I__s_[S1:0][package]Mesa-7.0.1-2.i586
+>!> ESTABLISHED:34: U__s_[S2:0][package]Mesa-devel-7.0.1-12.i586
+>!> ESTABLISHED:35: U__s_[S2:0][package]Mesa-devel-static-7.0.1-12.i586
+>!> ESTABLISHED:36: U__s_[S2:0][package]MesaGLw-7.0.1-10.i586
+>!> ESTABLISHED:37: U__s_[S2:0][package]MesaGLw-devel-7.0.1-10.i586
+>!> ESTABLISHED:38: U__s_[S2:0][package]Modules-3.1.6-121.i586
+>!> ESTABLISHED:39: I__s_[S1:0][package]MozillaFirefox-2.0.0.5-9.i586
+>!> ESTABLISHED:40: U__s_[S2:0][package]MozillaFirefox-2.0.0.6-9.i586
+>!> ESTABLISHED:41: U__s_[S2:0][package]MozillaFirefox-translations-2.0.0.6-9.i586
+>!> ESTABLISHED:42: U__s_[S2:0][package]MozillaSunbird-0.5-20.i586
+>!> ESTABLISHED:43: U__s_[S2:0][package]MozillaSunbird-translations-0.5-20.i586
+>!> ESTABLISHED:44: U__s_[S2:0][package]MozillaThunderbird-2.0.0.6-8.i586
+>!> ESTABLISHED:45: U__s_[S2:0][package]MozillaThunderbird-translations-2.0.0.6-8.i586
+>!> ESTABLISHED:46: U__s_[S2:0][package]NX-2.1.0-31.i586
+>!> ESTABLISHED:47: U__s_[S2:0][package]NetworkManager-0.6.5-22.i586
+>!> ESTABLISHED:48: I__s_[S1:0][package]NetworkManager-0.6.5-4.i586
+>!> ESTABLISHED:49: U__s_[S2:0][package]NetworkManager-devel-0.6.5-22.i586
+>!> ESTABLISHED:50: U__s_[S2:0][package]NetworkManager-glib-0.6.5-22.i586
+>!> ESTABLISHED:51: U__s_[S2:0][package]NetworkManager-gnome-0.6.5-22.i586
+>!> ESTABLISHED:52: I__s_[S1:0][package]NetworkManager-kde-0.2r674918-21.i586
+>!> ESTABLISHED:53: U__s_[S2:0][package]NetworkManager-kde-0.2r674918-40.i586
+>!> ESTABLISHED:54: U__s_[S2:0][package]NetworkManager-openvpn-0.3.2cvs20060202-160.i586
+>!> ESTABLISHED:55: U__s_[S2:0][package]NetworkManager-openvpn-gnome-0.3.2cvs20060202-160.i586
+>!> ESTABLISHED:56: U__s_[S2:0][package]NetworkManager-openvpn-kde-0.2r674918-40.i586
+>!> ESTABLISHED:57: U__s_[S2:0][package]NetworkManager-vpnc-0.5.0cvs20060202-162.i586
+>!> ESTABLISHED:58: U__s_[S2:0][package]NetworkManager-vpnc-gnome-0.5.0cvs20060202-162.i586
+>!> ESTABLISHED:59: U__s_[S2:0][package]NetworkManager-vpnc-kde-0.2r674918-40.i586
+>!> ESTABLISHED:60: I__s_[S1:0][package]OpenEXR-1.4.0a-22.i586
+>!> ESTABLISHED:61: U__s_[S2:0][package]OpenEXR-1.4.0a-30.i586
+>!> ESTABLISHED:62: I__s_[S1:0][package]OpenOffice_org-2.2.99.224-4.i586
+>!> ESTABLISHED:63: U__s_[S2:0][package]OpenOffice_org-2.3.0.1-2.i586
+>!> ESTABLISHED:64: I__s_[S1:0][package]OpenOffice_org-Quickstarter-1.0-572.i586
+>!> ESTABLISHED:65: U__s_[S2:0][package]OpenOffice_org-Quickstarter-1.0-582.i586
+>!> ESTABLISHED:66: U__s_[S2:0][package]OpenOffice_org-base-2.3.0.1-2.i586
+>!> ESTABLISHED:67: I__s_[S1:0][package]OpenOffice_org-calc-2.2.99.224-4.i586
+>!> ESTABLISHED:68: U__s_[S2:0][package]OpenOffice_org-calc-2.3.0.1-2.i586
+>!> ESTABLISHED:69: U__s_[S2:0][package]OpenOffice_org-cs-2.3.0.1-2.noarch
+>!> ESTABLISHED:70: U__s_[S2:0][package]OpenOffice_org-da-2.3.0.1-2.noarch
+>!> ESTABLISHED:71: U__s_[S2:0][package]OpenOffice_org-de-2.3.0.1-2.noarch
+>!> ESTABLISHED:72: I__s_[S1:0][package]OpenOffice_org-draw-2.2.99.224-4.i586
+>!> ESTABLISHED:73: U__s_[S2:0][package]OpenOffice_org-draw-2.3.0.1-2.i586
+>!> ESTABLISHED:74: U__s_[S2:0][package]OpenOffice_org-en-GB-2.3.0.1-2.noarch
+>!> ESTABLISHED:75: U__s_[S2:0][package]OpenOffice_org-es-2.3.0.1-2.noarch
+>!> ESTABLISHED:76: U__s_[S2:0][package]OpenOffice_org-fi-2.3.0.1-2.noarch
+>!> ESTABLISHED:77: U__s_[S2:0][package]OpenOffice_org-filters-2.3.0.1-2.i586
+>!> ESTABLISHED:78: U__s_[S2:0][package]OpenOffice_org-fr-2.3.0.1-2.noarch
+>!> ESTABLISHED:79: U__s_[S2:0][package]OpenOffice_org-gnome-2.3.0.1-2.i586
+>!> ESTABLISHED:80: U__s_[S2:0][package]OpenOffice_org-hu-2.3.0.1-2.noarch
+>!> ESTABLISHED:81: U__s_[S2:0][package]OpenOffice_org-hyphen-20070719-11.noarch
+>!> ESTABLISHED:82: I__s_[S1:0][package]OpenOffice_org-icon-themes-2.2.99.224-3.noarch
+>!> ESTABLISHED:83: U__s_[S2:0][package]OpenOffice_org-icon-themes-2.3.0.1-2.noarch
+>!> ESTABLISHED:84: I__s_[S1:0][package]OpenOffice_org-impress-2.2.99.224-4.i586
+>!> ESTABLISHED:85: U__s_[S2:0][package]OpenOffice_org-impress-2.3.0.1-2.i586
+>!> ESTABLISHED:86: U__s_[S2:0][package]OpenOffice_org-it-2.3.0.1-2.noarch
+>!> ESTABLISHED:87: U__s_[S2:0][package]OpenOffice_org-ja-2.3.0.1-2.noarch
+>!> ESTABLISHED:88: I__s_[S1:0][package]OpenOffice_org-kde-2.2.99.224-4.i586
+>!> ESTABLISHED:89: U__s_[S2:0][package]OpenOffice_org-kde-2.3.0.1-2.i586
+>!> ESTABLISHED:90: U__s_[S2:0][package]OpenOffice_org-mailmerge-2.3.0.1-2.i586
+>!> ESTABLISHED:91: U__s_[S2:0][package]OpenOffice_org-math-2.3.0.1-2.i586
+>!> ESTABLISHED:92: U__s_[S2:0][package]OpenOffice_org-mono-2.3.0.1-2.i586
+>!> ESTABLISHED:93: U__s_[S2:0][package]OpenOffice_org-nb-2.3.0.1-2.noarch
+>!> ESTABLISHED:94: U__s_[S2:0][package]OpenOffice_org-nl-2.3.0.1-2.noarch
+>!> ESTABLISHED:95: U__s_[S2:0][package]OpenOffice_org-pl-2.3.0.1-2.noarch
+>!> ESTABLISHED:96: U__s_[S2:0][package]OpenOffice_org-pt-2.3.0.1-2.noarch
+>!> ESTABLISHED:97: U__s_[S2:0][package]OpenOffice_org-pt-BR-2.3.0.1-2.noarch
+>!> ESTABLISHED:98: U__s_[S2:0][package]OpenOffice_org-pyuno-2.3.0.1-2.i586
+>!> ESTABLISHED:99: U__s_[S2:0][package]OpenOffice_org-ru-2.3.0.1-2.noarch
+>!> ESTABLISHED:100: U__s_[S2:0][package]OpenOffice_org-sv-2.3.0.1-2.noarch
+>!> ESTABLISHED:101: U__s_[S2:0][package]OpenOffice_org-templates-de-2.0.4-48.noarch
+>!> ESTABLISHED:102: U__s_[S2:0][package]OpenOffice_org-templates-en-2.0.4-48.noarch
+>!> ESTABLISHED:103: U__s_[S2:0][package]OpenOffice_org-templates-labels-a4-1.0-2.noarch
+>!> ESTABLISHED:104: U__s_[S2:0][package]OpenOffice_org-templates-labels-letter-1.0-2.noarch
+>!> ESTABLISHED:105: U__s_[S2:0][package]OpenOffice_org-templates-presentation-layouts-2.0.4-50.noarch
+>!> ESTABLISHED:106: U__s_[S2:0][package]OpenOffice_org-thesaurus-cs-20060111-11.noarch
+>!> ESTABLISHED:107: U__s_[S2:0][package]OpenOffice_org-thesaurus-de-20070206-11.noarch
+>!> ESTABLISHED:108: U__s_[S2:0][package]OpenOffice_org-thesaurus-en-20060111-11.noarch
+>!> ESTABLISHED:109: U__s_[S2:0][package]OpenOffice_org-thesaurus-es-20050720-11.noarch
+>!> ESTABLISHED:110: U__s_[S2:0][package]OpenOffice_org-thesaurus-fr-20050329-11.noarch
+>!> ESTABLISHED:111: U__s_[S2:0][package]OpenOffice_org-thesaurus-nb-20060508-11.noarch
+>!> ESTABLISHED:112: U__s_[S2:0][package]OpenOffice_org-thesaurus-pl-20061223-11.noarch
+>!> ESTABLISHED:113: U__s_[S2:0][package]OpenOffice_org-thesaurus-pt-20060817-11.noarch
+>!> ESTABLISHED:114: I__s_[S1:0][package]OpenOffice_org-writer-2.2.99.224-4.i586
+>!> ESTABLISHED:115: U__s_[S2:0][package]OpenOffice_org-writer-2.3.0.1-2.i586
+>!> ESTABLISHED:116: U__s_[S2:0][package]OpenOffice_org-zh-CN-2.3.0.1-2.noarch
+>!> ESTABLISHED:117: U__s_[S2:0][package]OpenOffice_org-zh-TW-2.3.0.1-2.noarch
+>!> ESTABLISHED:118: U__s_[S2:0][package]PgTcl-1.5-84.i586
+>!> ESTABLISHED:119: I__s_[S1:0][package]PolicyKit-0.2_git20060822-83.i586
+>!> ESTABLISHED:120: U__s_[S2:0][package]PolicyKit-0.4-15.i586
+>!> ESTABLISHED:121: U__s_[S2:0][package]QtDMM-0.8.8-47.i586
+>!> ESTABLISHED:122: U__s_[S2:0][package]RealPlayer-10.0.9-8.i586
+>!> ESTABLISHED:123: U__s_[S2:0][package]SDL-1.2.12-16.i586
+>!> ESTABLISHED:124: I__s_[S1:0][package]SDL-1.2.12-7.i586
+>!> ESTABLISHED:125: U__s_[S2:0][package]SDL-devel-1.2.12-16.i586
+>!> ESTABLISHED:126: U__s_[S2:0][package]SDL_Pango-0.1.2-74.i586
+>!> ESTABLISHED:127: U__s_[S2:0][package]SDL_Pango-devel-0.1.2-74.i586
+>!> ESTABLISHED:128: U__s_[S2:0][package]SDL_image-1.2.6-16.i586
+>!> ESTABLISHED:129: U__s_[S2:0][package]SDL_mixer-1.2.8-16.i586
+>!> ESTABLISHED:130: I__s_[S1:0][package]SDL_mixer-1.2.8-7.i586
+>!> ESTABLISHED:131: U__s_[S2:0][package]SDL_net-1.2.7-16.i586
+>!> ESTABLISHED:132: U__s_[S2:0][package]SDL_perl-1.20.0-462.i586
+>!> ESTABLISHED:133: U__s_[S2:0][package]SDL_ttf-2.0.9-16.i586
+>!> ESTABLISHED:134: I__s_[S1:0][package]SuSEfirewall2-3.6_SVNr182-2.noarch
+>!> ESTABLISHED:135: U__s_[S2:0][package]SuSEfirewall2-3.6_SVNr183-7.noarch
+>!> ESTABLISHED:136: U__s_[S2:0][package]TeX-Guy-1.3.1-59.i586
+>!> ESTABLISHED:137: U__s_[S2:0][package]TeX-Guy-devel-1.3.1-59.i586
+>!> ESTABLISHED:138: U__s_[S2:0][package]TeXmacs-1.0.6.9-48.i586
+>!> ESTABLISHED:139: U__s_[S2:0][package]Terminal-0.2.6_svn25932-23.i586
+>!> ESTABLISHED:140: U__s_[S2:0][package]VFlib3-3.6.14-59.i586
+>!> ESTABLISHED:141: U__s_[S2:0][package]VFlib3-devel-3.6.14-59.i586
+>!> ESTABLISHED:142: U__s_[S2:0][package]WindowMaker-0.92.0-101.i586
+>!> ESTABLISHED:143: U__s_[S2:0][package]WindowMaker-applets-1.0-756.i586
+>!> ESTABLISHED:144: U__s_[S2:0][package]WindowMaker-themes-0.1-309.noarch
+>!> ESTABLISHED:145: U__s_[S2:0][package]Xalan-c-1.10-71.i586
+>!> ESTABLISHED:146: U__s_[S2:0][package]Xerces-c-2.7.0-72.i586
+>!> ESTABLISHED:147: U__s_[S2:0][package]ZynAddSubFX-2.2.1-101.i586
+>!> ESTABLISHED:148: U__s_[S2:0][package]a2ps-4.13-1175.i586
+>!> ESTABLISHED:149: U__s_[S2:0][package]a2ps-h-20010113-591.noarch
+>!> ESTABLISHED:150: U__s_[S2:0][package]a2ps-perl-ja-1.45-10.noarch
+>!> ESTABLISHED:151: I__s_[S1:0][package]aaa_base-10.3-65.i586
+>!> ESTABLISHED:152: U__s_[S2:0][package]aaa_base-10.3-78.i586
+>!> ESTABLISHED:153: I__s_[S1:0][package]aaa_skel-2007.3.7-27.i586
+>!> ESTABLISHED:154: U__s_[S2:0][package]aaa_skel-2007.3.7-33.i586
+>!> ESTABLISHED:155: I__s_[S1:0][package]aalib-1.4.0-372.i586
+>!> ESTABLISHED:156: U__s_[S2:0][package]aalib-1.4.0-379.i586
+>!> ESTABLISHED:157: U__s_[S2:0][package]aalib-devel-1.4.0-379.i586
+>!> ESTABLISHED:158: U__s_[S2:0][package]abiword-2.4.6-17.i586
+>!> ESTABLISHED:159: U__s_[S2:0][package]acct-6.3.5-751.i586
+>!> ESTABLISHED:160: I__s_[S1:0][package]acl-2.2.34-66.i586
+>!> ESTABLISHED:161: U__s_[S2:0][package]acl-2.2.34-72.i586
+>!> ESTABLISHED:162: I__s_[S1:0][package]acpid-1.0.6-11.i586
+>!> ESTABLISHED:163: U__s_[S2:0][package]acpid-1.0.6-18.i586
+>!> ESTABLISHED:164: U__s_[S2:0][package]acroread-7.0.9-54.i586
+>!> ESTABLISHED:165: U__s_[S2:0][package]acx-kmp-bigsmp-20070101_2.6.22.5_10-6.i586
+>!> ESTABLISHED:166: U__s_[S2:0][package]acx-kmp-default-20070101_2.6.22.5_10-6.i586
+>!> ESTABLISHED:167: U__s_[S2:0][package]acx-kmp-xen-20070101_2.6.22.5_10-6.i586
+>!> ESTABLISHED:168: U__s_[S2:0][package]acx-kmp-xenpae-20070101_2.6.22.5_10-6.i586
+>!> ESTABLISHED:169: U__s_[S2:0][package]adaptec-firmware-1.0-39.noarch
+>!> ESTABLISHED:170: U__s_[S2:0][package]adm8211-kmp-bigsmp-20070720_2.6.22.5_10-3.i586
+>!> ESTABLISHED:171: U__s_[S2:0][package]adm8211-kmp-default-20070720_2.6.22.5_10-3.i586
+>!> ESTABLISHED:172: U__s_[S2:0][package]adm8211-kmp-xen-20070720_2.6.22.5_10-3.i586
+>!> ESTABLISHED:173: U__s_[S2:0][package]adm8211-kmp-xenpae-20070720_2.6.22.5_10-3.i586
+>!> ESTABLISHED:174: U__s_[S2:0][package]aelfred-1.2-112.noarch
+>!> ESTABLISHED:175: U__s_[S2:0][package]aelfred-javadoc-1.2-112.noarch
+>!> ESTABLISHED:176: U__s_[S2:0][package]aeolus-0.6.6-81.i586
+>!> ESTABLISHED:177: U__s_[S2:0][package]agfa-fonts-2003.03.19-91.noarch
+>!> ESTABLISHED:178: U__s_[S2:0][package]aide-0.11-69.i586
+>!> ESTABLISHED:179: U__s_[S2:0][package]alacarte-0.11.3-67.i586
+>!> ESTABLISHED:180: U__s_[S2:0][package]alevt-1.6.1-297.i586
+>!> ESTABLISHED:181: U__s_[S2:0][package]alien-8.68-18.i586
+>!> ESTABLISHED:182: I__s_[S1:0][package]alsa-1.0.14-20.i586
+>!> ESTABLISHED:183: U__s_[S2:0][package]alsa-1.0.14-27.i586
+>!> ESTABLISHED:184: U__s_[S2:0][package]alsa-devel-1.0.14-27.i586
+>!> ESTABLISHED:185: U__s_[S2:0][package]alsa-firmware-1.0.14-21.noarch
+>!> ESTABLISHED:186: I__s_[S1:0][package]alsa-oss-1.0.14-14.i586
+>!> ESTABLISHED:187: U__s_[S2:0][package]alsa-oss-1.0.14-20.i586
+>!> ESTABLISHED:188: U__s_[S2:0][package]alsa-plugins-1.0.14-33.i586
+>!> ESTABLISHED:189: U__s_[S2:0][package]alsa-plugins-samplerate-1.0.14-33.i586
+>!> ESTABLISHED:190: U__s_[S2:0][package]alsa-tools-1.0.14-30.i586
+>!> ESTABLISHED:191: U__s_[S2:0][package]alsa-tools-gui-1.0.14-30.i586
+>!> ESTABLISHED:192: I__s_[S1:0][package]alsa-utils-1.0.14-15.i586
+>!> ESTABLISHED:193: U__s_[S2:0][package]alsa-utils-1.0.14-22.i586
+>!> ESTABLISHED:194: U__s_[S2:0][package]alsamixergui-0.9.0rc1-638.i586
+>!> ESTABLISHED:195: I__s_[S1:0][package]amarok-1.4.6-17.i586
+>!> ESTABLISHED:196: U__s_[S2:0][package]amarok-1.4.7-22.i586
+>!> ESTABLISHED:197: I__s_[S1:0][package]amarok-libvisual-1.4.6-17.i586
+>!> ESTABLISHED:198: U__s_[S2:0][package]amarok-libvisual-1.4.7-22.i586
+>!> ESTABLISHED:199: I__s_[S1:0][package]amarok-xine-1.4.6-17.i586
+>!> ESTABLISHED:200: U__s_[S2:0][package]amarok-xine-1.4.7-22.i586
+>!> ESTABLISHED:201: I__s_[S1:0][package]amarok-yauap-1.4.6-17.i586
+>!> ESTABLISHED:202: U__s_[S2:0][package]amarok-yauap-1.4.7-22.i586
+>!> ESTABLISHED:203: U__s_[S2:0][package]amavisd-new-2.5.1-20.i586
+>!> ESTABLISHED:204: U__s_[S2:0][package]anjuta-1.2.4a-128.i586
+>!> ESTABLISHED:205: U__s_[S2:0][package]ant-1.7.0-20.noarch
+>!> ESTABLISHED:206: U__s_[S2:0][package]ant-antlr-1.7.0-27.noarch
+>!> ESTABLISHED:207: U__s_[S2:0][package]ant-apache-bcel-1.7.0-27.noarch
+>!> ESTABLISHED:208: U__s_[S2:0][package]ant-apache-bsf-1.7.0-27.noarch
+>!> ESTABLISHED:209: U__s_[S2:0][package]ant-apache-log4j-1.7.0-27.noarch
+>!> ESTABLISHED:210: U__s_[S2:0][package]ant-apache-oro-1.7.0-27.noarch
+>!> ESTABLISHED:211: U__s_[S2:0][package]ant-apache-regexp-1.7.0-27.noarch
+>!> ESTABLISHED:212: U__s_[S2:0][package]ant-apache-resolver-1.7.0-27.noarch
+>!> ESTABLISHED:213: U__s_[S2:0][package]ant-commons-logging-1.7.0-27.noarch
+>!> ESTABLISHED:214: U__s_[S2:0][package]ant-javadoc-1.7.0-20.noarch
+>!> ESTABLISHED:215: U__s_[S2:0][package]ant-javamail-1.7.0-27.noarch
+>!> ESTABLISHED:216: U__s_[S2:0][package]ant-jdepend-1.7.0-27.noarch
+>!> ESTABLISHED:217: U__s_[S2:0][package]ant-jmf-1.7.0-27.noarch
+>!> ESTABLISHED:218: U__s_[S2:0][package]ant-junit-1.7.0-27.noarch
+>!> ESTABLISHED:219: U__s_[S2:0][package]ant-manual-1.7.0-20.noarch
+>!> ESTABLISHED:220: U__s_[S2:0][package]ant-nodeps-1.7.0-27.noarch
+>!> ESTABLISHED:221: U__s_[S2:0][package]ant-scripts-1.7.0-20.noarch
+>!> ESTABLISHED:222: U__s_[S2:0][package]ant-swing-1.7.0-27.noarch
+>!> ESTABLISHED:223: U__s_[S2:0][package]ant-trax-1.7.0-27.noarch
+>!> ESTABLISHED:224: U__s_[S2:0][package]anthy-9100-16.i586
+>!> ESTABLISHED:225: U__s_[S2:0][package]anthy-devel-9100-16.i586
+>!> ESTABLISHED:226: U__s_[S2:0][package]antlr-2.7.6-104.noarch
+>!> ESTABLISHED:227: U__s_[S2:0][package]apache2-2.2.4-62.i586
+>!> ESTABLISHED:228: U__s_[S2:0][package]apache2-devel-2.2.4-62.i586
+>!> ESTABLISHED:229: U__s_[S2:0][package]apache2-doc-2.2.4-62.i586
+>!> ESTABLISHED:230: U__s_[S2:0][package]apache2-example-pages-2.2.4-62.i586
+>!> ESTABLISHED:231: U__s_[S2:0][package]apache2-mod_fcgid-2.1-12.i586
+>!> ESTABLISHED:232: U__s_[S2:0][package]apache2-mod_mono-1.2.5-14.i586
+>!> ESTABLISHED:233: U__s_[S2:0][package]apache2-mod_perl-2.0.3-48.i586
+>!> ESTABLISHED:234: U__s_[S2:0][package]apache2-mod_php5-5.2.4-3.i586
+>!> ESTABLISHED:235: U__s_[S2:0][package]apache2-mod_python-3.3.1-45.i586
+>!> ESTABLISHED:236: U__s_[S2:0][package]apache2-prefork-2.2.4-62.i586
+>!> ESTABLISHED:237: U__s_[S2:0][package]apache2-utils-2.2.4-62.i586
+>!> ESTABLISHED:238: U__s_[S2:0][package]apache2-worker-2.2.4-62.i586
+>!> ESTABLISHED:239: U__s_[S2:0][package]apel-10.6-151.noarch
+>!> ESTABLISHED:240: U__s_[S2:0][package]apel-xemacs-10.6-316.noarch
+>!> ESTABLISHED:241: U__s_[S2:0][package]apparmor-admin_en-10.3-7.noarch
+>!> ESTABLISHED:242: U__s_[S2:0][package]apparmor-dbus-1.2-10.i586
+>!> ESTABLISHED:243: U__s_[S2:0][package]apparmor-docs-2.1-10.noarch
+>!> ESTABLISHED:244: I__s_[S1:0][package]apparmor-parser-2.0.2-41.i586
+>!> ESTABLISHED:245: U__s_[S2:0][package]apparmor-parser-2.1-10.i586
+>!> ESTABLISHED:246: I__s_[S1:0][package]apparmor-profiles-2.0.2-38.noarch
+>!> ESTABLISHED:247: U__s_[S2:0][package]apparmor-profiles-2.1-9.noarch
+>!> ESTABLISHED:248: I__s_[S1:0][package]apparmor-utils-2.0.2-28.noarch
+>!> ESTABLISHED:249: U__s_[S2:0][package]apparmor-utils-2.1-6.noarch
+>!> ESTABLISHED:250: U__s_[S2:0][package]aqbanking-2.2.9-19.i586
+>!> ESTABLISHED:251: U__s_[S2:0][package]aqbanking-devel-2.2.9-19.i586
+>!> ESTABLISHED:252: U__s_[S2:0][package]arcad_eval-102-57.i586
+>!> ESTABLISHED:253: U__s_[S2:0][package]armagetron-0.2.7.1-109.i586
+>!> ESTABLISHED:254: U__s_[S2:0][package]arpwatch-2.1a15-30.i586
+>!> ESTABLISHED:255: U__s_[S2:0][package]arpwatch-ethercodes-2007.9.1-2.noarch
+>!> ESTABLISHED:256: U__s_[S2:0][package]art-sharp2-2.16.0-27.i586
+>!> ESTABLISHED:257: I__s_[S1:0][package]arts-1.5.7-23.i586
+>!> ESTABLISHED:258: U__s_[S2:0][package]arts-1.5.7-32.i586
+>!> ESTABLISHED:259: U__s_[S2:0][package]arts-devel-1.5.7-32.i586
+>!> ESTABLISHED:260: U__s_[S2:0][package]aseqview-0.2.7-46.i586
+>!> ESTABLISHED:261: U__s_[S2:0][package]asm-1.5.3-113.noarch
+>!> ESTABLISHED:262: I__s_[S1:0][package]aspell-0.60.5-33.i586
+>!> ESTABLISHED:263: U__s_[S2:0][package]aspell-0.60.5-42.i586
+>!> ESTABLISHED:264: U__s_[S2:0][package]aspell-cs-0.60.0.20040614-65.i586
+>!> ESTABLISHED:265: U__s_[S2:0][package]aspell-da-1.4.42.1-64.i586
+>!> ESTABLISHED:266: U__s_[S2:0][package]aspell-de-0.60.20030222.1-64.i586
+>!> ESTABLISHED:267: U__s_[S2:0][package]aspell-devel-0.60.5-42.i586
+>!> ESTABLISHED:268: I__s_[S1:0][package]aspell-en-6.0-85.i586
+>!> ESTABLISHED:269: U__s_[S2:0][package]aspell-en-6.0-93.i586
+>!> ESTABLISHED:270: U__s_[S2:0][package]aspell-es-0.50.2-430.i586
+>!> ESTABLISHED:271: U__s_[S2:0][package]aspell-fi-0.7-96.i586
+>!> ESTABLISHED:272: U__s_[S2:0][package]aspell-fr-0.50.3-430.i586
+>!> ESTABLISHED:273: U__s_[S2:0][package]aspell-hu-0.99.4.2-96.i586
+>!> ESTABLISHED:274: U__s_[S2:0][package]aspell-it-2.2_20050523-96.i586
+>!> ESTABLISHED:275: U__s_[S2:0][package]aspell-nb-0.50.10-103.i586
+>!> ESTABLISHED:276: U__s_[S2:0][package]aspell-nl-1.00.7-8.i586
+>!> ESTABLISHED:277: U__s_[S2:0][package]aspell-pl-0.60.2006.11.21-45.i586
+>!> ESTABLISHED:278: U__s_[S2:0][package]aspell-pt_BR-0.60.20070411-13.i586
+>!> ESTABLISHED:279: U__s_[S2:0][package]aspell-pt_PT-0.60.20070510-13.i586
+>!> ESTABLISHED:280: U__s_[S2:0][package]aspell-ru-0.99.f7.1-64.i586
+>!> ESTABLISHED:281: U__s_[S2:0][package]aspell-sv-0.51.0-117.i586
+>!> ESTABLISHED:282: U__s_[S2:0][package]at-3.1.8-996.i586
+>!> ESTABLISHED:283: U__s_[S2:0][package]at-spi-1.19.5-15.i586
+>!> ESTABLISHED:284: U__s_[S2:0][package]at-spi-devel-1.19.5-15.i586
+>!> ESTABLISHED:285: U__s_[S2:0][package]at-spi-doc-1.19.5-15.i586
+>!> ESTABLISHED:286: U__s_[S2:0][package]at76_usb-kmp-bigsmp-0.14beta1_2.6.22.5_10-5.i586
+>!> ESTABLISHED:287: U__s_[S2:0][package]at76_usb-kmp-default-0.14beta1_2.6.22.5_10-5.i586
+>!> ESTABLISHED:288: U__s_[S2:0][package]at76_usb-kmp-xen-0.14beta1_2.6.22.5_10-5.i586
+>!> ESTABLISHED:289: U__s_[S2:0][package]at76_usb-kmp-xenpae-0.14beta1_2.6.22.5_10-5.i586
+>!> ESTABLISHED:290: U__s_[S2:0][package]atk-1.19.6-14.i586
+>!> ESTABLISHED:291: I__s_[S1:0][package]atk-1.19.6-3.i586
+>!> ESTABLISHED:292: U__s_[S2:0][package]atk-devel-1.19.6-14.i586
+>!> ESTABLISHED:293: U__s_[S2:0][package]atk-doc-1.19.6-14.i586
+>!> ESTABLISHED:294: U__s_[S2:0][package]atmel-firmware-1.3-73.noarch
+>!> ESTABLISHED:295: I__s_[S1:0][package]attr-2.4.28-72.i586
+>!> ESTABLISHED:296: U__s_[S2:0][package]attr-2.4.28-78.i586
+>!> ESTABLISHED:297: U__s_[S2:0][package]audacity-1.3.3-35.i586
+>!> ESTABLISHED:298: I__s_[S1:0][package]audiofile-0.2.6-68.i586
+>!> ESTABLISHED:299: U__s_[S2:0][package]audiofile-0.2.6-74.i586
+>!> ESTABLISHED:300: U__s_[S2:0][package]audiofile-devel-0.2.6-74.i586
+>!> ESTABLISHED:301: U__s_[S2:0][package]audit-1.5.5-10.i586
+>!> ESTABLISHED:302: U__s_[S2:0][package]audit-devel-1.5.5-10.i586
+>!> ESTABLISHED:303: U__s_[S2:0][package]audit-libs-1.5.5-10.i586
+>!> ESTABLISHED:304: I__s_[S1:0][package]audit-libs-1.5.5-4.i586
+>!> ESTABLISHED:305: U__s_[S2:0][package]audit-visualize-1.5.2-25.noarch
+>!> ESTABLISHED:306: U__s_[S2:0][package]aumix-2.8-408.i586
+>!> ESTABLISHED:307: U__s_[S2:0][package]autoconf-2.61-44.i586
+>!> ESTABLISHED:308: I__s_[S1:0][package]autofs-5.0.2-12.i586
+>!> ESTABLISHED:309: U__s_[S2:0][package]autofs-5.0.2-20.i586
+>!> ESTABLISHED:310: U__s_[S2:0][package]automake-1.10-43.i586
+>!> ESTABLISHED:311: U__s_[S2:0][package]autotrace-0.31.1-475.i586
+>!> ESTABLISHED:312: U__s_[S2:0][package]autotrace-devel-0.31.1-475.i586
+>!> ESTABLISHED:313: I__s_[S1:0][package]autoyast2-2.15.13-12.noarch
+>!> ESTABLISHED:314: U__s_[S2:0][package]autoyast2-2.15.16-2.noarch
+>!> ESTABLISHED:315: I__s_[S1:0][package]autoyast2-installation-2.15.13-12.noarch
+>!> ESTABLISHED:316: U__s_[S2:0][package]autoyast2-installation-2.15.16-2.noarch
+>!> ESTABLISHED:317: I__s_[S1:0][package]avahi-0.6.20-21.i586
+>!> ESTABLISHED:318: U__s_[S2:0][package]avahi-0.6.20-31.i586
+>!> ESTABLISHED:319: U__s_[S2:0][package]avahi-compat-howl-0.6.20-31.i586
+>!> ESTABLISHED:320: I__s_[S1:0][package]avahi-compat-mDNSResponder-0.6.20-21.i586
+>!> ESTABLISHED:321: U__s_[S2:0][package]avahi-compat-mDNSResponder-0.6.20-31.i586
+>!> ESTABLISHED:322: U__s_[S2:0][package]avahi-compat-mDNSResponder-devel-0.6.20-31.i586
+>!> ESTABLISHED:323: U__s_[S2:0][package]avahi-devel-0.6.20-31.i586
+>!> ESTABLISHED:324: I__s_[S1:0][package]avahi-glib-0.6.20-21.i586
+>!> ESTABLISHED:325: U__s_[S2:0][package]avahi-glib-0.6.20-31.i586
+>!> ESTABLISHED:326: U__s_[S2:0][package]avahi-mono-0.6.20-36.i586
+>!> ESTABLISHED:327: U__s_[S2:0][package]avahi-python-0.6.20-31.i586
+>!> ESTABLISHED:328: U__s_[S2:0][package]avmailgate-2.1.2.14-2.i586
+>!> ESTABLISHED:329: U__s_[S2:0][package]awesfx-0.5.1a-10.i586
+>!> ESTABLISHED:330: U__s_[S2:0][package]axis-1.4-97.noarch
+>!> ESTABLISHED:331: U__s_[S2:0][package]banshee-0.13.1-10.i586
+>!> ESTABLISHED:332: U__s_[S2:0][package]banshee-devel-0.13.1-10.i586
+>!> ESTABLISHED:333: U__s_[S2:0][package]banshee-engine-gst-0.13.1-10.i586
+>!> ESTABLISHED:334: U__s_[S2:0][package]banshee-plugins-DAAP-0.13.1-10.i586
+>!> ESTABLISHED:335: U__s_[S2:0][package]banshee-plugins-default-0.13.1-10.i586
+>!> ESTABLISHED:336: U__s_[S2:0][package]banshee-plugins-extra-0.13.1-10.i586
+>!> ESTABLISHED:337: U__s_[S2:0][package]barcode-0.98-321.i586
+>!> ESTABLISHED:338: I__s_[S1:0][package]bash-3.2-46.i586
+>!> ESTABLISHED:339: U__s_[S2:0][package]bash-3.2-56.i586
+>!> ESTABLISHED:340: U__s_[S2:0][package]bash-doc-3.2-15.i586
+>!> ESTABLISHED:341: I__s_[S1:0][package]bash-doc-3.2-5.i586
+>!> ESTABLISHED:342: U__s_[S2:0][package]bayonne2-1.5.19-102.i586
+>!> ESTABLISHED:343: U__s_[S2:0][package]bayonne2-UsEng-1.5.19-102.i586
+>!> ESTABLISHED:344: U__s_[S2:0][package]bayonne2-devel-1.5.19-102.i586
+>!> ESTABLISHED:345: U__s_[S2:0][package]bbtools-2007.4.24-40.i586
+>!> ESTABLISHED:346: U__s_[S2:0][package]bbtools-gui-2007.6.11-27.i586
+>!> ESTABLISHED:347: U__s_[S2:0][package]bc-1.06-823.i586
+>!> ESTABLISHED:348: U__s_[S2:0][package]bcel-5.1-160.noarch
+>!> ESTABLISHED:349: U__s_[S2:0][package]bcm43xx-fwcutter-006-36.i586
+>!> ESTABLISHED:350: U__s_[S2:0][package]bdfresize-1.5-483.i586
+>!> ESTABLISHED:351: U__s_[S2:0][package]beagle-0.2.18-7.i586
+>!> ESTABLISHED:352: U__s_[S2:0][package]beagle-evolution-0.2.18-7.i586
+>!> ESTABLISHED:353: U__s_[S2:0][package]beagle-firefox-0.2.18-7.i586
+>!> ESTABLISHED:354: U__s_[S2:0][package]beagle-gui-0.2.18-7.i586
+>!> ESTABLISHED:355: U__s_[S2:0][package]beagle-index-10.3_20070203-88.i586
+>!> ESTABLISHED:356: U__s_[S2:0][package]bibview-2.2-893.i586
+>!> ESTABLISHED:357: U__s_[S2:0][package]bin86-0.16.17-34.i586
+>!> ESTABLISHED:358: U__s_[S2:0][package]bind-9.4.1.P1-8.i586
+>!> ESTABLISHED:359: U__s_[S2:0][package]bind-chrootenv-9.4.1.P1-8.i586
+>!> ESTABLISHED:360: U__s_[S2:0][package]bind-doc-9.4.1.P1-8.i586
+>!> ESTABLISHED:361: I__s_[S1:0][package]bind-libs-9.4.1-19.i586
+>!> ESTABLISHED:362: U__s_[S2:0][package]bind-libs-9.4.1.P1-8.i586
+>!> ESTABLISHED:363: I__s_[S1:0][package]bind-utils-9.4.1-19.i586
+>!> ESTABLISHED:364: U__s_[S2:0][package]bind-utils-9.4.1.P1-8.i586
+>!> ESTABLISHED:365: U__s_[S2:0][package]bing-1.0.5-69.i586
+>!> ESTABLISHED:366: U__s_[S2:0][package]binutils-2.17.50.20070726-10.i586
+>!> ESTABLISHED:367: U__s_[S2:0][package]bison-2.3-60.i586
+>!> ESTABLISHED:368: U__s_[S2:0][package]bitchx-1.1-77.i586
+>!> ESTABLISHED:369: U__s_[S2:0][package]bitstream-vera-1.10-237.noarch
+>!> ESTABLISHED:370: U__s_[S2:0][package]blackbox-0.70.1-90.i586
+>!> ESTABLISHED:371: U__s_[S2:0][package]blender-2.44-34.i586
+>!> ESTABLISHED:372: U__s_[S2:0][package]blktrace-0.99.3-3.i586
+>!> ESTABLISHED:373: I__s_[S1:0][package]blocxx-1.0.0-70.i586
+>!> ESTABLISHED:374: U__s_[S2:0][package]blocxx-1.0.0-76.i586
+>!> ESTABLISHED:375: U__s_[S2:0][package]blocxx-devel-1.0.0-76.i586
+>!> ESTABLISHED:376: U__s_[S2:0][package]blt-2.4z-295.i586
+>!> ESTABLISHED:377: U__s_[S2:0][package]bluez-cups-3.18-2.i586
+>!> ESTABLISHED:378: U__s_[S2:0][package]bluez-firmware-1.2-59.i586
+>!> ESTABLISHED:379: U__s_[S2:0][package]bluez-gnome-0.6-88.i586
+>!> ESTABLISHED:380: U__s_[S2:0][package]bluez-hcidump-1.40-4.i586
+>!> ESTABLISHED:381: I__s_[S1:0][package]bluez-libs-3.13-4.i586
+>!> ESTABLISHED:382: U__s_[S2:0][package]bluez-libs-3.18-2.i586
+>!> ESTABLISHED:383: U__s_[S2:0][package]bluez-test-3.18-2.i586
+>!> ESTABLISHED:384: I__s_[S1:0][package]bluez-utils-3.13-9.i586
+>!> ESTABLISHED:385: U__s_[S2:0][package]bluez-utils-3.18-2.i586
+>!> ESTABLISHED:386: U__s_[S2:0][package]bogofilter-1.1.1-72.i586
+>!> ESTABLISHED:387: U__s_[S2:0][package]bonnie++-1.02-405.i586
+>!> ESTABLISHED:388: U__s_[S2:0][package]bonnie-1.4-409.i586
+>!> ESTABLISHED:389: U__s_[S2:0][package]boo-0.7.8.2559-16.noarch
+>!> ESTABLISHED:390: U__s_[S2:0][package]boost-1.33.1-102.i586
+>!> ESTABLISHED:391: I__s_[S1:0][package]boost-1.34.1-3.i586
+>!> ESTABLISHED:392: U__s_[S2:0][package]boost-devel-1.33.1-102.i586
+>!> ESTABLISHED:393: U__s_[S2:0][package]boost-doc-1.33.1-102.i586
+>!> ESTABLISHED:394: U__s_[S2:0][package]boost-jam-3.1.14-11.i586
+>!> ESTABLISHED:395: U__s_[S2:0][package]bootcycle-0.3-166.i586
+>!> ESTABLISHED:396: I__s_[S1:0][package]bootsplash-3.3-72.i586
+>!> ESTABLISHED:397: U__s_[S2:0][package]bootsplash-3.3-78.i586
+>!> ESTABLISHED:398: I__s_[S1:0][package]bootsplash-theme-SuSE-3.1-154.i586
+>!> ESTABLISHED:399: U__s_[S2:0][package]bootsplash-theme-SuSE-3.1-166.i586
+>!> ESTABLISHED:400: U__s_[S2:0][package]brasero-0.6.1-3.i586
+>!> ESTABLISHED:401: U__s_[S2:0][package]brasero-lang-0.6.1-3.i586
+>!> ESTABLISHED:402: U__s_[S2:0][package]bridge-utils-1.2-50.i586
+>!> ESTABLISHED:403: U__s_[S2:0][package]briquolo-0.5.6-20.i586
+>!> ESTABLISHED:404: U__s_[S2:0][package]bsd-games-2.17-9.i586
+>!> ESTABLISHED:405: U__s_[S2:0][package]bsf-2.3.0-144.noarch
+>!> ESTABLISHED:406: U__s_[S2:0][package]bsh2-2.0-139.noarch
+>!> ESTABLISHED:407: U__s_[S2:0][package]bsh2-bsf-2.0-139.noarch
+>!> ESTABLISHED:408: U__s_[S2:0][package]bsh2-classgen-2.0-139.noarch
+>!> ESTABLISHED:409: U__s_[S2:0][package]bsh2-demo-2.0-139.noarch
+>!> ESTABLISHED:410: U__s_[S2:0][package]bsh2-javadoc-2.0-139.noarch
+>!> ESTABLISHED:411: U__s_[S2:0][package]bsh2-manual-2.0-139.noarch
+>!> ESTABLISHED:412: U__s_[S2:0][package]bug-buddy-2.19.91-3.i586
+>!> ESTABLISHED:413: U__s_[S2:0][package]build-2007.08.02-8.noarch
+>!> ESTABLISHED:414: U__s_[S2:0][package]bundle-lang-common-cs-10.3-21.noarch
+>!> ESTABLISHED:415: U__s_[S2:0][package]bundle-lang-common-da-10.3-21.noarch
+>!> ESTABLISHED:416: U__s_[S2:0][package]bundle-lang-common-de-10.3-21.noarch
+>!> ESTABLISHED:417: U__s_[S2:0][package]bundle-lang-common-en-10.3-21.noarch
+>!> ESTABLISHED:418: U__s_[S2:0][package]bundle-lang-common-es-10.3-21.noarch
+>!> ESTABLISHED:419: U__s_[S2:0][package]bundle-lang-common-fi-10.3-21.noarch
+>!> ESTABLISHED:420: U__s_[S2:0][package]bundle-lang-common-fr-10.3-21.noarch
+>!> ESTABLISHED:421: U__s_[S2:0][package]bundle-lang-common-hu-10.3-21.noarch
+>!> ESTABLISHED:422: U__s_[S2:0][package]bundle-lang-common-it-10.3-21.noarch
+>!> ESTABLISHED:423: U__s_[S2:0][package]bundle-lang-common-ja-10.3-21.noarch
+>!> ESTABLISHED:424: U__s_[S2:0][package]bundle-lang-common-nb-10.3-21.noarch
+>!> ESTABLISHED:425: U__s_[S2:0][package]bundle-lang-common-nl-10.3-21.noarch
+>!> ESTABLISHED:426: U__s_[S2:0][package]bundle-lang-common-pl-10.3-21.noarch
+>!> ESTABLISHED:427: U__s_[S2:0][package]bundle-lang-common-pt-10.3-21.noarch
+>!> ESTABLISHED:428: U__s_[S2:0][package]bundle-lang-common-ru-10.3-21.noarch
+>!> ESTABLISHED:429: U__s_[S2:0][package]bundle-lang-common-sv-10.3-21.noarch
+>!> ESTABLISHED:430: U__s_[S2:0][package]bundle-lang-common-zh-10.3-21.noarch
+>!> ESTABLISHED:431: U__s_[S2:0][package]bundle-lang-gnome-cs-10.3-35.noarch
+>!> ESTABLISHED:432: U__s_[S2:0][package]bundle-lang-gnome-da-10.3-35.noarch
+>!> ESTABLISHED:433: U__s_[S2:0][package]bundle-lang-gnome-de-10.3-35.noarch
+>!> ESTABLISHED:434: U__s_[S2:0][package]bundle-lang-gnome-en-10.3-35.noarch
+>!> ESTABLISHED:435: U__s_[S2:0][package]bundle-lang-gnome-es-10.3-35.noarch
+>!> ESTABLISHED:436: U__s_[S2:0][package]bundle-lang-gnome-fi-10.3-35.noarch
+>!> ESTABLISHED:437: U__s_[S2:0][package]bundle-lang-gnome-fr-10.3-35.noarch
+>!> ESTABLISHED:438: U__s_[S2:0][package]bundle-lang-gnome-hu-10.3-35.noarch
+>!> ESTABLISHED:439: U__s_[S2:0][package]bundle-lang-gnome-it-10.3-35.noarch
+>!> ESTABLISHED:440: U__s_[S2:0][package]bundle-lang-gnome-ja-10.3-35.noarch
+>!> ESTABLISHED:441: U__s_[S2:0][package]bundle-lang-gnome-nb-10.3-35.noarch
+>!> ESTABLISHED:442: U__s_[S2:0][package]bundle-lang-gnome-nl-10.3-35.noarch
+>!> ESTABLISHED:443: U__s_[S2:0][package]bundle-lang-gnome-pl-10.3-35.noarch
+>!> ESTABLISHED:444: U__s_[S2:0][package]bundle-lang-gnome-pt-10.3-35.noarch
+>!> ESTABLISHED:445: U__s_[S2:0][package]bundle-lang-gnome-ru-10.3-35.noarch
+>!> ESTABLISHED:446: U__s_[S2:0][package]bundle-lang-gnome-sv-10.3-35.noarch
+>!> ESTABLISHED:447: U__s_[S2:0][package]bundle-lang-gnome-zh-10.3-35.noarch
+>!> ESTABLISHED:448: U__s_[S2:0][package]bundle-lang-kde-cs-10.3-78.noarch
+>!> ESTABLISHED:449: U__s_[S2:0][package]bundle-lang-kde-da-10.3-78.noarch
+>!> ESTABLISHED:450: U__s_[S2:0][package]bundle-lang-kde-de-10.3-78.noarch
+>!> ESTABLISHED:451: I__s_[S1:0][package]bundle-lang-kde-en-10.3-42.noarch
+>!> ESTABLISHED:452: U__s_[S2:0][package]bundle-lang-kde-en-10.3-78.noarch
+>!> ESTABLISHED:453: U__s_[S2:0][package]bundle-lang-kde-es-10.3-78.noarch
+>!> ESTABLISHED:454: U__s_[S2:0][package]bundle-lang-kde-fi-10.3-78.noarch
+>!> ESTABLISHED:455: U__s_[S2:0][package]bundle-lang-kde-fr-10.3-78.noarch
+>!> ESTABLISHED:456: U__s_[S2:0][package]bundle-lang-kde-hu-10.3-78.noarch
+>!> ESTABLISHED:457: U__s_[S2:0][package]bundle-lang-kde-it-10.3-78.noarch
+>!> ESTABLISHED:458: U__s_[S2:0][package]bundle-lang-kde-ja-10.3-78.noarch
+>!> ESTABLISHED:459: U__s_[S2:0][package]bundle-lang-kde-nb-10.3-78.noarch
+>!> ESTABLISHED:460: U__s_[S2:0][package]bundle-lang-kde-nl-10.3-78.noarch
+>!> ESTABLISHED:461: U__s_[S2:0][package]bundle-lang-kde-pl-10.3-78.noarch
+>!> ESTABLISHED:462: U__s_[S2:0][package]bundle-lang-kde-pt-10.3-78.noarch
+>!> ESTABLISHED:463: U__s_[S2:0][package]bundle-lang-kde-ru-10.3-78.noarch
+>!> ESTABLISHED:464: U__s_[S2:0][package]bundle-lang-kde-sv-10.3-78.noarch
+>!> ESTABLISHED:465: U__s_[S2:0][package]bundle-lang-kde-zh-10.3-78.noarch
+>!> ESTABLISHED:466: U__s_[S2:0][package]bundle-lang-other-10.3-4.noarch
+>!> ESTABLISHED:467: U__s_[S2:0][package]busybox-1.6.1-12.i586
+>!> ESTABLISHED:468: U__s_[S2:0][package]bwidget-1.7.0-116.noarch
+>!> ESTABLISHED:469: U__s_[S2:0][package]bytefx-data-mysql-1.2.5-11.i586
+>!> ESTABLISHED:470: U__s_[S2:0][package]bzflag-2.0.8-72.i586
+>!> ESTABLISHED:471: I__s_[S1:0][package]bzip2-1.0.4-33.i586
+>!> ESTABLISHED:472: U__s_[S2:0][package]bzip2-1.0.4-39.i586
+>!> ESTABLISHED:473: U__s_[S2:0][package]bzip2-doc-1.0.4-39.i586
+>!> ESTABLISHED:474: U__s_[S2:0][package]cabextract-1.2-54.i586
+>!> ESTABLISHED:475: I__s_[S1:0][package]cairo-1.4.10-11.i586
+>!> ESTABLISHED:476: U__s_[S2:0][package]cairo-1.4.10-19.i586
+>!> ESTABLISHED:477: U__s_[S2:0][package]cairo-devel-1.4.10-19.i586
+>!> ESTABLISHED:478: U__s_[S2:0][package]cairo-doc-1.4.10-19.i586
+>!> ESTABLISHED:479: U__s_[S2:0][package]cairomm-1.2.2-79.i586
+>!> ESTABLISHED:480: U__s_[S2:0][package]cairomm-devel-1.2.2-79.i586
+>!> ESTABLISHED:481: U__s_[S2:0][package]calamaris-2.59-71.i586
+>!> ESTABLISHED:482: U__s_[S2:0][package]canna-3.7p3-101.i586
+>!> ESTABLISHED:483: U__s_[S2:0][package]canna-devel-3.7p3-101.i586
+>!> ESTABLISHED:484: U__s_[S2:0][package]canna-libs-3.7p3-101.i586
+>!> ESTABLISHED:485: U__s_[S2:0][package]canna-yubin-0.0.20011101-444.i586
+>!> ESTABLISHED:486: U__s_[S2:0][package]cannadic-0.95a-131.i586
+>!> ESTABLISHED:487: U__s_[S2:0][package]capi4hylafax-01.03.00-14.i586
+>!> ESTABLISHED:488: U__s_[S2:0][package]capi4linux-2007.8.16-9.i586
+>!> ESTABLISHED:489: U__s_[S2:0][package]capisuite-0.4.5-113.i586
+>!> ESTABLISHED:490: U__s_[S2:0][package]ccache-2.4-72.i586
+>!> ESTABLISHED:491: U__s_[S2:0][package]ccaudio2-0.9.9-62.i586
+>!> ESTABLISHED:492: U__s_[S2:0][package]ccaudio2-devel-0.9.9-62.i586
+>!> ESTABLISHED:493: U__s_[S2:0][package]ccrtp-1.5.0-57.i586
+>!> ESTABLISHED:494: U__s_[S2:0][package]ccscript3-1.0.9-62.i586
+>!> ESTABLISHED:495: U__s_[S2:0][package]ccscript3-devel-1.0.9-62.i586
+>!> ESTABLISHED:496: U__s_[S2:0][package]cdk-4.9.13-72.i586
+>!> ESTABLISHED:497: I__s_[S1:0][package]cdparanoia-IIIalpha9.8-616.i586
+>!> ESTABLISHED:498: U__s_[S2:0][package]cdparanoia-IIIalpha9.8-623.i586
+>!> ESTABLISHED:499: U__s_[S2:0][package]cdrdao-1.2.2-107.i586
+>!> ESTABLISHED:500: I__s_[S1:0][package]cdrdao-1.2.2-94.i586
+>!> ESTABLISHED:501: I__s_[S1:0][package]cdrkit-cdrtools-compat-1.1.6-10.i586
+>!> ESTABLISHED:502: U__s_[S2:0][package]cdrkit-cdrtools-compat-1.1.6-18.i586
+>!> ESTABLISHED:503: U__s_[S2:0][package]cecilia-2.0.5-194.noarch
+>!> ESTABLISHED:504: U__s_[S2:0][package]cedict-20070331-15.noarch
+>!> ESTABLISHED:505: U__s_[S2:0][package]cedilla-0.6-81.noarch
+>!> ESTABLISHED:506: U__s_[S2:0][package]cg-1.5-37.i586
+>!> ESTABLISHED:507: U__s_[S2:0][package]cg-devel-1.5-37.i586
+>!> ESTABLISHED:508: U__s_[S2:0][package]chasen-2.3.3-167.i586
+>!> ESTABLISHED:509: U__s_[S2:0][package]chasen-devel-2.3.3-167.i586
+>!> ESTABLISHED:510: I__s_[S1:0][package]check-0.9.5-25.i586
+>!> ESTABLISHED:511: U__s_[S2:0][package]check-0.9.5-31.i586
+>!> ESTABLISHED:512: U__s_[S2:0][package]check-devel-0.9.5-31.i586
+>!> ESTABLISHED:513: U__s_[S2:0][package]checkinstall-1.6.1-30.i586
+>!> ESTABLISHED:514: U__s_[S2:0][package]checkmedia-2.1-73.i586
+>!> ESTABLISHED:515: U__s_[S2:0][package]chkrootkit-0.47-45.i586
+>!> ESTABLISHED:516: U__s_[S2:0][package]chromium-0.9.12-1107.i586
+>!> ESTABLISHED:517: U__s_[S2:0][package]cifs-mount-3.0.25c-3.i586
+>!> ESTABLISHED:518: U__s_[S2:0][package]circuslinux-1.0.3-1125.i586
+>!> ESTABLISHED:519: U__s_[S2:0][package]ckermit-8.0.211-80.i586
+>!> ESTABLISHED:520: U__s_[S2:0][package]clamav-0.91.2-5.i586
+>!> ESTABLISHED:521: U__s_[S2:0][package]clanbomber-1.05-113.i586
+>!> ESTABLISHED:522: U__s_[S2:0][package]clanlib-0.6.5-462.i586
+>!> ESTABLISHED:523: I__s_[S1:0][package]classpath-0.95-45.i586
+>!> ESTABLISHED:524: U__s_[S2:0][package]classpath-0.95-62.i586
+>!> ESTABLISHED:525: U__s_[S2:0][package]classpath-devel-0.95-62.i586
+>!> ESTABLISHED:526: U__s_[S2:0][package]classpath-jta-0.93-63.noarch
+>!> ESTABLISHED:527: U__s_[S2:0][package]classpath-webplugin-0.95-62.i586
+>!> ESTABLISHED:528: U__s_[S2:0][package]clisp-2.41-27.i586
+>!> ESTABLISHED:529: U__s_[S2:0][package]cloop-2.04-105.i586
+>!> ESTABLISHED:530: U__s_[S2:0][package]cloop-kmp-bigsmp-2.04_2.6.22.5_10-105.i586
+>!> ESTABLISHED:531: U__s_[S2:0][package]cloop-kmp-default-2.04_2.6.22.5_10-105.i586
+>!> ESTABLISHED:532: U__s_[S2:0][package]cloop-kmp-xen-2.04_2.6.22.5_10-105.i586
+>!> ESTABLISHED:533: U__s_[S2:0][package]cloop-kmp-xenpae-2.04_2.6.22.5_10-105.i586
+>!> ESTABLISHED:534: I__s_[S1:0][package]clucene-core-0.9.16-28.i586
+>!> ESTABLISHED:535: U__s_[S2:0][package]clucene-core-0.9.16-34.i586
+>!> ESTABLISHED:536: U__s_[S2:0][package]clucene-core-devel-0.9.16-34.i586
+>!> ESTABLISHED:537: U__s_[S2:0][package]cm-unicode-0.4.2-84.noarch
+>!> ESTABLISHED:538: U__s_[S2:0][package]cmake-2.4.7-12.i586
+>!> ESTABLISHED:539: U__s_[S2:0][package]cmatrix-1.2a-361.i586
+>!> ESTABLISHED:540: U__s_[S2:0][package]comgt-0.32-48.i586
+>!> ESTABLISHED:541: U__s_[S2:0][package]commoncpp2-1.5.7-9.i586
+>!> ESTABLISHED:542: U__s_[S2:0][package]commoncpp2-devel-1.5.7-9.i586
+>!> ESTABLISHED:543: U__s_[S2:0][package]commoncpp2-doc-1.5.7-9.i586
+>!> ESTABLISHED:544: U__s_[S2:0][package]compat-2007.4.18-28.i586
+>!> ESTABLISHED:545: U__s_[S2:0][package]compat-libstdc++-5.0.7-83.i586
+>!> ESTABLISHED:546: U__s_[S2:0][package]compat-openssl097g-0.9.7g-71.i586
+>!> ESTABLISHED:547: U__s_[S2:0][package]compat-readline4-4.3-72.i586
+>!> ESTABLISHED:548: I__s_[S1:0][package]compiz-0.5.2-4.i586
+>!> ESTABLISHED:549: U__s_[S2:0][package]compiz-0.5.4-11.i586
+>!> ESTABLISHED:550: U__s_[S2:0][package]compiz-gnome-0.5.4-11.i586
+>!> ESTABLISHED:551: I__s_[S1:0][package]compiz-kde-0.5.2-4.i586
+>!> ESTABLISHED:552: U__s_[S2:0][package]compiz-kde-0.5.4-11.i586
+>!> ESTABLISHED:553: U__s_[S2:0][package]conglomerate-0.9.1-126.i586
+>!> ESTABLISHED:554: U__s_[S2:0][package]contact-lookup-applet-0.13-129.i586
+>!> ESTABLISHED:555: U__s_[S2:0][package]control-center2-2.19.91-3.i586
+>!> ESTABLISHED:556: U__s_[S2:0][package]control-center2-devel-2.19.91-3.i586
+>!> ESTABLISHED:557: U__s_[S2:0][package]convert-1.3-873.i586
+>!> ESTABLISHED:558: U__s_[S2:0][package]convmv-1.10-58.noarch
+>!> ESTABLISHED:559: I__s_[S1:0][package]coreutils-6.9-34.i586
+>!> ESTABLISHED:560: U__s_[S2:0][package]coreutils-6.9-40.i586
+>!> ESTABLISHED:561: U__s_[S2:0][package]cpio-2.9-14.i586
+>!> ESTABLISHED:562: I__s_[S1:0][package]cpio-2.9-5.i586
+>!> ESTABLISHED:563: I__s_[S1:0][package]cpp-4.2-15.i586
+>!> ESTABLISHED:564: U__s_[S2:0][package]cpp-4.2-21.i586
+>!> ESTABLISHED:565: U__s_[S2:0][package]cpp42-4.2.1_20070724-12.i586
+>!> ESTABLISHED:566: I__s_[S1:0][package]cpp42-4.2.1_20070724-4.i586
+>!> ESTABLISHED:567: U__s_[S2:0][package]cpufrequtils-002-86.i586
+>!> ESTABLISHED:568: I__s_[S1:0][package]cracklib-2.8.10-26.i586
+>!> ESTABLISHED:569: U__s_[S2:0][package]cracklib-2.8.10-34.i586
+>!> ESTABLISHED:570: U__s_[S2:0][package]cracklib-dict-full-2.8.10-28.i586
+>!> ESTABLISHED:571: I__s_[S1:0][package]cracklib-dict-small-2.8.10-26.i586
+>!> ESTABLISHED:572: U__s_[S2:0][package]cracklib-dict-small-2.8.10-34.i586
+>!> ESTABLISHED:573: I__s_[S1:0][package]cron-4.1-113.i586
+>!> ESTABLISHED:574: U__s_[S2:0][package]cron-4.1-119.i586
+>!> ESTABLISHED:575: U__s_[S2:0][package]cross-spu-binutils-2.17.50.20070726-10.i586
+>!> ESTABLISHED:576: U__s_[S2:0][package]cross-spu-gcc-4.3.0-33.i586
+>!> ESTABLISHED:577: U__s_[S2:0][package]cross-spu-newlib-1.15.0-31.i586
+>!> ESTABLISHED:578: U__s_[S2:0][package]cryptconfig-0.1.0-66.i586
+>!> ESTABLISHED:579: U__s_[S2:0][package]cryptsetup-1.0.5-26.i586
+>!> ESTABLISHED:580: U__s_[S2:0][package]cscope-15.6-52.i586
+>!> ESTABLISHED:581: U__s_[S2:0][package]csmash-0.6.6-110.i586
+>!> ESTABLISHED:582: U__s_[S2:0][package]csound-5.06.0-23.i586
+>!> ESTABLISHED:583: U__s_[S2:0][package]ctags-2007.2.6-36.i586
+>!> ESTABLISHED:584: U__s_[S2:0][package]ctapi-cyberjack-3.0.3-21.i586
+>!> ESTABLISHED:585: U__s_[S2:0][package]cups-1.2.12-13.i586
+>!> ESTABLISHED:586: U__s_[S2:0][package]cups-autoconfig-0.1.0-19.i586
+>!> ESTABLISHED:587: U__s_[S2:0][package]cups-backends-1.0-118.i586
+>!> ESTABLISHED:588: U__s_[S2:0][package]cups-client-1.2.12-13.i586
+>!> ESTABLISHED:589: I__s_[S1:0][package]cups-client-1.2.12-5.i586
+>!> ESTABLISHED:590: U__s_[S2:0][package]cups-devel-1.2.12-13.i586
+>!> ESTABLISHED:591: U__s_[S2:0][package]cups-drivers-1.2.12-17.i586
+>!> ESTABLISHED:592: U__s_[S2:0][package]cups-libs-1.2.12-13.i586
+>!> ESTABLISHED:593: I__s_[S1:0][package]cups-libs-1.2.12-5.i586
+>!> ESTABLISHED:594: U__s_[S2:0][package]curl-7.16.4-10.i586
+>!> ESTABLISHED:595: I__s_[S1:0][package]curl-7.16.4-2.i586
+>!> ESTABLISHED:596: U__s_[S2:0][package]curl-ca-bundle-7.16.4-10.i586
+>!> ESTABLISHED:597: I__s_[S1:0][package]curl-ca-bundle-7.16.4-2.i586
+>!> ESTABLISHED:598: U__s_[S2:0][package]cvs-1.12.12-82.i586
+>!> ESTABLISHED:599: U__s_[S2:0][package]cvs-doc-1.12.12-82.i586
+>!> ESTABLISHED:600: U__s_[S2:0][package]cvs2svn-1.5.1-53.i586
+>!> ESTABLISHED:601: U__s_[S2:0][package]cvsps-2.1-72.i586
+>!> ESTABLISHED:602: U__s_[S2:0][package]cyrus-imapd-2.3.8-44.i586
+>!> ESTABLISHED:603: I__s_[S1:0][package]cyrus-sasl-2.1.22-69.i586
+>!> ESTABLISHED:604: U__s_[S2:0][package]cyrus-sasl-2.1.22-76.i586
+>!> ESTABLISHED:605: I__s_[S1:0][package]cyrus-sasl-crammd5-2.1.22-69.i586
+>!> ESTABLISHED:606: U__s_[S2:0][package]cyrus-sasl-crammd5-2.1.22-76.i586
+>!> ESTABLISHED:607: U__s_[S2:0][package]cyrus-sasl-devel-2.1.22-76.i586
+>!> ESTABLISHED:608: I__s_[S1:0][package]cyrus-sasl-digestmd5-2.1.22-69.i586
+>!> ESTABLISHED:609: U__s_[S2:0][package]cyrus-sasl-digestmd5-2.1.22-76.i586
+>!> ESTABLISHED:610: U__s_[S2:0][package]cyrus-sasl-gssapi-2.1.22-76.i586
+>!> ESTABLISHED:611: U__s_[S2:0][package]cyrus-sasl-otp-2.1.22-76.i586
+>!> ESTABLISHED:612: I__s_[S1:0][package]cyrus-sasl-plain-2.1.22-69.i586
+>!> ESTABLISHED:613: U__s_[S2:0][package]cyrus-sasl-plain-2.1.22-76.i586
+>!> ESTABLISHED:614: I__s_[S1:0][package]cyrus-sasl-saslauthd-2.1.22-71.i586
+>!> ESTABLISHED:615: U__s_[S2:0][package]cyrus-sasl-saslauthd-2.1.22-78.i586
+>!> ESTABLISHED:616: U__s_[S2:0][package]cyrus-sasl-sqlauxprop-2.1.22-78.i586
+>!> ESTABLISHED:617: U__s_[S2:0][package]dante-1.1.19-69.i586
+>!> ESTABLISHED:618: U__s_[S2:0][package]dante-devel-1.1.19-69.i586
+>!> ESTABLISHED:619: U__s_[S2:0][package]dar-2.3.4-15.i586
+>!> ESTABLISHED:620: U__s_[S2:0][package]darts-0.2-163.i586
+>!> ESTABLISHED:621: U__s_[S2:0][package]dasher-4.5.2-17.i586
+>!> ESTABLISHED:622: U__s_[S2:0][package]datakiosk-0.7-116.i586
+>!> ESTABLISHED:623: U__s_[S2:0][package]dazuko-2.3.3.4-46.i586
+>!> ESTABLISHED:624: U__s_[S2:0][package]dazuko-kmp-bigsmp-2.3.3.4_2.6.22.5_10-46.i586
+>!> ESTABLISHED:625: U__s_[S2:0][package]dazuko-kmp-default-2.3.3.4_2.6.22.5_10-46.i586
+>!> ESTABLISHED:626: U__s_[S2:0][package]dazuko-kmp-xen-2.3.3.4_2.6.22.5_10-46.i586
+>!> ESTABLISHED:627: I__s_[S1:0][package]db-utils-4.5.20-20.i586
+>!> ESTABLISHED:628: U__s_[S2:0][package]db-utils-4.5.20-26.i586
+>!> ESTABLISHED:629: U__s_[S2:0][package]db1-1.85-158.i586
+>!> ESTABLISHED:630: U__s_[S2:0][package]db43-4.3.29-56.i586
+>!> ESTABLISHED:631: U__s_[S2:0][package]dbench-3.04-74.i586
+>!> ESTABLISHED:632: I__s_[S1:0][package]dbus-1-1.0.2-49.i586
+>!> ESTABLISHED:633: U__s_[S2:0][package]dbus-1-1.0.2-56.i586
+>!> ESTABLISHED:634: U__s_[S2:0][package]dbus-1-devel-1.0.2-56.i586
+>!> ESTABLISHED:635: I__s_[S1:0][package]dbus-1-glib-0.74-11.i586
+>!> ESTABLISHED:636: U__s_[S2:0][package]dbus-1-glib-0.74-19.i586
+>!> ESTABLISHED:637: U__s_[S2:0][package]dbus-1-glib-devel-0.74-19.i586
+>!> ESTABLISHED:638: U__s_[S2:0][package]dbus-1-mono-0.63-85.i586
+>!> ESTABLISHED:639: U__s_[S2:0][package]dbus-1-python-0.82.0-22.i586
+>!> ESTABLISHED:640: U__s_[S2:0][package]dbus-1-qt3-0.62-102.i586
+>!> ESTABLISHED:641: I__s_[S1:0][package]dbus-1-qt3-0.62-93.i586
+>!> ESTABLISHED:642: U__s_[S2:0][package]dbus-1-qt3-devel-0.62-102.i586
+>!> ESTABLISHED:643: I__s_[S1:0][package]dbus-1-x11-1.0.2-53.i586
+>!> ESTABLISHED:644: U__s_[S2:0][package]dbus-1-x11-1.0.2-61.i586
+>!> ESTABLISHED:645: U__s_[S2:0][package]dcraw-1.390-8.i586
+>!> ESTABLISHED:646: U__s_[S2:0][package]ddclient-3.7.3-8.i586
+>!> ESTABLISHED:647: U__s_[S2:0][package]ddd-3.3.11-123.i586
+>!> ESTABLISHED:648: U__s_[S2:0][package]ddrescue-1.14_0.0.6-3.i586
+>!> ESTABLISHED:649: U__s_[S2:0][package]ddskk-20050123-114.noarch
+>!> ESTABLISHED:650: U__s_[S2:0][package]ddskk-xemacs-20050123-114.noarch
+>!> ESTABLISHED:651: U__s_[S2:0][package]deb-1.10.27-109.i586
+>!> ESTABLISHED:652: U__s_[S2:0][package]decibel-0.5.0-11.i586
+>!> ESTABLISHED:653: U__s_[S2:0][package]dejagnu-1.4.4-74.i586
+>!> ESTABLISHED:654: I__s_[S1:0][package]dejavu-2.18-8.noarch
+>!> ESTABLISHED:655: U__s_[S2:0][package]dejavu-2.19-8.noarch
+>!> ESTABLISHED:656: U__s_[S2:0][package]delta-2006.08.03-8.i586
+>!> ESTABLISHED:657: U__s_[S2:0][package]deltarpm-3.4-33.i586
+>!> ESTABLISHED:658: U__s_[S2:0][package]deskbar-applet-2.19.91-2.i586
+>!> ESTABLISHED:659: I__s_[S1:0][package]desktop-data-SuSE-10.3-61.noarch
+>!> ESTABLISHED:660: U__s_[S2:0][package]desktop-data-SuSE-10.3-77.noarch
+>!> ESTABLISHED:661: I__s_[S1:0][package]desktop-file-utils-0.13-18.i586
+>!> ESTABLISHED:662: U__s_[S2:0][package]desktop-file-utils-0.13-29.i586
+>!> ESTABLISHED:663: U__s_[S2:0][package]desktop-translations-10.3-59.noarch
+>!> ESTABLISHED:664: U__s_[S2:0][package]detex-2.7-709.i586
+>!> ESTABLISHED:665: U__s_[S2:0][package]devhelp-0.10-141.i586
+>!> ESTABLISHED:666: U__s_[S2:0][package]devhelp-devel-0.10-141.i586
+>!> ESTABLISHED:667: I__s_[S1:0][package]device-mapper-1.02.19-19.i586
+>!> ESTABLISHED:668: U__s_[S2:0][package]device-mapper-1.02.19-25.i586
+>!> ESTABLISHED:669: U__s_[S2:0][package]devs-10.3-37.i586
+>!> ESTABLISHED:670: I__s_[S1:0][package]dhcdbd-1.14-53.i586
+>!> ESTABLISHED:671: U__s_[S2:0][package]dhcdbd-1.14-61.i586
+>!> ESTABLISHED:672: U__s_[S2:0][package]dhcp-3.0.6-17.i586
+>!> ESTABLISHED:673: I__s_[S1:0][package]dhcp-3.0.6-9.i586
+>!> ESTABLISHED:674: U__s_[S2:0][package]dhcp-client-3.0.6-17.i586
+>!> ESTABLISHED:675: I__s_[S1:0][package]dhcp-client-3.0.6-9.i586
+>!> ESTABLISHED:676: U__s_[S2:0][package]dhcp-relay-3.0.6-17.i586
+>!> ESTABLISHED:677: U__s_[S2:0][package]dhcp-server-3.0.6-17.i586
+>!> ESTABLISHED:678: U__s_[S2:0][package]dhcp-tools-1.6-99.i586
+>!> ESTABLISHED:679: U__s_[S2:0][package]dhcp6-0.10-98.i586
+>!> ESTABLISHED:680: I__s_[S1:0][package]dhcpcd-1.3.22pl4-278.i586
+>!> ESTABLISHED:681: U__s_[S2:0][package]dhcpcd-1.3.22pl4-284.i586
+>!> ESTABLISHED:682: U__s_[S2:0][package]dia-0.96.1-10.i586
+>!> ESTABLISHED:683: I__s_[S1:0][package]dialog-1.0-54.i586
+>!> ESTABLISHED:684: U__s_[S2:0][package]dialog-1.0-60.i586
+>!> ESTABLISHED:685: U__s_[S2:0][package]diffmk-1.0-73.noarch
+>!> ESTABLISHED:686: U__s_[S2:0][package]diffstat-1.43-58.i586
+>!> ESTABLISHED:687: I__s_[S1:0][package]diffutils-2.8.7-71.i586
+>!> ESTABLISHED:688: U__s_[S2:0][package]diffutils-2.8.7-77.i586
+>!> ESTABLISHED:689: I__s_[S1:0][package]digikam-0.9.2-19.i586
+>!> ESTABLISHED:690: U__s_[S2:0][package]digikam-0.9.2-37.i586
+>!> ESTABLISHED:691: I__s_[S1:0][package]digikamimageplugins-0.9.2-19.i586
+>!> ESTABLISHED:692: U__s_[S2:0][package]digikamimageplugins-0.9.2-37.i586
+>!> ESTABLISHED:693: U__s_[S2:0][package]digikamimageplugins-superimpose-0.9.2-37.i586
+>!> ESTABLISHED:694: U__s_[S2:0][package]ding-1.5-39.noarch
+>!> ESTABLISHED:695: U__s_[S2:0][package]dirdiff-2.1-71.i586
+>!> ESTABLISHED:696: U__s_[S2:0][package]dirmngr-1.0.0-11.i586
+>!> ESTABLISHED:697: I__s_[S1:0][package]dirmngr-1.0.0-3.i586
+>!> ESTABLISHED:698: U__s_[S2:0][package]djvulibre-3.5.19-50.i586
+>!> ESTABLISHED:699: U__s_[S2:0][package]dmraid-1.0.0.rc14-17.i586
+>!> ESTABLISHED:700: U__s_[S2:0][package]docbook-dsssl-stylesheets-1.79-77.noarch
+>!> ESTABLISHED:701: U__s_[S2:0][package]docbook-toys-1.51.0-340.noarch
+>!> ESTABLISHED:702: U__s_[S2:0][package]docbook-utils-0.6.14-139.noarch
+>!> ESTABLISHED:703: U__s_[S2:0][package]docbook-xml-website-2.5.0-125.noarch
+>!> ESTABLISHED:704: U__s_[S2:0][package]docbook-xsl-stylesheets-1.73.1-5.noarch
+>!> ESTABLISHED:705: U__s_[S2:0][package]docbook2x-0.8.8-18.i586
+>!> ESTABLISHED:706: U__s_[S2:0][package]docbook_3-3.1-672.noarch
+>!> ESTABLISHED:707: U__s_[S2:0][package]docbook_4-4.5-38.noarch
+>!> ESTABLISHED:708: I__s_[S1:0][package]dockutils-0.2-12.i586
+>!> ESTABLISHED:709: U__s_[S2:0][package]dockutils-0.2-18.i586
+>!> ESTABLISHED:710: U__s_[S2:0][package]dos2unix-3.1-373.i586
+>!> ESTABLISHED:711: U__s_[S2:0][package]dosbootdisk-1.1-127.i586
+>!> ESTABLISHED:712: I__s_[S1:0][package]dosfstools-2.11-70.i586
+>!> ESTABLISHED:713: U__s_[S2:0][package]dosfstools-2.11-77.i586
+>!> ESTABLISHED:714: U__s_[S2:0][package]doxygen-1.5.3-10.i586
+>!> ESTABLISHED:715: U__s_[S2:0][package]dragonegg-0.1-118.i586
+>!> ESTABLISHED:716: U__s_[S2:0][package]drbd-kmp-bigsmp-0.7.23_2.6.22.5_10-63.i586
+>!> ESTABLISHED:717: U__s_[S2:0][package]drbd-kmp-default-0.7.23_2.6.22.5_10-63.i586
+>!> ESTABLISHED:718: U__s_[S2:0][package]drbd-kmp-xen-0.7.23_2.6.22.5_10-63.i586
+>!> ESTABLISHED:719: U__s_[S2:0][package]drgeo-1.1.0-111.i586
+>!> ESTABLISHED:720: U__s_[S2:0][package]dvb-1.1.0_CVS20070305-36.i586
+>!> ESTABLISHED:721: I__s_[S1:0][package]dvd+rw-tools-7.0-40.i586
+>!> ESTABLISHED:722: U__s_[S2:0][package]dvd+rw-tools-7.0-46.i586
+>!> ESTABLISHED:723: U__s_[S2:0][package]dvi2tty-5.3.1-181.i586
+>!> ESTABLISHED:724: U__s_[S2:0][package]dviutils-94.3.19-1107.i586
+>!> ESTABLISHED:725: U__s_[S2:0][package]e2fsprogs-1.40.2-15.i586
+>!> ESTABLISHED:726: I__s_[S1:0][package]e2fsprogs-1.40.2-9.i586
+>!> ESTABLISHED:727: U__s_[S2:0][package]e2fsprogs-devel-1.40.2-15.i586
+>!> ESTABLISHED:728: U__s_[S2:0][package]e3-2.6.3-70.i586
+>!> ESTABLISHED:729: U__s_[S2:0][package]eID-belgium-2.5.9-109.i586
+>!> ESTABLISHED:730: U__s_[S2:0][package]eIDconfig-belgium-1.0.1-12.i586
+>!> ESTABLISHED:731: U__s_[S2:0][package]eb-4.3-37.i586
+>!> ESTABLISHED:732: U__s_[S2:0][package]ebdev-4.3-37.i586
+>!> ESTABLISHED:733: U__s_[S2:0][package]eblook-1.6.1-70.i586
+>!> ESTABLISHED:734: U__s_[S2:0][package]ebview-0.3.6-97.i586
+>!> ESTABLISHED:735: U__s_[S2:0][package]ec-fonts-mftraced-1.0.12-109.noarch
+>!> ESTABLISHED:736: U__s_[S2:0][package]ecj-bootstrap-0.755-35.noarch
+>!> ESTABLISHED:737: U__s_[S2:0][package]ed-0.2-935.i586
+>!> ESTABLISHED:738: U__s_[S2:0][package]edict-20060807-58.noarch
+>!> ESTABLISHED:739: U__s_[S2:0][package]edict-emacs-0.9.8-814.noarch
+>!> ESTABLISHED:740: U__s_[S2:0][package]eel-2.19.90-3.i586
+>!> ESTABLISHED:741: U__s_[S2:0][package]eel-devel-2.19.90-3.i586
+>!> ESTABLISHED:742: U__s_[S2:0][package]efont-serif-ttf-20010312-574.noarch
+>!> ESTABLISHED:743: U__s_[S2:0][package]efont-unicode-0.4.2-106.noarch
+>!> ESTABLISHED:744: I__s_[S1:0][package]eject-2.1.0-62.i586
+>!> ESTABLISHED:745: U__s_[S2:0][package]eject-2.1.0-68.i586
+>!> ESTABLISHED:746: U__s_[S2:0][package]ekiga-2.0.9-61.i586
+>!> ESTABLISHED:747: U__s_[S2:0][package]elilo-3.6-93.i586
+>!> ESTABLISHED:748: U__s_[S2:0][package]emacs-22.1-33.i586
+>!> ESTABLISHED:749: U__s_[S2:0][package]emacs-auctex-11.83-93.noarch
+>!> ESTABLISHED:750: U__s_[S2:0][package]emacs-info-22.1-33.i586
+>!> ESTABLISHED:751: U__s_[S2:0][package]emacs-nox-22.1-33.i586
+>!> ESTABLISHED:752: U__s_[S2:0][package]emacs-x11-22.1-33.i586
+>!> ESTABLISHED:753: U__s_[S2:0][package]encfs-1.3.2-38.i586
+>!> ESTABLISHED:754: U__s_[S2:0][package]enchant-1.2.0-90.i586
+>!> ESTABLISHED:755: U__s_[S2:0][package]enchant-devel-1.2.0-90.i586
+>!> ESTABLISHED:756: U__s_[S2:0][package]engdic-0.2-58.noarch
+>!> ESTABLISHED:757: U__s_[S2:0][package]enscript-1.6.4-80.i586
+>!> ESTABLISHED:758: U__s_[S2:0][package]eog-2.19.91-4.i586
+>!> ESTABLISHED:759: U__s_[S2:0][package]eog-devel-2.19.91-4.i586
+>!> ESTABLISHED:760: U__s_[S2:0][package]epic-2.6-38.i586
+>!> ESTABLISHED:761: U__s_[S2:0][package]epiphany-2.19.91-2.i586
+>!> ESTABLISHED:762: U__s_[S2:0][package]epiphany-devel-2.19.91-2.i586
+>!> ESTABLISHED:763: U__s_[S2:0][package]epiphany-doc-2.19.91-2.i586
+>!> ESTABLISHED:764: U__s_[S2:0][package]epiphany-extensions-2.19.90-2.i586
+>!> ESTABLISHED:765: U__s_[S2:0][package]epos-2.5.37-51.i586
+>!> ESTABLISHED:766: U__s_[S2:0][package]esound-0.2.38-14.i586
+>!> ESTABLISHED:767: I__s_[S1:0][package]esound-0.2.38-8.i586
+>!> ESTABLISHED:768: U__s_[S2:0][package]esound-devel-0.2.38-14.i586
+>!> ESTABLISHED:769: U__s_[S2:0][package]ethtool-6-10.i586
+>!> ESTABLISHED:770: I__s_[S1:0][package]ethtool-6-4.i586
+>!> ESTABLISHED:771: U__s_[S2:0][package]evince-2.19.4-4.i586
+>!> ESTABLISHED:772: U__s_[S2:0][package]evms-2.5.5-162.i586
+>!> ESTABLISHED:773: U__s_[S2:0][package]evms-gui-2.5.5-162.i586
+>!> ESTABLISHED:774: U__s_[S2:0][package]evolution-2.11.91-3.i586
+>!> ESTABLISHED:775: U__s_[S2:0][package]evolution-data-server-1.11.91-4.i586
+>!> ESTABLISHED:776: U__s_[S2:0][package]evolution-data-server-devel-1.11.91-4.i586
+>!> ESTABLISHED:777: U__s_[S2:0][package]evolution-devel-2.11.91-3.i586
+>!> ESTABLISHED:778: U__s_[S2:0][package]evolution-exchange-2.11.91-2.i586
+>!> ESTABLISHED:779: U__s_[S2:0][package]evolution-pilot-2.11.91-3.i586
+>!> ESTABLISHED:780: U__s_[S2:0][package]evolution-sharp-0.13.3-6.i586
+>!> ESTABLISHED:781: U__s_[S2:0][package]evolution-webcal-2.10.0-23.i586
+>!> ESTABLISHED:782: U__s_[S2:0][package]exiftool-6.90-8.i586
+>!> ESTABLISHED:783: U__s_[S2:0][package]exo-0.3.2-69.i586
+>!> ESTABLISHED:784: I__s_[S1:0][package]expat-2.0.1-15.i586
+>!> ESTABLISHED:785: U__s_[S2:0][package]expat-2.0.1-21.i586
+>!> ESTABLISHED:786: U__s_[S2:0][package]expect-5.43.0-73.i586
+>!> ESTABLISHED:787: U__s_[S2:0][package]f-spot-0.4.0-18.i586
+>!> ESTABLISHED:788: I__s_[S1:0][package]fam-2.7.0-61.i586
+>!> ESTABLISHED:789: U__s_[S2:0][package]fam-2.7.0-67.i586
+>!> ESTABLISHED:790: U__s_[S2:0][package]fam-devel-2.7.0-67.i586
+>!> ESTABLISHED:791: U__s_[S2:0][package]fam-server-2.7.0-67.i586
+>!> ESTABLISHED:792: U__s_[S2:0][package]fast-user-switch-applet-2.18.0-63.i586
+>!> ESTABLISHED:793: U__s_[S2:0][package]fastjar-0.92-61.i586
+>!> ESTABLISHED:794: U__s_[S2:0][package]fbiterm-0.5.20040304-133.i586
+>!> ESTABLISHED:795: U__s_[S2:0][package]fbset-2.1-852.i586
+>!> ESTABLISHED:796: U__s_[S2:0][package]fcwnn-1.1.1a017-618.i586
+>!> ESTABLISHED:797: U__s_[S2:0][package]fcwnncom-1.1.1a017-618.i586
+>!> ESTABLISHED:798: U__s_[S2:0][package]fcwnndev-1.1.1a017-618.i586
+>!> ESTABLISHED:799: U__s_[S2:0][package]festival-1.96-63.i586
+>!> ESTABLISHED:800: U__s_[S2:0][package]fetchmail-6.3.8-47.i586
+>!> ESTABLISHED:801: U__s_[S2:0][package]fftw-2.1.5-109.i586
+>!> ESTABLISHED:802: I__s_[S1:0][package]fftw3-3.1.2-53.i586
+>!> ESTABLISHED:803: U__s_[S2:0][package]fftw3-3.1.2-59.i586
+>!> ESTABLISHED:804: I__s_[S1:0][package]file-4.20-32.i586
+>!> ESTABLISHED:805: U__s_[S2:0][package]file-4.21-4.i586
+>!> ESTABLISHED:806: U__s_[S2:0][package]file-roller-2.19.91-3.i586
+>!> ESTABLISHED:807: I__s_[S1:0][package]fileshareset-2.0-329.i586
+>!> ESTABLISHED:808: U__s_[S2:0][package]fileshareset-2.0-352.i586
+>!> ESTABLISHED:809: I__s_[S1:0][package]filesystem-10.3-40.i586
+>!> ESTABLISHED:810: U__s_[S2:0][package]filesystem-10.3-47.i586
+>!> ESTABLISHED:811: U__s_[S2:0][package]fillets-ng-0.7.4-54.i586
+>!> ESTABLISHED:812: U__s_[S2:0][package]fillets-ng-data-0.7.4-34.noarch
+>!> ESTABLISHED:813: I__s_[S1:0][package]fillup-1.42-170.i586
+>!> ESTABLISHED:814: U__s_[S2:0][package]fillup-1.42-176.i586
+>!> ESTABLISHED:815: U__s_[S2:0][package]filters-2007.8.9-15.i586
+>!> ESTABLISHED:816: I__s_[S1:0][package]findutils-4.2.31-15.i586
+>!> ESTABLISHED:817: U__s_[S2:0][package]findutils-4.2.31-21.i586
+>!> ESTABLISHED:818: U__s_[S2:0][package]findutils-locate-4.2.31-21.i586
+>!> ESTABLISHED:819: U__s_[S2:0][package]finger-1.3-75.i586
+>!> ESTABLISHED:820: U__s_[S2:0][package]finger-server-1.3-75.i586
+>!> ESTABLISHED:821: U__s_[S2:0][package]firmwarekit-2-38.i586
+>!> ESTABLISHED:822: U__s_[S2:0][package]fkwnn-1.1.1a017-618.i586
+>!> ESTABLISHED:823: U__s_[S2:0][package]fkwnndev-1.1.1a017-618.i586
+>!> ESTABLISHED:824: U__s_[S2:0][package]flac-1.2.0-10.i586
+>!> ESTABLISHED:825: U__s_[S2:0][package]flash-player-9.0.48.0-13.i586
+>!> ESTABLISHED:826: I__s_[S1:0][package]flash-player-9.0.48.0-8.i586
+>!> ESTABLISHED:827: U__s_[S2:0][package]flex-2.5.33-60.i586
+>!> ESTABLISHED:828: U__s_[S2:0][package]flim-1.14.7-99.noarch
+>!> ESTABLISHED:829: U__s_[S2:0][package]flim-xemacs-1.14.7-111.noarch
+>!> ESTABLISHED:830: U__s_[S2:0][package]fltk-1.1.7-79.i586
+>!> ESTABLISHED:831: U__s_[S2:0][package]fluidsynth-1.0.7a-89.i586
+>!> ESTABLISHED:832: I__s_[S1:0][package]fontconfig-2.4.2-34.i586
+>!> ESTABLISHED:833: U__s_[S2:0][package]fontconfig-2.4.2-40.i586
+>!> ESTABLISHED:834: U__s_[S2:0][package]fontconfig-devel-2.4.2-40.i586
+>!> ESTABLISHED:835: I__s_[S1:0][package]fonts-config-20061025-45.noarch
+>!> ESTABLISHED:836: U__s_[S2:0][package]fonts-config-20061025-51.noarch
+>!> ESTABLISHED:837: U__s_[S2:0][package]fonts-thryomanes-1.2-74.noarch
+>!> ESTABLISHED:838: U__s_[S2:0][package]fonttools-2.0b2.20070423-41.i586
+>!> ESTABLISHED:839: U__s_[S2:0][package]foomatic-filters-3.0.2-120.i586
+>!> ESTABLISHED:840: U__s_[S2:0][package]fop-0.93-35.noarch
+>!> ESTABLISHED:841: U__s_[S2:0][package]fortune-1.0-929.i586
+>!> ESTABLISHED:842: U__s_[S2:0][package]fping-2.4b2-71.i586
+>!> ESTABLISHED:843: U__s_[S2:0][package]free-ttf-fonts-1.0-246.noarch
+>!> ESTABLISHED:844: U__s_[S2:0][package]freealut-1.1.0-76.i586
+>!> ESTABLISHED:845: U__s_[S2:0][package]freeciv-2.1.0-95.i586
+>!> ESTABLISHED:846: U__s_[S2:0][package]freefont-0.20060718-84.noarch
+>!> ESTABLISHED:847: U__s_[S2:0][package]freeglut-060903-73.i586
+>!> ESTABLISHED:848: U__s_[S2:0][package]freeglut-devel-060903-73.i586
+>!> ESTABLISHED:849: U__s_[S2:0][package]freeradius-1.1.6-39.i586
+>!> ESTABLISHED:850: U__s_[S2:0][package]freetype-1.3.1-1259.i586
+>!> ESTABLISHED:851: U__s_[S2:0][package]freetype-tools-1.3.1-1259.i586
+>!> ESTABLISHED:852: U__s_[S2:0][package]freetype2-2.3.5-15.i586
+>!> ESTABLISHED:853: I__s_[S1:0][package]freetype2-2.3.5-8.i586
+>!> ESTABLISHED:854: U__s_[S2:0][package]freetype2-devel-2.3.5-15.i586
+>!> ESTABLISHED:855: U__s_[S2:0][package]freqtweak-0.6.1-131.i586
+>!> ESTABLISHED:856: I__s_[S1:0][package]fribidi-0.10.4-565.i586
+>!> ESTABLISHED:857: U__s_[S2:0][package]fribidi-0.10.4-574.i586
+>!> ESTABLISHED:858: U__s_[S2:0][package]fribidi-devel-0.10.4-574.i586
+>!> ESTABLISHED:859: U__s_[S2:0][package]frink-2.2.2-123.i586
+>!> ESTABLISHED:860: U__s_[S2:0][package]frozen-bubble-2.1.0-70.i586
+>!> ESTABLISHED:861: U__s_[S2:0][package]ft2demos-2.3.5-16.i586
+>!> ESTABLISHED:862: U__s_[S2:0][package]ftgl-2.1.2-87.i586
+>!> ESTABLISHED:863: U__s_[S2:0][package]ftwnn-1.1.1a017-618.i586
+>!> ESTABLISHED:864: U__s_[S2:0][package]fuse-2.7.0-19.i586
+>!> ESTABLISHED:865: I__s_[S1:0][package]fuse-2.7.0-9.i586
+>!> ESTABLISHED:866: U__s_[S2:0][package]fuse_kio-0.0.cvs2005.12.08-129.i586
+>!> ESTABLISHED:867: U__s_[S2:0][package]fvwm-themes-0.6.2-301.noarch
+>!> ESTABLISHED:868: I__s_[S1:0][package]fvwm2-2.5.21-50.i586
+>!> ESTABLISHED:869: U__s_[S2:0][package]fvwm2-2.5.21-62.i586
+>!> ESTABLISHED:870: U__s_[S2:0][package]fvwm2-gtk-2.5.21-62.i586
+>!> ESTABLISHED:871: U__s_[S2:0][package]fwnn-1.1.1a017-618.i586
+>!> ESTABLISHED:872: U__s_[S2:0][package]fwnncom-1.1.1a017-618.i586
+>!> ESTABLISHED:873: U__s_[S2:0][package]fxload-2002_04_11-172.i586
+>!> ESTABLISHED:874: U__s_[S2:0][package]g-wrap-1.9.6-94.i586
+>!> ESTABLISHED:875: U__s_[S2:0][package]g3utils-1.1.35-63.i586
+>!> ESTABLISHED:876: U__s_[S2:0][package]gail-1.19.6-16.i586
+>!> ESTABLISHED:877: I__s_[S1:0][package]gail-1.19.6-5.i586
+>!> ESTABLISHED:878: U__s_[S2:0][package]gail-devel-1.19.6-16.i586
+>!> ESTABLISHED:879: U__s_[S2:0][package]gail-doc-1.19.6-16.i586
+>!> ESTABLISHED:880: U__s_[S2:0][package]gaim-otr-3.0.0-116.i586
+>!> ESTABLISHED:881: U__s_[S2:0][package]galago-daemon-0.5.1-47.i586
+>!> ESTABLISHED:882: U__s_[S2:0][package]galago-sharp-0.5.0-116.noarch
+>!> ESTABLISHED:883: U__s_[S2:0][package]gamix-1.99.p14-140.i586
+>!> ESTABLISHED:884: U__s_[S2:0][package]garlic-1.6-84.i586
+>!> ESTABLISHED:885: U__s_[S2:0][package]gau-0.4.1-833.i586
+>!> ESTABLISHED:886: I__s_[S1:0][package]gawk-3.1.5g-16.i586
+>!> ESTABLISHED:887: U__s_[S2:0][package]gawk-3.1.5g-22.i586
+>!> ESTABLISHED:888: U__s_[S2:0][package]gbuffy-0.2.6-127.i586
+>!> ESTABLISHED:889: U__s_[S2:0][package]gcal-3.01-654.i586
+>!> ESTABLISHED:890: U__s_[S2:0][package]gcalctool-5.19.91-3.i586
+>!> ESTABLISHED:891: U__s_[S2:0][package]gcc-4.2-21.i586
+>!> ESTABLISHED:892: U__s_[S2:0][package]gcc-c++-4.2-21.i586
+>!> ESTABLISHED:893: I__s_[S1:0][package]gcc-gij-4.2-15.i586
+>!> ESTABLISHED:894: U__s_[S2:0][package]gcc-gij-4.2-21.i586
+>!> ESTABLISHED:895: U__s_[S2:0][package]gcc-info-4.2-21.i586
+>!> ESTABLISHED:896: U__s_[S2:0][package]gcc-java-4.2-21.i586
+>!> ESTABLISHED:897: U__s_[S2:0][package]gcc42-4.2.1_20070724-12.i586
+>!> ESTABLISHED:898: U__s_[S2:0][package]gcc42-c++-4.2.1_20070724-12.i586
+>!> ESTABLISHED:899: U__s_[S2:0][package]gcc42-gij-4.2.1_20070724-17.i586
+>!> ESTABLISHED:900: I__s_[S1:0][package]gcc42-gij-4.2.1_20070724-6.i586
+>!> ESTABLISHED:901: U__s_[S2:0][package]gcc42-info-4.2.1_20070724-12.i586
+>!> ESTABLISHED:902: U__s_[S2:0][package]gcc42-java-4.2.1_20070724-12.i586
+>!> ESTABLISHED:903: U__s_[S2:0][package]gconf-editor-2.18.2-3.i586
+>!> ESTABLISHED:904: U__s_[S2:0][package]gconf-sharp2-2.16.0-27.i586
+>!> ESTABLISHED:905: I__s_[S1:0][package]gconf2-2.19.1-10.i586
+>!> ESTABLISHED:906: U__s_[S2:0][package]gconf2-2.19.1-21.i586
+>!> ESTABLISHED:907: U__s_[S2:0][package]gconf2-devel-2.19.1-21.i586
+>!> ESTABLISHED:908: U__s_[S2:0][package]gconf2-doc-2.19.1-21.i586
+>!> ESTABLISHED:909: U__s_[S2:0][package]gd-2.0.35-14.i586
+>!> ESTABLISHED:910: U__s_[S2:0][package]gdb-6.6.50.20070726-16.i586
+>!> ESTABLISHED:911: I__s_[S1:0][package]gdb-6.6.50.20070726-7.i586
+>!> ESTABLISHED:912: I__s_[S1:0][package]gdbm-1.8.3-293.i586
+>!> ESTABLISHED:913: U__s_[S2:0][package]gdbm-1.8.3-299.i586
+>!> ESTABLISHED:914: U__s_[S2:0][package]gdbm-devel-1.8.3-299.i586
+>!> ESTABLISHED:915: U__s_[S2:0][package]gdk-pixbuf-0.22.0-181.i586
+>!> ESTABLISHED:916: U__s_[S2:0][package]gdk-pixbuf-gnome-0.22.0-181.i586
+>!> ESTABLISHED:917: U__s_[S2:0][package]gdm-2.19.7-4.i586
+>!> ESTABLISHED:918: U__s_[S2:0][package]gecko-sharp2-0.12-26.noarch
+>!> ESTABLISHED:919: U__s_[S2:0][package]gedit-2.19.91-3.i586
+>!> ESTABLISHED:920: I__s_[S1:0][package]genisoimage-1.1.6-10.i586
+>!> ESTABLISHED:921: U__s_[S2:0][package]genisoimage-1.1.6-18.i586
+>!> ESTABLISHED:922: I__s_[S1:0][package]gettext-0.16-35.i586
+>!> ESTABLISHED:923: U__s_[S2:0][package]gettext-0.16-43.i586
+>!> ESTABLISHED:924: U__s_[S2:0][package]gettext-devel-0.16-43.i586
+>!> ESTABLISHED:925: U__s_[S2:0][package]gftp-2.0.18-114.i586
+>!> ESTABLISHED:926: U__s_[S2:0][package]gfxboot-3.3.34-6.i586
+>!> ESTABLISHED:927: U__s_[S2:0][package]ggreeter-0.1-12.i586
+>!> ESTABLISHED:928: U__s_[S2:0][package]ghex-2.8.2-105.i586
+>!> ESTABLISHED:929: U__s_[S2:0][package]ghostscript-cjk-20050315-79.noarch
+>!> ESTABLISHED:930: U__s_[S2:0][package]ghostscript-fonts-other-8.15.3-90.i586
+>!> ESTABLISHED:931: U__s_[S2:0][package]ghostscript-fonts-rus-8.15.3-90.i586
+>!> ESTABLISHED:932: I__s_[S1:0][package]ghostscript-fonts-std-8.15.3-82.i586
+>!> ESTABLISHED:933: U__s_[S2:0][package]ghostscript-fonts-std-8.15.3-90.i586
+>!> ESTABLISHED:934: I__s_[S1:0][package]ghostscript-library-8.15.3-82.i586
+>!> ESTABLISHED:935: U__s_[S2:0][package]ghostscript-library-8.15.3-90.i586
+>!> ESTABLISHED:936: I__s_[S1:0][package]ghostscript-x11-8.15.3-82.i586
+>!> ESTABLISHED:937: U__s_[S2:0][package]ghostscript-x11-8.15.3-90.i586
+>!> ESTABLISHED:938: I__s_[S1:0][package]giflib-4.1.4-73.i586
+>!> ESTABLISHED:939: U__s_[S2:0][package]giflib-4.1.4-80.i586
+>!> ESTABLISHED:940: U__s_[S2:0][package]giflib-devel-4.1.4-80.i586
+>!> ESTABLISHED:941: U__s_[S2:0][package]gimp-2.2.17-25.i586
+>!> ESTABLISHED:942: I__s_[S1:0][package]gimp-2.2.17-8.i586
+>!> ESTABLISHED:943: U__s_[S2:0][package]gimp-cmyk-0.3-133.i586
+>!> ESTABLISHED:944: U__s_[S2:0][package]gimp-devel-2.2.17-25.i586
+>!> ESTABLISHED:945: U__s_[S2:0][package]gimp-help-0.9-129.noarch
+>!> ESTABLISHED:946: U__s_[S2:0][package]git-core-1.5.2.4-13.i586
+>!> ESTABLISHED:947: U__s_[S2:0][package]gjdoc-0.7.8-45.noarch
+>!> ESTABLISHED:948: U__s_[S2:0][package]gjiten-2.6-66.i586
+>!> ESTABLISHED:949: U__s_[S2:0][package]glade-2.12.1-124.i586
+>!> ESTABLISHED:950: U__s_[S2:0][package]glade-sharp2-2.10.2-17.i586
+>!> ESTABLISHED:951: U__s_[S2:0][package]gle-3.1.0-14.i586
+>!> ESTABLISHED:952: U__s_[S2:0][package]glib-1.2.10-669.i586
+>!> ESTABLISHED:953: U__s_[S2:0][package]glib-devel-1.2.10-669.i586
+>!> ESTABLISHED:954: U__s_[S2:0][package]glib-sharp2-2.10.2-17.i586
+>!> ESTABLISHED:955: I__s_[S1:0][package]glib2-2.14.0-1.i586
+>!> ESTABLISHED:956: U__s_[S2:0][package]glib2-2.14.0-3.i586
+>!> ESTABLISHED:957: U__s_[S2:0][package]glib2-devel-2.14.0-3.i586
+>!> ESTABLISHED:958: U__s_[S2:0][package]glib2-doc-2.14.0-3.i586
+>!> ESTABLISHED:959: I__s_[S1:0][package]glib2-lang-2.14.0-1.i586
+>!> ESTABLISHED:960: I__s_[S1:0][package]glibc-2.6-16.i686
+>!> ESTABLISHED:961: U__s_[S2:0][package]glibc-2.6.1-12.i586
+>!> ESTABLISHED:962: U__s_[S2:0][package]glibc-2.6.1-12.i686
+>!> ESTABLISHED:963: U__s_[S2:0][package]glibc-devel-2.6.1-12.i586
+>!> ESTABLISHED:964: U__s_[S2:0][package]glibc-devel-2.6.1-12.i686
+>!> ESTABLISHED:965: U__s_[S2:0][package]glibc-html-2.6.1-12.i586
+>!> ESTABLISHED:966: I__s_[S1:0][package]glibc-i18ndata-2.6-16.i586
+>!> ESTABLISHED:967: U__s_[S2:0][package]glibc-i18ndata-2.6.1-12.i586
+>!> ESTABLISHED:968: U__s_[S2:0][package]glibc-info-2.6.1-12.i586
+>!> ESTABLISHED:969: I__s_[S1:0][package]glibc-locale-2.6-16.i586
+>!> ESTABLISHED:970: U__s_[S2:0][package]glibc-locale-2.6.1-12.i586
+>!> ESTABLISHED:971: U__s_[S2:0][package]glibc-obsolete-2.6.1-12.i586
+>!> ESTABLISHED:972: U__s_[S2:0][package]glibmm2-2.13.9-14.i586
+>!> ESTABLISHED:973: U__s_[S2:0][package]glibmm2-devel-2.13.9-14.i586
+>!> ESTABLISHED:974: I__s_[S1:0][package]glitz-0.5.6-72.i586
+>!> ESTABLISHED:975: U__s_[S2:0][package]glitz-0.5.6-80.i586
+>!> ESTABLISHED:976: U__s_[S2:0][package]glitz-devel-0.5.6-80.i586
+>!> ESTABLISHED:977: U__s_[S2:0][package]gltt-2.5.2-572.i586
+>!> ESTABLISHED:978: U__s_[S2:0][package]gmime-2.2.10-19.i586
+>!> ESTABLISHED:979: U__s_[S2:0][package]gmime-devel-2.2.10-19.i586
+>!> ESTABLISHED:980: U__s_[S2:0][package]gmime-sharp-2.2.10-19.i586
+>!> ESTABLISHED:981: I__s_[S1:0][package]gmp-4.2.1-49.i586
+>!> ESTABLISHED:982: U__s_[S2:0][package]gmp-4.2.1-55.i586
+>!> ESTABLISHED:983: U__s_[S2:0][package]gmp-devel-4.2.1-55.i586
+>!> ESTABLISHED:984: U__s_[S2:0][package]gnet-2.0.7-129.i586
+>!> ESTABLISHED:985: U__s_[S2:0][package]gnokii-0.6.18-19.i586
+>!> ESTABLISHED:986: U__s_[S2:0][package]gnome-applets-2.19.1-20.i586
+>!> ESTABLISHED:987: U__s_[S2:0][package]gnome-applets-devel-2.19.1-20.i586
+>!> ESTABLISHED:988: U__s_[S2:0][package]gnome-audio-2.0.0-193.noarch
+>!> ESTABLISHED:989: U__s_[S2:0][package]gnome-backgrounds-2.18.3-15.noarch
+>!> ESTABLISHED:990: U__s_[S2:0][package]gnome-blog-0.9.1-115.i586
+>!> ESTABLISHED:991: U__s_[S2:0][package]gnome-bluetooth-0.8.0-112.i586
+>!> ESTABLISHED:992: U__s_[S2:0][package]gnome-bluetooth-devel-0.8.0-112.i586
+>!> ESTABLISHED:993: U__s_[S2:0][package]gnome-certauth-devel-0.3-3.i586
+>!> ESTABLISHED:994: U__s_[S2:0][package]gnome-commander-1.2.4-18.i586
+>!> ESTABLISHED:995: U__s_[S2:0][package]gnome-common-2.18.0-8.noarch
+>!> ESTABLISHED:996: U__s_[S2:0][package]gnome-cups-manager-0.32cvs20060120-157.i586
+>!> ESTABLISHED:997: U__s_[S2:0][package]gnome-cups-manager-devel-0.32cvs20060120-157.i586
+>!> ESTABLISHED:998: U__s_[S2:0][package]gnome-desktop-2.19.90-3.i586
+>!> ESTABLISHED:999: U__s_[S2:0][package]gnome-desktop-devel-2.19.90-3.i586
+>!> ESTABLISHED:1000: U__s_[S2:0][package]gnome-doc-utils-0.11.2-2.noarch
+>!> ESTABLISHED:1001: U__s_[S2:0][package]gnome-doc-utils-devel-0.11.2-2.noarch
+>!> ESTABLISHED:1002: U__s_[S2:0][package]gnome-games-2.19.91.1-3.i586
+>!> ESTABLISHED:1003: I__s_[S1:0][package]gnome-icon-theme-2.18.0-30.noarch
+>!> ESTABLISHED:1004: U__s_[S2:0][package]gnome-icon-theme-2.19.91-4.noarch
+>!> ESTABLISHED:1005: I__s_[S1:0][package]gnome-keyring-2.19.6.1-3.i586
+>!> ESTABLISHED:1006: U__s_[S2:0][package]gnome-keyring-2.19.91-5.i586
+>!> ESTABLISHED:1007: U__s_[S2:0][package]gnome-keyring-devel-2.19.91-5.i586
+>!> ESTABLISHED:1008: U__s_[S2:0][package]gnome-keyring-manager-2.18.0-58.i586
+>!> ESTABLISHED:1009: U__s_[S2:0][package]gnome-libs-1.4.1.7-796.i586
+>!> ESTABLISHED:1010: U__s_[S2:0][package]gnome-mag-0.14.8-3.i586
+>!> ESTABLISHED:1011: U__s_[S2:0][package]gnome-main-menu-0.9.8-72.i586
+>!> ESTABLISHED:1012: U__s_[S2:0][package]gnome-main-menu-devel-0.9.8-72.i586
+>!> ESTABLISHED:1013: U__s_[S2:0][package]gnome-media-2.18.0-63.i586
+>!> ESTABLISHED:1014: U__s_[S2:0][package]gnome-media-cd-2.18.0-63.i586
+>!> ESTABLISHED:1015: U__s_[S2:0][package]gnome-media-devel-2.18.0-63.i586
+>!> ESTABLISHED:1016: U__s_[S2:0][package]gnome-menus-2.19.90-3.i586
+>!> ESTABLISHED:1017: U__s_[S2:0][package]gnome-menus-devel-2.19.90-3.i586
+>!> ESTABLISHED:1018: U__s_[S2:0][package]gnome-mount-0.6-17.i586
+>!> ESTABLISHED:1019: U__s_[S2:0][package]gnome-netstatus-2.12.1-63.i586
+>!> ESTABLISHED:1020: U__s_[S2:0][package]gnome-nettool-2.19.90-3.i586
+>!> ESTABLISHED:1021: U__s_[S2:0][package]gnome-panel-2.19.6-3.i586
+>!> ESTABLISHED:1022: U__s_[S2:0][package]gnome-panel-devel-2.19.6-3.i586
+>!> ESTABLISHED:1023: U__s_[S2:0][package]gnome-panel-doc-2.19.6-3.i586
+>!> ESTABLISHED:1024: U__s_[S2:0][package]gnome-phone-manager-0.8-109.i586
+>!> ESTABLISHED:1025: U__s_[S2:0][package]gnome-pilot-2.0.15-17.i586
+>!> ESTABLISHED:1026: U__s_[S2:0][package]gnome-pilot-conduits-2.0.14-108.i586
+>!> ESTABLISHED:1027: U__s_[S2:0][package]gnome-pilot-devel-2.0.15-17.i586
+>!> ESTABLISHED:1028: U__s_[S2:0][package]gnome-power-manager-2.19.6-17.i586
+>!> ESTABLISHED:1029: U__s_[S2:0][package]gnome-printer-add-1.0.1-126.i586
+>!> ESTABLISHED:1030: U__s_[S2:0][package]gnome-python-desktop-2.19.2-17.i586
+>!> ESTABLISHED:1031: U__s_[S2:0][package]gnome-reset-0.1.1-122.i586
+>!> ESTABLISHED:1032: U__s_[S2:0][package]gnome-screensaver-2.19.7-3.i586
+>!> ESTABLISHED:1033: U__s_[S2:0][package]gnome-session-2.19.90-3.i586
+>!> ESTABLISHED:1034: U__s_[S2:0][package]gnome-sharp2-2.16.0-27.i586
+>!> ESTABLISHED:1035: U__s_[S2:0][package]gnome-speech-0.4.16-15.i586
+>!> ESTABLISHED:1036: U__s_[S2:0][package]gnome-speech-devel-0.4.16-15.i586
+>!> ESTABLISHED:1037: U__s_[S2:0][package]gnome-spell2-1.0.7-109.i586
+>!> ESTABLISHED:1038: U__s_[S2:0][package]gnome-system-monitor-2.19.91.1-3.i586
+>!> ESTABLISHED:1039: U__s_[S2:0][package]gnome-terminal-2.18.1-24.i586
+>!> ESTABLISHED:1040: U__s_[S2:0][package]gnome-themes-2.19.91-2.noarch
+>!> ESTABLISHED:1041: U__s_[S2:0][package]gnome-utils-2.19.91-3.i586
+>!> ESTABLISHED:1042: U__s_[S2:0][package]gnome-vfs-sharp2-2.16.0-27.i586
+>!> ESTABLISHED:1043: I__s_[S1:0][package]gnome-vfs2-2.19.3-3.i586
+>!> ESTABLISHED:1044: U__s_[S2:0][package]gnome-vfs2-2.19.91-3.i586
+>!> ESTABLISHED:1045: U__s_[S2:0][package]gnome-vfs2-devel-2.19.91-3.i586
+>!> ESTABLISHED:1046: U__s_[S2:0][package]gnome-vfs2-doc-2.19.91-3.i586
+>!> ESTABLISHED:1047: U__s_[S2:0][package]gnome-volume-manager-2.17.0-92.i586
+>!> ESTABLISHED:1048: U__s_[S2:0][package]gnome-web-photo-0.2-106.i586
+>!> ESTABLISHED:1049: U__s_[S2:0][package]gnome2-SuSE-10.3-81.noarch
+>!> ESTABLISHED:1050: U__s_[S2:0][package]gnome2-user-docs-2.18.2-16.noarch
+>!> ESTABLISHED:1051: U__s_[S2:0][package]gnomeicu-0.99.10-114.i586
+>!> ESTABLISHED:1052: U__s_[S2:0][package]gnopernicus-1.1.2-109.i586
+>!> ESTABLISHED:1053: U__s_[S2:0][package]gnopernicus-devel-1.1.2-109.i586
+>!> ESTABLISHED:1054: U__s_[S2:0][package]gnu-getopt-1.0.10-118.noarch
+>!> ESTABLISHED:1055: U__s_[S2:0][package]gnu-jaf-1.0-82.noarch
+>!> ESTABLISHED:1056: U__s_[S2:0][package]gnu-regexp-1.1.4-113.noarch
+>!> ESTABLISHED:1057: U__s_[S2:0][package]gnu-regexp-demo-1.1.4-113.noarch
+>!> ESTABLISHED:1058: U__s_[S2:0][package]gnu-regexp-javadoc-1.1.4-113.noarch
+>!> ESTABLISHED:1059: U__s_[S2:0][package]gnucash-2.2.0-19.i586
+>!> ESTABLISHED:1060: U__s_[S2:0][package]gnucash-docs-2.2.0-21.noarch
+>!> ESTABLISHED:1061: U__s_[S2:0][package]gnuchess-5.07-74.i586
+>!> ESTABLISHED:1062: U__s_[S2:0][package]gnumeric-1.7.11-17.i586
+>!> ESTABLISHED:1063: U__s_[S2:0][package]gnuplot-4.2.0-59.i586
+>!> ESTABLISHED:1064: I__s_[S1:0][package]gnutls-1.6.1-26.i586
+>!> ESTABLISHED:1065: U__s_[S2:0][package]gnutls-1.6.1-33.i586
+>!> ESTABLISHED:1066: U__s_[S2:0][package]gnutls-devel-1.6.1-33.i586
+>!> ESTABLISHED:1067: U__s_[S2:0][package]gob2-2.0.14-83.i586
+>!> ESTABLISHED:1068: U__s_[S2:0][package]goffice-0.4.2-18.i586
+>!> ESTABLISHED:1069: U__s_[S2:0][package]gok-1.3.2-3.i586
+>!> ESTABLISHED:1070: I__s_[S1:0][package]gpart-0.1h-547.i586
+>!> ESTABLISHED:1071: U__s_[S2:0][package]gpart-0.1h-553.i586
+>!> ESTABLISHED:1072: U__s_[S2:0][package]gperf-3.0.2-58.i586
+>!> ESTABLISHED:1073: I__s_[S1:0][package]gpg2-2.0.4-30.i586
+>!> ESTABLISHED:1074: U__s_[S2:0][package]gpg2-2.0.4-38.i586
+>!> ESTABLISHED:1075: I__s_[S1:0][package]gpgme-1.1.5-11.i586
+>!> ESTABLISHED:1076: U__s_[S2:0][package]gpgme-1.1.5-21.i586
+>!> ESTABLISHED:1077: U__s_[S2:0][package]gphoto-2.4.0-17.i586
+>!> ESTABLISHED:1078: I__s_[S1:0][package]gpm-1.20.1-378.i586
+>!> ESTABLISHED:1079: U__s_[S2:0][package]gpm-1.20.1-385.i586
+>!> ESTABLISHED:1080: U__s_[S2:0][package]gpsdrive-2.09-127.i586
+>!> ESTABLISHED:1081: U__s_[S2:0][package]gqcam-0.9-152.i586
+>!> ESTABLISHED:1082: U__s_[S2:0][package]gramofile-1.6-307.i586
+>!> ESTABLISHED:1083: U__s_[S2:0][package]graphviz-2.12-42.i586
+>!> ESTABLISHED:1084: U__s_[S2:0][package]graphviz-devel-2.12-42.i586
+>!> ESTABLISHED:1085: U__s_[S2:0][package]graphviz-gd-2.12-42.i586
+>!> ESTABLISHED:1086: U__s_[S2:0][package]grass-5.0.3-112.i586
+>!> ESTABLISHED:1087: I__s_[S1:0][package]grep-2.5.2-19.i586
+>!> ESTABLISHED:1088: U__s_[S2:0][package]grep-2.5.2-25.i586
+>!> ESTABLISHED:1089: U__s_[S2:0][package]grepmail-5.3033-31.i586
+>!> ESTABLISHED:1090: U__s_[S2:0][package]grip-3.2.0-161.i586
+>!> ESTABLISHED:1091: U__s_[S2:0][package]groff-1.18.1.1-96.i586
+>!> ESTABLISHED:1092: I__s_[S1:0][package]grub-0.97-72.i586
+>!> ESTABLISHED:1093: U__s_[S2:0][package]grub-0.97-79.i586
+>!> ESTABLISHED:1094: U__s_[S2:0][package]gscpm-0.1-139.i586
+>!> ESTABLISHED:1095: U__s_[S2:0][package]gsf-sharp-0.8.1-72.i586
+>!> ESTABLISHED:1096: U__s_[S2:0][package]gsl-1.9-52.i586
+>!> ESTABLISHED:1097: U__s_[S2:0][package]gspcav-kmp-bigsmp-01.00.12_2.6.22.5_10-5.i586
+>!> ESTABLISHED:1098: U__s_[S2:0][package]gspcav-kmp-default-01.00.12_2.6.22.5_10-5.i586
+>!> ESTABLISHED:1099: I__s_[S1:0][package]gstreamer010-0.10.13-16.i586
+>!> ESTABLISHED:1100: U__s_[S2:0][package]gstreamer010-0.10.13-27.i586
+>!> ESTABLISHED:1101: U__s_[S2:0][package]gstreamer010-devel-0.10.13-27.i586
+>!> ESTABLISHED:1102: U__s_[S2:0][package]gstreamer010-doc-0.10.13-31.i586
+>!> ESTABLISHED:1103: I__s_[S1:0][package]gstreamer010-plugins-base-0.10.13-15.i586
+>!> ESTABLISHED:1104: U__s_[S2:0][package]gstreamer010-plugins-base-0.10.13-27.i586
+>!> ESTABLISHED:1105: U__s_[S2:0][package]gstreamer010-plugins-base-devel-0.10.13-27.i586
+>!> ESTABLISHED:1106: U__s_[S2:0][package]gstreamer010-plugins-base-doc-0.10.13-27.i586
+>!> ESTABLISHED:1107: I__s_[S1:0][package]gstreamer010-plugins-good-0.10.6-16.i586
+>!> ESTABLISHED:1108: U__s_[S2:0][package]gstreamer010-plugins-good-0.10.6-29.i586
+>!> ESTABLISHED:1109: U__s_[S2:0][package]gstreamer010-plugins-good-doc-0.10.6-29.i586
+>!> ESTABLISHED:1110: U__s_[S2:0][package]gstreamer010-plugins-good-extra-0.10.6-29.i586
+>!> ESTABLISHED:1111: U__s_[S2:0][package]gthumb-2.7.9-106.i586
+>!> ESTABLISHED:1112: U__s_[S2:0][package]gtk-1.2.10-987.i586
+>!> ESTABLISHED:1113: U__s_[S2:0][package]gtk-devel-1.2.10-987.i586
+>!> ESTABLISHED:1114: U__s_[S2:0][package]gtk-doc-1.8-35.noarch
+>!> ESTABLISHED:1115: U__s_[S2:0][package]gtk-engines-0.12-1063.i586
+>!> ESTABLISHED:1116: U__s_[S2:0][package]gtk-sharp2-2.10.2-17.i586
+>!> ESTABLISHED:1117: U__s_[S2:0][package]gtk-sharp2-complete-2.10.2-17.i586
+>!> ESTABLISHED:1118: U__s_[S2:0][package]gtk-sharp2-doc-2.10.2-17.i586
+>!> ESTABLISHED:1119: U__s_[S2:0][package]gtk-sharp2-gapi-2.10.2-17.i586
+>!> ESTABLISHED:1120: U__s_[S2:0][package]gtk-xfce-engine-2.4.1-47.i586
+>!> ESTABLISHED:1121: U__s_[S2:0][package]gtk2-2.11.6-20.i586
+>!> ESTABLISHED:1122: I__s_[S1:0][package]gtk2-2.11.6-7.i586
+>!> ESTABLISHED:1123: U__s_[S2:0][package]gtk2-devel-2.11.6-20.i586
+>!> ESTABLISHED:1124: U__s_[S2:0][package]gtk2-doc-2.11.6-20.i586
+>!> ESTABLISHED:1125: U__s_[S2:0][package]gtk2-engines-2.11.4-13.i586
+>!> ESTABLISHED:1126: U__s_[S2:0][package]gtk2-themes-0.1-711.noarch
+>!> ESTABLISHED:1127: U__s_[S2:0][package]gtkam-0.1.14.0.trunk-75.i586
+>!> ESTABLISHED:1128: U__s_[S2:0][package]gtkglarea-1.2.2-996.i586
+>!> ESTABLISHED:1129: U__s_[S2:0][package]gtkhtml-sharp2-2.16.0-27.i586
+>!> ESTABLISHED:1130: U__s_[S2:0][package]gtkhtml2-3.15.91-3.i586
+>!> ESTABLISHED:1131: U__s_[S2:0][package]gtkhtml2-devel-3.15.91-3.i586
+>!> ESTABLISHED:1132: U__s_[S2:0][package]gtkiterm-0.5.20040304-133.i586
+>!> ESTABLISHED:1133: U__s_[S2:0][package]gtklp-1.2.4-17.i586
+>!> ESTABLISHED:1134: U__s_[S2:0][package]gtkmm2-2.11.7-2.i586
+>!> ESTABLISHED:1135: U__s_[S2:0][package]gtkmm2-devel-2.11.7-2.i586
+>!> ESTABLISHED:1136: U__s_[S2:0][package]gtkpbbuttons-0.6.10-20.i586
+>!> ESTABLISHED:1137: U__s_[S2:0][package]gtksourceview-1.90.4-3.i586
+>!> ESTABLISHED:1138: U__s_[S2:0][package]gtksourceview-devel-1.90.4-3.i586
+>!> ESTABLISHED:1139: U__s_[S2:0][package]gtksourceview-doc-1.90.4-3.i586
+>!> ESTABLISHED:1140: U__s_[S2:0][package]gtksourceview-sharp2-0.11-30.noarch
+>!> ESTABLISHED:1141: U__s_[S2:0][package]gtksourceview18-1.8.5-8.i586
+>!> ESTABLISHED:1142: U__s_[S2:0][package]gtkspell-2.0.11-120.i586
+>!> ESTABLISHED:1143: U__s_[S2:0][package]gucharmap-1.10.0-60.i586
+>!> ESTABLISHED:1144: U__s_[S2:0][package]gucharmap-devel-1.10.0-60.i586
+>!> ESTABLISHED:1145: U__s_[S2:0][package]guile-1.8.1-68.i586
+>!> ESTABLISHED:1146: U__s_[S2:0][package]guile-devel-1.8.1-68.i586
+>!> ESTABLISHED:1147: U__s_[S2:0][package]gup-0.3-923.i586
+>!> ESTABLISHED:1148: U__s_[S2:0][package]gutenprint-5.0.1-1.i586
+>!> ESTABLISHED:1149: U__s_[S2:0][package]gv-3.5.8-1257.i586
+>!> ESTABLISHED:1150: U__s_[S2:0][package]gvim-7.1-37.i586
+>!> ESTABLISHED:1151: U__s_[S2:0][package]gwenhywfar-2.6.1-21.i586
+>!> ESTABLISHED:1152: U__s_[S2:0][package]gwenhywfar-devel-2.6.1-21.i586
+>!> ESTABLISHED:1153: I__s_[S1:0][package]gwenview-1.4.1-69.i586
+>!> ESTABLISHED:1154: U__s_[S2:0][package]gwenview-1.4.1-81.i586
+>!> ESTABLISHED:1155: U__s_[S2:0][package]gwget-0.99-46.i586
+>!> ESTABLISHED:1156: U__s_[S2:0][package]gxmhtml-1.4.1.7-796.i586
+>!> ESTABLISHED:1157: I__s_[S1:0][package]gzip-1.3.12-25.i586
+>!> ESTABLISHED:1158: U__s_[S2:0][package]gzip-1.3.12-31.i586
+>!> ESTABLISHED:1159: I__s_[S1:0][package]hal-0.5.8_git200704021230-51.i586
+>!> ESTABLISHED:1160: U__s_[S2:0][package]hal-0.5.9_git20070831-2.i586
+>!> ESTABLISHED:1161: U__s_[S2:0][package]hal-devel-0.5.9_git20070831-2.i586
+>!> ESTABLISHED:1162: U__s_[S2:0][package]hal-doc-0.5.9_git20070831-2.i586
+>!> ESTABLISHED:1163: I__s_[S1:0][package]hal-resmgr-0.1_SVNr141-11.i586
+>!> ESTABLISHED:1164: U__s_[S2:0][package]hal-resmgr-0.1_SVNr141-21.i586
+>!> ESTABLISHED:1165: U__s_[S2:0][package]handedict-20070618-15.noarch
+>!> ESTABLISHED:1166: U__s_[S2:0][package]hanout-0.1-837.i586
+>!> ESTABLISHED:1167: U__s_[S2:0][package]hcode-2.1-591.i586
+>!> ESTABLISHED:1168: I__s_[S1:0][package]hdparm-7.6-9.i586
+>!> ESTABLISHED:1169: U__s_[S2:0][package]hdparm-7.7-7.i586
+>!> ESTABLISHED:1170: U__s_[S2:0][package]heap-buddy-0.2-58.i586
+>!> ESTABLISHED:1171: U__s_[S2:0][package]helix-banshee-0.13.1-10.i586
+>!> ESTABLISHED:1172: U__s_[S2:0][package]helix-banshee-devel-0.13.1-10.i586
+>!> ESTABLISHED:1173: U__s_[S2:0][package]helix-banshee-engine-gst-0.13.1-10.i586
+>!> ESTABLISHED:1174: U__s_[S2:0][package]helix-banshee-engine-helix-0.13.1-10.i586
+>!> ESTABLISHED:1175: U__s_[S2:0][package]helix-banshee-plugins-DAAP-0.13.1-10.i586
+>!> ESTABLISHED:1176: U__s_[S2:0][package]helix-banshee-plugins-default-0.13.1-10.i586
+>!> ESTABLISHED:1177: U__s_[S2:0][package]helix-banshee-plugins-extra-0.13.1-10.i586
+>!> ESTABLISHED:1178: U__s_[S2:0][package]helix-dbus-server-0.4.0-60.i586
+>!> ESTABLISHED:1179: U__s_[S2:0][package]hermes-1.3.2-515.i586
+>!> ESTABLISHED:1180: U__s_[S2:0][package]hfsplusutils-1.0.4-75.i586
+>!> ESTABLISHED:1181: U__s_[S2:0][package]hfsutils-3.2.6-1123.i586
+>!> ESTABLISHED:1182: I__s_[S1:0][package]hicolor-icon-theme-0.10-28.noarch
+>!> ESTABLISHED:1183: U__s_[S2:0][package]hicolor-icon-theme-0.10-34.noarch
+>!> ESTABLISHED:1184: U__s_[S2:0][package]hk_classes-0.8.3-47.i586
+>!> ESTABLISHED:1185: U__s_[S2:0][package]hmconv-1.0pl5-586.i586
+>!> ESTABLISHED:1186: U__s_[S2:0][package]hostap-utils-0.4.7-52.i586
+>!> ESTABLISHED:1187: U__s_[S2:0][package]hostapd-0.5.8-17.i586
+>!> ESTABLISHED:1188: I__s_[S1:0][package]hotkey-setup-0.1-59.i586
+>!> ESTABLISHED:1189: U__s_[S2:0][package]hotkey-setup-0.1-67.i586
+>!> ESTABLISHED:1190: U__s_[S2:0][package]hplip-2.7.7-22.i586
+>!> ESTABLISHED:1191: U__s_[S2:0][package]hplip-hpijs-2.7.7-22.i586
+>!> ESTABLISHED:1192: I__s_[S1:0][package]hplip-hpijs-2.7.7-3.i586
+>!> ESTABLISHED:1193: U__s_[S2:0][package]htdig-3.2.0b6-103.i586
+>!> ESTABLISHED:1194: U__s_[S2:0][package]htdig-devel-3.2.0b6-103.i586
+>!> ESTABLISHED:1195: U__s_[S2:0][package]htdig-doc-3.2.0b6-103.i586
+>!> ESTABLISHED:1196: U__s_[S2:0][package]html-dtd-2004.1.26-136.noarch
+>!> ESTABLISHED:1197: U__s_[S2:0][package]html2text-1.3.2a-75.i586
+>!> ESTABLISHED:1198: I__s_[S1:0][package]hwinfo-13.41-3.i586
+>!> ESTABLISHED:1199: U__s_[S2:0][package]hwinfo-13.49-2.i586
+>!> ESTABLISHED:1200: U__s_[S2:0][package]hwinfo-devel-13.49-2.i586
+>!> ESTABLISHED:1201: U__s_[S2:0][package]hydrogen-0.9.3-107.i586
+>!> ESTABLISHED:1202: U__s_[S2:0][package]hylafax-4.4.0-15.i586
+>!> ESTABLISHED:1203: U__s_[S2:0][package]hylafax-client-4.4.0-15.i586
+>!> ESTABLISHED:1204: U__s_[S2:0][package]i4l-base-2007.8.16-9.i586
+>!> ESTABLISHED:1205: U__s_[S2:0][package]i4l-isdnlog-2007.8.16-9.i586
+>!> ESTABLISHED:1206: U__s_[S2:0][package]i4l-vbox-2007.8.16-9.i586
+>!> ESTABLISHED:1207: U__s_[S2:0][package]i4lfirm-2007.8.16-9.i586
+>!> ESTABLISHED:1208: U__s_[S2:0][package]ia32el-6.5-101.i586
+>!> ESTABLISHED:1209: U__s_[S2:0][package]ibm-data-db2-1.2.5-11.i586
+>!> ESTABLISHED:1210: U__s_[S2:0][package]icecream-0.8.0-14.i586
+>!> ESTABLISHED:1211: U__s_[S2:0][package]icecream-monitor-1.0-109.i586
+>!> ESTABLISHED:1212: I__s_[S1:0][package]icedax-1.1.6-10.i586
+>!> ESTABLISHED:1213: U__s_[S2:0][package]icedax-1.1.6-18.i586
+>!> ESTABLISHED:1214: U__s_[S2:0][package]icewm-1.2.32-12.i586
+>!> ESTABLISHED:1215: U__s_[S2:0][package]icewm-default-1.2.32-12.i586
+>!> ESTABLISHED:1216: U__s_[S2:0][package]icewm-gnome-1.2.32-12.i586
+>!> ESTABLISHED:1217: U__s_[S2:0][package]icewm-themes-0.1-601.noarch
+>!> ESTABLISHED:1218: U__s_[S2:0][package]icon-naming-utils-0.8.2-35.noarch
+>!> ESTABLISHED:1219: U__s_[S2:0][package]icu-3.6-10.i586
+>!> ESTABLISHED:1220: U__s_[S2:0][package]icu-data-3.6-10.i586
+>!> ESTABLISHED:1221: I__s_[S1:0][package]id3lib-3.8.3-157.i586
+>!> ESTABLISHED:1222: U__s_[S2:0][package]id3lib-3.8.3-163.i586
+>!> ESTABLISHED:1223: U__s_[S2:0][package]idutils-4.2-85.i586
+>!> ESTABLISHED:1224: U__s_[S2:0][package]ifntchia-1.2.1-296.noarch
+>!> ESTABLISHED:1225: U__s_[S2:0][package]ifntchib-1.2.1-296.noarch
+>!> ESTABLISHED:1226: I__s_[S1:0][package]ifnteuro-1.2.1-285.noarch
+>!> ESTABLISHED:1227: U__s_[S2:0][package]ifnteuro-1.2.1-296.noarch
+>!> ESTABLISHED:1228: U__s_[S2:0][package]ifntjapa-1.2.1-296.noarch
+>!> ESTABLISHED:1229: U__s_[S2:0][package]ifntjapb-1.2.1-296.noarch
+>!> ESTABLISHED:1230: U__s_[S2:0][package]ifplugd-0.28-100.i586
+>!> ESTABLISHED:1231: I__s_[S1:0][package]ifplugd-0.28-92.i586
+>!> ESTABLISHED:1232: U__s_[S2:0][package]iftop-0.17-61.i586
+>!> ESTABLISHED:1233: U__s_[S2:0][package]ikvm-0.34.0.2-10.noarch
+>!> ESTABLISHED:1234: U__s_[S2:0][package]ilbc-3951-32.i586
+>!> ESTABLISHED:1235: U__s_[S2:0][package]imap-lib-2006c1_suse-47.i586
+>!> ESTABLISHED:1236: U__s_[S2:0][package]img2eps-0.2-69.i586
+>!> ESTABLISHED:1237: U__s_[S2:0][package]imgSeek-0.8.5-141.i586
+>!> ESTABLISHED:1238: U__s_[S2:0][package]imlib-1.9.14-299.i586
+>!> ESTABLISHED:1239: U__s_[S2:0][package]imlib-devel-1.9.14-299.i586
+>!> ESTABLISHED:1240: I__s_[S1:0][package]imlib2-1.3.0-52.i586
+>!> ESTABLISHED:1241: U__s_[S2:0][package]imlib2-1.3.0-60.i586
+>!> ESTABLISHED:1242: U__s_[S2:0][package]imlib2-devel-1.3.0-60.i586
+>!> ESTABLISHED:1243: I__s_[S1:0][package]imlib2-loaders-1.3.0-52.i586
+>!> ESTABLISHED:1244: U__s_[S2:0][package]imlib2-loaders-1.3.0-60.i586
+>!> ESTABLISHED:1245: U__s_[S2:0][package]indent-2.2.9-263.i586
+>!> ESTABLISHED:1246: U__s_[S2:0][package]indeview-0.6.6-103.i586
+>!> ESTABLISHED:1247: U__s_[S2:0][package]info-4.9-12.i586
+>!> ESTABLISHED:1248: I__s_[S1:0][package]info-4.9-6.i586
+>!> ESTABLISHED:1249: I__s_[S1:0][package]info2html-2.0-71.noarch
+>!> ESTABLISHED:1250: U__s_[S2:0][package]info2html-2.0-79.noarch
+>!> ESTABLISHED:1251: U__s_[S2:0][package]initviocons-0.5-12.i586
+>!> ESTABLISHED:1252: U__s_[S2:0][package]inkscape-0.45.1-60.i586
+>!> ESTABLISHED:1253: U__s_[S2:0][package]inn-2.4.2-95.i586
+>!> ESTABLISHED:1254: U__s_[S2:0][package]input-utils-2007.06.22-22.i586
+>!> ESTABLISHED:1255: I__s_[S1:0][package]insserv-1.09.0-36.i586
+>!> ESTABLISHED:1256: U__s_[S2:0][package]insserv-1.09.0-43.i586
+>!> ESTABLISHED:1257: I__s_[S1:0][package]inst-source-utils-2007.8.7-1.noarch
+>!> ESTABLISHED:1258: U__s_[S2:0][package]inst-source-utils-2007.9.2-1.noarch
+>!> ESTABLISHED:1259: U__s_[S2:0][package]install-initrd-1.0-205.i586
+>!> ESTABLISHED:1260: U__s_[S2:0][package]intlfnts-1.2.1-296.noarch
+>!> ESTABLISHED:1261: U__s_[S2:0][package]intlfonts-ttf-1.2.1-296.noarch
+>!> ESTABLISHED:1262: U__s_[S2:0][package]intltool-0.35.5-36.noarch
+>!> ESTABLISHED:1263: U__s_[S2:0][package]ipadic-2.6.3-177.noarch
+>!> ESTABLISHED:1264: U__s_[S2:0][package]ipod-sharp-0.6.3-60.i586
+>!> ESTABLISHED:1265: I__s_[S1:0][package]iproute2-2.6.22-11.i586
+>!> ESTABLISHED:1266: U__s_[S2:0][package]iproute2-2.6.22-22.i586
+>!> ESTABLISHED:1267: U__s_[S2:0][package]ipsec-tools-0.6.5-93.i586
+>!> ESTABLISHED:1268: U__s_[S2:0][package]iptables-1.3.8-17.i586
+>!> ESTABLISHED:1269: I__s_[S1:0][package]iptables-1.3.8-7.i586
+>!> ESTABLISHED:1270: U__s_[S2:0][package]iptraf-3.0.0-73.i586
+>!> ESTABLISHED:1271: I__s_[S1:0][package]iputils-ss021109-224.i586
+>!> ESTABLISHED:1272: U__s_[S2:0][package]iputils-ss021109-230.i586
+>!> ESTABLISHED:1273: U__s_[S2:0][package]ipw-firmware-8-41.noarch
+>!> ESTABLISHED:1274: U__s_[S2:0][package]ipxrip-0.7-931.i586
+>!> ESTABLISHED:1275: U__s_[S2:0][package]ircd-2.11.1p1-59.i586
+>!> ESTABLISHED:1276: I__s_[S1:0][package]irda-0.9.18-80.i586
+>!> ESTABLISHED:1277: U__s_[S2:0][package]irda-0.9.18-89.i586
+>!> ESTABLISHED:1278: I__s_[S1:0][package]irqbalance-0.55-28.i586
+>!> ESTABLISHED:1279: U__s_[S2:0][package]irqbalance-0.55-36.i586
+>!> ESTABLISHED:1280: U__s_[S2:0][package]irssi-0.8.11-13.i586
+>!> ESTABLISHED:1281: U__s_[S2:0][package]isapnp-1.26-561.i586
+>!> ESTABLISHED:1282: U__s_[S2:0][package]iscan-2.8.0.1-16.i586
+>!> ESTABLISHED:1283: U__s_[S2:0][package]iscan-firmware-2.8.0.1-8.noarch
+>!> ESTABLISHED:1284: U__s_[S2:0][package]iscan-proprietary-drivers-2.8.0.1-8.i586
+>!> ESTABLISHED:1285: U__s_[S2:0][package]iso-codes-1.0a-43.noarch
+>!> ESTABLISHED:1286: U__s_[S2:0][package]iso-codes-devel-1.0a-43.noarch
+>!> ESTABLISHED:1287: U__s_[S2:0][package]iso_ent-2000.11.03-732.noarch
+>!> ESTABLISHED:1288: U__s_[S2:0][package]ispell-3.3.02-20.i586
+>!> ESTABLISHED:1289: U__s_[S2:0][package]ispell-american-3.3.02-20.i586
+>!> ESTABLISHED:1290: U__s_[S2:0][package]ispell-brazilian-1.5-319.i586
+>!> ESTABLISHED:1291: U__s_[S2:0][package]ispell-british-3.3.02-20.i586
+>!> ESTABLISHED:1292: U__s_[S2:0][package]ispell-czech-1.5-319.i586
+>!> ESTABLISHED:1293: U__s_[S2:0][package]ispell-danish-1.5-319.i586
+>!> ESTABLISHED:1294: U__s_[S2:0][package]ispell-dutch-1.5-319.i586
+>!> ESTABLISHED:1295: U__s_[S2:0][package]ispell-finnish-1.5-319.i586
+>!> ESTABLISHED:1296: U__s_[S2:0][package]ispell-french-1.5-319.i586
+>!> ESTABLISHED:1297: U__s_[S2:0][package]ispell-german-1.5-319.i586
+>!> ESTABLISHED:1298: U__s_[S2:0][package]ispell-hungarian-1.2-9.i586
+>!> ESTABLISHED:1299: U__s_[S2:0][package]ispell-italian-1.5-319.i586
+>!> ESTABLISHED:1300: U__s_[S2:0][package]ispell-ngerman-1.5-319.i586
+>!> ESTABLISHED:1301: U__s_[S2:0][package]ispell-norsk-1.5-319.i586
+>!> ESTABLISHED:1302: U__s_[S2:0][package]ispell-polish-1.5-319.i586
+>!> ESTABLISHED:1303: U__s_[S2:0][package]ispell-portuguese-1.5-319.i586
+>!> ESTABLISHED:1304: U__s_[S2:0][package]ispell-russian-1.5-319.i586
+>!> ESTABLISHED:1305: U__s_[S2:0][package]ispell-spanish-1.5-319.i586
+>!> ESTABLISHED:1306: U__s_[S2:0][package]ispell-swedish-1.5-319.i586
+>!> ESTABLISHED:1307: U__s_[S2:0][package]itcl-3.3-513.i586
+>!> ESTABLISHED:1308: U__s_[S2:0][package]ivman-0.6.14-64.i586
+>!> ESTABLISHED:1309: U__s_[S2:0][package]ivtv-0.10.3-28.i586
+>!> ESTABLISHED:1310: U__s_[S2:0][package]ivtv-firmware-0.10.3-28.i586
+>!> ESTABLISHED:1311: U__s_[S2:0][package]ivtv-kmp-bigsmp-0.10.3_2.6.22.5_10-28.i586
+>!> ESTABLISHED:1312: U__s_[S2:0][package]ivtv-kmp-default-0.10.3_2.6.22.5_10-28.i586
+>!> ESTABLISHED:1313: U__s_[S2:0][package]ivtv-kmp-xen-0.10.3_2.6.22.5_10-28.i586
+>!> ESTABLISHED:1314: U__s_[S2:0][package]ivtv-kmp-xenpae-0.10.3_2.6.22.5_10-28.i586
+>!> ESTABLISHED:1315: U__s_[S2:0][package]iwidgets-4.0.1-300.noarch
+>!> ESTABLISHED:1316: U__s_[S2:0][package]iwl3945-ucode-2.14.1.5-10.noarch
+>!> ESTABLISHED:1317: U__s_[S2:0][package]iwl4965-ucode-4.44.1.18-10.noarch
+>!> ESTABLISHED:1318: U__s_[S2:0][package]iwlwifi-kmp-bigsmp-0.1.14_2.6.22.5_10-2.i586
+>!> ESTABLISHED:1319: U__s_[S2:0][package]iwlwifi-kmp-default-0.1.14_2.6.22.5_10-2.i586
+>!> ESTABLISHED:1320: U__s_[S2:0][package]iwlwifi-kmp-xen-0.1.14_2.6.22.5_10-2.i586
+>!> ESTABLISHED:1321: U__s_[S2:0][package]iwlwifi-kmp-xenpae-0.1.14_2.6.22.5_10-2.i586
+>!> ESTABLISHED:1322: U__s_[S2:0][package]jaaa-0.4.0-80.i586
+>!> ESTABLISHED:1323: U__s_[S2:0][package]jack-0.103.0-50.i586
+>!> ESTABLISHED:1324: U__s_[S2:0][package]jack-devel-0.103.0-50.i586
+>!> ESTABLISHED:1325: U__s_[S2:0][package]jack-freebob-0.103.0-50.i586
+>!> ESTABLISHED:1326: U__s_[S2:0][package]jack-rack-1.4.6-18.i586
+>!> ESTABLISHED:1327: U__s_[S2:0][package]jackEQ-0.4.0-169.i586
+>!> ESTABLISHED:1328: U__s_[S2:0][package]jadetex-3.13-318.i586
+>!> ESTABLISHED:1329: U__s_[S2:0][package]jakarta-commons-beanutils-1.7.0-142.noarch
+>!> ESTABLISHED:1330: U__s_[S2:0][package]jakarta-commons-codec-1.3-143.noarch
+>!> ESTABLISHED:1331: U__s_[S2:0][package]jakarta-commons-collections-3.1-118.noarch
+>!> ESTABLISHED:1332: U__s_[S2:0][package]jakarta-commons-daemon-1.0.1-112.noarch
+>!> ESTABLISHED:1333: U__s_[S2:0][package]jakarta-commons-dbcp-1.2.1-119.noarch
+>!> ESTABLISHED:1334: U__s_[S2:0][package]jakarta-commons-digester-1.7-137.noarch
+>!> ESTABLISHED:1335: U__s_[S2:0][package]jakarta-commons-discovery-0.3-139.noarch
+>!> ESTABLISHED:1336: U__s_[S2:0][package]jakarta-commons-el-1.0-140.noarch
+>!> ESTABLISHED:1337: U__s_[S2:0][package]jakarta-commons-fileupload-1.0-152.noarch
+>!> ESTABLISHED:1338: U__s_[S2:0][package]jakarta-commons-httpclient3-3.0.1-128.noarch
+>!> ESTABLISHED:1339: U__s_[S2:0][package]jakarta-commons-httpclient3-demo-3.0.1-128.noarch
+>!> ESTABLISHED:1340: U__s_[S2:0][package]jakarta-commons-httpclient3-manual-3.0.1-128.noarch
+>!> ESTABLISHED:1341: U__s_[S2:0][package]jakarta-commons-lang-2.0-120.noarch
+>!> ESTABLISHED:1342: U__s_[S2:0][package]jakarta-commons-launcher-0.9-119.noarch
+>!> ESTABLISHED:1343: U__s_[S2:0][package]jakarta-commons-logging-1.0.4-144.noarch
+>!> ESTABLISHED:1344: U__s_[S2:0][package]jakarta-commons-modeler-2.0-91.noarch
+>!> ESTABLISHED:1345: U__s_[S2:0][package]jakarta-commons-pool-1.2-117.noarch
+>!> ESTABLISHED:1346: U__s_[S2:0][package]jamin-0.95.0-111.i586
+>!> ESTABLISHED:1347: I__s_[S1:0][package]jarnal-9.01-33.noarch
+>!> ESTABLISHED:1348: U__s_[S2:0][package]jarnal-9.01-42.noarch
+>!> ESTABLISHED:1349: U__s_[S2:0][package]java-1_4_2-cacao-0.97-77.i586
+>!> ESTABLISHED:1350: U__s_[S2:0][package]java-1_4_2-cacao-devel-0.97-77.i586
+>!> ESTABLISHED:1351: I__s_[S1:0][package]java-1_4_2-gcj-compat-1.4.2.0-140.i586
+>!> ESTABLISHED:1352: U__s_[S2:0][package]java-1_4_2-gcj-compat-1.4.2.0-166.i586
+>!> ESTABLISHED:1353: U__s_[S2:0][package]java-1_4_2-gcj-compat-devel-1.4.2.0-166.i586
+>!> ESTABLISHED:1354: U__s_[S2:0][package]java-1_5_0-sun-1.5.0_update12-20.i586
+>!> ESTABLISHED:1355: U__s_[S2:0][package]java-1_5_0-sun-alsa-1.5.0_update12-20.i586
+>!> ESTABLISHED:1356: U__s_[S2:0][package]java-1_5_0-sun-devel-1.5.0_update12-20.i586
+>!> ESTABLISHED:1357: U__s_[S2:0][package]java-1_5_0-sun-jdbc-1.5.0_update12-20.i586
+>!> ESTABLISHED:1358: U__s_[S2:0][package]java-1_5_0-sun-plugin-1.5.0_update12-20.i586
+>!> ESTABLISHED:1359: U__s_[S2:0][package]javamail-1.4-98.noarch
+>!> ESTABLISHED:1360: U__s_[S2:0][package]javamail-demo-1.4-98.noarch
+>!> ESTABLISHED:1361: U__s_[S2:0][package]javamail-javadoc-1.4-98.noarch
+>!> ESTABLISHED:1362: U__s_[S2:0][package]javamail-monolithic-1.4-98.noarch
+>!> ESTABLISHED:1363: U__s_[S2:0][package]jdepend-2.6-118.noarch
+>!> ESTABLISHED:1364: U__s_[S2:0][package]jedit-4.2-142.noarch
+>!> ESTABLISHED:1365: U__s_[S2:0][package]jedit-javadoc-4.2-142.noarch
+>!> ESTABLISHED:1366: U__s_[S2:0][package]jfbterm-0.3.10-588.i586
+>!> ESTABLISHED:1367: U__s_[S2:0][package]jfsutils-1.1.11-65.i586
+>!> ESTABLISHED:1368: U__s_[S2:0][package]jms-1.1-103.noarch
+>!> ESTABLISHED:1369: U__s_[S2:0][package]jms-javadoc-1.1-106.noarch
+>!> ESTABLISHED:1370: U__s_[S2:0][package]joe-3.5-61.i586
+>!> ESTABLISHED:1371: U__s_[S2:0][package]joy2key-1.6.1-88.i586
+>!> ESTABLISHED:1372: I__s_[S1:0][package]jpackage-utils-1.7.0-67.i586
+>!> ESTABLISHED:1373: U__s_[S2:0][package]jpackage-utils-1.7.0-74.i586
+>!> ESTABLISHED:1374: I__s_[S1:0][package]jpeg-6b-803.i586
+>!> ESTABLISHED:1375: U__s_[S2:0][package]jpeg-6b-809.i586
+>!> ESTABLISHED:1376: U__s_[S2:0][package]jtools-1.0-627.i586
+>!> ESTABLISHED:1377: U__s_[S2:0][package]junit-3.8.1-118.noarch
+>!> ESTABLISHED:1378: U__s_[S2:0][package]k3b-1.0.3-20.i586
+>!> ESTABLISHED:1379: I__s_[S1:0][package]k3b-1.0.3-9.i586
+>!> ESTABLISHED:1380: U__s_[S2:0][package]kadslwatch-01.00.06-116.i586
+>!> ESTABLISHED:1381: U__s_[S2:0][package]kaffeine-0.8.5-22.i586
+>!> ESTABLISHED:1382: I__s_[S1:0][package]kaffeine-0.8.5-7.i586
+>!> ESTABLISHED:1383: U__s_[S2:0][package]kaffeine-gstreamer-0.8.5-22.i586
+>!> ESTABLISHED:1384: U__s_[S2:0][package]kakasi-2.3.4-457.i586
+>!> ESTABLISHED:1385: U__s_[S2:0][package]kakasi-devel-2.3.4-457.i586
+>!> ESTABLISHED:1386: U__s_[S2:0][package]kakasi-dict-2.3.4-457.i586
+>!> ESTABLISHED:1387: U__s_[S2:0][package]kalsatools-1.5.0-459.i586
+>!> ESTABLISHED:1388: U__s_[S2:0][package]kanji-lookup-1.0-743.i586
+>!> ESTABLISHED:1389: U__s_[S2:0][package]kanjipad-2.0.0-293.i586
+>!> ESTABLISHED:1390: U__s_[S2:0][package]kasumi-2.2-55.i586
+>!> ESTABLISHED:1391: U__s_[S2:0][package]kbarcode-2.0.5-82.i586
+>!> ESTABLISHED:1392: I__s_[S1:0][package]kbd-1.12-126.i586
+>!> ESTABLISHED:1393: U__s_[S2:0][package]kbd-1.12-135.i586
+>!> ESTABLISHED:1394: U__s_[S2:0][package]kbiff-3.8-117.i586
+>!> ESTABLISHED:1395: U__s_[S2:0][package]kcall-0.7.0-15.i586
+>!> ESTABLISHED:1396: I__s_[S1:0][package]kcm_gtk-0.7cvs20060209-86.i586
+>!> ESTABLISHED:1397: U__s_[S2:0][package]kcm_gtk-0.7svn20070827-5.i586
+>!> ESTABLISHED:1398: U__s_[S2:0][package]kdbg-2.0.5-67.i586
+>!> ESTABLISHED:1399: U__s_[S2:0][package]kde3-i18n-cs-3.5.7-5.noarch
+>!> ESTABLISHED:1400: U__s_[S2:0][package]kde3-i18n-da-3.5.7-5.noarch
+>!> ESTABLISHED:1401: U__s_[S2:0][package]kde3-i18n-de-3.5.7-5.noarch
+>!> ESTABLISHED:1402: U__s_[S2:0][package]kde3-i18n-en_GB-3.5.7-5.noarch
+>!> ESTABLISHED:1403: U__s_[S2:0][package]kde3-i18n-es-3.5.7-5.noarch
+>!> ESTABLISHED:1404: U__s_[S2:0][package]kde3-i18n-fi-3.5.7-5.noarch
+>!> ESTABLISHED:1405: U__s_[S2:0][package]kde3-i18n-fr-3.5.7-5.noarch
+>!> ESTABLISHED:1406: U__s_[S2:0][package]kde3-i18n-hu-3.5.7-5.noarch
+>!> ESTABLISHED:1407: U__s_[S2:0][package]kde3-i18n-it-3.5.7-5.noarch
+>!> ESTABLISHED:1408: U__s_[S2:0][package]kde3-i18n-ja-3.5.7-5.noarch
+>!> ESTABLISHED:1409: U__s_[S2:0][package]kde3-i18n-nb-3.5.7-5.noarch
+>!> ESTABLISHED:1410: U__s_[S2:0][package]kde3-i18n-nl-3.5.7-5.noarch
+>!> ESTABLISHED:1411: U__s_[S2:0][package]kde3-i18n-pl-3.5.7-5.noarch
+>!> ESTABLISHED:1412: U__s_[S2:0][package]kde3-i18n-pt-3.5.7-5.noarch
+>!> ESTABLISHED:1413: U__s_[S2:0][package]kde3-i18n-pt_BR-3.5.7-5.noarch
+>!> ESTABLISHED:1414: U__s_[S2:0][package]kde3-i18n-ru-3.5.7-5.noarch
+>!> ESTABLISHED:1415: U__s_[S2:0][package]kde3-i18n-sv-3.5.7-5.noarch
+>!> ESTABLISHED:1416: U__s_[S2:0][package]kde3-i18n-zh_CN-3.5.7-5.noarch
+>!> ESTABLISHED:1417: U__s_[S2:0][package]kde3-i18n-zh_TW-3.5.7-5.noarch
+>!> ESTABLISHED:1418: U__s_[S2:0][package]kde4-dolphin-3.93.0-3.i586
+>!> ESTABLISHED:1419: I__s_[S1:0][package]kde4-filesystem-3.92.0-2.noarch
+>!> ESTABLISHED:1420: U__s_[S2:0][package]kde4-filesystem-3.93.0-2.noarch
+>!> ESTABLISHED:1421: U__s_[S2:0][package]kde4-katomic-3.93.0-4.i586
+>!> ESTABLISHED:1422: U__s_[S2:0][package]kde4-kbackgammon-3.93.0-4.i586
+>!> ESTABLISHED:1423: U__s_[S2:0][package]kde4-kbattleship-3.93.0-4.i586
+>!> ESTABLISHED:1424: U__s_[S2:0][package]kde4-kblackbox-3.93.0-4.i586
+>!> ESTABLISHED:1425: U__s_[S2:0][package]kde4-kbounce-3.93.0-4.i586
+>!> ESTABLISHED:1426: I__s_[S1:0][package]kde4-kdialog-3.92.0-9.i586
+>!> ESTABLISHED:1427: U__s_[S2:0][package]kde4-kdialog-3.93.0-3.i586
+>!> ESTABLISHED:1428: U__s_[S2:0][package]kde4-keditbookmarks-3.93.0-3.i586
+>!> ESTABLISHED:1429: U__s_[S2:0][package]kde4-kgoldrunner-3.93.0-4.i586
+>!> ESTABLISHED:1430: U__s_[S2:0][package]kde4-kiriki-3.93.0-4.i586
+>!> ESTABLISHED:1431: U__s_[S2:0][package]kde4-kjumpingcube-3.93.0-4.i586
+>!> ESTABLISHED:1432: U__s_[S2:0][package]kde4-klines-3.93.0-4.i586
+>!> ESTABLISHED:1433: I__s_[S1:0][package]kde4-kmahjongg-3.92.0-6.i586
+>!> ESTABLISHED:1434: U__s_[S2:0][package]kde4-kmahjongg-3.93.0-4.i586
+>!> ESTABLISHED:1435: I__s_[S1:0][package]kde4-kmines-3.92.0-6.i586
+>!> ESTABLISHED:1436: U__s_[S2:0][package]kde4-kmines-3.93.0-4.i586
+>!> ESTABLISHED:1437: U__s_[S2:0][package]kde4-knetwalk-3.93.0-4.i586
+>!> ESTABLISHED:1438: U__s_[S2:0][package]kde4-kolf-3.93.0-4.i586
+>!> ESTABLISHED:1439: U__s_[S2:0][package]kde4-konqueror-3.93.0-3.i586
+>!> ESTABLISHED:1440: U__s_[S2:0][package]kde4-konquest-3.93.0-4.i586
+>!> ESTABLISHED:1441: U__s_[S2:0][package]kde4-konsole-3.93.0-3.i586
+>!> ESTABLISHED:1442: I__s_[S1:0][package]kde4-kpat-3.92.0-6.i586
+>!> ESTABLISHED:1443: U__s_[S2:0][package]kde4-kpat-3.93.0-4.i586
+>!> ESTABLISHED:1444: I__s_[S1:0][package]kde4-krdc-3.92.0-8.i586
+>!> ESTABLISHED:1445: U__s_[S2:0][package]kde4-krdc-3.93.0-4.i586
+>!> ESTABLISHED:1446: I__s_[S1:0][package]kde4-kreversi-3.92.0-6.i586
+>!> ESTABLISHED:1447: U__s_[S2:0][package]kde4-kreversi-3.93.0-4.i586
+>!> ESTABLISHED:1448: I__s_[S1:0][package]kde4-krfb-3.92.0-8.i586
+>!> ESTABLISHED:1449: U__s_[S2:0][package]kde4-krfb-3.93.0-4.i586
+>!> ESTABLISHED:1450: U__s_[S2:0][package]kde4-ksame-3.93.0-4.i586
+>!> ESTABLISHED:1451: U__s_[S2:0][package]kde4-kshisen-3.93.0-4.i586
+>!> ESTABLISHED:1452: U__s_[S2:0][package]kde4-kspaceduel-3.93.0-4.i586
+>!> ESTABLISHED:1453: U__s_[S2:0][package]kde4-ksquares-3.93.0-4.i586
+>!> ESTABLISHED:1454: I__s_[S1:0][package]kde4-ksudoku-3.92.0-6.i586
+>!> ESTABLISHED:1455: U__s_[S2:0][package]kde4-ksudoku-3.93.0-4.i586
+>!> ESTABLISHED:1456: U__s_[S2:0][package]kde4-ktuberling-3.93.0-4.i586
+>!> ESTABLISHED:1457: U__s_[S2:0][package]kde4-kwin-3.93.0-3.i586
+>!> ESTABLISHED:1458: U__s_[S2:0][package]kde4-kwin4-3.93.0-4.i586
+>!> ESTABLISHED:1459: U__s_[S2:0][package]kde4-kwrite-3.93.0-3.i586
+>!> ESTABLISHED:1460: U__s_[S2:0][package]kde4-l10n-cs-3.92.0-7.noarch
+>!> ESTABLISHED:1461: U__s_[S2:0][package]kde4-l10n-da-3.92.0-7.noarch
+>!> ESTABLISHED:1462: U__s_[S2:0][package]kde4-l10n-de-3.92.0-7.noarch
+>!> ESTABLISHED:1463: U__s_[S2:0][package]kde4-l10n-en_GB-3.92.0-7.noarch
+>!> ESTABLISHED:1464: U__s_[S2:0][package]kde4-l10n-es-3.92.0-7.noarch
+>!> ESTABLISHED:1465: U__s_[S2:0][package]kde4-l10n-fi-3.92.0-7.noarch
+>!> ESTABLISHED:1466: U__s_[S2:0][package]kde4-l10n-fr-3.92.0-7.noarch
+>!> ESTABLISHED:1467: U__s_[S2:0][package]kde4-l10n-hu-3.92.0-7.noarch
+>!> ESTABLISHED:1468: U__s_[S2:0][package]kde4-l10n-it-3.92.0-7.noarch
+>!> ESTABLISHED:1469: U__s_[S2:0][package]kde4-l10n-ja-3.92.0-7.noarch
+>!> ESTABLISHED:1470: U__s_[S2:0][package]kde4-l10n-nb-3.92.0-7.noarch
+>!> ESTABLISHED:1471: U__s_[S2:0][package]kde4-l10n-nl-3.92.0-7.noarch
+>!> ESTABLISHED:1472: U__s_[S2:0][package]kde4-l10n-pl-3.92.0-7.noarch
+>!> ESTABLISHED:1473: U__s_[S2:0][package]kde4-l10n-pt-3.92.0-7.noarch
+>!> ESTABLISHED:1474: U__s_[S2:0][package]kde4-l10n-pt_BR-3.92.0-7.noarch
+>!> ESTABLISHED:1475: U__s_[S2:0][package]kde4-l10n-ru-3.92.0-7.noarch
+>!> ESTABLISHED:1476: U__s_[S2:0][package]kde4-l10n-sv-3.92.0-7.noarch
+>!> ESTABLISHED:1477: U__s_[S2:0][package]kde4-l10n-zh_CN-3.92.0-7.noarch
+>!> ESTABLISHED:1478: U__s_[S2:0][package]kde4-l10n-zh_TW-3.92.0-7.noarch
+>!> ESTABLISHED:1479: U__s_[S2:0][package]kde4-lskat-3.93.0-4.i586
+>!> ESTABLISHED:1480: U__s_[S2:0][package]kdeaccessibility3-3.5.7-39.i586
+>!> ESTABLISHED:1481: U__s_[S2:0][package]kdeaddons3-games-3.5.7-6.i586
+>!> ESTABLISHED:1482: U__s_[S2:0][package]kdeaddons3-kate-3.5.7-6.i586
+>!> ESTABLISHED:1483: U__s_[S2:0][package]kdeaddons3-kicker-3.5.7-6.i586
+>!> ESTABLISHED:1484: I__s_[S1:0][package]kdeaddons3-konqueror-3.5.7-6.i586
+>!> ESTABLISHED:1485: U__s_[S2:0][package]kdeaddons3-konqueror-3.5.7-6.i586
+>!> ESTABLISHED:1486: U__s_[S2:0][package]kdeaddons3-kontact-3.5.7-6.i586
+>!> ESTABLISHED:1487: U__s_[S2:0][package]kdeaddons3-sound-3.5.7-6.i586
+>!> ESTABLISHED:1488: U__s_[S2:0][package]kdeadmin3-3.5.7-43.i586
+>!> ESTABLISHED:1489: U__s_[S2:0][package]kdeartwork3-3.5.7-47.i586
+>!> ESTABLISHED:1490: I__s_[S1:0][package]kdeartwork3-kscreensaver-3.5.7-32.i586
+>!> ESTABLISHED:1491: U__s_[S2:0][package]kdeartwork3-kscreensaver-3.5.7-47.i586
+>!> ESTABLISHED:1492: U__s_[S2:0][package]kdeartwork3-sound-3.5.7-47.i586
+>!> ESTABLISHED:1493: U__s_[S2:0][package]kdeartwork3-xscreensaver-3.5.7-47.i586
+>!> ESTABLISHED:1494: I__s_[S1:0][package]kdebase3-3.5.7-44.i586
+>!> ESTABLISHED:1495: U__s_[S2:0][package]kdebase3-3.5.7-67.i586
+>!> ESTABLISHED:1496: I__s_[S1:0][package]kdebase3-SuSE-10.3-103.i586
+>!> ESTABLISHED:1497: U__s_[S2:0][package]kdebase3-SuSE-10.3-128.i586
+>!> ESTABLISHED:1498: U__s_[S2:0][package]kdebase3-beagle-3.5.7-67.i586
+>!> ESTABLISHED:1499: U__s_[S2:0][package]kdebase3-devel-3.5.7-67.i586
+>!> ESTABLISHED:1500: U__s_[S2:0][package]kdebase3-extra-3.5.7-67.i586
+>!> ESTABLISHED:1501: I__s_[S1:0][package]kdebase3-kdm-3.5.7-44.i586
+>!> ESTABLISHED:1502: U__s_[S2:0][package]kdebase3-kdm-3.5.7-67.i586
+>!> ESTABLISHED:1503: I__s_[S1:0][package]kdebase3-ksysguardd-3.5.7-44.i586
+>!> ESTABLISHED:1504: U__s_[S2:0][package]kdebase3-ksysguardd-3.5.7-67.i586
+>!> ESTABLISHED:1505: I__s_[S1:0][package]kdebase3-nsplugin-3.5.7-44.i586
+>!> ESTABLISHED:1506: U__s_[S2:0][package]kdebase3-nsplugin-3.5.7-67.i586
+>!> ESTABLISHED:1507: I__s_[S1:0][package]kdebase3-samba-3.5.7-44.i586
+>!> ESTABLISHED:1508: U__s_[S2:0][package]kdebase3-samba-3.5.7-67.i586
+>!> ESTABLISHED:1509: I__s_[S1:0][package]kdebase3-session-3.5.7-44.i586
+>!> ESTABLISHED:1510: U__s_[S2:0][package]kdebase3-session-3.5.7-67.i586
+>!> ESTABLISHED:1511: U__s_[S2:0][package]kdebase4-3.93.0-3.i586
+>!> ESTABLISHED:1512: U__s_[S2:0][package]kdebase4-libkonq-3.93.0-3.i586
+>!> ESTABLISHED:1513: U__s_[S2:0][package]kdebase4-nsplugin-3.93.0-3.i586
+>!> ESTABLISHED:1514: I__s_[S1:0][package]kdebase4-runtime-3.92.0-9.i586
+>!> ESTABLISHED:1515: U__s_[S2:0][package]kdebase4-runtime-3.93.0-3.i586
+>!> ESTABLISHED:1516: U__s_[S2:0][package]kdebase4-session-3.93.0-2.i586
+>!> ESTABLISHED:1517: U__s_[S2:0][package]kdebase4-workspace-3.93.0-3.i586
+>!> ESTABLISHED:1518: U__s_[S2:0][package]kdebindings3-3.5.7-49.i586
+>!> ESTABLISHED:1519: U__s_[S2:0][package]kdebindings3-javascript-3.5.7-47.i586
+>!> ESTABLISHED:1520: U__s_[S2:0][package]kdebindings3-perl-3.5.7-49.i586
+>!> ESTABLISHED:1521: U__s_[S2:0][package]kdebindings3-ruby-3.5.7-49.i586
+>!> ESTABLISHED:1522: I__s_[S1:0][package]kdebluetooth-1.0_beta5-8.i586
+>!> ESTABLISHED:1523: U__s_[S2:0][package]kdebluetooth-1.0_beta7-2.i586
+>!> ESTABLISHED:1524: U__s_[S2:0][package]kdedesktopcheck-0.1-70.noarch
+>!> ESTABLISHED:1525: U__s_[S2:0][package]kdeedu4-3.93.0-3.i586
+>!> ESTABLISHED:1526: U__s_[S2:0][package]kdegames3-3.5.7-42.i586
+>!> ESTABLISHED:1527: U__s_[S2:0][package]kdegames3-arcade-3.5.7-42.i586
+>!> ESTABLISHED:1528: U__s_[S2:0][package]kdegames3-board-3.5.7-42.i586
+>!> ESTABLISHED:1529: U__s_[S2:0][package]kdegames3-card-3.5.7-42.i586
+>!> ESTABLISHED:1530: U__s_[S2:0][package]kdegames3-tactic-3.5.7-42.i586
+>!> ESTABLISHED:1531: I__s_[S1:0][package]kdegames4-3.92.0-6.i586
+>!> ESTABLISHED:1532: U__s_[S2:0][package]kdegames4-3.93.0-4.i586
+>!> ESTABLISHED:1533: I__s_[S1:0][package]kdegames4-carddecks-default-3.92.0-2.noarch
+>!> ESTABLISHED:1534: U__s_[S2:0][package]kdegames4-carddecks-default-3.93.0-2.noarch
+>!> ESTABLISHED:1535: U__s_[S2:0][package]kdegames4-carddecks-other-3.93.0-2.noarch
+>!> ESTABLISHED:1536: I__s_[S1:0][package]kdegraphics3-3.5.7-31.i586
+>!> ESTABLISHED:1537: U__s_[S2:0][package]kdegraphics3-3.5.7-46.i586
+>!> ESTABLISHED:1538: U__s_[S2:0][package]kdegraphics3-devel-3.5.7-46.i586
+>!> ESTABLISHED:1539: U__s_[S2:0][package]kdegraphics3-extra-3.5.7-46.i586
+>!> ESTABLISHED:1540: U__s_[S2:0][package]kdegraphics3-fax-3.5.7-46.i586
+>!> ESTABLISHED:1541: U__s_[S2:0][package]kdegraphics3-imaging-3.5.7-46.i586
+>!> ESTABLISHED:1542: I__s_[S1:0][package]kdegraphics3-kamera-3.5.7-31.i586
+>!> ESTABLISHED:1543: U__s_[S2:0][package]kdegraphics3-kamera-3.5.7-46.i586
+>!> ESTABLISHED:1544: I__s_[S1:0][package]kdegraphics3-pdf-3.5.7-31.i586
+>!> ESTABLISHED:1545: U__s_[S2:0][package]kdegraphics3-pdf-3.5.7-46.i586
+>!> ESTABLISHED:1546: I__s_[S1:0][package]kdegraphics3-postscript-3.5.7-31.i586
+>!> ESTABLISHED:1547: U__s_[S2:0][package]kdegraphics3-postscript-3.5.7-46.i586
+>!> ESTABLISHED:1548: I__s_[S1:0][package]kdegraphics3-scan-3.5.7-31.i586
+>!> ESTABLISHED:1549: U__s_[S2:0][package]kdegraphics3-scan-3.5.7-46.i586
+>!> ESTABLISHED:1550: U__s_[S2:0][package]kdegraphics3-tex-3.5.7-46.i586
+>!> ESTABLISHED:1551: I__s_[S1:0][package]kdelibs3-3.5.7-43.i586
+>!> ESTABLISHED:1552: U__s_[S2:0][package]kdelibs3-3.5.7-58.i586
+>!> ESTABLISHED:1553: U__s_[S2:0][package]kdelibs3-arts-3.5.7-58.i586
+>!> ESTABLISHED:1554: I__s_[S1:0][package]kdelibs3-default-style-3.5.7-43.i586
+>!> ESTABLISHED:1555: U__s_[S2:0][package]kdelibs3-default-style-3.5.7-58.i586
+>!> ESTABLISHED:1556: U__s_[S2:0][package]kdelibs3-devel-3.5.7-58.i586
+>!> ESTABLISHED:1557: U__s_[S2:0][package]kdelibs3-devel-doc-3.5.7-60.noarch
+>!> ESTABLISHED:1558: U__s_[S2:0][package]kdelibs3-doc-3.5.7-58.i586
+>!> ESTABLISHED:1559: I__s_[S1:0][package]kdelibs4-3.92.0-8.i586
+>!> ESTABLISHED:1560: U__s_[S2:0][package]kdelibs4-3.93.0-3.i586
+>!> ESTABLISHED:1561: I__s_[S1:0][package]kdelibs4-core-3.92.0-8.i586
+>!> ESTABLISHED:1562: U__s_[S2:0][package]kdelibs4-core-3.93.0-3.i586
+>!> ESTABLISHED:1563: U__s_[S2:0][package]kdelibs4-doc-3.93.0-3.i586
+>!> ESTABLISHED:1564: I__s_[S1:0][package]kdelibs4-icons-3.92.0-9.noarch
+>!> ESTABLISHED:1565: I__s_[S1:0][package]kdemultimedia3-3.5.7-35.i586
+>!> ESTABLISHED:1566: U__s_[S2:0][package]kdemultimedia3-3.5.7-48.i586
+>!> ESTABLISHED:1567: I__s_[S1:0][package]kdemultimedia3-CD-3.5.7-35.i586
+>!> ESTABLISHED:1568: U__s_[S2:0][package]kdemultimedia3-CD-3.5.7-48.i586
+>!> ESTABLISHED:1569: U__s_[S2:0][package]kdemultimedia3-arts-3.5.7-48.i586
+>!> ESTABLISHED:1570: U__s_[S2:0][package]kdemultimedia3-devel-3.5.7-48.i586
+>!> ESTABLISHED:1571: U__s_[S2:0][package]kdemultimedia3-extra-3.5.7-48.i586
+>!> ESTABLISHED:1572: U__s_[S2:0][package]kdemultimedia3-jukebox-3.5.7-48.i586
+>!> ESTABLISHED:1573: U__s_[S2:0][package]kdemultimedia3-midi-3.5.7-48.i586
+>!> ESTABLISHED:1574: I__s_[S1:0][package]kdemultimedia3-mixer-3.5.7-35.i586
+>!> ESTABLISHED:1575: U__s_[S2:0][package]kdemultimedia3-mixer-3.5.7-48.i586
+>!> ESTABLISHED:1576: U__s_[S2:0][package]kdemultimedia3-sound-3.5.7-48.i586
+>!> ESTABLISHED:1577: U__s_[S2:0][package]kdemultimedia3-video-3.5.7-48.i586
+>!> ESTABLISHED:1578: U__s_[S2:0][package]kdemultimedia3-video-xine-3.5.7-48.i586
+>!> ESTABLISHED:1579: I__s_[S1:0][package]kdenetwork3-3.5.7-39.i586
+>!> ESTABLISHED:1580: U__s_[S2:0][package]kdenetwork3-3.5.7-54.i586
+>!> ESTABLISHED:1581: U__s_[S2:0][package]kdenetwork3-IRC-3.5.7-54.i586
+>!> ESTABLISHED:1582: I__s_[S1:0][package]kdenetwork3-InstantMessenger-3.5.7-39.i586
+>!> ESTABLISHED:1583: U__s_[S2:0][package]kdenetwork3-InstantMessenger-3.5.7-54.i586
+>!> ESTABLISHED:1584: U__s_[S2:0][package]kdenetwork3-dialup-3.5.7-54.i586
+>!> ESTABLISHED:1585: U__s_[S2:0][package]kdenetwork3-lan-3.5.7-54.i586
+>!> ESTABLISHED:1586: U__s_[S2:0][package]kdenetwork3-lisa-3.5.7-54.i586
+>!> ESTABLISHED:1587: I__s_[S1:0][package]kdenetwork3-news-3.5.7-39.i586
+>!> ESTABLISHED:1588: U__s_[S2:0][package]kdenetwork3-news-3.5.7-54.i586
+>!> ESTABLISHED:1589: U__s_[S2:0][package]kdenetwork3-query-3.5.7-54.i586
+>!> ESTABLISHED:1590: U__s_[S2:0][package]kdenetwork3-wireless-3.5.7-54.i586
+>!> ESTABLISHED:1591: I__s_[S1:0][package]kdepim3-3.5.7.enterprise.0.20070731.694771-2.i586
+>!> ESTABLISHED:1592: U__s_[S2:0][package]kdepim3-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> ESTABLISHED:1593: U__s_[S2:0][package]kdepim3-devel-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> ESTABLISHED:1594: I__s_[S1:0][package]kdepim3-kpilot-3.5.7.enterprise.0.20070731.694771-2.i586
+>!> ESTABLISHED:1595: U__s_[S2:0][package]kdepim3-kpilot-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> ESTABLISHED:1596: U__s_[S2:0][package]kdepim3-mobile-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> ESTABLISHED:1597: I__s_[S1:0][package]kdepim3-notes-3.5.7.enterprise.0.20070731.694771-2.i586
+>!> ESTABLISHED:1598: U__s_[S2:0][package]kdepim3-notes-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> ESTABLISHED:1599: U__s_[S2:0][package]kdepim3-time-management-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> ESTABLISHED:1600: I__s_[S1:0][package]kdepimlibs4-3.92.0-6.i586
+>!> ESTABLISHED:1601: U__s_[S2:0][package]kdepimlibs4-3.93.0-3.i586
+>!> ESTABLISHED:1602: U__s_[S2:0][package]kdesdk3-3.5.7-48.i586
+>!> ESTABLISHED:1603: U__s_[S2:0][package]kdesdk3-devel-3.5.7-48.i586
+>!> ESTABLISHED:1604: U__s_[S2:0][package]kdesdk3-kdecvs-3.5.7-48.i586
+>!> ESTABLISHED:1605: U__s_[S2:0][package]kdesdk3-profile-3.5.7-48.i586
+>!> ESTABLISHED:1606: U__s_[S2:0][package]kdesdk3-translate-3.5.7-48.i586
+>!> ESTABLISHED:1607: U__s_[S2:0][package]kdesvn-0.12.1-22.i586
+>!> ESTABLISHED:1608: U__s_[S2:0][package]kdetoys3-3.5.7-44.i586
+>!> ESTABLISHED:1609: I__s_[S1:0][package]kdetv-0.8.9-74.i586
+>!> ESTABLISHED:1610: U__s_[S2:0][package]kdetv-0.8.9-84.i586
+>!> ESTABLISHED:1611: I__s_[S1:0][package]kdeutils3-3.5.7-32.i586
+>!> ESTABLISHED:1612: U__s_[S2:0][package]kdeutils3-3.5.7-47.i586
+>!> ESTABLISHED:1613: U__s_[S2:0][package]kdeutils3-devel-3.5.7-47.i586
+>!> ESTABLISHED:1614: U__s_[S2:0][package]kdeutils3-extra-3.5.7-47.i586
+>!> ESTABLISHED:1615: U__s_[S2:0][package]kdevelop3-3.4.1-49.i586
+>!> ESTABLISHED:1616: U__s_[S2:0][package]kdewebdev3-3.5.7-47.i586
+>!> ESTABLISHED:1617: U__s_[S2:0][package]kdiff3-0.9.92-62.i586
+>!> ESTABLISHED:1618: U__s_[S2:0][package]kdirstat-2.4.4-119.i586
+>!> ESTABLISHED:1619: U__s_[S2:0][package]kdissert-1.0.6c-80.i586
+>!> ESTABLISHED:1620: U__s_[S2:0][package]kdrill-6.4-102.i586
+>!> ESTABLISHED:1621: U__s_[S2:0][package]kdump-helpers-0.2.4-18.i586
+>!> ESTABLISHED:1622: U__s_[S2:0][package]kernel-bigsmp-2.6.22.5-10.i586
+>!> ESTABLISHED:1623: I__s_[S1:0][package]kernel-default-2.6.22.1-16.i586
+>!> ESTABLISHED:1624: U__s_[S2:0][package]kernel-default-2.6.22.5-10.i586
+>!> ESTABLISHED:1625: U__s_[S2:0][package]kernel-docs-2.6.22.5-10.noarch
+>!> ESTABLISHED:1626: U__s_[S2:0][package]kernel-source-2.6.22.5-10.i586
+>!> ESTABLISHED:1627: U__s_[S2:0][package]kernel-syms-2.6.22.5-10.i586
+>!> ESTABLISHED:1628: U__s_[S2:0][package]kernel-xen-2.6.22.5-10.i586
+>!> ESTABLISHED:1629: U__s_[S2:0][package]kernel-xenpae-2.6.22.5-10.i586
+>!> ESTABLISHED:1630: U__s_[S2:0][package]kerry-0.2.2-77.i586
+>!> ESTABLISHED:1631: U__s_[S2:0][package]kexec-tools-1.101-136.i586
+>!> ESTABLISHED:1632: U__s_[S2:0][package]keychain-2.6.8-15.noarch
+>!> ESTABLISHED:1633: U__s_[S2:0][package]keyutils-1.2-39.i586
+>!> ESTABLISHED:1634: U__s_[S2:0][package]keyutils-devel-1.2-39.i586
+>!> ESTABLISHED:1635: I__s_[S1:0][package]keyutils-libs-1.2-33.i586
+>!> ESTABLISHED:1636: U__s_[S2:0][package]keyutils-libs-1.2-39.i586
+>!> ESTABLISHED:1637: U__s_[S2:0][package]kiax-0.8.4-106.i586
+>!> ESTABLISHED:1638: U__s_[S2:0][package]kile-1.9.3-86.i586
+>!> ESTABLISHED:1639: U__s_[S2:0][package]kinput2-v3.1-418.i586
+>!> ESTABLISHED:1640: U__s_[S2:0][package]kinternet-0.75-141.i586
+>!> ESTABLISHED:1641: U__s_[S2:0][package]kio-locate-0.4.5-100.i586
+>!> ESTABLISHED:1642: U__s_[S2:0][package]kio_beagle-0.3.1-106.i586
+>!> ESTABLISHED:1643: U__s_[S2:0][package]kio_ipodslave-0.8.pre1-102.i586
+>!> ESTABLISHED:1644: I__s_[S1:0][package]kio_ipodslave-0.8.pre1-91.i586
+>!> ESTABLISHED:1645: U__s_[S2:0][package]kio_iso-1.80.0-26.i586
+>!> ESTABLISHED:1646: I__s_[S1:0][package]kio_iso-1.80.0-9.i586
+>!> ESTABLISHED:1647: I__s_[S1:0][package]kio_slp-0.4.1-103.i586
+>!> ESTABLISHED:1648: U__s_[S2:0][package]kio_slp-0.4.1-113.i586
+>!> ESTABLISHED:1649: I__s_[S1:0][package]kio_sysinfo-10.3-103.i586
+>!> ESTABLISHED:1650: U__s_[S2:0][package]kio_sysinfo-10.3-128.i586
+>!> ESTABLISHED:1651: U__s_[S2:0][package]kiosktool-1.0-116.i586
+>!> ESTABLISHED:1652: U__s_[S2:0][package]kipi-plugins-0.1.4-25.i586
+>!> ESTABLISHED:1653: I__s_[S1:0][package]kipi-plugins-0.1.4-9.i586
+>!> ESTABLISHED:1654: U__s_[S2:0][package]kisdnwatch-01.00.10-118.i586
+>!> ESTABLISHED:1655: U__s_[S2:0][package]kismet-2007_01_R1b-62.i586
+>!> ESTABLISHED:1656: I__s_[S1:0][package]kitchensync-0.01svn691344-2.i586
+>!> ESTABLISHED:1657: U__s_[S2:0][package]kitchensync-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> ESTABLISHED:1658: U__s_[S2:0][package]kiwi-1.59-2.i586
+>!> ESTABLISHED:1659: U__s_[S2:0][package]kiwi-desc-isoboot-1.59-2.i586
+>!> ESTABLISHED:1660: U__s_[S2:0][package]kiwi-desc-netboot-1.59-2.i586
+>!> ESTABLISHED:1661: U__s_[S2:0][package]kiwi-desc-oemboot-1.59-2.i586
+>!> ESTABLISHED:1662: U__s_[S2:0][package]kiwi-desc-usbboot-1.59-2.i586
+>!> ESTABLISHED:1663: U__s_[S2:0][package]kiwi-desc-vmxboot-1.59-2.i586
+>!> ESTABLISHED:1664: U__s_[S2:0][package]kiwi-desc-xenboot-1.59-2.i586
+>!> ESTABLISHED:1665: U__s_[S2:0][package]kiwi-desc-xennetboot-1.59-2.i586
+>!> ESTABLISHED:1666: U__s_[S2:0][package]kiwi-pxeboot-1.59-2.i586
+>!> ESTABLISHED:1667: U__s_[S2:0][package]klipsi-0.16-89.i586
+>!> ESTABLISHED:1668: I__s_[S1:0][package]klogd-1.4.1-622.i586
+>!> ESTABLISHED:1669: U__s_[S2:0][package]klogd-1.4.1-629.i586
+>!> ESTABLISHED:1670: U__s_[S2:0][package]kmobiletools-0.4.99+0.5.0beta3-19.i586
+>!> ESTABLISHED:1671: U__s_[S2:0][package]kmobiletools-lang-0.4.99+0.5.0beta3-19.i586
+>!> ESTABLISHED:1672: U__s_[S2:0][package]kmymoney-0.8.7-21.i586
+>!> ESTABLISHED:1673: U__s_[S2:0][package]knights-0.6-539.i586
+>!> ESTABLISHED:1674: U__s_[S2:0][package]knoda-0.8.2-98.i586
+>!> ESTABLISHED:1675: U_Tl_[S2:0][package]koffice-1.6.3-38.i586
+>!> ESTABLISHED:1676: U__s_[S2:0][package]koffice-database-1.6.3-38.i586
+>!> ESTABLISHED:1677: U__s_[S2:0][package]koffice-devel-1.6.3-38.i586
+>!> ESTABLISHED:1678: U__s_[S2:0][package]koffice-extra-1.6.3-38.i586
+>!> ESTABLISHED:1679: U__s_[S2:0][package]koffice-i18n-cs-1.6.3-2.noarch
+>!> ESTABLISHED:1680: U__s_[S2:0][package]koffice-i18n-da-1.6.3-2.noarch
+>!> ESTABLISHED:1681: U__s_[S2:0][package]koffice-i18n-da-doc-1.6.3-2.noarch
+>!> ESTABLISHED:1682: U__s_[S2:0][package]koffice-i18n-de-1.6.3-2.noarch
+>!> ESTABLISHED:1683: U__s_[S2:0][package]koffice-i18n-de-doc-1.6.3-2.noarch
+>!> ESTABLISHED:1684: U__s_[S2:0][package]koffice-i18n-en_GB-1.6.3-2.noarch
+>!> ESTABLISHED:1685: U__s_[S2:0][package]koffice-i18n-en_GB-doc-1.6.3-2.noarch
+>!> ESTABLISHED:1686: U__s_[S2:0][package]koffice-i18n-es-1.6.3-2.noarch
+>!> ESTABLISHED:1687: U__s_[S2:0][package]koffice-i18n-es-doc-1.6.3-2.noarch
+>!> ESTABLISHED:1688: U__s_[S2:0][package]koffice-i18n-fi-1.6.3-2.noarch
+>!> ESTABLISHED:1689: U__s_[S2:0][package]koffice-i18n-fr-1.6.3-2.noarch
+>!> ESTABLISHED:1690: U__s_[S2:0][package]koffice-i18n-fr-doc-1.6.3-2.noarch
+>!> ESTABLISHED:1691: U__s_[S2:0][package]koffice-i18n-hu-1.6.3-2.noarch
+>!> ESTABLISHED:1692: U__s_[S2:0][package]koffice-i18n-it-1.6.3-2.noarch
+>!> ESTABLISHED:1693: U__s_[S2:0][package]koffice-i18n-it-doc-1.6.3-2.noarch
+>!> ESTABLISHED:1694: U__s_[S2:0][package]koffice-i18n-ja-1.6.3-2.noarch
+>!> ESTABLISHED:1695: U__s_[S2:0][package]koffice-i18n-nb-1.6.3-2.noarch
+>!> ESTABLISHED:1696: U__s_[S2:0][package]koffice-i18n-nl-1.6.3-2.noarch
+>!> ESTABLISHED:1697: U__s_[S2:0][package]koffice-i18n-nl-doc-1.6.3-2.noarch
+>!> ESTABLISHED:1698: U__s_[S2:0][package]koffice-i18n-pl-1.6.3-2.noarch
+>!> ESTABLISHED:1699: U__s_[S2:0][package]koffice-i18n-pt-1.6.3-2.noarch
+>!> ESTABLISHED:1700: U__s_[S2:0][package]koffice-i18n-pt-doc-1.6.3-2.noarch
+>!> ESTABLISHED:1701: U__s_[S2:0][package]koffice-i18n-pt_BR-1.6.3-2.noarch
+>!> ESTABLISHED:1702: U__s_[S2:0][package]koffice-i18n-pt_BR-doc-1.6.3-2.noarch
+>!> ESTABLISHED:1703: U__s_[S2:0][package]koffice-i18n-ru-1.6.3-2.noarch
+>!> ESTABLISHED:1704: U__s_[S2:0][package]koffice-i18n-ru-doc-1.6.3-2.noarch
+>!> ESTABLISHED:1705: U__s_[S2:0][package]koffice-i18n-sv-1.6.3-2.noarch
+>!> ESTABLISHED:1706: U__s_[S2:0][package]koffice-i18n-sv-doc-1.6.3-2.noarch
+>!> ESTABLISHED:1707: U__s_[S2:0][package]koffice-i18n-zh_CN-1.6.3-2.noarch
+>!> ESTABLISHED:1708: U__s_[S2:0][package]koffice-i18n-zh_TW-1.6.3-2.noarch
+>!> ESTABLISHED:1709: U_Tl_[S2:0][package]koffice-illustration-1.6.3-38.i586
+>!> ESTABLISHED:1710: U__s_[S2:0][package]koffice-presentation-1.6.3-38.i586
+>!> ESTABLISHED:1711: U__s_[S2:0][package]koffice-spreadsheet-1.6.3-38.i586
+>!> ESTABLISHED:1712: U__s_[S2:0][package]koffice-wordprocessing-1.6.3-38.i586
+>!> ESTABLISHED:1713: U__s_[S2:0][package]kommander-3.5.7-47.i586
+>!> ESTABLISHED:1714: U__s_[S2:0][package]kommander-runtime-3.5.7-47.i586
+>!> ESTABLISHED:1715: U__s_[S2:0][package]konserve-0.10.3-119.i586
+>!> ESTABLISHED:1716: U__s_[S2:0][package]konversation-1.0.1-101.i586
+>!> ESTABLISHED:1717: I__s_[S1:0][package]konversation-1.0.1-91.i586
+>!> ESTABLISHED:1718: U__s_[S2:0][package]kover-2.9.6-121.i586
+>!> ESTABLISHED:1719: U__s_[S2:0][package]kpartx-0.4.7-75.i586
+>!> ESTABLISHED:1720: U__s_[S2:0][package]kpl-3.3-115.i586
+>!> ESTABLISHED:1721: I__s_[S1:0][package]kpowersave-0.7.2_SVN20070724-10.i586
+>!> ESTABLISHED:1722: U__s_[S2:0][package]kpowersave-0.7.2_SVN20070830-3.i586
+>!> ESTABLISHED:1723: U__s_[S2:0][package]kpsion-0.16-89.i586
+>!> ESTABLISHED:1724: U__s_[S2:0][package]kradio-1.0beta3b_20060920-84.i586
+>!> ESTABLISHED:1725: U__s_[S2:0][package]krb5-1.6.2-15.i586
+>!> ESTABLISHED:1726: I__s_[S1:0][package]krb5-1.6.2-8.i586
+>!> ESTABLISHED:1727: U__s_[S2:0][package]krb5-apps-clients-1.6.2-15.i586
+>!> ESTABLISHED:1728: U__s_[S2:0][package]krb5-apps-servers-1.6.2-15.i586
+>!> ESTABLISHED:1729: U__s_[S2:0][package]krb5-client-1.6.2-15.i586
+>!> ESTABLISHED:1730: U__s_[S2:0][package]krb5-devel-1.6.2-15.i586
+>!> ESTABLISHED:1731: U__s_[S2:0][package]krb5-doc-1.6.2-23.noarch
+>!> ESTABLISHED:1732: U__s_[S2:0][package]krb5-plugin-kdb-ldap-1.6.2-3.i586
+>!> ESTABLISHED:1733: U__s_[S2:0][package]krb5-server-1.6.2-15.i586
+>!> ESTABLISHED:1734: I__s_[S1:0][package]krecord-1.16-117.i586
+>!> ESTABLISHED:1735: U__s_[S2:0][package]krecord-1.16-127.i586
+>!> ESTABLISHED:1736: U__s_[S2:0][package]krename-3.0.14-53.i586
+>!> ESTABLISHED:1737: U__s_[S2:0][package]krpmbuilder-1.2-116.i586
+>!> ESTABLISHED:1738: U__s_[S2:0][package]krusader-1.80.0-26.i586
+>!> ESTABLISHED:1739: U_Tl_[S2:0][package]kscpm-0.5.3-124.i586
+>!> ESTABLISHED:1740: U__s_[S2:0][package]kseg-0.4-299.i586
+>!> ESTABLISHED:1741: U__s_[S2:0][package]ksh-93s-41.i586
+>!> ESTABLISHED:1742: U__s_[S2:0][package]ksimus-0.3.6.2-118.i586
+>!> ESTABLISHED:1743: U__s_[S2:0][package]kst-1.4.0-16.i586
+>!> ESTABLISHED:1744: U__s_[S2:0][package]kst-lang-1.4.0-16.i586
+>!> ESTABLISHED:1745: U__s_[S2:0][package]ksudoku-0.4-56.i586
+>!> ESTABLISHED:1746: U__s_[S2:0][package]ksymoops-2.4.11-73.i586
+>!> ESTABLISHED:1747: U__s_[S2:0][package]ksystemlog-0.3.2-118.i586
+>!> ESTABLISHED:1748: U__s_[S2:0][package]kterm-6.2.0-906.i586
+>!> ESTABLISHED:1749: U__s_[S2:0][package]ktoblzcheck-1.14-13.i586
+>!> ESTABLISHED:1750: U__s_[S2:0][package]ktoblzcheck-devel-1.14-13.i586
+>!> ESTABLISHED:1751: U__s_[S2:0][package]ktorrent-2.2.1-22.i586
+>!> ESTABLISHED:1752: I__s_[S1:0][package]ktorrent-2.2.1-9.i586
+>!> ESTABLISHED:1753: U__s_[S2:0][package]ktray-0.1-116.i586
+>!> ESTABLISHED:1754: U__s_[S2:0][package]kvirc-3.2.6-72.i586
+>!> ESTABLISHED:1755: U__s_[S2:0][package]kvocabs-0.3.4-97.i586
+>!> ESTABLISHED:1756: U__s_[S2:0][package]kvpnc-0.8.9-46.i586
+>!> ESTABLISHED:1757: U__s_[S2:0][package]kwatch-2.3.3-115.i586
+>!> ESTABLISHED:1758: U__s_[S2:0][package]kwin-decor-suse2-0.4.1-19.i586
+>!> ESTABLISHED:1759: I__s_[S1:0][package]kwin-decor-suse2-0.4.1-2.i586
+>!> ESTABLISHED:1760: U__s_[S2:0][package]kxmleditor-1.1.4-135.i586
+>!> ESTABLISHED:1761: U__s_[S2:0][package]kyum-0.7.5-117.i586
+>!> ESTABLISHED:1762: U__s_[S2:0][package]lacheck-1.26-72.i586
+>!> ESTABLISHED:1763: U__s_[S2:0][package]ladspa-1.12.code10.3-50.i586
+>!> ESTABLISHED:1764: U__s_[S2:0][package]ladspa-devel-1.12.code10.3-33.noarch
+>!> ESTABLISHED:1765: U_Tu_[S0:0][language]en-.noarch
+>!> ESTABLISHED:1766: U_Tu_[S0:0][language]en_US-.noarch
+>!> ESTABLISHED:1767: U__s_[S2:0][package]lash-0.5.0-101.i586
+>!> ESTABLISHED:1768: U__s_[S2:0][package]lash-devel-0.5.0-101.i586
+>!> ESTABLISHED:1769: U__s_[S2:0][package]lash-libs-0.5.0-101.i586
+>!> ESTABLISHED:1770: U__s_[S2:0][package]latex2html-2002.2.1-469.noarch
+>!> ESTABLISHED:1771: U__s_[S2:0][package]latex2html-pngicons-2002.2.1-469.noarch
+>!> ESTABLISHED:1772: U__s_[S2:0][package]lbreakout-2.5.2-106.i586
+>!> ESTABLISHED:1773: I__s_[S1:0][package]lbreakout-2.5.2-97.i586
+>!> ESTABLISHED:1774: I__s_[S1:0][package]ldapcpplib-0.0.4-81.i586
+>!> ESTABLISHED:1775: U__s_[S2:0][package]ldapcpplib-0.0.4-88.i586
+>!> ESTABLISHED:1776: U__s_[S2:0][package]less-406-11.i586
+>!> ESTABLISHED:1777: I__s_[S1:0][package]less-406-4.i586
+>!> ESTABLISHED:1778: U__s_[S2:0][package]lessons4lizards_en-0.2-8.noarch
+>!> ESTABLISHED:1779: U__s_[S2:0][package]lftp-3.5.11-12.i586
+>!> ESTABLISHED:1780: U__s_[S2:0][package]lha-1.14.20070523-12.i586
+>!> ESTABLISHED:1781: U__s_[S2:0][package]libEMF-1.0-250.i586
+>!> ESTABLISHED:1782: U__s_[S2:0][package]libEMF-devel-1.0-250.i586
+>!> ESTABLISHED:1783: U__s_[S2:0][package]libFLAC++6-1.2.0-10.i586
+>!> ESTABLISHED:1784: I__s_[S1:0][package]libFLAC++6-1.2.0-4.i586
+>!> ESTABLISHED:1785: U__s_[S2:0][package]libFLAC8-1.2.0-10.i586
+>!> ESTABLISHED:1786: I__s_[S1:0][package]libFLAC8-1.2.0-4.i586
+>!> ESTABLISHED:1787: U__s_[S2:0][package]libGraphicsMagick++1-1.1.8-12.i586
+>!> ESTABLISHED:1788: U_Tl_[S2:0][package]libGraphicsMagick1-1.1.8-12.i586
+>!> ESTABLISHED:1789: U__s_[S2:0][package]libGraphicsMagickWand0-1.1.8-12.i586
+>!> ESTABLISHED:1790: U__s_[S2:0][package]libMagick++-devel-6.3.5.3-20.i586
+>!> ESTABLISHED:1791: U__s_[S2:0][package]libMagick++10-6.3.5.3-20.i586
+>!> ESTABLISHED:1792: U_Tl_[S2:0][package]libMagick10-6.3.5.3-20.i586
+>!> ESTABLISHED:1793: U__s_[S2:0][package]libPropList-0.10.1-706.i586
+>!> ESTABLISHED:1794: U__s_[S2:0][package]libQtTapioca0-0.14.1+svn2032-11.i586
+>!> ESTABLISHED:1795: U__s_[S2:0][package]libQtTelepathy0-0.14.1-11.i586
+>!> ESTABLISHED:1796: U_Tl_[S2:0][package]libWand10-6.3.5.3-20.i586
+>!> ESTABLISHED:1797: U__s_[S2:0][package]libXalan-c-110-1.10-71.i586
+>!> ESTABLISHED:1798: U__s_[S2:0][package]libXerces-c-27-2.7.0-72.i586
+>!> ESTABLISHED:1799: U__s_[S2:0][package]libXiterm-0.5.20040304-133.i586
+>!> ESTABLISHED:1800: U__s_[S2:0][package]libXiterm-devel-0.5.20040304-133.i586
+>!> ESTABLISHED:1801: U__s_[S2:0][package]libaal-1_0-5-1.0.5-9.i586
+>!> ESTABLISHED:1802: U__s_[S2:0][package]libaal-minimal0-1.0.5-9.i586
+>!> ESTABLISHED:1803: I__s_[S1:0][package]libacl-2.2.34-66.i586
+>!> ESTABLISHED:1804: U__s_[S2:0][package]libacl-2.2.34-72.i586
+>!> ESTABLISHED:1805: U__s_[S2:0][package]libacl-devel-2.2.34-72.i586
+>!> ESTABLISHED:1806: U__s_[S2:0][package]libadns1-1.4-7.i586
+>!> ESTABLISHED:1807: U__s_[S2:0][package]libaio-0.3.104-71.i586
+>!> ESTABLISHED:1808: U__s_[S2:0][package]libaio-devel-0.3.104-71.i586
+>!> ESTABLISHED:1809: I__s_[S1:0][package]libakode-2.0.2-41.i586
+>!> ESTABLISHED:1810: U__s_[S2:0][package]libakode-2.0.2-51.i586
+>!> ESTABLISHED:1811: U__s_[S2:0][package]libakode-devel-2.0.2-51.i586
+>!> ESTABLISHED:1812: U__s_[S2:0][package]libao-0.8.8-12.i586
+>!> ESTABLISHED:1813: I__s_[S1:0][package]libao-0.8.8-3.i586
+>!> ESTABLISHED:1814: U__s_[S2:0][package]libao-devel-0.8.8-12.i586
+>!> ESTABLISHED:1815: U__s_[S2:0][package]libapparmor-devel-2.2-10.i586
+>!> ESTABLISHED:1816: U__s_[S2:0][package]libapparmor1-2.2-10.i586
+>!> ESTABLISHED:1817: I__s_[S1:0][package]libapparmor1-2.2-2.i586
+>!> ESTABLISHED:1818: U__s_[S2:0][package]libapr-util1-1.2.8-60.i586
+>!> ESTABLISHED:1819: U__s_[S2:0][package]libapr-util1-devel-1.2.8-60.i586
+>!> ESTABLISHED:1820: U__s_[S2:0][package]libapr1-1.2.9-6.i586
+>!> ESTABLISHED:1821: U__s_[S2:0][package]libapr1-devel-1.2.9-6.i586
+>!> ESTABLISHED:1822: I__s_[S1:0][package]libart_lgpl-2.3.19-26.i586
+>!> ESTABLISHED:1823: U__s_[S2:0][package]libart_lgpl-2.3.19-32.i586
+>!> ESTABLISHED:1824: U__s_[S2:0][package]libart_lgpl-devel-2.3.19-32.i586
+>!> ESTABLISHED:1825: I__s_[S1:0][package]libasound2-1.0.14-20.i586
+>!> ESTABLISHED:1826: U__s_[S2:0][package]libasound2-1.0.14-27.i586
+>!> ESTABLISHED:1827: U__s_[S2:0][package]libassuan-devel-1.0.2-3.i586
+>!> ESTABLISHED:1828: I__s_[S1:0][package]libattr-2.4.28-72.i586
+>!> ESTABLISHED:1829: U__s_[S2:0][package]libattr-2.4.28-78.i586
+>!> ESTABLISHED:1830: U__s_[S2:0][package]libattr-devel-2.4.28-78.i586
+>!> ESTABLISHED:1831: U__s_[S2:0][package]libavc1394-0-0.5.3-61.i586
+>!> ESTABLISHED:1832: U__s_[S2:0][package]libavc1394-0.5.3-61.i586
+>!> ESTABLISHED:1833: U__s_[S2:0][package]libavc1394-devel-0.5.3-61.i586
+>!> ESTABLISHED:1834: U__s_[S2:0][package]libbeagle-0.2.18-8.i586
+>!> ESTABLISHED:1835: U__s_[S2:0][package]libbeagle-devel-0.2.18-8.i586
+>!> ESTABLISHED:1836: U__s_[S2:0][package]libbeagle-python-0.2.18-8.i586
+>!> ESTABLISHED:1837: U__s_[S2:0][package]libblkid-devel-1.40.2-15.i586
+>!> ESTABLISHED:1838: U__s_[S2:0][package]libblkid1-1.40.2-15.i586
+>!> ESTABLISHED:1839: I__s_[S1:0][package]libblkid1-1.40.2-9.i586
+>!> ESTABLISHED:1840: U__s_[S2:0][package]libbonobo-2.19.6-13.i586
+>!> ESTABLISHED:1841: I__s_[S1:0][package]libbonobo-2.19.6-3.i586
+>!> ESTABLISHED:1842: U__s_[S2:0][package]libbonobo-devel-2.19.6-13.i586
+>!> ESTABLISHED:1843: U__s_[S2:0][package]libbonobo-doc-2.19.6-13.i586
+>!> ESTABLISHED:1844: U__s_[S2:0][package]libbonoboui-2.19.6-17.i586
+>!> ESTABLISHED:1845: I__s_[S1:0][package]libbonoboui-2.19.6-4.i586
+>!> ESTABLISHED:1846: U__s_[S2:0][package]libbonoboui-devel-2.19.6-17.i586
+>!> ESTABLISHED:1847: U__s_[S2:0][package]libbonoboui-doc-2.19.6-17.i586
+>!> ESTABLISHED:1848: U__s_[S2:0][package]libbtctl-0.8.0-100.i586
+>!> ESTABLISHED:1849: U__s_[S2:0][package]libbtctl-devel-0.8.0-100.i586
+>!> ESTABLISHED:1850: I__s_[S1:0][package]libbz2-1-1.0.4-33.i586
+>!> ESTABLISHED:1851: U__s_[S2:0][package]libbz2-1-1.0.4-39.i586
+>!> ESTABLISHED:1852: U__s_[S2:0][package]libbz2-devel-1.0.4-39.i586
+>!> ESTABLISHED:1853: I__s_[S1:0][package]libcap-1.10-34.i586
+>!> ESTABLISHED:1854: U__s_[S2:0][package]libcap-1.10-40.i586
+>!> ESTABLISHED:1855: U__s_[S2:0][package]libcap-progs-1.10-40.i586
+>!> ESTABLISHED:1856: U__s_[S2:0][package]libcddb-1.3.0-54.i586
+>!> ESTABLISHED:1857: U__s_[S2:0][package]libcddb-devel-1.3.0-54.i586
+>!> ESTABLISHED:1858: U__s_[S2:0][package]libcdio++0-0.78.2-4.i586
+>!> ESTABLISHED:1859: U__s_[S2:0][package]libcdio-devel-0.78.2-4.i586
+>!> ESTABLISHED:1860: U__s_[S2:0][package]libcdio-utils-0.78.2-4.i586
+>!> ESTABLISHED:1861: I__s_[S1:0][package]libcdio7-0.78.2-3.i586
+>!> ESTABLISHED:1862: U__s_[S2:0][package]libcdio7-0.78.2-4.i586
+>!> ESTABLISHED:1863: U__s_[S2:0][package]libcdio_cdda0-0.78.2-4.i586
+>!> ESTABLISHED:1864: U__s_[S2:0][package]libcdio_paranoia0-0.78.2-4.i586
+>!> ESTABLISHED:1865: U__s_[S2:0][package]libchewing-0.3.0-70.i586
+>!> ESTABLISHED:1866: U__s_[S2:0][package]libchipcard2-2.1.9-17.i586
+>!> ESTABLISHED:1867: U__s_[S2:0][package]libchipcard2-devel-2.1.9-17.i586
+>!> ESTABLISHED:1868: U__s_[S2:0][package]libcom_err-devel-1.40.2-15.i586
+>!> ESTABLISHED:1869: U__s_[S2:0][package]libcom_err2-1.40.2-15.i586
+>!> ESTABLISHED:1870: I__s_[S1:0][package]libcom_err2-1.40.2-9.i586
+>!> ESTABLISHED:1871: I__s_[S1:0][package]libcroco-0.6.1-56.i586
+>!> ESTABLISHED:1872: U__s_[S2:0][package]libcroco-0.6.1-64.i586
+>!> ESTABLISHED:1873: U__s_[S2:0][package]libcroco-devel-0.6.1-64.i586
+>!> ESTABLISHED:1874: U__s_[S2:0][package]libcurl-devel-7.16.4-10.i586
+>!> ESTABLISHED:1875: U__s_[S2:0][package]libcurl2-7.11.0-28.i586
+>!> ESTABLISHED:1876: U__s_[S2:0][package]libcurl4-7.16.4-10.i586
+>!> ESTABLISHED:1877: I__s_[S1:0][package]libcurl4-7.16.4-2.i586
+>!> ESTABLISHED:1878: U__s_[S2:0][package]libdaemon-0.12-14.i586
+>!> ESTABLISHED:1879: I__s_[S1:0][package]libdaemon-0.12-8.i586
+>!> ESTABLISHED:1880: U__s_[S2:0][package]libdar-4-2.3.4-15.i586
+>!> ESTABLISHED:1881: U__s_[S2:0][package]libdb-4_4-4.4.20-25.i586
+>!> ESTABLISHED:1882: I__s_[S1:0][package]libdb-4_5-4.5.20-20.i586
+>!> ESTABLISHED:1883: U__s_[S2:0][package]libdb-4_5-4.5.20-26.i586
+>!> ESTABLISHED:1884: U__s_[S2:0][package]libdb-4_5-devel-4.5.20-26.i586
+>!> ESTABLISHED:1885: U__s_[S2:0][package]libdc1394-2.0.0-1.i586
+>!> ESTABLISHED:1886: U__s_[S2:0][package]libdc1394-20-2.0.0-1.i586
+>!> ESTABLISHED:1887: U__s_[S2:0][package]libdigikam-devel-0.9.2-37.i586
+>!> ESTABLISHED:1888: U__s_[S2:0][package]libdjvulibre15-3.5.19-50.i586
+>!> ESTABLISHED:1889: U__s_[S2:0][package]libdnet-1.11-79.i586
+>!> ESTABLISHED:1890: I__s_[S1:0][package]libdrm-2.3.0-34.i586
+>!> ESTABLISHED:1891: U__s_[S2:0][package]libdrm-2.3.0-40.i586
+>!> ESTABLISHED:1892: U__s_[S2:0][package]libdrm-devel-2.3.0-40.i586
+>!> ESTABLISHED:1893: U__s_[S2:0][package]libdv-devel-1.0.0-11.i586
+>!> ESTABLISHED:1894: U__s_[S2:0][package]libdv4-1.0.0-11.i586
+>!> ESTABLISHED:1895: U__s_[S2:0][package]libdvdnav-0.1.10-72.i586
+>!> ESTABLISHED:1896: I__s_[S1:0][package]libdvdread3-0.9.7-3.i586
+>!> ESTABLISHED:1897: U__s_[S2:0][package]libdvdread3-0.9.7-4.i586
+>!> ESTABLISHED:1898: U__s_[S2:0][package]libedit0-2.10.snap20070831-2.i586
+>!> ESTABLISHED:1899: U__s_[S2:0][package]libelf0-0.8.9-14.i586
+>!> ESTABLISHED:1900: U__s_[S2:0][package]libelf1-0.128-14.i586
+>!> ESTABLISHED:1901: U__s_[S2:0][package]liberation-fonts-0.1-28.noarch
+>!> ESTABLISHED:1902: I__s_[S1:0][package]libevent-1.3b-27.i586
+>!> ESTABLISHED:1903: U__s_[S2:0][package]libevent-1.3b-33.i586
+>!> ESTABLISHED:1904: I__s_[S1:0][package]libexif-0.6.16-10.i586
+>!> ESTABLISHED:1905: U__s_[S2:0][package]libexif-0.6.16-18.i586
+>!> ESTABLISHED:1906: U__s_[S2:0][package]libexif-devel-0.6.16-18.i586
+>!> ESTABLISHED:1907: U__s_[S2:0][package]libexif-gtk-0.3.3-408.i586
+>!> ESTABLISHED:1908: I__s_[S1:0][package]libexiv2-0.14-35.i586
+>!> ESTABLISHED:1909: U__s_[S2:0][package]libexiv2-0.15-2.i586
+>!> ESTABLISHED:1910: U__s_[S2:0][package]libexiv2-devel-0.15-2.i586
+>!> ESTABLISHED:1911: U__s_[S2:0][package]libexpat-devel-2.0.1-21.i586
+>!> ESTABLISHED:1912: U__s_[S2:0][package]libexpat0-1.95.8-29.i586
+>!> ESTABLISHED:1913: I__s_[S1:0][package]libexpat1-2.0.1-15.i586
+>!> ESTABLISHED:1914: U__s_[S2:0][package]libexpat1-2.0.1-21.i586
+>!> ESTABLISHED:1915: U__s_[S2:0][package]libext2fs-devel-1.40.2-15.i586
+>!> ESTABLISHED:1916: U__s_[S2:0][package]libext2fs2-1.40.2-15.i586
+>!> ESTABLISHED:1917: I__s_[S1:0][package]libext2fs2-1.40.2-9.i586
+>!> ESTABLISHED:1918: U__s_[S2:0][package]libffi42-4.2.1_20070724-17.i586
+>!> ESTABLISHED:1919: U__s_[S2:0][package]libfluidsynth1-1.0.7a-89.i586
+>!> ESTABLISHED:1920: U__s_[S2:0][package]libfreebob-1.0.3-38.i586
+>!> ESTABLISHED:1921: U__s_[S2:0][package]libfuse2-2.7.0-19.i586
+>!> ESTABLISHED:1922: U__s_[S2:0][package]libgadu-1.7.1-26.i586
+>!> ESTABLISHED:1923: U__s_[S2:0][package]libgail-gnome-1.19.5-17.i586
+>!> ESTABLISHED:1924: U__s_[S2:0][package]libgail-gnome-devel-1.19.5-17.i586
+>!> ESTABLISHED:1925: U__s_[S2:0][package]libgalago-0.5.2-50.i586
+>!> ESTABLISHED:1926: U__s_[S2:0][package]libgcc42-4.2.1_20070724-12.i586
+>!> ESTABLISHED:1927: I__s_[S1:0][package]libgcc42-4.2.1_20070724-4.i586
+>!> ESTABLISHED:1928: U__s_[S2:0][package]libgcj-devel-4.2-21.i586
+>!> ESTABLISHED:1929: U__s_[S2:0][package]libgcj42-4.2.1_20070724-17.i586
+>!> ESTABLISHED:1930: I__s_[S1:0][package]libgcj42-4.2.1_20070724-6.i586
+>!> ESTABLISHED:1931: U__s_[S2:0][package]libgcj42-devel-4.2.1_20070724-17.i586
+>!> ESTABLISHED:1932: U__s_[S2:0][package]libgcj_bc42-4.2.1_20070724-17.i586
+>!> ESTABLISHED:1933: I__s_[S1:0][package]libgcrypt-1.2.4-29.i586
+>!> ESTABLISHED:1934: U__s_[S2:0][package]libgcrypt-1.2.4-35.i586
+>!> ESTABLISHED:1935: U__s_[S2:0][package]libgcrypt-devel-1.2.4-35.i586
+>!> ESTABLISHED:1936: U__s_[S2:0][package]libgda-1.3.91-137.i586
+>!> ESTABLISHED:1937: U__s_[S2:0][package]libgda-devel-1.3.91-137.i586
+>!> ESTABLISHED:1938: U__s_[S2:0][package]libgdiplus-1.2.5-11.i586
+>!> ESTABLISHED:1939: U__s_[S2:0][package]libghttp-1.0.9-724.i586
+>!> ESTABLISHED:1940: I__s_[S1:0][package]libgimpprint-4.2.7-159.i586
+>!> ESTABLISHED:1941: U__s_[S2:0][package]libgimpprint-4.2.7-168.i586
+>!> ESTABLISHED:1942: U__s_[S2:0][package]libglade2-2.6.2-12.i586
+>!> ESTABLISHED:1943: I__s_[S1:0][package]libglade2-2.6.2-3.i586
+>!> ESTABLISHED:1944: U__s_[S2:0][package]libglade2-devel-2.6.2-12.i586
+>!> ESTABLISHED:1945: U__s_[S2:0][package]libglade2-doc-2.6.2-12.i586
+>!> ESTABLISHED:1946: U__s_[S2:0][package]libgmime-2_0-2-2.2.10-19.i586
+>!> ESTABLISHED:1947: U__s_[S2:0][package]libgnome-2.19.1-17.i586
+>!> ESTABLISHED:1948: I__s_[S1:0][package]libgnome-2.19.1-3.i586
+>!> ESTABLISHED:1949: U__s_[S2:0][package]libgnome-certauth0-0.3-3.i586
+>!> ESTABLISHED:1950: U__s_[S2:0][package]libgnome-devel-2.19.1-17.i586
+>!> ESTABLISHED:1951: U__s_[S2:0][package]libgnome-doc-2.19.1-17.i586
+>!> ESTABLISHED:1952: I__s_[S1:0][package]libgnomecanvas-2.19.1-3.i586
+>!> ESTABLISHED:1953: U__s_[S2:0][package]libgnomecanvas-2.19.2-4.i586
+>!> ESTABLISHED:1954: U__s_[S2:0][package]libgnomecanvas-devel-2.19.2-4.i586
+>!> ESTABLISHED:1955: U__s_[S2:0][package]libgnomecanvas-doc-2.19.2-4.i586
+>!> ESTABLISHED:1956: I__s_[S1:0][package]libgnomecups-0.2.2-104.i586
+>!> ESTABLISHED:1957: U__s_[S2:0][package]libgnomecups-0.2.2-115.i586
+>!> ESTABLISHED:1958: U__s_[S2:0][package]libgnomecups-devel-0.2.2-115.i586
+>!> ESTABLISHED:1959: U__s_[S2:0][package]libgnomedb-1.3.91-131.i586
+>!> ESTABLISHED:1960: U__s_[S2:0][package]libgnomedb-devel-1.3.91-131.i586
+>!> ESTABLISHED:1961: U__s_[S2:0][package]libgnomekbd-2.19.91-3.i586
+>!> ESTABLISHED:1962: U__s_[S2:0][package]libgnomekbd-devel-2.19.91-3.i586
+>!> ESTABLISHED:1963: I__s_[S1:0][package]libgnomeprint-2.18.0-34.i586
+>!> ESTABLISHED:1964: U__s_[S2:0][package]libgnomeprint-2.18.1-3.i586
+>!> ESTABLISHED:1965: U__s_[S2:0][package]libgnomeprint-devel-2.18.1-3.i586
+>!> ESTABLISHED:1966: U__s_[S2:0][package]libgnomeprint-doc-2.18.1-3.i586
+>!> ESTABLISHED:1967: I__s_[S1:0][package]libgnomeprintui-2.18.0-40.i586
+>!> ESTABLISHED:1968: U__s_[S2:0][package]libgnomeprintui-2.18.0-52.i586
+>!> ESTABLISHED:1969: U__s_[S2:0][package]libgnomeprintui-devel-2.18.0-52.i586
+>!> ESTABLISHED:1970: U__s_[S2:0][package]libgnomeprintui-doc-2.18.0-52.i586
+>!> ESTABLISHED:1971: I__s_[S1:0][package]libgnomesu-1.0.0-130.i586
+>!> ESTABLISHED:1972: U__s_[S2:0][package]libgnomesu-1.0.0-144.i586
+>!> ESTABLISHED:1973: U__s_[S2:0][package]libgnomesu-devel-1.0.0-144.i586
+>!> ESTABLISHED:1974: U__s_[S2:0][package]libgnomeui-2.19.1-17.i586
+>!> ESTABLISHED:1975: I__s_[S1:0][package]libgnomeui-2.19.1-3.i586
+>!> ESTABLISHED:1976: U__s_[S2:0][package]libgnomeui-devel-2.19.1-17.i586
+>!> ESTABLISHED:1977: U__s_[S2:0][package]libgnomeui-doc-2.19.1-17.i586
+>!> ESTABLISHED:1978: U__s_[S2:0][package]libgomp42-4.2.1_20070724-12.i586
+>!> ESTABLISHED:1979: I__s_[S1:0][package]libgpg-error-1.4-50.i586
+>!> ESTABLISHED:1980: U__s_[S2:0][package]libgpg-error-1.4-56.i586
+>!> ESTABLISHED:1981: U__s_[S2:0][package]libgpg-error-devel-1.4-56.i586
+>!> ESTABLISHED:1982: I__s_[S1:0][package]libgpgme11-1.1.5-11.i586
+>!> ESTABLISHED:1983: U__s_[S2:0][package]libgpgme11-1.1.5-21.i586
+>!> ESTABLISHED:1984: U__s_[S2:0][package]libgphoto2-2.4.0-16.i586
+>!> ESTABLISHED:1985: I__s_[S1:0][package]libgphoto2-2.4.0-3.i586
+>!> ESTABLISHED:1986: U__s_[S2:0][package]libgphoto2-devel-2.4.0-16.i586
+>!> ESTABLISHED:1987: I__s_[S1:0][package]libgpod2-0.5.2-13.i586
+>!> ESTABLISHED:1988: U__s_[S2:0][package]libgpod2-0.5.2-23.i586
+>!> ESTABLISHED:1989: U__s_[S2:0][package]libgsf-1.14.5-15.i586
+>!> ESTABLISHED:1990: I__s_[S1:0][package]libgsf-1.14.5-3.i586
+>!> ESTABLISHED:1991: U__s_[S2:0][package]libgsf-devel-1.14.5-15.i586
+>!> ESTABLISHED:1992: U__s_[S2:0][package]libgsf-doc-1.14.5-15.i586
+>!> ESTABLISHED:1993: U__s_[S2:0][package]libgsf-gnome-1.14.5-15.i586
+>!> ESTABLISHED:1994: U__s_[S2:0][package]libgsm-1.0.10-69.i586
+>!> ESTABLISHED:1995: I__s_[S1:0][package]libgssapi-0.11-21.i586
+>!> ESTABLISHED:1996: U__s_[S2:0][package]libgssapi-0.11-27.i586
+>!> ESTABLISHED:1997: U__s_[S2:0][package]libgtkhtml-2.11.0-104.i586
+>!> ESTABLISHED:1998: I__s_[S1:0][package]libgtkhtml-2.11.0-94.i586
+>!> ESTABLISHED:1999: U__s_[S2:0][package]libgtkhtml-devel-2.11.0-104.i586
+>!> ESTABLISHED:2000: U__s_[S2:0][package]libgtksourceview-2_0-0-1.90.4-3.i586
+>!> ESTABLISHED:2001: U__s_[S2:0][package]libgtop-2.19.5-14.i586
+>!> ESTABLISHED:2002: U__s_[S2:0][package]libgtop-2_0-7-2.19.5-14.i586
+>!> ESTABLISHED:2003: U__s_[S2:0][package]libgtop-devel-2.19.5-14.i586
+>!> ESTABLISHED:2004: U__s_[S2:0][package]libgwenhywfar38-2.6.1-21.i586
+>!> ESTABLISHED:2005: U__s_[S2:0][package]libhangul-0.0.4-29.i586
+>!> ESTABLISHED:2006: U__s_[S2:0][package]libhangul-devel-0.0.4-29.i586
+>!> ESTABLISHED:2007: U__s_[S2:0][package]libical-0.24.RC4-137.i586
+>!> ESTABLISHED:2008: U__s_[S2:0][package]libicu-3.6-10.i586
+>!> ESTABLISHED:2009: I__s_[S1:0][package]libicu-3.6-4.i586
+>!> ESTABLISHED:2010: U__s_[S2:0][package]libicu-devel-3.6-10.i586
+>!> ESTABLISHED:2011: U__s_[S2:0][package]libicu-doc-3.6-10.i586
+>!> ESTABLISHED:2012: U__s_[S2:0][package]libid3tag-0.15.1b-92.i586
+>!> ESTABLISHED:2013: I__s_[S1:0][package]libidl-0.8.8-29.i586
+>!> ESTABLISHED:2014: U__s_[S2:0][package]libidl-0.8.8-37.i586
+>!> ESTABLISHED:2015: U__s_[S2:0][package]libidl-devel-0.8.8-37.i586
+>!> ESTABLISHED:2016: I__s_[S1:0][package]libidn-1.0-2.i586
+>!> ESTABLISHED:2017: U__s_[S2:0][package]libidn-1.0-8.i586
+>!> ESTABLISHED:2018: U__s_[S2:0][package]libidn-devel-1.0-8.i586
+>!> ESTABLISHED:2019: U__s_[S2:0][package]libiec61883-1.1.0-54.i586
+>!> ESTABLISHED:2020: I__s_[S1:0][package]libieee1284-0.2.10-90.i586
+>!> ESTABLISHED:2021: U__s_[S2:0][package]libieee1284-0.2.10-99.i586
+>!> ESTABLISHED:2022: U__s_[S2:0][package]libiniparser-2.17-22.i586
+>!> ESTABLISHED:2023: U__s_[S2:0][package]libiniparser-devel-2.17-22.i586
+>!> ESTABLISHED:2024: U__s_[S2:0][package]libipoddevice-0.5.3-60.i586
+>!> ESTABLISHED:2025: U__s_[S2:0][package]libiptcdata-0.2.1-71.i586
+>!> ESTABLISHED:2026: U__s_[S2:0][package]libiso9660-5-0.78.2-4.i586
+>!> ESTABLISHED:2027: U__s_[S2:0][package]libiterm-0.5.20040304-133.i586
+>!> ESTABLISHED:2028: U__s_[S2:0][package]libiterm-devel-0.5.20040304-133.i586
+>!> ESTABLISHED:2029: I__s_[S1:0][package]libjack-0.103.0-43.i586
+>!> ESTABLISHED:2030: U__s_[S2:0][package]libjack-0.103.0-50.i586
+>!> ESTABLISHED:2031: I__s_[S1:0][package]libjasper-1.900.1-30.i586
+>!> ESTABLISHED:2032: U__s_[S2:0][package]libjasper-1.900.1-38.i586
+>!> ESTABLISHED:2033: U__s_[S2:0][package]libjasper-devel-1.900.1-38.i586
+>!> ESTABLISHED:2034: I__s_[S1:0][package]libjpeg-6.2.0-803.i586
+>!> ESTABLISHED:2035: U__s_[S2:0][package]libjpeg-6.2.0-809.i586
+>!> ESTABLISHED:2036: U__s_[S2:0][package]libjpeg-devel-6.2.0-75.i586
+>!> ESTABLISHED:2037: U__s_[S2:0][package]libkdcraw-devel-0.1.1-12.i586
+>!> ESTABLISHED:2038: U__s_[S2:0][package]libkdcraw1-0.1.1-12.i586
+>!> ESTABLISHED:2039: I__s_[S1:0][package]libkdcraw1-0.1.1-2.i586
+>!> ESTABLISHED:2040: I__s_[S1:0][package]libkde4-3.92.0-8.i586
+>!> ESTABLISHED:2041: U__s_[S2:0][package]libkde4-3.93.0-3.i586
+>!> ESTABLISHED:2042: U__s_[S2:0][package]libkde4-devel-3.93.0-3.i586
+>!> ESTABLISHED:2043: I__s_[S1:0][package]libkdecore4-3.92.0-8.i586
+>!> ESTABLISHED:2044: U__s_[S2:0][package]libkdecore4-3.93.0-3.i586
+>!> ESTABLISHED:2045: U__s_[S2:0][package]libkdecore4-devel-3.93.0-3.i586
+>!> ESTABLISHED:2046: U__s_[S2:0][package]libkdeedu4-3.93.0-3.i586
+>!> ESTABLISHED:2047: U__s_[S2:0][package]libkdeedu4-devel-3.93.0-3.i586
+>!> ESTABLISHED:2048: I__s_[S1:0][package]libkdegames4-3.92.0-6.i586
+>!> ESTABLISHED:2049: U__s_[S2:0][package]libkdegames4-3.93.0-4.i586
+>!> ESTABLISHED:2050: U__s_[S2:0][package]libkdegames4-devel-3.93.0-4.i586
+>!> ESTABLISHED:2051: I__s_[S1:0][package]libkdepimlibs4-3.92.0-6.i586
+>!> ESTABLISHED:2052: U__s_[S2:0][package]libkdepimlibs4-3.93.0-3.i586
+>!> ESTABLISHED:2053: U__s_[S2:0][package]libkdepimlibs4-devel-3.93.0-3.i586
+>!> ESTABLISHED:2054: I__s_[S1:0][package]libkexiv2-0.1.5-14.i586
+>!> ESTABLISHED:2055: U__s_[S2:0][package]libkexiv2-0.1.5-26.i586
+>!> ESTABLISHED:2056: U__s_[S2:0][package]libkexiv2-devel-0.1.5-26.i586
+>!> ESTABLISHED:2057: I__s_[S1:0][package]libkipi-0.1.5-61.i586
+>!> ESTABLISHED:2058: U__s_[S2:0][package]libkipi-0.1.5-74.i586
+>!> ESTABLISHED:2059: U__s_[S2:0][package]libkonq4-3.93.0-3.i586
+>!> ESTABLISHED:2060: U__s_[S2:0][package]libkonq4-devel-3.93.0-3.i586
+>!> ESTABLISHED:2061: I__s_[S1:0][package]libksba-1.0.2-2.i586
+>!> ESTABLISHED:2062: U__s_[S2:0][package]libksba-1.0.2-8.i586
+>!> ESTABLISHED:2063: U__s_[S2:0][package]libksba-devel-1.0.2-8.i586
+>!> ESTABLISHED:2064: I__s_[S1:0][package]liblazy-0.1.1-40.i586
+>!> ESTABLISHED:2065: U__s_[S2:0][package]liblazy-0.2-8.i586
+>!> ESTABLISHED:2066: I__s_[S1:0][package]liblcms-1.16-30.i586
+>!> ESTABLISHED:2067: U__s_[S2:0][package]liblcms-1.16-36.i586
+>!> ESTABLISHED:2068: U__s_[S2:0][package]liblcms-devel-1.16-36.i586
+>!> ESTABLISHED:2069: U__s_[S2:0][package]liblo-0.24-31.i586
+>!> ESTABLISHED:2070: U__s_[S2:0][package]liblrdf-0.4.0-97.i586
+>!> ESTABLISHED:2071: U__s_[S2:0][package]libltdl-3-1.5.24-14.i586
+>!> ESTABLISHED:2072: I__s_[S1:0][package]libltdl-3-1.5.24-8.i586
+>!> ESTABLISHED:2073: I__s_[S1:0][package]libmal-0.31-260.i586
+>!> ESTABLISHED:2074: U__s_[S2:0][package]libmal-0.31-270.i586
+>!> ESTABLISHED:2075: U__s_[S2:0][package]libmcal-0.7-190.i586
+>!> ESTABLISHED:2076: U__s_[S2:0][package]libmcrypt-2.5.8-26.i586
+>!> ESTABLISHED:2077: I__s_[S1:0][package]libmikmod-3.1.11a-24.i586
+>!> ESTABLISHED:2078: U__s_[S2:0][package]libmikmod-3.1.11a-31.i586
+>!> ESTABLISHED:2079: U__s_[S2:0][package]libmikmod-devel-3.1.11a-31.i586
+>!> ESTABLISHED:2080: U__s_[S2:0][package]libmm14-1.4.2-15.i586
+>!> ESTABLISHED:2081: U__s_[S2:0][package]libmng-1.0.10-11.i586
+>!> ESTABLISHED:2082: I__s_[S1:0][package]libmng-1.0.10-5.i586
+>!> ESTABLISHED:2083: U__s_[S2:0][package]libmng-devel-1.0.10-11.i586
+>!> ESTABLISHED:2084: I__s_[S1:0][package]libmpcdec5-1.2.6-3.i586
+>!> ESTABLISHED:2085: U__s_[S2:0][package]libmpcdec5-1.2.6-5.i586
+>!> ESTABLISHED:2086: U__s_[S2:0][package]libmspack-0.0.20060920alpha-48.i586
+>!> ESTABLISHED:2087: U__s_[S2:0][package]libmsrpc-3.0.25c-3.i586
+>!> ESTABLISHED:2088: I__s_[S1:0][package]libmtp-0.2.0-2.i586
+>!> ESTABLISHED:2089: U__s_[S2:0][package]libmtp-0.2.1-7.i586
+>!> ESTABLISHED:2090: U__s_[S2:0][package]libmudflap42-4.2.1_20070724-12.i586
+>!> ESTABLISHED:2091: U__s_[S2:0][package]libmusicbrainz-devel-2.1.5-3.i586
+>!> ESTABLISHED:2092: I__s_[S1:0][package]libmusicbrainz4-2.1.5-3.i586
+>!> ESTABLISHED:2093: U__s_[S2:0][package]libmusicbrainz4-2.1.5-3.i586
+>!> ESTABLISHED:2094: U__s_[S2:0][package]libmysqlclient15-5.0.45-15.i586
+>!> ESTABLISHED:2095: U__s_[S2:0][package]libmysqlclient_r15-5.0.45-15.i586
+>!> ESTABLISHED:2096: U__s_[S2:0][package]libnet-1.1.2.1-77.i586
+>!> ESTABLISHED:2097: I__s_[S1:0][package]libnetpbm-1.0.0-709.i586
+>!> ESTABLISHED:2098: U__s_[S2:0][package]libnetpbm10-10.26.44-7.i586
+>!> ESTABLISHED:2099: I__s_[S1:0][package]libnjb-2.2.5-85.i586
+>!> ESTABLISHED:2100: U__s_[S2:0][package]libnjb-2.2.5-95.i586
+>!> ESTABLISHED:2101: I__s_[S1:0][package]libnl-1.0-68.i586
+>!> ESTABLISHED:2102: U__s_[S2:0][package]libnl-1.0-78.i586
+>!> ESTABLISHED:2103: U__s_[S2:0][package]libnotify-0.4.4-51.i586
+>!> ESTABLISHED:2104: U__s_[S2:0][package]libnotify-devel-0.4.4-51.i586
+>!> ESTABLISHED:2105: I__s_[S1:0][package]libnscd-2.0.2-34.i586
+>!> ESTABLISHED:2106: U__s_[S2:0][package]libnscd-2.0.2-40.i586
+>!> ESTABLISHED:2107: U__s_[S2:0][package]libnscd-devel-2.0.2-40.i586
+>!> ESTABLISHED:2108: U__s_[S2:0][package]libnvtv-0.4.7a-116.i586
+>!> ESTABLISHED:2109: I__s_[S1:0][package]libofa-0.9.3-48.i586
+>!> ESTABLISHED:2110: U__s_[S2:0][package]libofa-0.9.3-55.i586
+>!> ESTABLISHED:2111: U__s_[S2:0][package]libofx-0.8.2-83.i586
+>!> ESTABLISHED:2112: U__s_[S2:0][package]libofx-devel-0.8.2-83.i586
+>!> ESTABLISHED:2113: I__s_[S1:0][package]libogg-1.1.3-65.i586
+>!> ESTABLISHED:2114: U__s_[S2:0][package]libogg-1.1.3-71.i586
+>!> ESTABLISHED:2115: U__s_[S2:0][package]libogg-devel-1.1.3-71.i586
+>!> ESTABLISHED:2116: U__s_[S2:0][package]liboggz-0.9.5-56.i586
+>!> ESTABLISHED:2117: I__s_[S1:0][package]liboil-0.3.9-55.i586
+>!> ESTABLISHED:2118: U__s_[S2:0][package]liboil-0.3.9-63.i586
+>!> ESTABLISHED:2119: U__s_[S2:0][package]liboil-devel-0.3.9-63.i586
+>!> ESTABLISHED:2120: I__s_[S1:0][package]libopencdk-0.5.11-31.i586
+>!> ESTABLISHED:2121: U__s_[S2:0][package]libopencdk-0.5.11-37.i586
+>!> ESTABLISHED:2122: U__s_[S2:0][package]libopencdk-devel-0.5.11-37.i586
+>!> ESTABLISHED:2123: I__s_[S1:0][package]libopenct1-0.6.12-6.i586
+>!> ESTABLISHED:2124: U__s_[S2:0][package]libopenct1-0.6.13-4.i586
+>!> ESTABLISHED:2125: U__s_[S2:0][package]libopensc2-0.11.3-13.i586
+>!> ESTABLISHED:2126: I__s_[S1:0][package]libopensc2-0.11.3-5.i586
+>!> ESTABLISHED:2127: U__s_[S2:0][package]libopenssl-devel-0.9.8e-40.i586
+>!> ESTABLISHED:2128: I__s_[S1:0][package]libopenssl0_9_8-0.9.8e-33.i586
+>!> ESTABLISHED:2129: U__s_[S2:0][package]libopenssl0_9_8-0.9.8e-40.i586
+>!> ESTABLISHED:2130: U__s_[S2:0][package]libopensync-0.22-44.i586
+>!> ESTABLISHED:2131: U__s_[S2:0][package]libopensync-devel-0.22-44.i586
+>!> ESTABLISHED:2132: U__s_[S2:0][package]libopensync-plugin-evolution2-0.22-56.i586
+>!> ESTABLISHED:2133: U__s_[S2:0][package]libopensync-plugin-file-0.22-42.i586
+>!> ESTABLISHED:2134: U__s_[S2:0][package]libopensync-plugin-gnokii-0.22-48.i586
+>!> ESTABLISHED:2135: U__s_[S2:0][package]libopensync-plugin-google-calendar-0.22-42.i586
+>!> ESTABLISHED:2136: U__s_[S2:0][package]libopensync-plugin-irmc-0.22-46.i586
+>!> ESTABLISHED:2137: U__s_[S2:0][package]libopensync-plugin-kdepim-0.22-63.i586
+>!> ESTABLISHED:2138: U__s_[S2:0][package]libopensync-plugin-moto-0.22-46.i586
+>!> ESTABLISHED:2139: U__s_[S2:0][package]libopensync-plugin-opie-0.22-42.i586
+>!> ESTABLISHED:2140: U__s_[S2:0][package]libopensync-plugin-palm-0.22-52.i586
+>!> ESTABLISHED:2141: U__s_[S2:0][package]libopensync-plugin-python-module-0.22-43.i586
+>!> ESTABLISHED:2142: U__s_[S2:0][package]libopensync-plugin-syncml-0.22-47.i586
+>!> ESTABLISHED:2143: U__s_[S2:0][package]libopensync-tools-0.22-44.i586
+>!> ESTABLISHED:2144: I__s_[S1:0][package]libopensync1-0.32-3.i586
+>!> ESTABLISHED:2145: U__s_[S2:0][package]libosip2-2.2.0-98.i586
+>!> ESTABLISHED:2146: U__s_[S2:0][package]libotf-0.9.6-9.i586
+>!> ESTABLISHED:2147: U__s_[S2:0][package]libotf-devel-0.9.6-9.i586
+>!> ESTABLISHED:2148: U__s_[S2:0][package]libotr-3.0.0-73.i586
+>!> ESTABLISHED:2149: U__s_[S2:0][package]libpcap-0.9.7-10.i586
+>!> ESTABLISHED:2150: I__s_[S1:0][package]libpcap-0.9.7-4.i586
+>!> ESTABLISHED:2151: U__s_[S2:0][package]libpisock-devel-0.12.2-20.i586
+>!> ESTABLISHED:2152: I__s_[S1:0][package]libpisock9-0.12.2-10.i586
+>!> ESTABLISHED:2153: U__s_[S2:0][package]libpisock9-0.12.2-20.i586
+>!> ESTABLISHED:2154: U__s_[S2:0][package]libpisync0-0.12.2-20.i586
+>!> ESTABLISHED:2155: U__s_[S2:0][package]libpng-1.2.18-12.i586
+>!> ESTABLISHED:2156: I__s_[S1:0][package]libpng-1.2.18-6.i586
+>!> ESTABLISHED:2157: U__s_[S2:0][package]libpng-devel-1.2.18-12.i586
+>!> ESTABLISHED:2158: U__s_[S2:0][package]libpqxx-2.6.9-10.i586
+>!> ESTABLISHED:2159: U__s_[S2:0][package]libpurple-2.1.0-22.i586
+>!> ESTABLISHED:2160: U__s_[S2:0][package]libpurple-devel-2.1.0-22.i586
+>!> ESTABLISHED:2161: I__s_[S1:0][package]libqt4-4.3.0-25.i586
+>!> ESTABLISHED:2162: U__s_[S2:0][package]libqt4-4.3.1-13.i586
+>!> ESTABLISHED:2163: I__s_[S1:0][package]libqt4-dbus-1-4.3.0-25.i586
+>!> ESTABLISHED:2164: U__s_[S2:0][package]libqt4-dbus-1-4.3.1-13.i586
+>!> ESTABLISHED:2165: U__s_[S2:0][package]libqt4-devel-4.3.1-13.i586
+>!> ESTABLISHED:2166: U__s_[S2:0][package]libqt4-devel-doc-4.3.1-13.i586
+>!> ESTABLISHED:2167: U__s_[S2:0][package]libqt4-devel-doc-data-4.3.1-13.noarch
+>!> ESTABLISHED:2168: I__s_[S1:0][package]libqt4-qt3support-4.3.0-25.i586
+>!> ESTABLISHED:2169: U__s_[S2:0][package]libqt4-qt3support-4.3.1-13.i586
+>!> ESTABLISHED:2170: I__s_[S1:0][package]libqt4-sql-4.3.0-25.i586
+>!> ESTABLISHED:2171: U__s_[S2:0][package]libqt4-sql-4.3.1-13.i586
+>!> ESTABLISHED:2172: U__s_[S2:0][package]libqt4-sql-mysql-4.3.1-6.i586
+>!> ESTABLISHED:2173: U__s_[S2:0][package]libqt4-sql-postgresql-4.3.1-6.i586
+>!> ESTABLISHED:2174: U__s_[S2:0][package]libqt4-sql-sqlite-4.3.1-6.i586
+>!> ESTABLISHED:2175: U__s_[S2:0][package]libqt4-sql-unixODBC-4.3.1-6.i586
+>!> ESTABLISHED:2176: I__s_[S1:0][package]libqt4-x11-4.3.0-25.i586
+>!> ESTABLISHED:2177: U__s_[S2:0][package]libqt4-x11-4.3.1-13.i586
+>!> ESTABLISHED:2178: I__s_[S1:0][package]libqtpod-0.3-69.i586
+>!> ESTABLISHED:2179: U__s_[S2:0][package]libqtpod-0.3-78.i586
+>!> ESTABLISHED:2180: U__s_[S2:0][package]libquicktime-1.0.0-45.i586
+>!> ESTABLISHED:2181: U__s_[S2:0][package]libquicktime-devel-1.0.0-45.i586
+>!> ESTABLISHED:2182: U__s_[S2:0][package]libraptor1-1.4.15-35.i586
+>!> ESTABLISHED:2183: U__s_[S2:0][package]libraw1394-1.2.1-61.i586
+>!> ESTABLISHED:2184: U__s_[S2:0][package]libraw1394-8-1.2.1-61.i586
+>!> ESTABLISHED:2185: U__s_[S2:0][package]libraw1394-devel-1.2.1-61.i586
+>!> ESTABLISHED:2186: U__s_[S2:0][package]libreadline5-5.2-15.i586
+>!> ESTABLISHED:2187: I__s_[S1:0][package]libreadline5-5.2-5.i586
+>!> ESTABLISHED:2188: U__s_[S2:0][package]libreiserfs-0.3.0.5-73.i586
+>!> ESTABLISHED:2189: I__s_[S1:0][package]librpcsecgss-0.14-60.i586
+>!> ESTABLISHED:2190: U__s_[S2:0][package]librpcsecgss-0.14-66.i586
+>!> ESTABLISHED:2191: U__s_[S2:0][package]librsaref2-2.0-15.i586
+>!> ESTABLISHED:2192: I__s_[S1:0][package]librsvg-2.18.0-3.i586
+>!> ESTABLISHED:2193: U__s_[S2:0][package]librsvg-2.18.1-2.i586
+>!> ESTABLISHED:2194: U__s_[S2:0][package]librsvg-devel-2.18.1-2.i586
+>!> ESTABLISHED:2195: I__s_[S1:0][package]libsamplerate-0.1.2-67.i586
+>!> ESTABLISHED:2196: U__s_[S2:0][package]libsamplerate-0.1.2-73.i586
+>!> ESTABLISHED:2197: U__s_[S2:0][package]libsap-1.51.1-591.i586
+>!> ESTABLISHED:2198: U__s_[S2:0][package]libsexy-0.1.11-47.i586
+>!> ESTABLISHED:2199: U__s_[S2:0][package]libshout-2.2.2-85.i586
+>!> ESTABLISHED:2200: U__s_[S2:0][package]libsidplay-2.1.1-74.i586
+>!> ESTABLISHED:2201: U__s_[S2:0][package]libsidplay1-1.36.59-69.i586
+>!> ESTABLISHED:2202: U__s_[S2:0][package]libsigc++12-1.2.7-76.i586
+>!> ESTABLISHED:2203: U__s_[S2:0][package]libsigc++12-devel-1.2.7-76.i586
+>!> ESTABLISHED:2204: U__s_[S2:0][package]libsigc++2-2.0.17-74.i586
+>!> ESTABLISHED:2205: U__s_[S2:0][package]libsigc++2-devel-2.0.17-74.i586
+>!> ESTABLISHED:2206: I__s_[S1:0][package]libsmbclient-3.0.25b-13.i586
+>!> ESTABLISHED:2207: U__s_[S2:0][package]libsmbclient-3.0.25c-3.i586
+>!> ESTABLISHED:2208: U__s_[S2:0][package]libsmbclient-devel-3.0.25c-3.i586
+>!> ESTABLISHED:2209: I__s_[S1:0][package]libsmbios-libs-0.13.6-2.i586
+>!> ESTABLISHED:2210: U__s_[S2:0][package]libsmbios-libs-0.13.6-2.i586
+>!> ESTABLISHED:2211: U__s_[S2:0][package]libsmbsharemodes-3.0.25c-3.i586
+>!> ESTABLISHED:2212: U__s_[S2:0][package]libsmbsharemodes-devel-3.0.25c-3.i586
+>!> ESTABLISHED:2213: I__s_[S1:0][package]libsndfile-1.0.17-68.i586
+>!> ESTABLISHED:2214: U__s_[S2:0][package]libsndfile-1.0.17-75.i586
+>!> ESTABLISHED:2215: U__s_[S2:0][package]libsndfile-progs-1.0.17-75.i586
+>!> ESTABLISHED:2216: U__s_[S2:0][package]libsnmp15-5.4.1-11.i586
+>!> ESTABLISHED:2217: I__s_[S1:0][package]libsnmp15-5.4.1-2.i586
+>!> ESTABLISHED:2218: I__s_[S1:0][package]libsoprano3-0.9.0-20.i586
+>!> ESTABLISHED:2219: U__s_[S2:0][package]libsoprano3-0.9.0-31.i586
+>!> ESTABLISHED:2220: U__s_[S2:0][package]libsoup-2.2.100-41.i586
+>!> ESTABLISHED:2221: U__s_[S2:0][package]libsoup-devel-2.2.100-41.i586
+>!> ESTABLISHED:2222: I__s_[S1:0][package]libspeex-1.1.99.2-16.i586
+>!> ESTABLISHED:2223: U__s_[S2:0][package]libspeex-1.1.99.2-23.i586
+>!> ESTABLISHED:2224: U__s_[S2:0][package]libssui-0.5.7-12.i586
+>!> ESTABLISHED:2225: U__s_[S2:0][package]libstdc++-devel-4.2-21.i586
+>!> ESTABLISHED:2226: U__s_[S2:0][package]libstdc++42-4.2.1_20070724-12.i586
+>!> ESTABLISHED:2227: I__s_[S1:0][package]libstdc++42-4.2.1_20070724-4.i586
+>!> ESTABLISHED:2228: U__s_[S2:0][package]libstdc++42-devel-4.2.1_20070724-12.i586
+>!> ESTABLISHED:2229: I__s_[S1:0][package]libstroke-0.5.1-88.i586
+>!> ESTABLISHED:2230: U__s_[S2:0][package]libstroke-0.5.1-99.i586
+>!> ESTABLISHED:2231: U__s_[S2:0][package]libstroke-devel-0.5.1-99.i586
+>!> ESTABLISHED:2232: U__s_[S2:0][package]libsvg-0.1.4-74.i586
+>!> ESTABLISHED:2233: U__s_[S2:0][package]libsvg-cairo-0.1.6-93.i586
+>!> ESTABLISHED:2234: U__s_[S2:0][package]libsyncml-tools-0.4.4-38.i586
+>!> ESTABLISHED:2235: U__s_[S2:0][package]libsyncml0-0.4.4-38.i586
+>!> ESTABLISHED:2236: U__s_[S2:0][package]libtabe-0.2.6-500.i586
+>!> ESTABLISHED:2237: U__s_[S2:0][package]libtabe-devel-0.2.6-500.i586
+>!> ESTABLISHED:2238: I__s_[S1:0][package]libtheora-0.99.0.7-40.i586
+>!> ESTABLISHED:2239: U__s_[S2:0][package]libtheora0-0.99.0.7-44.i586
+>!> ESTABLISHED:2240: U__s_[S2:0][package]libthinkfinger-0.3-2.i586
+>!> ESTABLISHED:2241: U__s_[S2:0][package]libtidy-1.0-48.i586
+>!> ESTABLISHED:2242: U__s_[S2:0][package]libtiff-devel-3.8.2-65.i586
+>!> ESTABLISHED:2243: I__s_[S1:0][package]libtiff3-3.8.2-59.i586
+>!> ESTABLISHED:2244: U__s_[S2:0][package]libtiff3-3.8.2-65.i586
+>!> ESTABLISHED:2245: U__s_[S2:0][package]libtomoe-gtk-0.5.1-17.i586
+>!> ESTABLISHED:2246: U__s_[S2:0][package]libtool-1.5.24-14.i586
+>!> ESTABLISHED:2247: U__s_[S2:0][package]libtunepimp-0.5.3-14.i586
+>!> ESTABLISHED:2248: I__s_[S1:0][package]libtunepimp-0.5.3-6.i586
+>!> ESTABLISHED:2249: U__s_[S2:0][package]libtunepimp5-0.5.3-14.i586
+>!> ESTABLISHED:2250: I__s_[S1:0][package]libtunepimp5-0.5.3-6.i586
+>!> ESTABLISHED:2251: U__s_[S2:0][package]libudf0-0.78.2-4.i586
+>!> ESTABLISHED:2252: U__s_[S2:0][package]libunwind-0.98.5-75.i586
+>!> ESTABLISHED:2253: U__s_[S2:0][package]libunwind-devel-0.98.5-75.i586
+>!> ESTABLISHED:2254: I__s_[S1:0][package]libusb-0.1.12-63.i586
+>!> ESTABLISHED:2255: U__s_[S2:0][package]libusb-0.1.12-69.i586
+>!> ESTABLISHED:2256: U__s_[S2:0][package]libusb-devel-0.1.12-69.i586
+>!> ESTABLISHED:2257: U__s_[S2:0][package]libuuid-devel-1.40.2-15.i586
+>!> ESTABLISHED:2258: U__s_[S2:0][package]libuuid1-1.40.2-15.i586
+>!> ESTABLISHED:2259: I__s_[S1:0][package]libuuid1-1.40.2-9.i586
+>!> ESTABLISHED:2260: U__s_[S2:0][package]libvirt-0.3.0-21.i586
+>!> ESTABLISHED:2261: U__s_[S2:0][package]libvirt-python-0.3.0-21.i586
+>!> ESTABLISHED:2262: I__s_[S1:0][package]libvisual-0.4.0-71.i586
+>!> ESTABLISHED:2263: U__s_[S2:0][package]libvisual-0.4.0-79.i586
+>!> ESTABLISHED:2264: U__s_[S2:0][package]libvisual-devel-0.4.0-79.i586
+>!> ESTABLISHED:2265: U__s_[S2:0][package]libvisual-plugins-0.4.0-103.i586
+>!> ESTABLISHED:2266: U__s_[S2:0][package]libvolume_id-114-10.i586
+>!> ESTABLISHED:2267: I__s_[S1:0][package]libvolume_id-114-2.i586
+>!> ESTABLISHED:2268: I__s_[S1:0][package]libvorbis-1.2.0-2.i586
+>!> ESTABLISHED:2269: U__s_[S2:0][package]libvorbis-1.2.0-8.i586
+>!> ESTABLISHED:2270: U__s_[S2:0][package]libvorbis-devel-1.2.0-8.i586
+>!> ESTABLISHED:2271: U__s_[S2:0][package]libwavpack1-4.41.0-11.i586
+>!> ESTABLISHED:2272: I__s_[S1:0][package]libwavpack1-4.41.0-4.i586
+>!> ESTABLISHED:2273: U__s_[S2:0][package]libwbxml2-0-0.9.2_SVN48-26.i586
+>!> ESTABLISHED:2274: U__s_[S2:0][package]libwbxml2-devel-0.9.2_SVN48-26.i586
+>!> ESTABLISHED:2275: I__s_[S1:0][package]libwmf-0.2.8.4-75.i586
+>!> ESTABLISHED:2276: U__s_[S2:0][package]libwmf-0.2.8.4-84.i586
+>!> ESTABLISHED:2277: U__s_[S2:0][package]libwmf-devel-0.2.8.4-84.i586
+>!> ESTABLISHED:2278: U__s_[S2:0][package]libwmf-gnome-0.2.8.4-84.i586
+>!> ESTABLISHED:2279: U__s_[S2:0][package]libwnck-1-22-2.19.90-3.i586
+>!> ESTABLISHED:2280: U__s_[S2:0][package]libwnck-2.19.90-3.i586
+>!> ESTABLISHED:2281: U__s_[S2:0][package]libwnck-devel-2.19.90-3.i586
+>!> ESTABLISHED:2282: U__s_[S2:0][package]libwpd-0.8.10-26.i586
+>!> ESTABLISHED:2283: U__s_[S2:0][package]libwpd-devel-0.8.10-26.i586
+>!> ESTABLISHED:2284: U__s_[S2:0][package]libwpd-tools-0.8.10-26.i586
+>!> ESTABLISHED:2285: I__s_[S1:0][package]libx86-0.99-27.i586
+>!> ESTABLISHED:2286: U__s_[S2:0][package]libx86-0.99-33.i586
+>!> ESTABLISHED:2287: I__s_[S1:0][package]libxcrypt-2.4-62.i586
+>!> ESTABLISHED:2288: U__s_[S2:0][package]libxcrypt-2.4-68.i586
+>!> ESTABLISHED:2289: U__s_[S2:0][package]libxcrypt-devel-2.4-68.i586
+>!> ESTABLISHED:2290: U__s_[S2:0][package]libxfce4mcs-4.4.1-42.i586
+>!> ESTABLISHED:2291: U__s_[S2:0][package]libxfce4util-4.4.1-35.i586
+>!> ESTABLISHED:2292: U__s_[S2:0][package]libxfcegui4-4.4.1-47.i586
+>!> ESTABLISHED:2293: U__s_[S2:0][package]libxklavier-3.2-17.i586
+>!> ESTABLISHED:2294: U__s_[S2:0][package]libxklavier-devel-3.2-17.i586
+>!> ESTABLISHED:2295: U__s_[S2:0][package]libxml++-2.18.0-47.i586
+>!> ESTABLISHED:2296: U__s_[S2:0][package]libxml-1.8.17-447.i586
+>!> ESTABLISHED:2297: U__s_[S2:0][package]libxml2-2.6.29-17.i586
+>!> ESTABLISHED:2298: I__s_[S1:0][package]libxml2-2.6.29-8.i586
+>!> ESTABLISHED:2299: U__s_[S2:0][package]libxml2-devel-2.6.29-17.i586
+>!> ESTABLISHED:2300: U__s_[S2:0][package]libxml2-python-2.6.29-22.i586
+>!> ESTABLISHED:2301: I__s_[S1:0][package]libxslt-1.1.20-29.i586
+>!> ESTABLISHED:2302: U__s_[S2:0][package]libxslt-1.1.20-37.i586
+>!> ESTABLISHED:2303: U__s_[S2:0][package]libxslt-devel-1.1.20-37.i586
+>!> ESTABLISHED:2304: I__s_[S1:0][package]liby2util-2.14.0-52.i586
+>!> ESTABLISHED:2305: U__s_[S2:0][package]liby2util-2.14.0-60.i586
+>!> ESTABLISHED:2306: U__s_[S2:0][package]liby2util-devel-2.14.0-60.i586
+>!> ESTABLISHED:2307: U__s_[S2:0][package]libyaz-3.0.6-18.i586
+>!> ESTABLISHED:2308: I__s_[S1:0][package]libzio-0.4-34.i586
+>!> ESTABLISHED:2309: U__s_[S2:0][package]libzio-0.4-40.i586
+>!> ESTABLISHED:2310: U__s_[S2:0][package]libzrtpcpp-0.9.0-37.i586
+>!> ESTABLISHED:2311: I__s_[S1:0][package]libzypp-3.14.0-4.i586
+>!> ESTABLISHED:2312: U__s_[S2:0][package]libzypp-3.22.1-3.i586
+>!> ESTABLISHED:2313: U__s_[S2:0][package]libzypp-devel-3.22.1-3.i586
+>!> ESTABLISHED:2314: I__s_[S1:0][package]licenses-20070130-34.noarch
+>!> ESTABLISHED:2315: U__s_[S2:0][package]licenses-20070810-9.noarch
+>!> ESTABLISHED:2316: U__s_[S2:0][package]liferea-1.2.20-17.i586
+>!> ESTABLISHED:2317: I__s_[S1:0][package]lilo-22.7-101.i586
+>!> ESTABLISHED:2318: U__s_[S2:0][package]lilo-22.7-111.i586
+>!> ESTABLISHED:2319: U__s_[S2:0][package]lilo-doc-22.7-111.i586
+>!> ESTABLISHED:2320: U__s_[S2:0][package]lilypond-2.10.29-14.i586
+>!> ESTABLISHED:2321: U__s_[S2:0][package]lilypond-documentation-2.10.29-14.i586
+>!> ESTABLISHED:2322: I__s_[S1:0][package]limal-1.3.0-9.i586
+>!> ESTABLISHED:2323: U__s_[S2:0][package]limal-1.3.1-6.i586
+>!> ESTABLISHED:2324: U__s_[S2:0][package]limal-ca-mgm-1.3.1-7.i586
+>!> ESTABLISHED:2325: U__s_[S2:0][package]limal-ca-mgm-perl-1.3.1-7.i586
+>!> ESTABLISHED:2326: U__s_[S2:0][package]limal-nfs-server-1.3.1-6.i586
+>!> ESTABLISHED:2327: U__s_[S2:0][package]limal-nfs-server-perl-1.3.1-6.i586
+>!> ESTABLISHED:2328: I__s_[S1:0][package]limal-perl-1.3.0-9.i586
+>!> ESTABLISHED:2329: U__s_[S2:0][package]limal-perl-1.3.1-6.i586
+>!> ESTABLISHED:2330: U__s_[S2:0][package]lincity-1.12.0-161.i586
+>!> ESTABLISHED:2331: U__s_[S2:0][package]lineak_defaultplugin-0.9-90.i586
+>!> ESTABLISHED:2332: U__s_[S2:0][package]lineak_kde-0.9-102.i586
+>!> ESTABLISHED:2333: U__s_[S2:0][package]lineak_xosdplugin-0.9-99.i586
+>!> ESTABLISHED:2334: U__s_[S2:0][package]lineakd-0.9-89.i586
+>!> ESTABLISHED:2335: U__s_[S2:0][package]links-2.1pre30-6.i586
+>!> ESTABLISHED:2336: U__s_[S2:0][package]linphone-1.3.0-114.i586
+>!> ESTABLISHED:2337: U__s_[S2:0][package]linphone-applet-1.3.0-114.i586
+>!> ESTABLISHED:2338: I__s_[S1:0][package]linux-atm-lib-2.5.0-64.i586
+>!> ESTABLISHED:2339: U__s_[S2:0][package]linux-atm-lib-2.5.0-70.i586
+>!> ESTABLISHED:2340: U__s_[S2:0][package]linux-kernel-headers-2.6.22-15.noarch
+>!> ESTABLISHED:2341: U__s_[S2:0][package]lirc-0.8.2-8.i586
+>!> ESTABLISHED:2342: U__s_[S2:0][package]lirc-kmp-bigsmp-0.8.2_2.6.22.5_10-2.i586
+>!> ESTABLISHED:2343: U__s_[S2:0][package]lirc-kmp-default-0.8.2_2.6.22.5_10-2.i586
+>!> ESTABLISHED:2344: U__s_[S2:0][package]lirc-kmp-xen-0.8.2_2.6.22.5_10-2.i586
+>!> ESTABLISHED:2345: U__s_[S2:0][package]lirc-kmp-xenpae-0.8.2_2.6.22.5_10-2.i586
+>!> ESTABLISHED:2346: U__s_[S2:0][package]log4j-1.2.12-136.noarch
+>!> ESTABLISHED:2347: U__s_[S2:0][package]log4net-1.2.9-99.noarch
+>!> ESTABLISHED:2348: I__s_[S1:0][package]logrotate-3.7.4-53.i586
+>!> ESTABLISHED:2349: U__s_[S2:0][package]logrotate-3.7.5-6.i586
+>!> ESTABLISHED:2350: U__s_[S2:0][package]lomoco-1.0-10.i586
+>!> ESTABLISHED:2351: U__s_[S2:0][package]loudmouth-1.2.0-26.i586
+>!> ESTABLISHED:2352: U__s_[S2:0][package]loudmouth-devel-1.2.0-26.i586
+>!> ESTABLISHED:2353: U__s_[S2:0][package]loudmouth-doc-1.2.0-26.i586
+>!> ESTABLISHED:2354: U__s_[S2:0][package]lphdisk-0.9.1-364.i586
+>!> ESTABLISHED:2355: U__s_[S2:0][package]lsb-3.1-60.i586
+>!> ESTABLISHED:2356: U__s_[S2:0][package]lsof-4.78-8.i586
+>!> ESTABLISHED:2357: U__s_[S2:0][package]ltrace-0.4-72.i586
+>!> ESTABLISHED:2358: U__s_[S2:0][package]ltris-1.0.11-52.i586
+>!> ESTABLISHED:2359: U__s_[S2:0][package]ltxml-1.2.7-74.i586
+>!> ESTABLISHED:2360: U__s_[S2:0][package]lua-5.1.2-11.i586
+>!> ESTABLISHED:2361: U__s_[S2:0][package]lua-devel-5.1.2-11.i586
+>!> ESTABLISHED:2362: U__s_[S2:0][package]lua-libs-5.1.2-11.i586
+>!> ESTABLISHED:2363: U__s_[S2:0][package]lukemftp-1.5-657.i586
+>!> ESTABLISHED:2364: U__s_[S2:0][package]lv-4.51-59.i586
+>!> ESTABLISHED:2365: U__s_[S2:0][package]lvm2-2.02.25-25.i586
+>!> ESTABLISHED:2366: U__s_[S2:0][package]lynx-2.8.6-41.i586
+>!> ESTABLISHED:2367: I__s_[S1:0][package]lzo-2.02-65.i586
+>!> ESTABLISHED:2368: U__s_[S2:0][package]lzo-2.02-71.i586
+>!> ESTABLISHED:2369: U__s_[S2:0][package]lzo-devel-2.02-71.i586
+>!> ESTABLISHED:2370: U__s_[S2:0][package]m17n-db-1.4.0-7.noarch
+>!> ESTABLISHED:2371: U__s_[S2:0][package]m17n-lib-1.4.0-16.i586
+>!> ESTABLISHED:2372: U__s_[S2:0][package]m17n-lib-devel-1.4.0-16.i586
+>!> ESTABLISHED:2373: U__s_[S2:0][package]m4-1.4.10-14.i586
+>!> ESTABLISHED:2374: U__s_[S2:0][package]madbomber-0.2.5-378.i586
+>!> ESTABLISHED:2375: U__s_[S2:0][package]mailman-2.1.9-82.i586
+>!> ESTABLISHED:2376: I__s_[S1:0][package]mailx-12.2-31.i586
+>!> ESTABLISHED:2377: U__s_[S2:0][package]mailx-12.2-39.i586
+>!> ESTABLISHED:2378: U__s_[S2:0][package]make-3.81-62.i586
+>!> ESTABLISHED:2379: U__s_[S2:0][package]makedev-2.6-476.noarch
+>!> ESTABLISHED:2380: U__s_[S2:0][package]makedumpfile-1.1.6-6.i586
+>!> ESTABLISHED:2381: U__s_[S2:0][package]makewhat-2006.1.25-67.i586
+>!> ESTABLISHED:2382: U__s_[S2:0][package]man-2.4.3-81.i586
+>!> ESTABLISHED:2383: U__s_[S2:0][package]man-pages-2.64-7.noarch
+>!> ESTABLISHED:2384: U__s_[S2:0][package]man-pages-cs-0.17.20070715-4.noarch
+>!> ESTABLISHED:2385: U__s_[S2:0][package]man-pages-de-0.5-16.noarch
+>!> ESTABLISHED:2386: U__s_[S2:0][package]man-pages-es-1.55-58.noarch
+>!> ESTABLISHED:2387: U__s_[S2:0][package]man-pages-fr-1.58.1-69.noarch
+>!> ESTABLISHED:2388: U__s_[S2:0][package]man-pages-it-0.3.0-610.noarch
+>!> ESTABLISHED:2389: U__s_[S2:0][package]man-pages-ja-20070615-24.noarch
+>!> ESTABLISHED:2390: U__s_[S2:0][package]man-pages-pl-2007.7.5-14.noarch
+>!> ESTABLISHED:2391: U__s_[S2:0][package]man-pages-ru-0.98-15.noarch
+>!> ESTABLISHED:2392: U__s_[S2:0][package]man-pages-zh_CN-1.5-9.noarch
+>!> ESTABLISHED:2393: U__s_[S2:0][package]manufacturer-PPDs-10.2-92.noarch
+>!> ESTABLISHED:2394: I__s_[S1:0][package]master-boot-code-1.14-15.i586
+>!> ESTABLISHED:2395: U__s_[S2:0][package]master-boot-code-1.14-21.i586
+>!> ESTABLISHED:2396: U__s_[S2:0][package]mc-4.6.1-131.i586
+>!> ESTABLISHED:2397: U__s_[S2:0][package]mcpp-2.6.4-15.i586
+>!> ESTABLISHED:2398: U__s_[S2:0][package]mdadm-2.6.2-13.i586
+>!> ESTABLISHED:2399: I__s_[S1:0][package]mdadm-2.6.2-7.i586
+>!> ESTABLISHED:2400: I__s_[S1:0][package]meanwhile-1.0.2-22.i586
+>!> ESTABLISHED:2401: U__s_[S2:0][package]meanwhile-1.0.2-30.i586
+>!> ESTABLISHED:2402: U__s_[S2:0][package]meanwhile-devel-1.0.2-30.i586
+>!> ESTABLISHED:2403: U__s_[S2:0][package]meanwhile-doc-1.0.2-30.i586
+>!> ESTABLISHED:2404: U__s_[S2:0][package]memtest86+-1.70-37.i586
+>!> ESTABLISHED:2405: U__s_[S2:0][package]mergeant-0.62-119.i586
+>!> ESTABLISHED:2406: U__s_[S2:0][package]metacity-2.19.55-3.i586
+>!> ESTABLISHED:2407: U__s_[S2:0][package]metacity-devel-2.19.55-3.i586
+>!> ESTABLISHED:2408: U__s_[S2:0][package]metacity-themes-0.1-604.noarch
+>!> ESTABLISHED:2409: U__s_[S2:0][package]metamail-2.7.19-1134.i586
+>!> ESTABLISHED:2410: U__s_[S2:0][package]meterbridge-0.9.2-339.i586
+>!> ESTABLISHED:2411: U__s_[S2:0][package]mgetty-1.1.35-63.i586
+>!> ESTABLISHED:2412: U__s_[S2:0][package]mgp-1.12a-14.i586
+>!> ESTABLISHED:2413: U__s_[S2:0][package]mhash-0.9.9-31.i586
+>!> ESTABLISHED:2414: I__s_[S1:0][package]microcode_ctl-1.17-22.i586
+>!> ESTABLISHED:2415: U__s_[S2:0][package]microcode_ctl-1.17-29.i586
+>!> ESTABLISHED:2416: U__s_[S2:0][package]mikachan-fonts-9.1.2006.08.09-72.noarch
+>!> ESTABLISHED:2417: U__s_[S2:0][package]mined-2000.14-14.i586
+>!> ESTABLISHED:2418: I__s_[S1:0][package]mingetty-1.0.7s-16.i586
+>!> ESTABLISHED:2419: U__s_[S2:0][package]mingetty-1.0.7s-22.i586
+>!> ESTABLISHED:2420: U__s_[S2:0][package]minicom-2.2-56.i586
+>!> ESTABLISHED:2421: U__s_[S2:0][package]mirror-2.9-822.i586
+>!> ESTABLISHED:2422: U__s_[S2:0][package]mjpegtools-1.9.0rc2-44.i586
+>!> ESTABLISHED:2423: U__s_[S2:0][package]mjpegtools-devel-1.9.0rc2-44.i586
+>!> ESTABLISHED:2424: I__s_[S1:0][package]mkinitrd-2.1-17.i586
+>!> ESTABLISHED:2425: U__s_[S2:0][package]mkinitrd-2.1-28.i586
+>!> ESTABLISHED:2426: I__s_[S1:0][package]mktemp-1.5-795.i586
+>!> ESTABLISHED:2427: U__s_[S2:0][package]mktemp-1.5-801.i586
+>!> ESTABLISHED:2428: U__s_[S2:0][package]mlterm-2.9.3.20070123-71.i586
+>!> ESTABLISHED:2429: U__s_[S2:0][package]mlterm-scim-2.9.3.20070123-71.i586
+>!> ESTABLISHED:2430: U__s_[S2:0][package]mlterm-uim-2.9.3.20070123-71.i586
+>!> ESTABLISHED:2431: U__s_[S2:0][package]mmv-1.01b-864.i586
+>!> ESTABLISHED:2432: I__s_[S1:0][package]module-init-tools-3.2.99.pre11-11.i586
+>!> ESTABLISHED:2433: U__s_[S2:0][package]module-init-tools-3.2.99.pre11-19.i586
+>!> ESTABLISHED:2434: U__s_[S2:0][package]mono-basic-1.2.5-10.noarch
+>!> ESTABLISHED:2435: U__s_[S2:0][package]mono-core-1.2.5-11.i586
+>!> ESTABLISHED:2436: U__s_[S2:0][package]mono-data-1.2.5-11.i586
+>!> ESTABLISHED:2437: U__s_[S2:0][package]mono-data-firebird-1.2.5-11.i586
+>!> ESTABLISHED:2438: U__s_[S2:0][package]mono-data-oracle-1.2.5-11.i586
+>!> ESTABLISHED:2439: U__s_[S2:0][package]mono-data-postgresql-1.2.5-11.i586
+>!> ESTABLISHED:2440: U__s_[S2:0][package]mono-data-sqlite-1.2.5-11.i586
+>!> ESTABLISHED:2441: U__s_[S2:0][package]mono-data-sybase-1.2.5-11.i586
+>!> ESTABLISHED:2442: U__s_[S2:0][package]mono-debugger-0.50-20.i586
+>!> ESTABLISHED:2443: U__s_[S2:0][package]mono-devel-1.2.5-11.i586
+>!> ESTABLISHED:2444: U__s_[S2:0][package]mono-extras-1.2.5-11.i586
+>!> ESTABLISHED:2445: U__s_[S2:0][package]mono-jscript-1.2.5-11.i586
+>!> ESTABLISHED:2446: U__s_[S2:0][package]mono-locale-extras-1.2.5-11.i586
+>!> ESTABLISHED:2447: U__s_[S2:0][package]mono-nunit-1.2.5-11.i586
+>!> ESTABLISHED:2448: U__s_[S2:0][package]mono-tools-1.2.4-32.noarch
+>!> ESTABLISHED:2449: U__s_[S2:0][package]mono-web-1.2.5-11.i586
+>!> ESTABLISHED:2450: U__s_[S2:0][package]mono-winforms-1.2.5-11.i586
+>!> ESTABLISHED:2451: U__s_[S2:0][package]monodevelop-0.15-18.noarch
+>!> ESTABLISHED:2452: U__s_[S2:0][package]monodoc-core-1.2.5-10.noarch
+>!> ESTABLISHED:2453: U__s_[S2:0][package]motv-3.95-90.i586
+>!> ESTABLISHED:2454: U__s_[S2:0][package]mousepad-0.2.12-56.i586
+>!> ESTABLISHED:2455: I__s_[S1:0][package]mozilla-nspr-4.6.7-11.i586
+>!> ESTABLISHED:2456: U__s_[S2:0][package]mozilla-nspr-4.6.7-17.i586
+>!> ESTABLISHED:2457: U__s_[S2:0][package]mozilla-nspr-devel-4.6.7-17.i586
+>!> ESTABLISHED:2458: I__s_[S1:0][package]mozilla-nss-3.11.7-3.i586
+>!> ESTABLISHED:2459: U__s_[S2:0][package]mozilla-nss-3.11.7-9.i586
+>!> ESTABLISHED:2460: U__s_[S2:0][package]mozilla-nss-devel-3.11.7-9.i586
+>!> ESTABLISHED:2461: U__s_[S2:0][package]mozilla-nss-tools-3.11.7-9.i586
+>!> ESTABLISHED:2462: U__s_[S2:0][package]mozilla-xulrunner181-1.8.1.4-19.i586
+>!> ESTABLISHED:2463: U__s_[S2:0][package]mozilla-xulrunner181-devel-1.8.1.4-19.i586
+>!> ESTABLISHED:2464: U__s_[S2:0][package]mpfr-2.2.1-42.i586
+>!> ESTABLISHED:2465: U__s_[S2:0][package]mpt-firmware-1.0-74.noarch
+>!> ESTABLISHED:2466: U__s_[S2:0][package]mpt-status-1.2.0-61.i586
+>!> ESTABLISHED:2467: U__s_[S2:0][package]mrtg-2.15.2-39.i586
+>!> ESTABLISHED:2468: U__s_[S2:0][package]msynctool-0.22-42.i586
+>!> ESTABLISHED:2469: U__s_[S2:0][package]mtools-3.9.11-30.i586
+>!> ESTABLISHED:2470: U__s_[S2:0][package]mtr-0.72-86.i586
+>!> ESTABLISHED:2471: U__s_[S2:0][package]multipath-tools-0.4.7-75.i586
+>!> ESTABLISHED:2472: U__s_[S2:0][package]multisync-gui-0.91.0-85.i586
+>!> ESTABLISHED:2473: U__s_[S2:0][package]muse-0.8.1-90.i586
+>!> ESTABLISHED:2474: U__s_[S2:0][package]musictex-T.99-936.i586
+>!> ESTABLISHED:2475: U__s_[S2:0][package]mutt-1.5.16-25.i586
+>!> ESTABLISHED:2476: U__s_[S2:0][package]mwavem-2.0-67.i586
+>!> ESTABLISHED:2477: U__s_[S2:0][package]mx4j-3.0.1-103.noarch
+>!> ESTABLISHED:2478: U__s_[S2:0][package]mxml-2.3-13.i586
+>!> ESTABLISHED:2479: U__s_[S2:0][package]myldapklient-0.6.6-424.i586
+>!> ESTABLISHED:2480: U__s_[S2:0][package]myspell-american-20060207-10.noarch
+>!> ESTABLISHED:2481: I__s_[S1:0][package]myspell-american-20060207-3.noarch
+>!> ESTABLISHED:2482: U__s_[S2:0][package]myspell-brazilian-20070606-10.noarch
+>!> ESTABLISHED:2483: U__s_[S2:0][package]myspell-british-20050526-82.noarch
+>!> ESTABLISHED:2484: U__s_[S2:0][package]myspell-czech-20060303-10.noarch
+>!> ESTABLISHED:2485: U__s_[S2:0][package]myspell-danish-20061018-10.noarch
+>!> ESTABLISHED:2486: U__s_[S2:0][package]myspell-dutch-20070603-10.noarch
+>!> ESTABLISHED:2487: U__s_[S2:0][package]myspell-french-20060914-50.noarch
+>!> ESTABLISHED:2488: U__s_[S2:0][package]myspell-german-old-20030428-178.noarch
+>!> ESTABLISHED:2489: U__s_[S2:0][package]myspell-hungarian-1.2-10.noarch
+>!> ESTABLISHED:2490: U__s_[S2:0][package]myspell-italian-20050711-82.noarch
+>!> ESTABLISHED:2491: U__s_[S2:0][package]myspell-norsk-bokmaal-20060428-50.noarch
+>!> ESTABLISHED:2492: U__s_[S2:0][package]myspell-polish-20061202-10.noarch
+>!> ESTABLISHED:2493: U__s_[S2:0][package]myspell-portuguese-20020629-303.noarch
+>!> ESTABLISHED:2494: U__s_[S2:0][package]myspell-russian-20040406-88.noarch
+>!> ESTABLISHED:2495: U__s_[S2:0][package]myspell-spanish-20051029-80.noarch
+>!> ESTABLISHED:2496: U__s_[S2:0][package]myspell-swedish-20061207-31.noarch
+>!> ESTABLISHED:2497: U__s_[S2:0][package]mysql-5.0.45-15.i586
+>!> ESTABLISHED:2498: U__s_[S2:0][package]mysql-client-5.0.45-15.i586
+>!> ESTABLISHED:2499: U__s_[S2:0][package]nagios-2.9-40.i586
+>!> ESTABLISHED:2500: U__s_[S2:0][package]namazu-2.0.16-36.i586
+>!> ESTABLISHED:2501: U__s_[S2:0][package]namazu-cgi-2.0.16-36.i586
+>!> ESTABLISHED:2502: U__s_[S2:0][package]namazu-devel-2.0.16-36.i586
+>!> ESTABLISHED:2503: U__s_[S2:0][package]nano-2.0.6-26.i586
+>!> ESTABLISHED:2504: U__s_[S2:0][package]nant-0.85.0-71.noarch
+>!> ESTABLISHED:2505: U__s_[S2:0][package]nautilus-2.19.91-2.i586
+>!> ESTABLISHED:2506: U__s_[S2:0][package]nautilus-cd-burner-2.19.6-17.i586
+>!> ESTABLISHED:2507: U__s_[S2:0][package]nautilus-cd-burner-devel-2.19.6-17.i586
+>!> ESTABLISHED:2508: U__s_[S2:0][package]nautilus-devel-2.19.91-2.i586
+>!> ESTABLISHED:2509: U__s_[S2:0][package]nautilus-open-terminal-0.7-107.i586
+>!> ESTABLISHED:2510: U__s_[S2:0][package]nautilus-sendto-0.10-37.i586
+>!> ESTABLISHED:2511: U__s_[S2:0][package]nautilus-share-0.7.0-109.i586
+>!> ESTABLISHED:2512: U__s_[S2:0][package]ncpfs-2.2.6-85.i586
+>!> ESTABLISHED:2513: I__s_[S1:0][package]ncurses-5.6-31.i586
+>!> ESTABLISHED:2514: U__s_[S2:0][package]ncurses-5.6-37.i586
+>!> ESTABLISHED:2515: U__s_[S2:0][package]ncurses-devel-5.6-37.i586
+>!> ESTABLISHED:2516: U__s_[S2:0][package]ndiswrapper-1.47-22.i586
+>!> ESTABLISHED:2517: U__s_[S2:0][package]ndiswrapper-kmp-bigsmp-1.47_2.6.22.5_10-22.i586
+>!> ESTABLISHED:2518: U__s_[S2:0][package]ndiswrapper-kmp-default-1.47_2.6.22.5_10-22.i586
+>!> ESTABLISHED:2519: U__s_[S2:0][package]ndiswrapper-kmp-xen-1.47_2.6.22.5_10-22.i586
+>!> ESTABLISHED:2520: U__s_[S2:0][package]neon-0.26.4-13.i586
+>!> ESTABLISHED:2521: I__s_[S1:0][package]neon-0.26.4-6.i586
+>!> ESTABLISHED:2522: U__s_[S2:0][package]neon-devel-0.26.4-13.i586
+>!> ESTABLISHED:2523: U__s_[S2:0][package]net-snmp-5.4.1-11.i586
+>!> ESTABLISHED:2524: I__s_[S1:0][package]net-tools-1.60-641.i586
+>!> ESTABLISHED:2525: U__s_[S2:0][package]net-tools-1.60-647.i586
+>!> ESTABLISHED:2526: U__s_[S2:0][package]netacct-0.71-567.i586
+>!> ESTABLISHED:2527: U__s_[S2:0][package]netatalk-2.0.3-119.i586
+>!> ESTABLISHED:2528: I__s_[S1:0][package]netcat-1.10-934.i586
+>!> ESTABLISHED:2529: U__s_[S2:0][package]netcat-1.10-940.i586
+>!> ESTABLISHED:2530: I__s_[S1:0][package]netcfg-10.3-30.noarch
+>!> ESTABLISHED:2531: U__s_[S2:0][package]netcfg-10.3-36.noarch
+>!> ESTABLISHED:2532: U__s_[S2:0][package]netdate-1.2-648.i586
+>!> ESTABLISHED:2533: U__s_[S2:0][package]netdiag-20060324-55.i586
+>!> ESTABLISHED:2534: I__s_[S1:0][package]netpbm-10.26.22-66.i586
+>!> ESTABLISHED:2535: U__s_[S2:0][package]netpbm-10.26.44-7.i586
+>!> ESTABLISHED:2536: U__s_[S2:0][package]neverball-1.4.0-113.i586
+>!> ESTABLISHED:2537: U__s_[S2:0][package]newt-0.52.7-25.i586
+>!> ESTABLISHED:2538: I__s_[S1:0][package]nfs-client-1.1.0-6.i586
+>!> ESTABLISHED:2539: U__s_[S2:0][package]nfs-client-1.1.0-6.i586
+>!> ESTABLISHED:2540: U__s_[S2:0][package]nfs-kernel-server-1.1.0-6.i586
+>!> ESTABLISHED:2541: U__s_[S2:0][package]nfsidmap-0.20-14.i586
+>!> ESTABLISHED:2542: I__s_[S1:0][package]nfsidmap-0.20-7.i586
+>!> ESTABLISHED:2543: U__s_[S2:0][package]nfsidmap-devel-0.20-14.i586
+>!> ESTABLISHED:2544: U__s_[S2:0][package]nh2ps-2.3.1-587.i586
+>!> ESTABLISHED:2545: U__s_[S2:0][package]nicolatter-1.7.8-94.i586
+>!> ESTABLISHED:2546: U__s_[S2:0][package]nkf-2.0.5-70.i586
+>!> ESTABLISHED:2547: U__s_[S2:0][package]nmap-4.20-52.i586
+>!> ESTABLISHED:2548: U__s_[S2:0][package]noteedit-2.8.1-88.i586
+>!> ESTABLISHED:2549: U__s_[S2:0][package]notification-daemon-0.3.7-56.i586
+>!> ESTABLISHED:2550: U__s_[S2:0][package]notification-daemon-xfce-0.3.7-35.i586
+>!> ESTABLISHED:2551: U__s_[S2:0][package]novfs-kmp-bigsmp-2.0.0_2.6.22.5_10-22.i586
+>!> ESTABLISHED:2552: U__s_[S2:0][package]novfs-kmp-default-2.0.0_2.6.22.5_10-22.i586
+>!> ESTABLISHED:2553: U__s_[S2:0][package]novfs-kmp-xen-2.0.0_2.6.22.5_10-22.i586
+>!> ESTABLISHED:2554: I__s_[S1:0][package]nscd-2.6-16.i586
+>!> ESTABLISHED:2555: U__s_[S2:0][package]nscd-2.6.1-12.i586
+>!> ESTABLISHED:2556: U__s_[S2:0][package]nspluginwrapper-0.9.91.4-49.i586
+>!> ESTABLISHED:2557: I__s_[S1:0][package]nss-mdns-0.9-30.i586
+>!> ESTABLISHED:2558: U__s_[S2:0][package]nss-mdns-0.9-36.i586
+>!> ESTABLISHED:2559: U__s_[S2:0][package]nss_ldap-257-10.i586
+>!> ESTABLISHED:2560: U__s_[S2:0][package]ntfs-3g-1.826-3.i586
+>!> ESTABLISHED:2561: I__s_[S1:0][package]ntfsprogs-1.13.1-39.i586
+>!> ESTABLISHED:2562: U__s_[S2:0][package]ntfsprogs-1.13.1-46.i586
+>!> ESTABLISHED:2563: U__s_[S2:0][package]ntfsprogs-fuse-1.13.1-46.i586
+>!> ESTABLISHED:2564: U__s_[S2:0][package]ntop-3.3-13.i586
+>!> ESTABLISHED:2565: I__s_[S1:0][package]numlockx-1.1-68.i586
+>!> ESTABLISHED:2566: U__s_[S2:0][package]numlockx-1.1-75.i586
+>!> ESTABLISHED:2567: U__s_[S2:0][package]nvtv-0.4.7-118.i586
+>!> ESTABLISHED:2568: U__s_[S2:0][package]nxml-mode-20041004-99.noarch
+>!> ESTABLISHED:2569: U__s_[S2:0][package]nxtvepg-2.7.7-8.i586
+>!> ESTABLISHED:2570: U__s_[S2:0][package]obconf-2.0.1-24.i586
+>!> ESTABLISHED:2571: I__s_[S1:0][package]obexftp-0.21-81.i586
+>!> ESTABLISHED:2572: U__s_[S2:0][package]obexftp-0.21-92.i586
+>!> ESTABLISHED:2573: U__s_[S2:0][package]ocfs2-tools-1.2.6-10.i586
+>!> ESTABLISHED:2574: U__s_[S2:0][package]ocfs2console-1.2.6-10.i586
+>!> ESTABLISHED:2575: I__s_[S1:0][package]ocrad-0.17-3.i586
+>!> ESTABLISHED:2576: U__s_[S2:0][package]ocrad-0.17-9.i586
+>!> ESTABLISHED:2577: U__s_[S2:0][package]oggztools-0.9.5-56.i586
+>!> ESTABLISHED:2578: U__s_[S2:0][package]omnibook-kmp-bigsmp-20070530_2.6.22.5_10-2.i586
+>!> ESTABLISHED:2579: U__s_[S2:0][package]omnibook-kmp-default-20070530_2.6.22.5_10-2.i586
+>!> ESTABLISHED:2580: U__s_[S2:0][package]omnibook-kmp-xen-20070530_2.6.22.5_10-2.i586
+>!> ESTABLISHED:2581: U__s_[S2:0][package]omnibook-kmp-xenpae-20070530_2.6.22.5_10-2.i586
+>!> ESTABLISHED:2582: U__s_[S2:0][package]opal-2.2.8-50.i586
+>!> ESTABLISHED:2583: U__s_[S2:0][package]open-iscsi-2.0.866-12.i586
+>!> ESTABLISHED:2584: I__s_[S1:0][package]openSUSE-release-10.3-51.i586
+>!> ESTABLISHED:2585: U__s_[S2:0][package]openSUSE-release-10.3-65.i586
+>!> ESTABLISHED:2586: U__s_[S2:0][package]openal-0.0.8-80.i586
+>!> ESTABLISHED:2587: U__s_[S2:0][package]openbox-3.4.2-24.i586
+>!> ESTABLISHED:2588: U__s_[S2:0][package]openclipart-0.18-71.noarch
+>!> ESTABLISHED:2589: I__s_[S1:0][package]openct-0.6.12-6.i586
+>!> ESTABLISHED:2590: U__s_[S2:0][package]openct-0.6.13-4.i586
+>!> ESTABLISHED:2591: U__s_[S2:0][package]openct-devel-0.6.13-4.i586
+>!> ESTABLISHED:2592: U__s_[S2:0][package]openh323-1.19.0.1-97.i586
+>!> ESTABLISHED:2593: U__s_[S2:0][package]openh323-devel-1.19.0.1-97.i586
+>!> ESTABLISHED:2594: U__s_[S2:0][package]openjade-1.3.2-281.i586
+>!> ESTABLISHED:2595: U__s_[S2:0][package]openldap2-2.3.35-12.i586
+>!> ESTABLISHED:2596: U__s_[S2:0][package]openldap2-client-2.3.37-13.i586
+>!> ESTABLISHED:2597: I__s_[S1:0][package]openldap2-client-2.3.37-5.i586
+>!> ESTABLISHED:2598: U__s_[S2:0][package]openldap2-devel-2.3.37-13.i586
+>!> ESTABLISHED:2599: U__s_[S2:0][package]openmotif-2.3.0-17.i586
+>!> ESTABLISHED:2600: U__s_[S2:0][package]openmotif-libs-2.3.0-17.i586
+>!> ESTABLISHED:2601: U__s_[S2:0][package]openmotif22-libs-2.2.4-79.i586
+>!> ESTABLISHED:2602: I__s_[S1:0][package]openobex-1.3-63.i586
+>!> ESTABLISHED:2603: U__s_[S2:0][package]openobex-1.3-74.i586
+>!> ESTABLISHED:2604: U__s_[S2:0][package]openobex-devel-1.3-74.i586
+>!> ESTABLISHED:2605: U__s_[S2:0][package]openobex-glib-1.3-74.i586
+>!> ESTABLISHED:2606: U__s_[S2:0][package]opensc-0.11.3-13.i586
+>!> ESTABLISHED:2607: I__s_[S1:0][package]opensc-0.11.3-5.i586
+>!> ESTABLISHED:2608: U__s_[S2:0][package]opensc-devel-0.11.3-13.i586
+>!> ESTABLISHED:2609: I__s_[S1:0][package]openslp-1.2.0-83.i586
+>!> ESTABLISHED:2610: U__s_[S2:0][package]openslp-1.2.0-90.i586
+>!> ESTABLISHED:2611: U__s_[S2:0][package]openslp-server-1.2.0-90.i586
+>!> ESTABLISHED:2612: U__s_[S2:0][package]opensp-1.5.2-24.i586
+>!> ESTABLISHED:2613: U__s_[S2:0][package]opensp-devel-1.5.2-24.i586
+>!> ESTABLISHED:2614: I__s_[S1:0][package]openssh-4.6p1-38.i586
+>!> ESTABLISHED:2615: U__s_[S2:0][package]openssh-4.6p1-49.i586
+>!> ESTABLISHED:2616: I__s_[S1:0][package]openssh-askpass-4.6p1-38.i586
+>!> ESTABLISHED:2617: U__s_[S2:0][package]openssh-askpass-4.6p1-49.i586
+>!> ESTABLISHED:2618: I__s_[S1:0][package]openssl-0.9.8e-33.i586
+>!> ESTABLISHED:2619: U__s_[S2:0][package]openssl-0.9.8e-40.i586
+>!> ESTABLISHED:2620: I__s_[S1:0][package]openssl-certs-0.9.8e-33.i586
+>!> ESTABLISHED:2621: U__s_[S2:0][package]openssl-certs-0.9.8e-40.i586
+>!> ESTABLISHED:2622: U__s_[S2:0][package]opensuse-codecs-installer-10.3.0-8.noarch
+>!> ESTABLISHED:2623: U__s_[S2:0][package]opensuse-gnomeuser_en-10.3-14.noarch
+>!> ESTABLISHED:2624: U__s_[S2:0][package]opensuse-gnomeuser_en-pdf-10.3-14.noarch
+>!> ESTABLISHED:2625: U__s_[S2:0][package]opensuse-manual_de-10.3-7.noarch
+>!> ESTABLISHED:2626: U__s_[S2:0][package]opensuse-manual_en-10.3-23.noarch
+>!> ESTABLISHED:2627: I__s_[S1:0][package]opensuse-manual_en-10.3-9.noarch
+>!> ESTABLISHED:2628: U__s_[S2:0][package]opensuse-updater-gnome-0.4.2-2.i586
+>!> ESTABLISHED:2629: I__s_[S1:0][package]opensuse-updater-kde-0.5-10.i586
+>!> ESTABLISHED:2630: U__s_[S2:0][package]opensuse-updater-kde-0.6-8.i586
+>!> ESTABLISHED:2631: U__s_[S2:0][package]openswan-2.4.7-54.i586
+>!> ESTABLISHED:2632: U__s_[S2:0][package]openvpn-2.0.9-40.i586
+>!> ESTABLISHED:2633: U__s_[S2:0][package]opera-9.23-9.i586
+>!> ESTABLISHED:2634: U__s_[S2:0][package]opie-2.4-627.i586
+>!> ESTABLISHED:2635: U__s_[S2:0][package]oprofile-0.9.3-17.i586
+>!> ESTABLISHED:2636: U__s_[S2:0][package]orage-4.4.1-48.i586
+>!> ESTABLISHED:2637: U__s_[S2:0][package]orbit-0.5.17-412.i586
+>!> ESTABLISHED:2638: U__s_[S2:0][package]orbit2-2.14.8-10.i586
+>!> ESTABLISHED:2639: I__s_[S1:0][package]orbit2-2.14.8-2.i586
+>!> ESTABLISHED:2640: U__s_[S2:0][package]orbit2-devel-2.14.8-10.i586
+>!> ESTABLISHED:2641: U__s_[S2:0][package]orca-2.19.91-3.i586
+>!> ESTABLISHED:2642: U__s_[S2:0][package]oro-2.0.8-117.noarch
+>!> ESTABLISHED:2643: U__s_[S2:0][package]oto-0.4-304.i586
+>!> ESTABLISHED:2644: U__s_[S2:0][package]oxygen-icon-theme-3.93.0-3.noarch
+>!> ESTABLISHED:2645: U__s_[S2:0][package]oxygen-icon-theme-scalable-3.93.0-3.noarch
+>!> ESTABLISHED:2646: U__s_[S2:0][package]p54-kmp-default-20070806_2.6.22.5_10-3.i586
+>!> ESTABLISHED:2647: U__s_[S2:0][package]pacman-1.001-949.i586
+>!> ESTABLISHED:2648: U__s_[S2:0][package]pam-0.99.8.1-12.i586
+>!> ESTABLISHED:2649: I__s_[S1:0][package]pam-0.99.8.1-6.i586
+>!> ESTABLISHED:2650: I__s_[S1:0][package]pam-config-0.21-4.i586
+>!> ESTABLISHED:2651: U__s_[S2:0][package]pam-config-0.23-6.i586
+>!> ESTABLISHED:2652: U__s_[S2:0][package]pam-devel-0.99.8.1-12.i586
+>!> ESTABLISHED:2653: U__s_[S2:0][package]pam-doc-0.99.8.1-12.i586
+>!> ESTABLISHED:2654: I__s_[S1:0][package]pam-modules-10.3-36.i586
+>!> ESTABLISHED:2655: U__s_[S2:0][package]pam-modules-10.3-44.i586
+>!> ESTABLISHED:2656: U__s_[S2:0][package]pam_cifs-0.5.1-4.i586
+>!> ESTABLISHED:2657: U__s_[S2:0][package]pam_krb5-2.2.17-8.i586
+>!> ESTABLISHED:2658: U__s_[S2:0][package]pam_ldap-184-41.i586
+>!> ESTABLISHED:2659: U__s_[S2:0][package]pam_mount-0.18-77.i586
+>!> ESTABLISHED:2660: U__s_[S2:0][package]pam_smb-2.0.0rc6-78.i586
+>!> ESTABLISHED:2661: U__s_[S2:0][package]pam_ssh-1.94-88.i586
+>!> ESTABLISHED:2662: U__s_[S2:0][package]pam_thinkfinger-0.3-2.i586
+>!> ESTABLISHED:2663: U__s_[S2:0][package]pan-0.132-18.i586
+>!> ESTABLISHED:2664: I__s_[S1:0][package]pango-1.17.5-3.i586
+>!> ESTABLISHED:2665: U__s_[S2:0][package]pango-1.18.1-2.i586
+>!> ESTABLISHED:2666: U__s_[S2:0][package]pango-devel-1.18.1-2.i586
+>!> ESTABLISHED:2667: U__s_[S2:0][package]pango-doc-1.18.1-2.i586
+>!> ESTABLISHED:2668: U__s_[S2:0][package]par-1.1-100.i586
+>!> ESTABLISHED:2669: I__s_[S1:0][package]parted-1.8.7-26.i586
+>!> ESTABLISHED:2670: U__s_[S2:0][package]parted-1.8.7-34.i586
+>!> ESTABLISHED:2671: U__s_[S2:0][package]passivetex-2004.3.10-74.noarch
+>!> ESTABLISHED:2672: I__s_[S1:0][package]patch-2.5.9-210.i586
+>!> ESTABLISHED:2673: U__s_[S2:0][package]patch-2.5.9-216.i586
+>!> ESTABLISHED:2674: U__s_[S2:0][package]patchrpm-1.1-68.i586
+>!> ESTABLISHED:2675: U__s_[S2:0][package]patchutils-0.2.31-69.i586
+>!> ESTABLISHED:2676: I__s_[S1:0][pattern]apparmor-10.3-100.i586
+>!> ESTABLISHED:2677: U__s_[S2:0][pattern]apparmor-10.3-133.i586
+>!> ESTABLISHED:2678: U__s_[S2:0][pattern]apparmor_opt-10.3-133.i586
+>!> ESTABLISHED:2679: I__s_[S1:0][pattern]base-10.3-100.i586
+>!> ESTABLISHED:2680: US_s_[S2:0][pattern]base-10.3-133.i586
+>!> ESTABLISHED:2681: U__s_[S2:0][pattern]console-10.3-133.i586
+>!> ESTABLISHED:2682: US_s_[S2:0][pattern]default-10.3-133.i586
+>!> ESTABLISHED:2683: U__s_[S2:0][pattern]devel_C_C++-10.3-133.i586
+>!> ESTABLISHED:2684: U__s_[S2:0][pattern]devel_basis-10.3-133.i586
+>!> ESTABLISHED:2685: U__s_[S2:0][pattern]devel_gnome-10.3-133.i586
+>!> ESTABLISHED:2686: U__s_[S2:0][pattern]devel_ide-10.3-133.i586
+>!> ESTABLISHED:2687: U__s_[S2:0][pattern]devel_java-10.3-133.i586
+>!> ESTABLISHED:2688: U__s_[S2:0][pattern]devel_kde-10.3-133.i586
+>!> ESTABLISHED:2689: U__s_[S2:0][pattern]devel_kernel-10.3-133.i586
+>!> ESTABLISHED:2690: U__s_[S2:0][pattern]devel_mono-10.3-133.i586
+>!> ESTABLISHED:2691: US_s_[S2:0][pattern]devel_perl-10.3-133.i586
+>!> ESTABLISHED:2692: U__s_[S2:0][pattern]devel_python-10.3-133.i586
+>!> ESTABLISHED:2693: U__s_[S2:0][pattern]devel_qt4-10.3-133.i586
+>!> ESTABLISHED:2694: U__s_[S2:0][pattern]devel_rails-10.3-133.i586
+>!> ESTABLISHED:2695: U__s_[S2:0][pattern]devel_rpm_build-10.3-133.i586
+>!> ESTABLISHED:2696: U__s_[S2:0][pattern]devel_ruby-10.3-133.i586
+>!> ESTABLISHED:2697: U__s_[S2:0][pattern]devel_tcl-10.3-133.i586
+>!> ESTABLISHED:2698: U__s_[S2:0][pattern]devel_web-10.3-133.i586
+>!> ESTABLISHED:2699: U__s_[S2:0][pattern]devel_yast-10.3-133.i586
+>!> ESTABLISHED:2700: U__s_[S2:0][pattern]dhcp_dns_server-10.3-133.i586
+>!> ESTABLISHED:2701: U__s_[S2:0][pattern]directory_server-10.3-133.i586
+>!> ESTABLISHED:2702: I__s_[S1:0][pattern]enhanced_base-10.3-100.i586
+>!> ESTABLISHED:2703: U__s_[S2:0][pattern]enhanced_base-10.3-133.i586
+>!> ESTABLISHED:2704: US_s_[S2:0][pattern]enhanced_base_opt-10.3-133.i586
+>!> ESTABLISHED:2705: U__s_[S2:0][pattern]file_server-10.3-133.i586
+>!> ESTABLISHED:2706: I__s_[S1:0][pattern]fonts-10.3-100.i586
+>!> ESTABLISHED:2707: US_s_[S2:0][pattern]fonts-10.3-133.i586
+>!> ESTABLISHED:2708: US_s_[S2:0][pattern]fonts_opt-10.3-133.i586
+>!> ESTABLISHED:2709: I__s_[S1:0][pattern]games-10.3-100.i586
+>!> ESTABLISHED:2710: US_s_[S2:0][pattern]games-10.3-133.i586
+>!> ESTABLISHED:2711: US_s_[S2:0][pattern]games_opt-10.3-133.i586
+>!> ESTABLISHED:2712: US_s_[S2:0][pattern]gateway_server-10.3-133.i586
+>!> ESTABLISHED:2713: U__s_[S2:0][pattern]gnome-10.3-133.i586
+>!> ESTABLISHED:2714: U__s_[S2:0][pattern]gnome_admin-10.3-133.i586
+>!> ESTABLISHED:2715: U__s_[S2:0][pattern]gnome_basis-10.3-133.i586
+>!> ESTABLISHED:2716: US_s_[S2:0][pattern]gnome_basis_opt-10.3-133.i586
+>!> ESTABLISHED:2717: UU_s_[S2:0][pattern]gnome_games-10.3-133.i586
+>!> ESTABLISHED:2718: UU_s_[S2:0][pattern]gnome_ide-10.3-133.i586
+>!> ESTABLISHED:2719: UU_s_[S2:0][pattern]gnome_imaging-10.3-133.i586
+>!> ESTABLISHED:2720: UU_s_[S2:0][pattern]gnome_imaging_opt-10.3-133.i586
+>!> ESTABLISHED:2721: U__s_[S2:0][pattern]gnome_internet-10.3-133.i586
+>!> ESTABLISHED:2722: UU_s_[S2:0][pattern]gnome_laptop-10.3-133.i586
+>!> ESTABLISHED:2723: UU_s_[S2:0][pattern]gnome_multimedia-10.3-133.i586
+>!> ESTABLISHED:2724: UU_s_[S2:0][pattern]gnome_multimedia_opt-10.3-133.i586
+>!> ESTABLISHED:2725: UU_s_[S2:0][pattern]gnome_office-10.3-133.i586
+>!> ESTABLISHED:2726: UU_s_[S2:0][pattern]gnome_office_opt-10.3-133.i586
+>!> ESTABLISHED:2727: U__s_[S2:0][pattern]gnome_utilities-10.3-133.i586
+>!> ESTABLISHED:2728: U__s_[S2:0][pattern]gnome_utilities_opt-10.3-133.i586
+>!> ESTABLISHED:2729: UU_s_[S2:0][pattern]gnome_xgl-10.3-133.i586
+>!> ESTABLISHED:2730: UU_s_[S2:0][pattern]gnome_yast-10.3-133.i586
+>!> ESTABLISHED:2731: I__s_[S1:0][pattern]imaging-10.3-100.i586
+>!> ESTABLISHED:2732: US_s_[S2:0][pattern]imaging-10.3-133.i586
+>!> ESTABLISHED:2733: US_s_[S2:0][pattern]imaging_opt-10.3-133.i586
+>!> ESTABLISHED:2734: I__s_[S1:0][pattern]kde-10.3-100.i586
+>!> ESTABLISHED:2735: US_s_[S2:0][pattern]kde-10.3-133.i586
+>!> ESTABLISHED:2736: U__s_[S2:0][pattern]kde4_basis-10.3-133.i586
+>!> ESTABLISHED:2737: I__s_[S1:0][pattern]kde_basis-10.3-100.i586
+>!> ESTABLISHED:2738: US_s_[S2:0][pattern]kde_basis-10.3-133.i586
+>!> ESTABLISHED:2739: US_s_[S2:0][pattern]kde_basis_opt-10.3-133.i586
+>!> ESTABLISHED:2740: I__s_[S1:0][pattern]kde_games-10.3-100.i586
+>!> ESTABLISHED:2741: US_s_[S2:0][pattern]kde_games-10.3-133.i586
+>!> ESTABLISHED:2742: UU_s_[S2:0][pattern]kde_ide-10.3-133.i586
+>!> ESTABLISHED:2743: I__s_[S1:0][pattern]kde_imaging-10.3-100.i586
+>!> ESTABLISHED:2744: US_s_[S2:0][pattern]kde_imaging-10.3-133.i586
+>!> ESTABLISHED:2745: U_Tl_[S2:0][pattern]kde_imaging_opt-10.3-133.i586
+>!> ESTABLISHED:2746: I__s_[S1:0][pattern]kde_internet-10.3-100.i586
+>!> ESTABLISHED:2747: US_s_[S2:0][pattern]kde_internet-10.3-133.i586
+>!> ESTABLISHED:2748: U_Tl_[S2:0][pattern]kde_laptop-10.3-133.i586
+>!> ESTABLISHED:2749: I__s_[S1:0][pattern]kde_multimedia-10.3-100.i586
+>!> ESTABLISHED:2750: U__s_[S2:0][pattern]kde_multimedia-10.3-133.i586
+>!> ESTABLISHED:2751: I__s_[S1:0][pattern]kde_office-10.3-100.i586
+>!> ESTABLISHED:2752: US_s_[S2:0][pattern]kde_office-10.3-133.i586
+>!> ESTABLISHED:2753: U_Tl_[S2:0][pattern]kde_office_opt-10.3-133.i586
+>!> ESTABLISHED:2754: I__s_[S1:0][pattern]kde_utilities-10.3-100.i586
+>!> ESTABLISHED:2755: US_s_[S2:0][pattern]kde_utilities-10.3-133.i586
+>!> ESTABLISHED:2756: U__s_[S2:0][pattern]kde_utilities_opt-10.3-133.i586
+>!> ESTABLISHED:2757: I__s_[S1:0][pattern]kde_xgl-10.3-100.i586
+>!> ESTABLISHED:2758: US_s_[S2:0][pattern]kde_xgl-10.3-133.i586
+>!> ESTABLISHED:2759: U__s_[S2:0][pattern]lamp_server-10.3-133.i586
+>!> ESTABLISHED:2760: I__s_[S1:0][pattern]laptop-10.3-100.i586
+>!> ESTABLISHED:2761: US_s_[S2:0][pattern]laptop-10.3-133.i586
+>!> ESTABLISHED:2762: US_s_[S2:0][pattern]mail_server-10.3-133.i586
+>!> ESTABLISHED:2763: US_s_[S2:0][pattern]misc_server-10.3-133.i586
+>!> ESTABLISHED:2764: I__s_[S1:0][pattern]multimedia-10.3-100.i586
+>!> ESTABLISHED:2765: US_s_[S2:0][pattern]multimedia-10.3-133.i586
+>!> ESTABLISHED:2766: US_s_[S2:0][pattern]multimedia_opt-10.3-133.i586
+>!> ESTABLISHED:2767: U__s_[S2:0][pattern]network_admin-10.3-133.i586
+>!> ESTABLISHED:2768: US_s_[S2:0][pattern]non_oss-10.3-133.i586
+>!> ESTABLISHED:2769: U__s_[S2:0][pattern]non_oss_java-10.3-133.i586
+>!> ESTABLISHED:2770: I__s_[S1:0][pattern]office-10.3-100.i586
+>!> ESTABLISHED:2771: US_s_[S2:0][pattern]office-10.3-133.i586
+>!> ESTABLISHED:2772: US_s_[S2:0][pattern]office_opt-10.3-133.i586
+>!> ESTABLISHED:2773: U__s_[S2:0][pattern]print_server-10.3-133.i586
+>!> ESTABLISHED:2774: US_s_[S2:0][pattern]remote_desktop-10.3-133.i586
+>!> ESTABLISHED:2775: U__s_[S2:0][pattern]rest_cd_gnome-10.3-133.i586
+>!> ESTABLISHED:2776: U__s_[S2:0][pattern]rest_cd_kde-10.3-133.i586
+>!> ESTABLISHED:2777: U__s_[S2:0][pattern]rest_dvd-10.3-133.i586
+>!> ESTABLISHED:2778: I__s_[S1:0][pattern]sw_management-10.3-100.i586
+>!> ESTABLISHED:2779: US_s_[S2:0][pattern]sw_management-10.3-133.i586
+>!> ESTABLISHED:2780: UU_s_[S2:0][pattern]sw_management_gnome-10.3-133.i586
+>!> ESTABLISHED:2781: I__s_[S1:0][pattern]sw_management_kde-10.3-100.i586
+>!> ESTABLISHED:2782: US_s_[S2:0][pattern]sw_management_kde-10.3-133.i586
+>!> ESTABLISHED:2783: U__s_[S2:0][pattern]update_test-10.3-133.i586
+>!> ESTABLISHED:2784: US_s_[S2:0][pattern]voip-10.3-133.i586
+>!> ESTABLISHED:2785: I__s_[S1:0][pattern]x11-10.3-100.i586
+>!> ESTABLISHED:2786: US_s_[S2:0][pattern]x11-10.3-133.i586
+>!> ESTABLISHED:2787: US_s_[S2:0][pattern]x11_opt-10.3-133.i586
+>!> ESTABLISHED:2788: U__s_[S2:0][pattern]xen_server-10.3-133.i586
+>!> ESTABLISHED:2789: U__s_[S2:0][pattern]xfce-10.3-133.i586
+>!> ESTABLISHED:2790: I__s_[S1:0][pattern]xgl-10.3-100.i586
+>!> ESTABLISHED:2791: US_s_[S2:0][pattern]xgl-10.3-133.i586
+>!> ESTABLISHED:2792: U__s_[S2:0][pattern]xml-10.3-133.i586
+>!> ESTABLISHED:2793: I__s_[S1:0][pattern]yast2_basis-10.3-100.i586
+>!> ESTABLISHED:2794: U__s_[S2:0][pattern]yast2_basis-10.3-133.i586
+>!> ESTABLISHED:2795: I__s_[S1:0][pattern]yast2_install_wf-10.3-100.i586
+>!> ESTABLISHED:2796: US_s_[S2:0][pattern]yast2_install_wf-10.3-133.i586
+>!> ESTABLISHED:2797: U__s_[S2:0][package]pax-3.4-70.i586
+>!> ESTABLISHED:2798: U__s_[S2:0][package]pbbuttonsd-0.8.1a-13.i586
+>!> ESTABLISHED:2799: U__s_[S2:0][package]pbm2l7k-990321-864.i586
+>!> ESTABLISHED:2800: U__s_[S2:0][package]pciutils-2.2.6-14.i586
+>!> ESTABLISHED:2801: I__s_[S1:0][package]pciutils-2.2.6-8.i586
+>!> ESTABLISHED:2802: I__s_[S1:0][package]pciutils-ids-2007.8.4-1.noarch
+>!> ESTABLISHED:2803: U__s_[S2:0][package]pciutils-ids-2007.9.1-1.noarch
+>!> ESTABLISHED:2804: I__s_[S1:0][package]pcmciautils-014-32.i586
+>!> ESTABLISHED:2805: U__s_[S2:0][package]pcmciautils-014-38.i586
+>!> ESTABLISHED:2806: U__s_[S2:0][package]pcre-7.2-11.i586
+>!> ESTABLISHED:2807: I__s_[S1:0][package]pcre-7.2-4.i586
+>!> ESTABLISHED:2808: U__s_[S2:0][package]pcre-devel-7.2-11.i586
+>!> ESTABLISHED:2809: U__s_[S2:0][package]pcsc-acr38-1.7.9-26.i586
+>!> ESTABLISHED:2810: U__s_[S2:0][package]pcsc-ccid-1.3.0-11.i586
+>!> ESTABLISHED:2811: U__s_[S2:0][package]pcsc-cyberjack-3.0.3-21.i586
+>!> ESTABLISHED:2812: U__s_[S2:0][package]pcsc-lite-1.4.3-12.i586
+>!> ESTABLISHED:2813: I__s_[S1:0][package]pcsc-lite-1.4.3-5.i586
+>!> ESTABLISHED:2814: U__s_[S2:0][package]pcsc-lite-devel-1.4.3-12.i586
+>!> ESTABLISHED:2815: U__s_[S2:0][package]penguin-command-1.6.11-16.i586
+>!> ESTABLISHED:2816: I__s_[S1:0][package]perl-5.8.8-67.i586
+>!> ESTABLISHED:2817: U__s_[S2:0][package]perl-5.8.8-73.i586
+>!> ESTABLISHED:2818: U__s_[S2:0][package]perl-Algorithm-Diff-1.1902-59.i586
+>!> ESTABLISHED:2819: U__s_[S2:0][package]perl-Apache-AuthCookie-3.10-68.i586
+>!> ESTABLISHED:2820: U__s_[S2:0][package]perl-Apache-AuthNetLDAP-0.29-97.i586
+>!> ESTABLISHED:2821: U__s_[S2:0][package]perl-Apache-DBI-1.06-46.i586
+>!> ESTABLISHED:2822: U__s_[S2:0][package]perl-Apache-Session-1.83-24.i586
+>!> ESTABLISHED:2823: U__s_[S2:0][package]perl-Apache-SessionX-2.01-95.i586
+>!> ESTABLISHED:2824: U__s_[S2:0][package]perl-AppConfig-1.66-13.i586
+>!> ESTABLISHED:2825: U__s_[S2:0][package]perl-Archive-Tar-1.32-15.i586
+>!> ESTABLISHED:2826: U__s_[S2:0][package]perl-Archive-Zip-1.20-16.i586
+>!> ESTABLISHED:2827: U__s_[S2:0][package]perl-Authen-SASL-2.10-57.i586
+>!> ESTABLISHED:2828: U__s_[S2:0][package]perl-Authen-SASL-Cyrus-0.12-83.i586
+>!> ESTABLISHED:2829: U__s_[S2:0][package]perl-BerkeleyDB-0.32-10.i586
+>!> ESTABLISHED:2830: U__s_[S2:0][package]perl-Bit-Vector-6.4-68.i586
+>!> ESTABLISHED:2831: I__s_[S1:0][package]perl-Bootloader-0.4.18-2.i586
+>!> ESTABLISHED:2832: U__s_[S2:0][package]perl-Bootloader-0.4.23-8.i586
+>!> ESTABLISHED:2833: U__s_[S2:0][package]perl-CDDB_get-2.27-68.i586
+>!> ESTABLISHED:2834: U__s_[S2:0][package]perl-CGI-Application-4.06-46.i586
+>!> ESTABLISHED:2835: U__s_[S2:0][package]perl-Cairo-1.041-20.i586
+>!> ESTABLISHED:2836: U__s_[S2:0][package]perl-Carp-Clan-5.9-14.i586
+>!> ESTABLISHED:2837: U__s_[S2:0][package]perl-Chart-2.4.1-83.i586
+>!> ESTABLISHED:2838: U__s_[S2:0][package]perl-Compress-Raw-Zlib-2.005-14.i586
+>!> ESTABLISHED:2839: I__s_[S1:0][package]perl-Compress-Raw-Zlib-2.005-8.i586
+>!> ESTABLISHED:2840: U__s_[S2:0][package]perl-Compress-Zlib-2.005-10.i586
+>!> ESTABLISHED:2841: I__s_[S1:0][package]perl-Compress-Zlib-2.005-4.i586
+>!> ESTABLISHED:2842: I__s_[S1:0][package]perl-Config-Crontab-1.21-2.i586
+>!> ESTABLISHED:2843: U__s_[S2:0][package]perl-Config-Crontab-1.21-8.i586
+>!> ESTABLISHED:2844: U__s_[S2:0][package]perl-Config-General-2.33-8.i586
+>!> ESTABLISHED:2845: U__s_[S2:0][package]perl-Config-IniFiles-2.39-69.i586
+>!> ESTABLISHED:2846: U__s_[S2:0][package]perl-Convert-ASN1-0.21-34.i586
+>!> ESTABLISHED:2847: U__s_[S2:0][package]perl-Convert-TNEF-0.17-329.i586
+>!> ESTABLISHED:2848: U__s_[S2:0][package]perl-Convert-UUlib-1.051-69.i586
+>!> ESTABLISHED:2849: U__s_[S2:0][package]perl-Crypt-Blowfish-2.10-69.i586
+>!> ESTABLISHED:2850: U__s_[S2:0][package]perl-Crypt-CBC-2.22-40.i586
+>!> ESTABLISHED:2851: U__s_[S2:0][package]perl-Crypt-DES-2.05-68.i586
+>!> ESTABLISHED:2852: U__s_[S2:0][package]perl-Crypt-SSLeay-0.56-12.i586
+>!> ESTABLISHED:2853: I__s_[S1:0][package]perl-Crypt-SSLeay-0.56-5.i586
+>!> ESTABLISHED:2854: I__s_[S1:0][package]perl-Crypt-SmbHash-0.12-63.i586
+>!> ESTABLISHED:2855: U__s_[S2:0][package]perl-Crypt-SmbHash-0.12-69.i586
+>!> ESTABLISHED:2856: U__s_[S2:0][package]perl-Cyrus-IMAP-2.3.8-44.i586
+>!> ESTABLISHED:2857: U__s_[S2:0][package]perl-Cyrus-SIEVE-managesieve-2.3.8-44.i586
+>!> ESTABLISHED:2858: U__s_[S2:0][package]perl-DBD-CSV-0.22-70.i586
+>!> ESTABLISHED:2859: U__s_[S2:0][package]perl-DBD-ODBC-1.14-10.i586
+>!> ESTABLISHED:2860: U__s_[S2:0][package]perl-DBD-Pg-1.49-70.i586
+>!> ESTABLISHED:2861: I__s_[S1:0][package]perl-DBD-SQLite-1.13-63.i586
+>!> ESTABLISHED:2862: U__s_[S2:0][package]perl-DBD-SQLite-1.13-70.i586
+>!> ESTABLISHED:2863: U__s_[S2:0][package]perl-DBD-XBase-0.241-98.i586
+>!> ESTABLISHED:2864: U__s_[S2:0][package]perl-DBD-mysql-4.005-19.i586
+>!> ESTABLISHED:2865: U__s_[S2:0][package]perl-DBI-1.58-14.i586
+>!> ESTABLISHED:2866: I__s_[S1:0][package]perl-DBI-1.58-8.i586
+>!> ESTABLISHED:2867: U__s_[S2:0][package]perl-Data-ShowTable-3.3-640.i586
+>!> ESTABLISHED:2868: U__s_[S2:0][package]perl-Date-Calc-5.4-69.i586
+>!> ESTABLISHED:2869: U__s_[S2:0][package]perl-DateManip-5.44-68.i586
+>!> ESTABLISHED:2870: U__s_[S2:0][package]perl-Digest-HMAC-1.01-563.i586
+>!> ESTABLISHED:2871: I__s_[S1:0][package]perl-Digest-MD4-1.5-62.i586
+>!> ESTABLISHED:2872: U__s_[S2:0][package]perl-Digest-MD4-1.5-68.i586
+>!> ESTABLISHED:2873: I__s_[S1:0][package]perl-Digest-SHA1-2.11-52.i586
+>!> ESTABLISHED:2874: U__s_[S2:0][package]perl-Digest-SHA1-2.11-58.i586
+>!> ESTABLISHED:2875: U__s_[S2:0][package]perl-Encode-HanExtra-0.10-69.i586
+>!> ESTABLISHED:2876: U__s_[S2:0][package]perl-Encode-JIS2K-0.02-70.i586
+>!> ESTABLISHED:2877: U__s_[S2:0][package]perl-ExtUtils-Depends-0.205-69.i586
+>!> ESTABLISHED:2878: U__s_[S2:0][package]perl-ExtUtils-PkgConfig-1.07-70.i586
+>!> ESTABLISHED:2879: U__s_[S2:0][package]perl-File-HomeDir-0.65-23.i586
+>!> ESTABLISHED:2880: U__s_[S2:0][package]perl-File-MMagic-1.27-38.i586
+>!> ESTABLISHED:2881: I__s_[S1:0][package]perl-File-Tail-0.99.3-62.i586
+>!> ESTABLISHED:2882: U__s_[S2:0][package]perl-File-Tail-0.99.3-68.i586
+>!> ESTABLISHED:2883: U__s_[S2:0][package]perl-File-Type-0.22-72.i586
+>!> ESTABLISHED:2884: U__s_[S2:0][package]perl-FileHandle-Unget-0.1621-68.i586
+>!> ESTABLISHED:2885: U__s_[S2:0][package]perl-Filter-1.34-13.i586
+>!> ESTABLISHED:2886: U__s_[S2:0][package]perl-Finance-Quote-1.13-4.i586
+>!> ESTABLISHED:2887: U__s_[S2:0][package]perl-GD-2.35-68.i586
+>!> ESTABLISHED:2888: U__s_[S2:0][package]perl-GDGraph-1.44-44.i586
+>!> ESTABLISHED:2889: U__s_[S2:0][package]perl-GDTextUtil-0.85-210.i586
+>!> ESTABLISHED:2890: U__s_[S2:0][package]perl-HTML-Clean-0.8-765.i586
+>!> ESTABLISHED:2891: U__s_[S2:0][package]perl-HTML-FillInForm-1.06-67.i586
+>!> ESTABLISHED:2892: I__s_[S1:0][package]perl-HTML-Parser-3.56-30.i586
+>!> ESTABLISHED:2893: U__s_[S2:0][package]perl-HTML-Parser-3.56-36.i586
+>!> ESTABLISHED:2894: U__s_[S2:0][package]perl-HTML-SimpleParse-0.12-190.i586
+>!> ESTABLISHED:2895: U__s_[S2:0][package]perl-HTML-TableExtract-2.10-4.i586
+>!> ESTABLISHED:2896: I__s_[S1:0][package]perl-HTML-Tagset-3.10-62.i586
+>!> ESTABLISHED:2897: U__s_[S2:0][package]perl-HTML-Tagset-3.10-68.i586
+>!> ESTABLISHED:2898: U__s_[S2:0][package]perl-HTML-Template-2.9-37.i586
+>!> ESTABLISHED:2899: U__s_[S2:0][package]perl-HTML-Template-Expr-0.07-59.i586
+>!> ESTABLISHED:2900: U__s_[S2:0][package]perl-HTML-Template-JIT-0.05-67.i586
+>!> ESTABLISHED:2901: U__s_[S2:0][package]perl-HTML-Tree-3.23-39.i586
+>!> ESTABLISHED:2902: U__s_[S2:0][package]perl-HTTP-DAV-0.31-117.i586
+>!> ESTABLISHED:2903: U__s_[S2:0][package]perl-HTTPS-Daemon-1.02-79.i586
+>!> ESTABLISHED:2904: U__s_[S2:0][package]perl-IO-Compress-Base-2.005-14.i586
+>!> ESTABLISHED:2905: I__s_[S1:0][package]perl-IO-Compress-Base-2.005-8.i586
+>!> ESTABLISHED:2906: U__s_[S2:0][package]perl-IO-Compress-Zlib-2.005-13.i586
+>!> ESTABLISHED:2907: I__s_[S1:0][package]perl-IO-Compress-Zlib-2.005-7.i586
+>!> ESTABLISHED:2908: U__s_[S2:0][package]perl-IO-Multiplex-1.09-33.i586
+>!> ESTABLISHED:2909: U__s_[S2:0][package]perl-IO-Socket-SSL-1.07-18.i586
+>!> ESTABLISHED:2910: U__s_[S2:0][package]perl-IO-String-1.08-68.i586
+>!> ESTABLISHED:2911: U__s_[S2:0][package]perl-IO-Stty-.02-588.i586
+>!> ESTABLISHED:2912: U__s_[S2:0][package]perl-IO-Zlib-1.06-10.i586
+>!> ESTABLISHED:2913: U__s_[S2:0][package]perl-IO-stringy-2.110-69.i586
+>!> ESTABLISHED:2914: U__s_[S2:0][package]perl-Image-Size-3.01-56.i586
+>!> ESTABLISHED:2915: U__s_[S2:0][package]perl-Inline-0.44-262.i586
+>!> ESTABLISHED:2916: U__s_[S2:0][package]perl-Log-Log4perl-1.12-12.i586
+>!> ESTABLISHED:2917: U__s_[S2:0][package]perl-MIME-Lite-3.01-211.i586
+>!> ESTABLISHED:2918: U__s_[S2:0][package]perl-MIME-Types-1.20-16.i586
+>!> ESTABLISHED:2919: U__s_[S2:0][package]perl-MIME-tools-5.420-58.i586
+>!> ESTABLISHED:2920: U__s_[S2:0][package]perl-MP3-Info-1.23-7.i586
+>!> ESTABLISHED:2921: U__s_[S2:0][package]perl-Mail-Mbox-MessageParser-1.5000-36.i586
+>!> ESTABLISHED:2922: U__s_[S2:0][package]perl-MailTools-1.77-23.i586
+>!> ESTABLISHED:2923: U__s_[S2:0][package]perl-NKF-2.0.5-70.i586
+>!> ESTABLISHED:2924: U__s_[S2:0][package]perl-Net-DNS-0.60-13.i586
+>!> ESTABLISHED:2925: U__s_[S2:0][package]perl-Net-Daemon-0.43-12.i586
+>!> ESTABLISHED:2926: I__s_[S1:0][package]perl-Net-Daemon-0.43-6.i586
+>!> ESTABLISHED:2927: U__s_[S2:0][package]perl-Net-IP-1.23-70.i586
+>!> ESTABLISHED:2928: U__s_[S2:0][package]perl-Net-IPv4Addr-0.10-73.i586
+>!> ESTABLISHED:2929: U__s_[S2:0][package]perl-Net-Netmask-1.9015-39.i586
+>!> ESTABLISHED:2930: U__s_[S2:0][package]perl-Net-SNMP-5.2.0-67.i586
+>!> ESTABLISHED:2931: U__s_[S2:0][package]perl-Net-Server-0.96-30.i586
+>!> ESTABLISHED:2932: U__s_[S2:0][package]perl-Net-Telnet-3.03-251.i586
+>!> ESTABLISHED:2933: U__s_[S2:0][package]perl-Net-XMPP-1.02-33.i586
+>!> ESTABLISHED:2934: U__s_[S2:0][package]perl-NetAddr-IP-4.004-36.i586
+>!> ESTABLISHED:2935: U__s_[S2:0][package]perl-Net_SSLeay-1.30-71.i586
+>!> ESTABLISHED:2936: U__s_[S2:0][package]perl-NetxAP-0.02-628.i586
+>!> ESTABLISHED:2937: U__s_[S2:0][package]perl-PDA-Pilot-0.12.2-20.i586
+>!> ESTABLISHED:2938: I__s_[S1:0][package]perl-Parse-RecDescent-1.80-309.i586
+>!> ESTABLISHED:2939: U__s_[S2:0][package]perl-Parse-RecDescent-1.80-315.i586
+>!> ESTABLISHED:2940: U__s_[S2:0][package]perl-PerlMagick-6.3.5.3-20.i586
+>!> ESTABLISHED:2941: U__s_[S2:0][package]perl-PlRPC-0.2019-15.i586
+>!> ESTABLISHED:2942: I__s_[S1:0][package]perl-PlRPC-0.2019-9.i586
+>!> ESTABLISHED:2943: U__s_[S2:0][package]perl-PostScript-Simple-0.07-68.i586
+>!> ESTABLISHED:2944: U__s_[S2:0][package]perl-Qt-3.008-268.i586
+>!> ESTABLISHED:2945: I__s_[S1:0][package]perl-RPC-XML-0.59-55.i586
+>!> ESTABLISHED:2946: U__s_[S2:0][package]perl-RPC-XML-0.59-62.i586
+>!> ESTABLISHED:2947: U__s_[S2:0][package]perl-SGMLS-1.03ii-453.i586
+>!> ESTABLISHED:2948: U__s_[S2:0][package]perl-SNMP-5.4.1-11.i586
+>!> ESTABLISHED:2949: U__s_[S2:0][package]perl-SOAP-Lite-0.69-53.i586
+>!> ESTABLISHED:2950: U__s_[S2:0][package]perl-SQL-Statement-1.15-48.i586
+>!> ESTABLISHED:2951: U__s_[S2:0][package]perl-SVN-Simple-0.27-106.i586
+>!> ESTABLISHED:2952: U__s_[S2:0][package]perl-Template-Toolkit-2.19-27.i586
+>!> ESTABLISHED:2953: U__s_[S2:0][package]perl-TermReadKey-2.30-69.i586
+>!> ESTABLISHED:2954: U__s_[S2:0][package]perl-TermReadLine-Gnu-1.16-35.i586
+>!> ESTABLISHED:2955: U__s_[S2:0][package]perl-Text-CSV_XS-0.29-12.i586
+>!> ESTABLISHED:2956: U__s_[S2:0][package]perl-Text-ChaSen-2.3.3-167.i586
+>!> ESTABLISHED:2957: U__s_[S2:0][package]perl-Text-Iconv-1.4-70.i586
+>!> ESTABLISHED:2958: U__s_[S2:0][package]perl-Text-Kakasi-2.04-69.i586
+>!> ESTABLISHED:2959: U__s_[S2:0][package]perl-Tie-Cache-0.17-312.i586
+>!> ESTABLISHED:2960: U__s_[S2:0][package]perl-Tie-IxHash-1.21-656.i586
+>!> ESTABLISHED:2961: U__s_[S2:0][package]perl-Time-Duration-1.04-58.i586
+>!> ESTABLISHED:2962: U__s_[S2:0][package]perl-Time-Period-1.20-373.i586
+>!> ESTABLISHED:2963: U__s_[S2:0][package]perl-Time-modules-2006.0814-55.i586
+>!> ESTABLISHED:2964: I__s_[S1:0][package]perl-TimeDate-1.16-186.i586
+>!> ESTABLISHED:2965: U__s_[S2:0][package]perl-TimeDate-1.16-192.i586
+>!> ESTABLISHED:2966: U__s_[S2:0][package]perl-Tk-804.027-86.i586
+>!> ESTABLISHED:2967: I__s_[S1:0][package]perl-URI-1.35-65.i586
+>!> ESTABLISHED:2968: U__s_[S2:0][package]perl-URI-1.35-71.i586
+>!> ESTABLISHED:2969: U__s_[S2:0][package]perl-Unicode-Map8-0.12-218.i586
+>!> ESTABLISHED:2970: U__s_[S2:0][package]perl-Unicode-String-2.09-68.i586
+>!> ESTABLISHED:2971: U__s_[S2:0][package]perl-Unix-Syslog-0.100-96.i586
+>!> ESTABLISHED:2972: U__s_[S2:0][package]perl-WeakRef-0.01-52.i586
+>!> ESTABLISHED:2973: U__s_[S2:0][package]perl-X500-DN-0.29-12.i586
+>!> ESTABLISHED:2974: I__s_[S1:0][package]perl-X500-DN-0.29-6.i586
+>!> ESTABLISHED:2975: U__s_[S2:0][package]perl-XML-Bare-0.11-12.i586
+>!> ESTABLISHED:2976: I__s_[S1:0][package]perl-XML-Bare-0.11-6.i586
+>!> ESTABLISHED:2977: U__s_[S2:0][package]perl-XML-DOM-1.44-74.i586
+>!> ESTABLISHED:2978: U__s_[S2:0][package]perl-XML-Generator-0.99-72.i586
+>!> ESTABLISHED:2979: U__s_[S2:0][package]perl-XML-LibXML-1.62001-53.i586
+>!> ESTABLISHED:2980: U__s_[S2:0][package]perl-XML-LibXML-Common-0.13-88.i586
+>!> ESTABLISHED:2981: U__s_[S2:0][package]perl-XML-LibXSLT-1.59-60.i586
+>!> ESTABLISHED:2982: U__s_[S2:0][package]perl-XML-NamespaceSupport-1.09-69.i586
+>!> ESTABLISHED:2983: U__s_[S2:0][package]perl-XML-Parser-2.34-104.i586
+>!> ESTABLISHED:2984: I__s_[S1:0][package]perl-XML-Parser-2.34-98.i586
+>!> ESTABLISHED:2985: U__s_[S2:0][package]perl-XML-RegExp-0.03-547.i586
+>!> ESTABLISHED:2986: U__s_[S2:0][package]perl-XML-SAX-0.12-88.i586
+>!> ESTABLISHED:2987: U__s_[S2:0][package]perl-XML-Simple-2.16-41.i586
+>!> ESTABLISHED:2988: U__s_[S2:0][package]perl-XML-Stream-1.22-76.i586
+>!> ESTABLISHED:2989: U__s_[S2:0][package]perl-XML-Writer-0.603-14.i586
+>!> ESTABLISHED:2990: I__s_[S1:0][package]perl-XML-Writer-0.603-8.i586
+>!> ESTABLISHED:2991: I__s_[S1:0][package]perl-XML-XPath-1.13-3.i586
+>!> ESTABLISHED:2992: U__s_[S2:0][package]perl-XML-XPath-1.13-9.i586
+>!> ESTABLISHED:2993: U__s_[S2:0][package]perl-XML-XSLT-0.48-100.i586
+>!> ESTABLISHED:2994: I__s_[S1:0][package]perl-base-5.8.8-67.i586
+>!> ESTABLISHED:2995: U__s_[S2:0][package]perl-base-5.8.8-73.i586
+>!> ESTABLISHED:2996: I__s_[S1:0][package]perl-gettext-1.05-64.i586
+>!> ESTABLISHED:2997: U__s_[S2:0][package]perl-gettext-1.05-70.i586
+>!> ESTABLISHED:2998: U__s_[S2:0][package]perl-ldap-0.33-77.i586
+>!> ESTABLISHED:2999: U__s_[S2:0][package]perl-ldap-ssl-0.33-77.i586
+>!> ESTABLISHED:3000: U__s_[S2:0][package]perl-libapparmor-2.2-10.i586
+>!> ESTABLISHED:3001: U__s_[S2:0][package]perl-libconfigfile-1.1.1-69.i586
+>!> ESTABLISHED:3002: U__s_[S2:0][package]perl-libwww-perl-5.806-10.i586
+>!> ESTABLISHED:3003: I__s_[S1:0][package]perl-libwww-perl-5.806-4.i586
+>!> ESTABLISHED:3004: U__s_[S2:0][package]perl-libxml-perl-0.08-70.i586
+>!> ESTABLISHED:3005: U__s_[S2:0][package]perl-razor-agents-2.77-66.i586
+>!> ESTABLISHED:3006: U__s_[S2:0][package]perl-spamassassin-3.2.3-7.i586
+>!> ESTABLISHED:3007: U__s_[S2:0][package]perlref-5.004.1-251.noarch
+>!> ESTABLISHED:3008: I__s_[S1:0][package]permissions-2007.6.12-10.i586
+>!> ESTABLISHED:3009: U__s_[S2:0][package]permissions-2007.8.10-8.i586
+>!> ESTABLISHED:3010: U__s_[S2:0][package]pessulus-2.16.2-58.i586
+>!> ESTABLISHED:3011: U__s_[S2:0][package]pgcalc-2.2-126.i586
+>!> ESTABLISHED:3012: U__s_[S2:0][package]php5-5.2.4-3.i586
+>!> ESTABLISHED:3013: U__s_[S2:0][package]php5-bcmath-5.2.4-3.i586
+>!> ESTABLISHED:3014: U__s_[S2:0][package]php5-bz2-5.2.4-3.i586
+>!> ESTABLISHED:3015: U__s_[S2:0][package]php5-calendar-5.2.4-3.i586
+>!> ESTABLISHED:3016: U__s_[S2:0][package]php5-ctype-5.2.4-3.i586
+>!> ESTABLISHED:3017: U__s_[S2:0][package]php5-curl-5.2.4-3.i586
+>!> ESTABLISHED:3018: U__s_[S2:0][package]php5-dbase-5.2.4-3.i586
+>!> ESTABLISHED:3019: U__s_[S2:0][package]php5-devel-5.2.4-3.i586
+>!> ESTABLISHED:3020: U__s_[S2:0][package]php5-dom-5.2.4-3.i586
+>!> ESTABLISHED:3021: U__s_[S2:0][package]php5-exif-5.2.4-3.i586
+>!> ESTABLISHED:3022: U__s_[S2:0][package]php5-fastcgi-5.2.4-3.i586
+>!> ESTABLISHED:3023: U__s_[S2:0][package]php5-ftp-5.2.4-3.i586
+>!> ESTABLISHED:3024: U__s_[S2:0][package]php5-gd-5.2.4-3.i586
+>!> ESTABLISHED:3025: U__s_[S2:0][package]php5-gettext-5.2.4-3.i586
+>!> ESTABLISHED:3026: U__s_[S2:0][package]php5-gmp-5.2.4-3.i586
+>!> ESTABLISHED:3027: U__s_[S2:0][package]php5-hash-5.2.4-3.i586
+>!> ESTABLISHED:3028: U__s_[S2:0][package]php5-iconv-5.2.4-3.i586
+>!> ESTABLISHED:3029: U__s_[S2:0][package]php5-imap-5.2.4-3.i586
+>!> ESTABLISHED:3030: U__s_[S2:0][package]php5-json-5.2.4-3.i586
+>!> ESTABLISHED:3031: U__s_[S2:0][package]php5-ldap-5.2.4-3.i586
+>!> ESTABLISHED:3032: U__s_[S2:0][package]php5-mbstring-5.2.4-3.i586
+>!> ESTABLISHED:3033: U__s_[S2:0][package]php5-mcrypt-5.2.4-3.i586
+>!> ESTABLISHED:3034: U__s_[S2:0][package]php5-mhash-5.2.4-3.i586
+>!> ESTABLISHED:3035: U__s_[S2:0][package]php5-mysql-5.2.4-3.i586
+>!> ESTABLISHED:3036: U__s_[S2:0][package]php5-ncurses-5.2.4-3.i586
+>!> ESTABLISHED:3037: U__s_[S2:0][package]php5-odbc-5.2.4-3.i586
+>!> ESTABLISHED:3038: U__s_[S2:0][package]php5-openssl-5.2.4-3.i586
+>!> ESTABLISHED:3039: U__s_[S2:0][package]php5-pcntl-5.2.4-3.i586
+>!> ESTABLISHED:3040: U__s_[S2:0][package]php5-pdo-5.2.4-3.i586
+>!> ESTABLISHED:3041: U__s_[S2:0][package]php5-pear-5.2.4-3.i586
+>!> ESTABLISHED:3042: U__s_[S2:0][package]php5-pear-log-1.9.11-12.noarch
+>!> ESTABLISHED:3043: U__s_[S2:0][package]php5-pgsql-5.2.4-3.i586
+>!> ESTABLISHED:3044: U__s_[S2:0][package]php5-posix-5.2.4-3.i586
+>!> ESTABLISHED:3045: U__s_[S2:0][package]php5-pspell-5.2.4-3.i586
+>!> ESTABLISHED:3046: U__s_[S2:0][package]php5-shmop-5.2.4-3.i586
+>!> ESTABLISHED:3047: U__s_[S2:0][package]php5-snmp-5.2.4-3.i586
+>!> ESTABLISHED:3048: U__s_[S2:0][package]php5-soap-5.2.4-3.i586
+>!> ESTABLISHED:3049: U__s_[S2:0][package]php5-sockets-5.2.4-3.i586
+>!> ESTABLISHED:3050: U__s_[S2:0][package]php5-sqlite-5.2.4-3.i586
+>!> ESTABLISHED:3051: U__s_[S2:0][package]php5-sysvmsg-5.2.4-3.i586
+>!> ESTABLISHED:3052: U__s_[S2:0][package]php5-sysvsem-5.2.4-3.i586
+>!> ESTABLISHED:3053: U__s_[S2:0][package]php5-sysvshm-5.2.4-3.i586
+>!> ESTABLISHED:3054: U__s_[S2:0][package]php5-tokenizer-5.2.4-3.i586
+>!> ESTABLISHED:3055: U__s_[S2:0][package]php5-wddx-5.2.4-3.i586
+>!> ESTABLISHED:3056: U__s_[S2:0][package]php5-xmlreader-5.2.4-3.i586
+>!> ESTABLISHED:3057: U__s_[S2:0][package]php5-xmlrpc-5.2.4-3.i586
+>!> ESTABLISHED:3058: U__s_[S2:0][package]php5-xmlwriter-5.2.4-3.i586
+>!> ESTABLISHED:3059: U__s_[S2:0][package]php5-xsl-5.2.4-3.i586
+>!> ESTABLISHED:3060: U__s_[S2:0][package]php5-zip-5.2.4-3.i586
+>!> ESTABLISHED:3061: U__s_[S2:0][package]php5-zlib-5.2.4-3.i586
+>!> ESTABLISHED:3062: U__s_[S2:0][package]physfs-1.0.1-73.i586
+>!> ESTABLISHED:3063: U__s_[S2:0][package]pia-3.95-90.i586
+>!> ESTABLISHED:3064: U__s_[S2:0][package]pico-4.64N-1.i586
+>!> ESTABLISHED:3065: U__s_[S2:0][package]pidgin-2.1.0-22.i586
+>!> ESTABLISHED:3066: U__s_[S2:0][package]pilot-4.64N-1.i586
+>!> ESTABLISHED:3067: U__s_[S2:0][package]pilot-link-0.12.2-20.i586
+>!> ESTABLISHED:3068: U__s_[S2:0][package]pin-0.38-26.noarch
+>!> ESTABLISHED:3069: U__s_[S2:0][package]pine-4.64N-83.i586
+>!> ESTABLISHED:3070: I__s_[S1:0][package]pinentry-0.7.2-102.i586
+>!> ESTABLISHED:3071: U__s_[S2:0][package]pinentry-0.7.2-111.i586
+>!> ESTABLISHED:3072: U__s_[S2:0][package]pinentry-gtk2-0.7.2-1.i586
+>!> ESTABLISHED:3073: I__s_[S1:0][package]pinentry-qt-0.7.2-1.i586
+>!> ESTABLISHED:3074: U__s_[S2:0][package]pinentry-qt-0.7.2-1.i586
+>!> ESTABLISHED:3075: U__s_[S2:0][package]pinepg-1.02-252.i586
+>!> ESTABLISHED:3076: U__s_[S2:0][package]pinfo-0.6.9-22.i586
+>!> ESTABLISHED:3077: U__s_[S2:0][package]pingus-0.6.0-391.i586
+>!> ESTABLISHED:3078: U__s_[S2:0][package]pixmap-2.6-13.i586
+>!> ESTABLISHED:3079: I__s_[S1:0][package]pkg-config-0.21-29.i586
+>!> ESTABLISHED:3080: U__s_[S2:0][package]pkg-config-0.21-35.i586
+>!> ESTABLISHED:3081: U__s_[S2:0][package]planmaker-2007.3.26-39.i586
+>!> ESTABLISHED:3082: U__s_[S2:0][package]planner-0.14.2-21.i586
+>!> ESTABLISHED:3083: U__s_[S2:0][package]planner-devel-0.14.2-21.i586
+>!> ESTABLISHED:3084: U__s_[S2:0][package]plib-1.8.4-105.i586
+>!> ESTABLISHED:3085: U__s_[S2:0][package]plotutils-2.5-87.i586
+>!> ESTABLISHED:3086: U__s_[S2:0][package]plptools-0.16-89.i586
+>!> ESTABLISHED:3087: U__s_[S2:0][package]plptools-kde-0.16-89.i586
+>!> ESTABLISHED:3088: U__s_[S2:0][package]pm-utils-0.99.3.20070618-13.i586
+>!> ESTABLISHED:3089: I__s_[S1:0][package]pm-utils-0.99.3.20070618-5.i586
+>!> ESTABLISHED:3090: U__s_[S2:0][package]pmidi-1.6.0-166.i586
+>!> ESTABLISHED:3091: I__s_[S1:0][package]pmtools-20061026-35.i586
+>!> ESTABLISHED:3092: U__s_[S2:0][package]pmtools-20061026-41.i586
+>!> ESTABLISHED:3093: U__s_[S2:0][package]po-utils-0.5-881.i586
+>!> ESTABLISHED:3094: I__s_[S1:0][package]poppler-0.5.4-83.i586
+>!> ESTABLISHED:3095: U__s_[S2:0][package]poppler-0.5.4-92.i586
+>!> ESTABLISHED:3096: U__s_[S2:0][package]poppler-devel-0.5.4-92.i586
+>!> ESTABLISHED:3097: U__s_[S2:0][package]poppler-glib-0.5.4-92.i586
+>!> ESTABLISHED:3098: I__s_[S1:0][package]poppler-qt-0.5.4-83.i586
+>!> ESTABLISHED:3099: U__s_[S2:0][package]poppler-qt-0.5.4-92.i586
+>!> ESTABLISHED:3100: U__s_[S2:0][package]poppler-qt4-0.5.4-92.i586
+>!> ESTABLISHED:3101: I__s_[S1:0][package]popt-1.7-355.i586
+>!> ESTABLISHED:3102: U__s_[S2:0][package]popt-1.7-364.i586
+>!> ESTABLISHED:3103: U__s_[S2:0][package]popt-devel-1.7-364.i586
+>!> ESTABLISHED:3104: I__s_[S1:0][package]portaudio-19-163.i586
+>!> ESTABLISHED:3105: U__s_[S2:0][package]portaudio-19-170.i586
+>!> ESTABLISHED:3106: I__s_[S1:0][package]portmap-6.0+git20070513-16.i586
+>!> ESTABLISHED:3107: U__s_[S2:0][package]portmap-6.0+git20070513-22.i586
+>!> ESTABLISHED:3108: U__s_[S2:0][package]posix_cc-1.4-425.i586
+>!> ESTABLISHED:3109: U__s_[S2:0][package]poster-20060221-6.i586
+>!> ESTABLISHED:3110: U__s_[S2:0][package]postfix-2.4.5-12.i586
+>!> ESTABLISHED:3111: I__s_[S1:0][package]postfix-2.4.5-2.i586
+>!> ESTABLISHED:3112: U__s_[S2:0][package]postgresql-8.2.4-21.i586
+>!> ESTABLISHED:3113: U__s_[S2:0][package]postgresql-contrib-8.2.4-21.i586
+>!> ESTABLISHED:3114: U__s_[S2:0][package]postgresql-devel-8.2.4-21.i586
+>!> ESTABLISHED:3115: U__s_[S2:0][package]postgresql-libs-8.2.4-21.i586
+>!> ESTABLISHED:3116: U__s_[S2:0][package]postgresql-server-8.2.4-21.i586
+>!> ESTABLISHED:3117: U__s_[S2:0][package]powerprefs-0.8.0-52.i586
+>!> ESTABLISHED:3118: I__s_[S1:0][package]powersave-0.15.13-38.i586
+>!> ESTABLISHED:3119: U__s_[S2:0][package]powersave-0.15.17-2.i586
+>!> ESTABLISHED:3120: U__s_[S2:0][package]powersave-devel-0.15.17-2.i586
+>!> ESTABLISHED:3121: I__s_[S1:0][package]powersave-libs-0.15.13-38.i586
+>!> ESTABLISHED:3122: U__s_[S2:0][package]powersave-libs-0.15.17-2.i586
+>!> ESTABLISHED:3123: U__s_[S2:0][package]powertop-1.7-15.i586
+>!> ESTABLISHED:3124: I__s_[S1:0][package]ppp-2.4.4-60.i586
+>!> ESTABLISHED:3125: U__s_[S2:0][package]ppp-2.4.4-67.i586
+>!> ESTABLISHED:3126: I__s_[S1:0][package]pptp-1.7.1-42.i586
+>!> ESTABLISHED:3127: U__s_[S2:0][package]pptp-1.7.1-48.i586
+>!> ESTABLISHED:3128: U__s_[S2:0][package]pptpd-1.3.4-29.i586
+>!> ESTABLISHED:3129: U__s_[S2:0][package]prctl-1.3-424.i586
+>!> ESTABLISHED:3130: U__s_[S2:0][package]preload-0.2-101.i586
+>!> ESTABLISHED:3131: I__s_[S1:0][package]preload-0.2-87.i586
+>!> ESTABLISHED:3132: U__s_[S2:0][package]privoxy-3.0.6-63.i586
+>!> ESTABLISHED:3133: U__s_[S2:0][package]procinfo-18-125.i586
+>!> ESTABLISHED:3134: U__s_[S2:0][package]procmail-3.22-132.i586
+>!> ESTABLISHED:3135: I__s_[S1:0][package]procps-3.2.7-58.i586
+>!> ESTABLISHED:3136: U__s_[S2:0][package]procps-3.2.7-64.i586
+>!> ESTABLISHED:3137: US_s_[S2:0][product]openSUSE-DVD5-download-10.3.i686
+>!> ESTABLISHED:3138: U__s_[S2:0][package]providers-2006.11.21-41.noarch
+>!> ESTABLISHED:3139: U__s_[S2:0][package]psgml-1.3.2-96.noarch
+>!> ESTABLISHED:3140: U__s_[S2:0][package]psgplay-0.6-776.i586
+>!> ESTABLISHED:3141: U__s_[S2:0][package]psiconv-0.9.8-104.i586
+>!> ESTABLISHED:3142: I__s_[S1:0][package]psmisc-22.5-21.i586
+>!> ESTABLISHED:3143: U__s_[S2:0][package]psmisc-22.5-27.i586
+>!> ESTABLISHED:3144: U__s_[S2:0][package]pstoedit-3.44-103.i586
+>!> ESTABLISHED:3145: U__s_[S2:0][package]pstoedit-devel-3.44-103.i586
+>!> ESTABLISHED:3146: U__s_[S2:0][package]psutils-p17-936.i586
+>!> ESTABLISHED:3147: I__s_[S1:0][package]pth-2.0.7-34.i586
+>!> ESTABLISHED:3148: U__s_[S2:0][package]pth-2.0.7-40.i586
+>!> ESTABLISHED:3149: I__s_[S1:0][package]pwdutils-3.1.4-12.i586
+>!> ESTABLISHED:3150: U__s_[S2:0][package]pwdutils-3.1.4-20.i586
+>!> ESTABLISHED:3151: U__s_[S2:0][package]pwgen-2.06-14.i586
+>!> ESTABLISHED:3152: U__s_[S2:0][package]pwlib-1.10.7-52.i586
+>!> ESTABLISHED:3153: U__s_[S2:0][package]pybluez-0.9.2-54.i586
+>!> ESTABLISHED:3154: U__s_[S2:0][package]pychecker-0.8.17-74.i586
+>!> ESTABLISHED:3155: U_Tl_[S2:0][package]python-2.5.1-32.i586
+>!> ESTABLISHED:3156: U__s_[S2:0][package]python-cairo-1.2.2-83.i586
+>!> ESTABLISHED:3157: U__s_[S2:0][package]python-curl-7.16.4-8.i586
+>!> ESTABLISHED:3158: U__s_[S2:0][package]python-curses-2.5.1-32.i586
+>!> ESTABLISHED:3159: U__s_[S2:0][package]python-dateutil-1.1-69.i586
+>!> ESTABLISHED:3160: U__s_[S2:0][package]python-devel-2.5.1-32.i586
+>!> ESTABLISHED:3161: U__s_[S2:0][package]python-fcgi-2000.09.21-242.i586
+>!> ESTABLISHED:3162: U__s_[S2:0][package]python-gdbm-2.5.1-32.i586
+>!> ESTABLISHED:3163: U__s_[S2:0][package]python-gnome-2.18.2-19.i586
+>!> ESTABLISHED:3164: U__s_[S2:0][package]python-gnome-extras-2.14.2-115.i586
+>!> ESTABLISHED:3165: U__s_[S2:0][package]python-gobject2-2.12.3-54.i586
+>!> ESTABLISHED:3166: U__s_[S2:0][package]python-gtk-2.10.6-17.i586
+>!> ESTABLISHED:3167: U__s_[S2:0][package]python-httplib2-0.2.0-69.i586
+>!> ESTABLISHED:3168: U__s_[S2:0][package]python-imaging-1.1.6-59.i586
+>!> ESTABLISHED:3169: U__s_[S2:0][package]python-kde3-3.16.0-15.i586
+>!> ESTABLISHED:3170: U__s_[S2:0][package]python-ldap-2.3.1-10.i586
+>!> ESTABLISHED:3171: U__s_[S2:0][package]python-numeric-24.2-95.i586
+>!> ESTABLISHED:3172: U__s_[S2:0][package]python-openssl-0.6-97.i586
+>!> ESTABLISHED:3173: U__s_[S2:0][package]python-opensync-0.22-44.i586
+>!> ESTABLISHED:3174: U__s_[S2:0][package]python-orbit-2.14.3-12.i586
+>!> ESTABLISHED:3175: U__s_[S2:0][package]python-pam-0.4.2-99.i586
+>!> ESTABLISHED:3176: U__s_[S2:0][package]python-pygame-1.7.1release-111.i586
+>!> ESTABLISHED:3177: U__s_[S2:0][package]python-qt-3.17.3-10.i586
+>!> ESTABLISHED:3178: U__s_[S2:0][package]python-serial-2.2-94.i586
+>!> ESTABLISHED:3179: U__s_[S2:0][package]python-sip-4.7-14.i586
+>!> ESTABLISHED:3180: U__s_[S2:0][package]python-tk-2.5.1-32.i586
+>!> ESTABLISHED:3181: U__s_[S2:0][package]python-twisted-2.5.0-10.i586
+>!> ESTABLISHED:3182: U__s_[S2:0][package]python-twisted-doc-2.5.0-10.i586
+>!> ESTABLISHED:3183: U__s_[S2:0][package]python-twisted-web-0.7.0-10.i586
+>!> ESTABLISHED:3184: U__s_[S2:0][package]python-urlgrabber-3.1.0-77.i586
+>!> ESTABLISHED:3185: U__s_[S2:0][package]python-xml-2.5.1-32.i586
+>!> ESTABLISHED:3186: U__s_[S2:0][package]python-zopeinterface-3.3.0-10.i586
+>!> ESTABLISHED:3187: U__s_[S2:0][package]pyxml-0.8.4-97.i586
+>!> ESTABLISHED:3188: U__s_[S2:0][package]qamix-0.0.7e-248.i586
+>!> ESTABLISHED:3189: I__s_[S1:0][package]qca-1.0-101.i586
+>!> ESTABLISHED:3190: U__s_[S2:0][package]qca-1.0-110.i586
+>!> ESTABLISHED:3191: U__s_[S2:0][package]qemacs-0.3.1-287.i586
+>!> ESTABLISHED:3192: U__s_[S2:0][package]qemu-0.9.0.cvs-28.i586
+>!> ESTABLISHED:3193: U__s_[S2:0][package]qjackconnect-0.0.3b-653.i586
+>!> ESTABLISHED:3194: U__s_[S2:0][package]qjackctl-0.3.1a-18.i586
+>!> ESTABLISHED:3195: U__s_[S2:0][package]qlogic-firmware-1.0-81.noarch
+>!> ESTABLISHED:3196: U__s_[S2:0][package]qnotify-0.5.2-97.i586
+>!> ESTABLISHED:3197: U__s_[S2:0][package]qnotify-libs-0.5.2-97.i586
+>!> ESTABLISHED:3198: U__s_[S2:0][package]qpopper-4.0.8-87.i586
+>!> ESTABLISHED:3199: I__s_[S1:0][package]qt3-3.3.8-56.i586
+>!> ESTABLISHED:3200: U__s_[S2:0][package]qt3-3.3.8-67.i586
+>!> ESTABLISHED:3201: U__s_[S2:0][package]qt3-devel-3.3.8-67.i586
+>!> ESTABLISHED:3202: U__s_[S2:0][package]qt3-devel-doc-3.3.8-67.noarch
+>!> ESTABLISHED:3203: U__s_[S2:0][package]qt3-devel-tools-3.3.8-67.i586
+>!> ESTABLISHED:3204: U__s_[S2:0][package]qt3-man-3.3.8-67.i586
+>!> ESTABLISHED:3205: U__s_[S2:0][package]qt3-mysql-3.3.8-67.i586
+>!> ESTABLISHED:3206: U__s_[S2:0][package]qt3-postgresql-3.3.8-67.i586
+>!> ESTABLISHED:3207: U__s_[S2:0][package]qt3-sqlite-3.3.8-67.i586
+>!> ESTABLISHED:3208: U__s_[S2:0][package]qt3-unixODBC-3.3.8-67.i586
+>!> ESTABLISHED:3209: I__s_[S1:0][package]qtcurve-gtk2-0.52.3-11.i586
+>!> ESTABLISHED:3210: U__s_[S2:0][package]qtcurve-gtk2-0.52.3-21.i586
+>!> ESTABLISHED:3211: U__s_[S2:0][package]qtcurve-kde-0.52.3-21.i586
+>!> ESTABLISHED:3212: U__s_[S2:0][package]quagga-0.99.7-28.i586
+>!> ESTABLISHED:3213: U__s_[S2:0][package]quilt-0.46-57.i586
+>!> ESTABLISHED:3214: U__s_[S2:0][package]quota-3.15-14.i586
+>!> ESTABLISHED:3215: U__s_[S2:0][package]radvd-0.9-69.i586
+>!> ESTABLISHED:3216: U__s_[S2:0][package]raptor-1.4.15-35.i586
+>!> ESTABLISHED:3217: U__s_[S2:0][package]rarian-0.5.6-11.i586
+>!> ESTABLISHED:3218: U__s_[S2:0][package]rarpd-1.1-658.i586
+>!> ESTABLISHED:3219: U__s_[S2:0][package]rasmol-2.7.3.1-94.i586
+>!> ESTABLISHED:3220: U__s_[S2:0][package]rcs-5.7-938.i586
+>!> ESTABLISHED:3221: U__s_[S2:0][package]rdesktop-1.5.0-73.i586
+>!> ESTABLISHED:3222: U__s_[S2:0][package]readline-devel-5.2-56.i586
+>!> ESTABLISHED:3223: U__s_[S2:0][package]readline-doc-5.2-15.i586
+>!> ESTABLISHED:3224: I__s_[S1:0][package]recode-3.6-554.i586
+>!> ESTABLISHED:3225: U__s_[S2:0][package]recode-3.6-560.i586
+>!> ESTABLISHED:3226: U__s_[S2:0][package]regexp-1.3-118.noarch
+>!> ESTABLISHED:3227: I__s_[S1:0][package]reiserfs-3.6.19-79.i586
+>!> ESTABLISHED:3228: U__s_[S2:0][package]reiserfs-3.6.19-87.i586
+>!> ESTABLISHED:3229: U__s_[S2:0][package]rekall-2.4.5-58.i586
+>!> ESTABLISHED:3230: U__s_[S2:0][package]rekall-xbase-2.4.5-58.i586
+>!> ESTABLISHED:3231: I__s_[S1:0][package]release-notes-10.3.3-3.noarch
+>!> ESTABLISHED:3232: U__s_[S2:0][package]release-notes-10.3.8-2.noarch
+>!> ESTABLISHED:3233: U__s_[S2:0][package]resapplet-0.1.4-77.i586
+>!> ESTABLISHED:3234: I__s_[S1:0][package]resmgr-1.1.0_SVNr143-2.i586
+>!> ESTABLISHED:3235: U__s_[S2:0][package]resmgr-1.1.0_SVNr143-8.i586
+>!> ESTABLISHED:3236: U__s_[S2:0][package]rfb-0.6.1-570.i586
+>!> ESTABLISHED:3237: U__s_[S2:0][package]rfbplaymacro-0.2.0-309.i586
+>!> ESTABLISHED:3238: U__s_[S2:0][package]rfbproxy-0.6.5-337.i586
+>!> ESTABLISHED:3239: U__s_[S2:0][package]rfswitch-kmp-bigsmp-1.1_2.6.22.5_10-4.i586
+>!> ESTABLISHED:3240: U__s_[S2:0][package]rfswitch-kmp-default-1.1_2.6.22.5_10-4.i586
+>!> ESTABLISHED:3241: U__s_[S2:0][package]rfswitch-kmp-xen-1.1_2.6.22.5_10-4.i586
+>!> ESTABLISHED:3242: U__s_[S2:0][package]rfswitch-kmp-xenpae-1.1_2.6.22.5_10-4.i586
+>!> ESTABLISHED:3243: U__s_[S2:0][package]rinetd-0.61-875.i586
+>!> ESTABLISHED:3244: U__s_[S2:0][package]ripit-3.6.0-15.noarch
+>!> ESTABLISHED:3245: U__s_[S2:0][package]rlog-1.3.7-68.i586
+>!> ESTABLISHED:3246: U__s_[S2:0][package]root-tail-1.2-102.i586
+>!> ESTABLISHED:3247: I__s_[S1:0][package]rpm-4.4.2-127.i586
+>!> ESTABLISHED:3248: U__s_[S2:0][package]rpm-4.4.2-136.i586
+>!> ESTABLISHED:3249: U__s_[S2:0][package]rpm-devel-4.4.2-136.i586
+>!> ESTABLISHED:3250: U__s_[S2:0][package]rpm-python-4.4.2-157.i586
+>!> ESTABLISHED:3251: I__s_[S1:0][package]rrdtool-1.2.23-34.i586
+>!> ESTABLISHED:3252: U__s_[S2:0][package]rrdtool-1.2.23-41.i586
+>!> ESTABLISHED:3253: U__s_[S2:0][package]rsh-0.17-635.i586
+>!> ESTABLISHED:3254: U__s_[S2:0][package]rsh-server-0.17-635.i586
+>!> ESTABLISHED:3255: U__s_[S2:0][package]rsvg-sharp2-2.16.0-27.i586
+>!> ESTABLISHED:3256: U__s_[S2:0][package]rsync-2.6.9-41.i586
+>!> ESTABLISHED:3257: U__s_[S2:0][package]rt2x00-kmp-bigsmp-2.0.6+git20070816_2.6.22.5_10-2.i586
+>!> ESTABLISHED:3258: U__s_[S2:0][package]rt2x00-kmp-default-2.0.6+git20070816_2.6.22.5_10-2.i586
+>!> ESTABLISHED:3259: U__s_[S2:0][package]rt2x00-kmp-xen-2.0.6+git20070816_2.6.22.5_10-2.i586
+>!> ESTABLISHED:3260: U__s_[S2:0][package]rt2x00-kmp-xenpae-2.0.6+git20070816_2.6.22.5_10-2.i586
+>!> ESTABLISHED:3261: U__s_[S2:0][package]ruby-1.8.6.p36-13.i586
+>!> ESTABLISHED:3262: I__s_[S1:0][package]ruby-1.8.6.p36-2.i586
+>!> ESTABLISHED:3263: U__s_[S2:0][package]ruby-devel-1.8.6.p36-13.i586
+>!> ESTABLISHED:3264: U__s_[S2:0][package]ruby-gettext-1.10.0-13.i586
+>!> ESTABLISHED:3265: U__s_[S2:0][package]ruby-ldap-0.9.7-82.i586
+>!> ESTABLISHED:3266: U__s_[S2:0][package]rubygem-actionmailer-1.3.3-13.i586
+>!> ESTABLISHED:3267: U__s_[S2:0][package]rubygem-actionpack-1.13.3-13.i586
+>!> ESTABLISHED:3268: U__s_[S2:0][package]rubygem-actionwebservice-1.2.3-13.i586
+>!> ESTABLISHED:3269: U__s_[S2:0][package]rubygem-activerecord-1.15.3-13.i586
+>!> ESTABLISHED:3270: U__s_[S2:0][package]rubygem-activesupport-1.4.2-13.i586
+>!> ESTABLISHED:3271: U__s_[S2:0][package]rubygem-daemons-1.0.7-13.i586
+>!> ESTABLISHED:3272: U__s_[S2:0][package]rubygem-gem_plugin-0.2.2-13.i586
+>!> ESTABLISHED:3273: U__s_[S2:0][package]rubygem-mongrel-0.3.13.4-79.i586
+>!> ESTABLISHED:3274: U__s_[S2:0][package]rubygem-rails-1.2.3-13.i586
+>!> ESTABLISHED:3275: U__s_[S2:0][package]rubygem-rake-0.7.3-13.i586
+>!> ESTABLISHED:3276: U__s_[S2:0][package]rubygems-0.9.2-56.i586
+>!> ESTABLISHED:3277: U__s_[S2:0][package]rxp-1.4.8-7.i586
+>!> ESTABLISHED:3278: U__s_[S2:0][package]rxvt-unicode-8.3-10.i586
+>!> ESTABLISHED:3279: U__s_[S2:0][package]rzsz-0.12.20-909.i586
+>!> ESTABLISHED:3280: U__s_[S2:0][package]sabayon-2.19.2-11.i586
+>!> ESTABLISHED:3281: U__s_[S2:0][package]sabayon-admin-2.19.2-11.i586
+>!> ESTABLISHED:3282: U__s_[S2:0][package]sablot-1.0.3-41.i586
+>!> ESTABLISHED:3283: U__s_[S2:0][package]samba-3.0.25c-3.i586
+>!> ESTABLISHED:3284: U__s_[S2:0][package]samba-client-3.0.25c-3.i586
+>!> ESTABLISHED:3285: U__s_[S2:0][package]samba-doc-3.0.25c-3.noarch
+>!> ESTABLISHED:3286: U__s_[S2:0][package]samba-vscan-0.3.6b-171.i586
+>!> ESTABLISHED:3287: U__s_[S2:0][package]samba-winbind-3.0.25c-3.i586
+>!> ESTABLISHED:3288: I__s_[S1:0][package]sane-backends-1.0.18-56.i586
+>!> ESTABLISHED:3289: U__s_[S2:0][package]sane-backends-1.0.18-71.i586
+>!> ESTABLISHED:3290: U__s_[S2:0][package]sane-frontends-1.0.14-129.i586
+>!> ESTABLISHED:3291: U__s_[S2:0][package]sash-3.7-105.i586
+>!> ESTABLISHED:3292: I__s_[S1:0][package]sax2-8.1-197.i586
+>!> ESTABLISHED:3293: U__s_[S2:0][package]sax2-8.1-235.i586
+>!> ESTABLISHED:3294: I__s_[S1:0][package]sax2-gui-8.1-197.i586
+>!> ESTABLISHED:3295: U__s_[S2:0][package]sax2-gui-8.1-235.i586
+>!> ESTABLISHED:3296: I__s_[S1:0][package]sax2-ident-8.1-197.i586
+>!> ESTABLISHED:3297: U__s_[S2:0][package]sax2-ident-8.1-235.i586
+>!> ESTABLISHED:3298: I__s_[S1:0][package]sax2-libsax-8.1-197.i586
+>!> ESTABLISHED:3299: U__s_[S2:0][package]sax2-libsax-8.1-235.i586
+>!> ESTABLISHED:3300: I__s_[S1:0][package]sax2-libsax-perl-8.1-197.i586
+>!> ESTABLISHED:3301: U__s_[S2:0][package]sax2-libsax-perl-8.1-235.i586
+>!> ESTABLISHED:3302: I__s_[S1:0][package]sax2-tools-8.1-197.i586
+>!> ESTABLISHED:3303: U__s_[S2:0][package]sax2-tools-8.1-235.i586
+>!> ESTABLISHED:3304: U__s_[S2:0][package]sazanami-fonts-20040629-96.noarch
+>!> ESTABLISHED:3305: U__s_[S2:0][package]sbl-3.0f-13.i586
+>!> ESTABLISHED:3306: U__s_[S2:0][package]scim-1.4.7-15.i586
+>!> ESTABLISHED:3307: U__s_[S2:0][package]scim-anthy-1.2.4-17.i586
+>!> ESTABLISHED:3308: U__s_[S2:0][package]scim-bridge-0.4.13-16.i586
+>!> ESTABLISHED:3309: U__s_[S2:0][package]scim-bridge-gtk-0.4.13-16.i586
+>!> ESTABLISHED:3310: U__s_[S2:0][package]scim-bridge-qt-0.4.13-16.i586
+>!> ESTABLISHED:3311: U__s_[S2:0][package]scim-canna-1.0.0-98.i586
+>!> ESTABLISHED:3312: U__s_[S2:0][package]scim-chewing-0.3.1-102.i586
+>!> ESTABLISHED:3313: U__s_[S2:0][package]scim-devel-1.4.7-15.i586
+>!> ESTABLISHED:3314: U__s_[S2:0][package]scim-input-pad-0.1.1-117.i586
+>!> ESTABLISHED:3315: U__s_[S2:0][package]scim-m17n-0.2.2-59.i586
+>!> ESTABLISHED:3316: U__s_[S2:0][package]scim-pinyin-0.5.91.20060705-108.i586
+>!> ESTABLISHED:3317: U__s_[S2:0][package]scim-pinyin-skim-0.5.91.20060705-108.i586
+>!> ESTABLISHED:3318: U__s_[S2:0][package]scim-qtimm-0.9.4-111.i586
+>!> ESTABLISHED:3319: U__s_[S2:0][package]scim-skk-0.5.2-121.i586
+>!> ESTABLISHED:3320: U__s_[S2:0][package]scim-tables-0.5.7-99.i586
+>!> ESTABLISHED:3321: U__s_[S2:0][package]scim-tables-additional-0.5.7-99.i586
+>!> ESTABLISHED:3322: U__s_[S2:0][package]scim-tables-ja-0.5.7-99.i586
+>!> ESTABLISHED:3323: U__s_[S2:0][package]scim-tables-skim-0.5.7-99.i586
+>!> ESTABLISHED:3324: U__s_[S2:0][package]scim-tables-zh-0.5.7-99.i586
+>!> ESTABLISHED:3325: U__s_[S2:0][package]scim-tomoe-0.5.0-14.i586
+>!> ESTABLISHED:3326: U__s_[S2:0][package]scim-uim-0.2.0-17.i586
+>!> ESTABLISHED:3327: U__s_[S2:0][package]scotty-2.1.11-702.i586
+>!> ESTABLISHED:3328: I__s_[S1:0][package]scpm-1.1.6pre1-23.i586
+>!> ESTABLISHED:3329: U__s_[S2:0][package]scpm-1.1.6pre2-6.i586
+>!> ESTABLISHED:3330: U__s_[S2:0][package]screen-4.0.2-124.i586
+>!> ESTABLISHED:3331: U__s_[S2:0][package]scrollkeeper-0.3.14-174.i586
+>!> ESTABLISHED:3332: U__s_[S2:0][package]scsi-1.7_2.37_1.25_0.19_1.02_0.93-13.i586
+>!> ESTABLISHED:3333: I__s_[S1:0][package]scsi-1.7_2.37_1.25_0.19_1.02_0.93-6.i586
+>!> ESTABLISHED:3334: U__s_[S2:0][package]scsirastools-1.4.10-72.i586
+>!> ESTABLISHED:3335: U__s_[S2:0][package]seahorse-1.0.1-53.i586
+>!> ESTABLISHED:3336: U__s_[S2:0][package]seamonkey-1.1.4-7.i586
+>!> ESTABLISHED:3337: U__s_[S2:0][package]seamonkey-dom-inspector-1.1.4-7.i586
+>!> ESTABLISHED:3338: U__s_[S2:0][package]seamonkey-irc-1.1.4-7.i586
+>!> ESTABLISHED:3339: U__s_[S2:0][package]seamonkey-mail-1.1.4-7.i586
+>!> ESTABLISHED:3340: U__s_[S2:0][package]seamonkey-spellchecker-1.1.4-7.i586
+>!> ESTABLISHED:3341: U__s_[S2:0][package]seamonkey-venkman-1.1.4-7.i586
+>!> ESTABLISHED:3342: U__s_[S2:0][package]seccheck-2.0-590.noarch
+>!> ESTABLISHED:3343: I__s_[S1:0][package]sed-4.1.5-55.i586
+>!> ESTABLISHED:3344: U__s_[S2:0][package]sed-4.1.5-61.i586
+>!> ESTABLISHED:3345: U__s_[S2:0][package]semi-xemacs-1.14.6-111.noarch
+>!> ESTABLISHED:3346: U__s_[S2:0][package]sendfax-1.1.35-63.i586
+>!> ESTABLISHED:3347: U__s_[S2:0][package]sendmail-8.14.1-46.i586
+>!> ESTABLISHED:3348: U__s_[S2:0][package]sensors-2.10.4-15.i586
+>!> ESTABLISHED:3349: I__s_[S1:0][package]sensors-2.10.4-3.i586
+>!> ESTABLISHED:3350: U__s_[S2:0][package]seq24-0.8.7-97.i586
+>!> ESTABLISHED:3351: U__s_[S2:0][package]servletapi4-4.0.4-118.noarch
+>!> ESTABLISHED:3352: U__s_[S2:0][package]servletapi5-5.0.18-117.noarch
+>!> ESTABLISHED:3353: U__s_[S2:0][package]sesam_srv-3.0.1-65.i586
+>!> ESTABLISHED:3354: U__s_[S2:0][package]setserial-2.17-651.i586
+>!> ESTABLISHED:3355: U__s_[S2:0][package]sfftobmp-3.1-47.i586
+>!> ESTABLISHED:3356: U__s_[S2:0][package]sgi-fonts-1.0-812.noarch
+>!> ESTABLISHED:3357: U__s_[S2:0][package]sgml-skel-0.6-342.noarch
+>!> ESTABLISHED:3358: U__s_[S2:0][package]sgmltool-1.0.9-983.i586
+>!> ESTABLISHED:3359: U__s_[S2:0][package]sgmltools-lite-3.0.2-1181.noarch
+>!> ESTABLISHED:3360: U__s_[S2:0][package]sgrep-1.92a-893.i586
+>!> ESTABLISHED:3361: U__s_[S2:0][package]shared-mime-info-0.22-10.i586
+>!> ESTABLISHED:3362: I__s_[S1:0][package]shared-mime-info-0.22-2.i586
+>!> ESTABLISHED:3363: U__s_[S2:0][package]sharutils-4.6.2-74.i586
+>!> ESTABLISHED:3364: U__s_[S2:0][package]sidplay-2.0.9-73.i586
+>!> ESTABLISHED:3365: I__s_[S1:0][package]siga-10.101-64.noarch
+>!> ESTABLISHED:3366: U__s_[S2:0][package]siga-10.101-70.noarch
+>!> ESTABLISHED:3367: U__s_[S2:0][package]sil-charis-4.0.02-62.noarch
+>!> ESTABLISHED:3368: U__s_[S2:0][package]sil-doulos-4.0.14-62.noarch
+>!> ESTABLISHED:3369: U__s_[S2:0][package]silc-toolkit-1.1.2-10.i586
+>!> ESTABLISHED:3370: U__s_[S2:0][package]siproxd-0.5.13-83.i586
+>!> ESTABLISHED:3371: U__s_[S2:0][package]sisctrl-0.0.20051202-97.i586
+>!> ESTABLISHED:3372: U__s_[S2:0][package]sitar-1.0.6-63.noarch
+>!> ESTABLISHED:3373: U__s_[S2:0][package]skencil-0.6.17-123.i586
+>!> ESTABLISHED:3374: U__s_[S2:0][package]skim-1.4.5-110.i586
+>!> ESTABLISHED:3375: U__s_[S2:0][package]skim-scim-anthy-1.2.2-55.i586
+>!> ESTABLISHED:3376: U__s_[S2:0][package]skim-scim-canna-1.0.0-105.i586
+>!> ESTABLISHED:3377: U__s_[S2:0][package]skim-scim-skk-0.5.2.1-106.i586
+>!> ESTABLISHED:3378: U__s_[S2:0][package]skkdic-20050123-114.noarch
+>!> ESTABLISHED:3379: U__s_[S2:0][package]slang-2.1.1-13.i586
+>!> ESTABLISHED:3380: I__s_[S1:0][package]slang-2.1.1-7.i586
+>!> ESTABLISHED:3381: U__s_[S2:0][package]slang-devel-2.1.1-13.i586
+>!> ESTABLISHED:3382: U__s_[S2:0][package]slib-3a1-122.noarch
+>!> ESTABLISHED:3383: U__s_[S2:0][package]slrn-0.9.8.1pl1-87.i586
+>!> ESTABLISHED:3384: U__s_[S2:0][package]smart-0.51-44.i586
+>!> ESTABLISHED:3385: U__s_[S2:0][package]smart-gui-0.51-44.i586
+>!> ESTABLISHED:3386: I__s_[S1:0][package]smartlink-softmodem-2.9.10-126.i586
+>!> ESTABLISHED:3387: U__s_[S2:0][package]smartlink-softmodem-2.9.10-138.i586
+>!> ESTABLISHED:3388: U__s_[S2:0][package]smartlink-softmodem-kmp-bigsmp-2.9.10_2.6.22.5_10-138.i586
+>!> ESTABLISHED:3389: U__s_[S2:0][package]smartlink-softmodem-kmp-default-2.9.10_2.6.22.5_10-138.i586
+>!> ESTABLISHED:3390: U__s_[S2:0][package]smartmontools-5.37-12.i586
+>!> ESTABLISHED:3391: U__s_[S2:0][package]smolt-0.9.8.3-14.noarch
+>!> ESTABLISHED:3392: U__s_[S2:0][package]smpppd-1.59-80.i586
+>!> ESTABLISHED:3393: U__s_[S2:0][package]snd_sf2-0.1.2-594.noarch
+>!> ESTABLISHED:3394: U__s_[S2:0][package]snmp-mibs-5.4.1-11.i586
+>!> ESTABLISHED:3395: I__s_[S1:0][package]snmp-mibs-5.4.1-2.i586
+>!> ESTABLISHED:3396: U__s_[S2:0][package]socat-1.5.0.0-60.i586
+>!> ESTABLISHED:3397: U__s_[S2:0][package]solarwolf-1.5-127.i586
+>!> ESTABLISHED:3398: U__s_[S2:0][package]solfege-3.8.2-22.i586
+>!> ESTABLISHED:3399: U__s_[S2:0][package]sound-juicer-2.19.3-3.i586
+>!> ESTABLISHED:3400: U__s_[S2:0][package]soundtouch-1.3.1-16.i586
+>!> ESTABLISHED:3401: U__s_[S2:0][package]sox-13.0.0-37.i586
+>!> ESTABLISHED:3402: U__s_[S2:0][package]spamassassin-3.2.3-7.i586
+>!> ESTABLISHED:3403: U__s_[S2:0][package]spandsp-0.0.3-36.i586
+>!> ESTABLISHED:3404: U__s_[S2:0][package]spectcl-1.2.1.9-16.noarch
+>!> ESTABLISHED:3405: U__s_[S2:0][package]speex-1.1.99.2-23.i586
+>!> ESTABLISHED:3406: I__s_[S1:0][package]splashy-0.3.3-16.i586
+>!> ESTABLISHED:3407: U__s_[S2:0][package]splashy-0.3.3-32.i586
+>!> ESTABLISHED:3408: U__s_[S2:0][package]sqlite-3.4.1-10.i586
+>!> ESTABLISHED:3409: I__s_[S1:0][package]sqlite-3.4.1-2.i586
+>!> ESTABLISHED:3410: U__s_[S2:0][package]sqlite-devel-3.4.1-10.i586
+>!> ESTABLISHED:3411: I__s_[S1:0][package]sqlite2-2.8.17-77.i586
+>!> ESTABLISHED:3412: U__s_[S2:0][package]sqlite2-2.8.17-84.i586
+>!> ESTABLISHED:3413: U__s_[S2:0][package]sqlite2-devel-2.8.17-84.i586
+>!> ESTABLISHED:3414: U__s_[S2:0][package]squid-2.6.STABLE14-14.i586
+>!> ESTABLISHED:3415: U__s_[S2:0][package]squidGuard-1.2.1-31.i586
+>!> ESTABLISHED:3416: U__s_[S2:0][package]src_vipa-2.0.3-71.i586
+>!> ESTABLISHED:3417: U__s_[S2:0][package]sshfs-1.8-28.i586
+>!> ESTABLISHED:3418: U__s_[S2:0][package]star-1.5a70-78.i586
+>!> ESTABLISHED:3419: I__s_[S1:0][package]startup-notification-0.9-2.i586
+>!> ESTABLISHED:3420: U__s_[S2:0][package]startup-notification-0.9-9.i586
+>!> ESTABLISHED:3421: U__s_[S2:0][package]startup-notification-devel-0.9-9.i586
+>!> ESTABLISHED:3422: U__s_[S2:0][package]statserial-1.1-647.i586
+>!> ESTABLISHED:3423: U__s_[S2:0][package]strace-4.5.16-8.i586
+>!> ESTABLISHED:3424: I__s_[S1:0][package]strigi-0.5.4.svn696918-2.i586
+>!> ESTABLISHED:3425: U__s_[S2:0][package]strigi-0.5.5-11.i586
+>!> ESTABLISHED:3426: U__s_[S2:0][package]strigi-devel-0.5.5-11.i586
+>!> ESTABLISHED:3427: U__s_[S2:0][package]subversion-1.4.4-22.i586
+>!> ESTABLISHED:3428: U__s_[S2:0][package]subversion-doc-1.4-18.noarch
+>!> ESTABLISHED:3429: U__s_[S2:0][package]subversion-perl-1.4.4-22.i586
+>!> ESTABLISHED:3430: U__s_[S2:0][package]subversion-python-1.4.4-22.i586
+>!> ESTABLISHED:3431: U__s_[S2:0][package]subversion-server-1.4.4-22.i586
+>!> ESTABLISHED:3432: U__s_[S2:0][package]subversion-tools-1.4.4-22.i586
+>!> ESTABLISHED:3433: U__s_[S2:0][package]suck-4.3.0-614.i586
+>!> ESTABLISHED:3434: U__s_[S2:0][package]sudo-1.6.9p2-16.i586
+>!> ESTABLISHED:3435: I__s_[S1:0][package]sudo-1.6.9p2-3.i586
+>!> ESTABLISHED:3436: I__s_[S1:0][package]sumf-0.2.4pre1-126.i586
+>!> ESTABLISHED:3437: U__s_[S2:0][package]sumf-0.2.4pre2-13.i586
+>!> ESTABLISHED:3438: U__s_[S2:0][package]supertux-0.1.3-82.i586
+>!> ESTABLISHED:3439: I__s_[S1:0][package]suse-build-key-1.0-752.noarch
+>!> ESTABLISHED:3440: U__s_[S2:0][package]suse-build-key-1.0-762.noarch
+>!> ESTABLISHED:3441: I__s_[S1:0][package]suseRegister-1.2-62.noarch
+>!> ESTABLISHED:3442: U__s_[S2:0][package]suseRegister-1.2-73.noarch
+>!> ESTABLISHED:3443: I__s_[S1:0][package]susehelp-2007.05.30-20.noarch
+>!> ESTABLISHED:3444: U__s_[S2:0][package]susehelp-2007.08.22-6.noarch
+>!> ESTABLISHED:3445: U__s_[S2:0][package]susehelp_cz-2007.08.22-6.noarch
+>!> ESTABLISHED:3446: U__s_[S2:0][package]susehelp_de-2007.08.22-6.noarch
+>!> ESTABLISHED:3447: I__s_[S1:0][package]susehelp_en-2007.05.30-20.noarch
+>!> ESTABLISHED:3448: U__s_[S2:0][package]susehelp_en-2007.08.22-6.noarch
+>!> ESTABLISHED:3449: U__s_[S2:0][package]susehelp_es-2007.08.22-6.noarch
+>!> ESTABLISHED:3450: U__s_[S2:0][package]susehelp_fr-2007.08.22-6.noarch
+>!> ESTABLISHED:3451: U__s_[S2:0][package]susehelp_hu-2007.08.22-6.noarch
+>!> ESTABLISHED:3452: U__s_[S2:0][package]susehelp_it-2007.08.22-6.noarch
+>!> ESTABLISHED:3453: U__s_[S2:0][package]susevbox-1.1-1636.i586
+>!> ESTABLISHED:3454: I__s_[S1:0][package]suspend-0.50.20070731-5.i586
+>!> ESTABLISHED:3455: U__s_[S2:0][package]suspend-0.69.9-2.i586
+>!> ESTABLISHED:3456: U__s_[S2:0][package]svg-schema-20030114-26.noarch
+>!> ESTABLISHED:3457: U__s_[S2:0][package]swig-1.3.31-44.i586
+>!> ESTABLISHED:3458: U__s_[S2:0][package]sysconfig-0.70.0-10.i586
+>!> ESTABLISHED:3459: I__s_[S1:0][package]sysconfig-0.70.0-3.i586
+>!> ESTABLISHED:3460: I__s_[S1:0][package]sysfsutils-2.1.0-52.i586
+>!> ESTABLISHED:3461: U__s_[S2:0][package]sysfsutils-2.1.0-58.i586
+>!> ESTABLISHED:3462: U__s_[S2:0][package]syslinux-3.31-55.i586
+>!> ESTABLISHED:3463: I__s_[S1:0][package]syslog-ng-1.6.12-24.i586
+>!> ESTABLISHED:3464: U__s_[S2:0][package]syslog-ng-1.6.12-30.i586
+>!> ESTABLISHED:3465: U__s_[S2:0][package]syslogd-1.4.1-629.i586
+>!> ESTABLISHED:3466: U__s_[S2:0][package]sysstat-7.1.6-13.i586
+>!> ESTABLISHED:3467: U__s_[S2:0][package]sysstat-isag-7.1.6-13.i586
+>!> ESTABLISHED:3468: I_Lu_[S0:0][system]system-.noarch
+>!> ESTABLISHED:3469: I__s_[S1:0][package]sysvinit-2.86-93.i586
+>!> ESTABLISHED:3470: U__s_[S2:0][package]sysvinit-2.86-99.i586
+>!> ESTABLISHED:3471: U__s_[S2:0][package]t1lib-5.1.1-8.i586
+>!> ESTABLISHED:3472: U__s_[S2:0][package]t1lib-devel-5.1.1-8.i586
+>!> ESTABLISHED:3473: U__s_[S2:0][package]tack-5.6-37.i586
+>!> ESTABLISHED:3474: U__s_[S2:0][package]taglib-1.4-106.i586
+>!> ESTABLISHED:3475: I__s_[S1:0][package]taglib-1.4-97.i586
+>!> ESTABLISHED:3476: U__s_[S2:0][package]talk-0.17-630.i586
+>!> ESTABLISHED:3477: U__s_[S2:0][package]talk-server-0.17-630.i586
+>!> ESTABLISHED:3478: U__s_[S2:0][package]tamago-4.0.6_20011017cvs-707.noarch
+>!> ESTABLISHED:3479: U__s_[S2:0][package]tango-icon-theme-0.8.0-69.noarch
+>!> ESTABLISHED:3480: U__s_[S2:0][package]tar-1.17-18.i586
+>!> ESTABLISHED:3481: I__s_[S1:0][package]tar-1.17-8.i586
+>!> ESTABLISHED:3482: U__s_[S2:0][package]tcl-8.4.15-19.i586
+>!> ESTABLISHED:3483: U__s_[S2:0][package]tcl-devel-8.4.15-19.i586
+>!> ESTABLISHED:3484: U__s_[S2:0][package]tcllib-1.9-50.noarch
+>!> ESTABLISHED:3485: U__s_[S2:0][package]tclplug-3.0.2-86.i586
+>!> ESTABLISHED:3486: U__s_[S2:0][package]tcludp-1.0.7-74.i586
+>!> ESTABLISHED:3487: U__s_[S2:0][package]tclx-8.4-403.i586
+>!> ESTABLISHED:3488: I__s_[S1:0][package]tcpd-7.6-782.i586
+>!> ESTABLISHED:3489: U__s_[S2:0][package]tcpd-7.6-788.i586
+>!> ESTABLISHED:3490: U__s_[S2:0][package]tcpd-devel-7.6-788.i586
+>!> ESTABLISHED:3491: U__s_[S2:0][package]tcpdump-3.9.7-11.i586
+>!> ESTABLISHED:3492: U__s_[S2:0][package]tcsh-6.15.00-17.i586
+>!> ESTABLISHED:3493: U__s_[S2:0][package]tdom-0.8.2-8.i586
+>!> ESTABLISHED:3494: U__s_[S2:0][package]tei-xsl-stylesheets-5.4.24-30.noarch
+>!> ESTABLISHED:3495: U__s_[S2:0][package]tei_4-2004.1.30-122.noarch
+>!> ESTABLISHED:3496: U__s_[S2:0][package]tellico-1.2.13-19.i586
+>!> ESTABLISHED:3497: U__s_[S2:0][package]telnet-1.2-74.i586
+>!> ESTABLISHED:3498: U__s_[S2:0][package]telnet-server-1.2-74.i586
+>!> ESTABLISHED:3499: U__s_[S2:0][package]termcap-2.0.8-948.i586
+>!> ESTABLISHED:3500: U__s_[S2:0][package]terminfo-5.6-37.i586
+>!> ESTABLISHED:3501: U__s_[S2:0][package]terminus-font-4.20-87.noarch
+>!> ESTABLISHED:3502: U__s_[S2:0][package]testgart-0.1-259.i586
+>!> ESTABLISHED:3503: U__s_[S2:0][package]texinfo-4.9-12.i586
+>!> ESTABLISHED:3504: U__s_[S2:0][package]texlive-2007-62.noarch
+>!> ESTABLISHED:3505: U__s_[S2:0][package]texlive-bin-2007-61.i586
+>!> ESTABLISHED:3506: U__s_[S2:0][package]texlive-bin-cjk-2007-61.i586
+>!> ESTABLISHED:3507: U__s_[S2:0][package]texlive-bin-devel-2007-61.i586
+>!> ESTABLISHED:3508: U__s_[S2:0][package]texlive-bin-dvilj-2007-61.i586
+>!> ESTABLISHED:3509: U__s_[S2:0][package]texlive-bin-latex-2007-61.i586
+>!> ESTABLISHED:3510: U__s_[S2:0][package]texlive-bin-metapost-2007-61.i586
+>!> ESTABLISHED:3511: U__s_[S2:0][package]texlive-bin-omega-2007-61.i586
+>!> ESTABLISHED:3512: U__s_[S2:0][package]texlive-bin-xetex-2007-61.i586
+>!> ESTABLISHED:3513: U__s_[S2:0][package]texlive-cjk-2007-62.noarch
+>!> ESTABLISHED:3514: U__s_[S2:0][package]texlive-cjk-latex-extras-20070515-36.noarch
+>!> ESTABLISHED:3515: U__s_[S2:0][package]texlive-context-2007-62.noarch
+>!> ESTABLISHED:3516: U__s_[S2:0][package]texlive-devel-2007-62.noarch
+>!> ESTABLISHED:3517: U__s_[S2:0][package]texlive-dvilj-2007-62.noarch
+>!> ESTABLISHED:3518: U__s_[S2:0][package]texlive-latex-2007-62.noarch
+>!> ESTABLISHED:3519: U__s_[S2:0][package]texlive-metapost-2007-62.noarch
+>!> ESTABLISHED:3520: U__s_[S2:0][package]texlive-omega-2007-62.noarch
+>!> ESTABLISHED:3521: U__s_[S2:0][package]texlive-xetex-2007-62.noarch
+>!> ESTABLISHED:3522: U__s_[S2:0][package]textmaker-2007.3.26-39.i586
+>!> ESTABLISHED:3523: U__s_[S2:0][package]tftp-0.48-36.i586
+>!> ESTABLISHED:3524: U__s_[S2:0][package]tgt-0.1-30.i586
+>!> ESTABLISHED:3525: U__s_[S2:0][package]thinkeramik-3.2.1-140.i586
+>!> ESTABLISHED:3526: U__s_[S2:0][package]thinkeramik-style-3.2.1-140.i586
+>!> ESTABLISHED:3527: U__s_[S2:0][package]thunar-0.8.0-72.i586
+>!> ESTABLISHED:3528: U__s_[S2:0][package]thunar-volman-0.1.2-65.i586
+>!> ESTABLISHED:3529: U__s_[S2:0][package]tidy-1.0-48.i586
+>!> ESTABLISHED:3530: U__s_[S2:0][package]tiff-3.8.2-65.i586
+>!> ESTABLISHED:3531: I__s_[S1:0][package]tightvnc-1.3.9-2.i586
+>!> ESTABLISHED:3532: U__s_[S2:0][package]tightvnc-1.3.9-9.i586
+>!> ESTABLISHED:3533: I__s_[S1:0][package]timezone-2.6-16.i586
+>!> ESTABLISHED:3534: U__s_[S2:0][package]timezone-2007g-4.i586
+>!> ESTABLISHED:3535: U__s_[S2:0][package]timidity-2.13.2-120.i586
+>!> ESTABLISHED:3536: U__s_[S2:0][package]tix-8.4.0-22.i586
+>!> ESTABLISHED:3537: U__s_[S2:0][package]tk-8.4.15-19.i586
+>!> ESTABLISHED:3538: U__s_[S2:0][package]tk-devel-8.4.15-19.i586
+>!> ESTABLISHED:3539: U__s_[S2:0][package]tkcon-2.4-71.noarch
+>!> ESTABLISHED:3540: U__s_[S2:0][package]tkimg-1.3-119.i586
+>!> ESTABLISHED:3541: U__s_[S2:0][package]tktable-2.9-80.i586
+>!> ESTABLISHED:3542: U__s_[S2:0][package]tla-1.3.3-79.i586
+>!> ESTABLISHED:3543: U__s_[S2:0][package]tls-1.5.1-67.i586
+>!> ESTABLISHED:3544: U__s_[S2:0][package]tomboy-0.7.6-2.i586
+>!> ESTABLISHED:3545: U__s_[S2:0][package]tomcat55-5.5.23-101.noarch
+>!> ESTABLISHED:3546: U__s_[S2:0][package]tomcat55-common-lib-5.5.23-101.noarch
+>!> ESTABLISHED:3547: U__s_[S2:0][package]tomcat55-jasper-5.5.23-101.noarch
+>!> ESTABLISHED:3548: U__s_[S2:0][package]tomcat55-jsp-2_0-api-5.5.23-101.noarch
+>!> ESTABLISHED:3549: U__s_[S2:0][package]tomcat55-server-lib-5.5.23-101.noarch
+>!> ESTABLISHED:3550: U__s_[S2:0][package]tomcat55-servlet-2_4-api-5.5.23-101.noarch
+>!> ESTABLISHED:3551: U__s_[S2:0][package]tomoe-0.5.1-13.i586
+>!> ESTABLISHED:3552: U__s_[S2:0][package]toshutils-2.0.1-1246.i586
+>!> ESTABLISHED:3553: U__s_[S2:0][package]totem-2.19.90-3.i586
+>!> ESTABLISHED:3554: U__s_[S2:0][package]totem-plugin-2.19.90-3.i586
+>!> ESTABLISHED:3555: U__s_[S2:0][package]tpb-0.6.4-102.i586
+>!> ESTABLISHED:3556: U__s_[S2:0][package]tpctl-4.17-121.i586
+>!> ESTABLISHED:3557: U__s_[S2:0][package]tpctl-kmp-bigsmp-4.17_2.6.22.5_10-121.i586
+>!> ESTABLISHED:3558: U__s_[S2:0][package]tpctl-kmp-default-4.17_2.6.22.5_10-121.i586
+>!> ESTABLISHED:3559: U__s_[S2:0][package]trackballs-1.1.4-10.i586
+>!> ESTABLISHED:3560: U__s_[S2:0][package]traffic-vis-0.35-240.i586
+>!> ESTABLISHED:3561: U__s_[S2:0][package]transfig-3.2.5-18.i586
+>!> ESTABLISHED:3562: U__s_[S2:0][package]transset-20040120-91.i586
+>!> ESTABLISHED:3563: U__s_[S2:0][package]tree-1.5.1-29.i586
+>!> ESTABLISHED:3564: U__s_[S2:0][package]tsclient-0.148-108.i586
+>!> ESTABLISHED:3565: U__s_[S2:0][package]tse3-0.3.1-75.i586
+>!> ESTABLISHED:3566: U__s_[S2:0][package]ttf-arphic-20001125-673.noarch
+>!> ESTABLISHED:3567: U__s_[S2:0][package]ttf-arphic-bkai00mp-20001125-673.noarch
+>!> ESTABLISHED:3568: U__s_[S2:0][package]ttf-arphic-bsmi00lp-20001125-673.noarch
+>!> ESTABLISHED:3569: U__s_[S2:0][package]ttf-arphic-gbsn00lp-20001125-673.noarch
+>!> ESTABLISHED:3570: U__s_[S2:0][package]ttf-arphic-gkai00mp-20001125-673.noarch
+>!> ESTABLISHED:3571: U__s_[S2:0][package]ttf-caslon-20031202-147.noarch
+>!> ESTABLISHED:3572: U__s_[S2:0][package]ttf-cmex-kai-0.20061030-1.noarch
+>!> ESTABLISHED:3573: U__s_[S2:0][package]ttf-cmex-song-0.20061030-1.noarch
+>!> ESTABLISHED:3574: U__s_[S2:0][package]ttf-founder-simplified-0.20040419-1.noarch
+>!> ESTABLISHED:3575: U__s_[S2:0][package]ttf-founder-traditional-0.20040419-1.noarch
+>!> ESTABLISHED:3576: U__s_[S2:0][package]tv-common-3.95-90.i586
+>!> ESTABLISHED:3577: U__s_[S2:0][package]tv-fonts-1.1-313.noarch
+>!> ESTABLISHED:3578: U__s_[S2:0][package]twinkle-1.1-14.i586
+>!> ESTABLISHED:3579: U__s_[S2:0][package]udev-114-10.i586
+>!> ESTABLISHED:3580: I__s_[S1:0][package]udev-114-2.i586
+>!> ESTABLISHED:3581: U__s_[S2:0][package]ufraw-0.12-19.i586
+>!> ESTABLISHED:3582: I__s_[S1:0][package]ufraw-0.12-2.i586
+>!> ESTABLISHED:3583: U__s_[S2:0][package]ufraw-gimp-0.12-19.i586
+>!> ESTABLISHED:3584: I__s_[S1:0][package]ufraw-gimp-0.12-2.i586
+>!> ESTABLISHED:3585: U__s_[S2:0][package]uim-1.2.1-117.i586
+>!> ESTABLISHED:3586: U__s_[S2:0][package]uim-devel-1.2.1-117.i586
+>!> ESTABLISHED:3587: U__s_[S2:0][package]uim-gtk2-1.2.1-117.i586
+>!> ESTABLISHED:3588: U__s_[S2:0][package]uim-qt-1.2.1-117.i586
+>!> ESTABLISHED:3589: U__s_[S2:0][package]ulimit-1.1-205.noarch
+>!> ESTABLISHED:3590: U__s_[S2:0][package]umtsmon-0.6.9-3.i586
+>!> ESTABLISHED:3591: U__s_[S2:0][package]unace-2.5-199.i586
+>!> ESTABLISHED:3592: U__s_[S2:0][package]unarj-2.65-211.i586
+>!> ESTABLISHED:3593: U__s_[S2:0][package]unclutter-8-936.i586
+>!> ESTABLISHED:3594: U__s_[S2:0][package]ungifsicle-1.39-244.i586
+>!> ESTABLISHED:3595: U__s_[S2:0][package]unison-2.27.24-50.i586
+>!> ESTABLISHED:3596: U__s_[S2:0][package]units-1.86-41.i586
+>!> ESTABLISHED:3597: U__s_[S2:0][package]unix2dos-2.2-296.i586
+>!> ESTABLISHED:3598: U__s_[S2:0][package]unixODBC-2.2.12-52.i586
+>!> ESTABLISHED:3599: U__s_[S2:0][package]unrar-3.70-18.i586
+>!> ESTABLISHED:3600: U__s_[S2:0][package]unsermake-0.4_20070504-36.i586
+>!> ESTABLISHED:3601: I__s_[S1:0][package]unzip-5.52-68.i586
+>!> ESTABLISHED:3602: U__s_[S2:0][package]unzip-5.52-74.i586
+>!> ESTABLISHED:3603: I__s_[S1:0][package]update-alternatives-1.8.3-66.noarch
+>!> ESTABLISHED:3604: U__s_[S2:0][package]update-alternatives-1.8.3-72.noarch
+>!> ESTABLISHED:3605: U__s_[S2:0][package]update-desktop-files-10.3-59.noarch
+>!> ESTABLISHED:3606: U__s_[S2:0][package]update-test-affects-package-manager-0-1.3.noarch
+>!> ESTABLISHED:3607: U__s_[S2:0][package]update-test-interactive-0-1.3.noarch
+>!> ESTABLISHED:3608: U__s_[S2:0][package]update-test-optional-0-1.3.noarch
+>!> ESTABLISHED:3609: U__s_[S2:0][package]update-test-reboot-needed-0-1.3.noarch
+>!> ESTABLISHED:3610: U__s_[S2:0][package]update-test-security-0-1.3.noarch
+>!> ESTABLISHED:3611: U__s_[S2:0][package]update-test-trival-0-1.3.noarch
+>!> ESTABLISHED:3612: U__s_[S2:0][package]upx-3.00-11.i586
+>!> ESTABLISHED:3613: U__s_[S2:0][package]usbutils-0.72-60.i586
+>!> ESTABLISHED:3614: U__s_[S2:0][package]usbview-1.0-939.i586
+>!> ESTABLISHED:3615: I__s_[S1:0][package]utempter-0.5.5-67.i586
+>!> ESTABLISHED:3616: U__s_[S2:0][package]utempter-0.5.5-73.i586
+>!> ESTABLISHED:3617: U__s_[S2:0][package]util-linux-2.12r+2.13rc2+git20070725-18.i586
+>!> ESTABLISHED:3618: I__s_[S1:0][package]util-linux-2.12r+2.13rc2+git20070725-5.i586
+>!> ESTABLISHED:3619: U__s_[S2:0][package]uvcvideo-kmp-bigsmp-r117_2.6.22.5_10-2.i586
+>!> ESTABLISHED:3620: U__s_[S2:0][package]uvcvideo-kmp-default-r117_2.6.22.5_10-2.i586
+>!> ESTABLISHED:3621: U__s_[S2:0][package]uvcvideo-kmp-xen-r117_2.6.22.5_10-2.i586
+>!> ESTABLISHED:3622: U__s_[S2:0][package]uvcvideo-kmp-xenpae-r117_2.6.22.5_10-2.i586
+>!> ESTABLISHED:3623: I__s_[S1:0][package]v4l-conf-3.95-82.i586
+>!> ESTABLISHED:3624: U__s_[S2:0][package]v4l-conf-3.95-90.i586
+>!> ESTABLISHED:3625: U__s_[S2:0][package]v4l-tools-3.95-90.i586
+>!> ESTABLISHED:3626: U__s_[S2:0][package]vacation-1.2.6.2-59.i586
+>!> ESTABLISHED:3627: U__s_[S2:0][package]valgrind-3.2.3-50.i586
+>!> ESTABLISHED:3628: U__s_[S2:0][package]vbetool-1.0-31.i586
+>!> ESTABLISHED:3629: U__s_[S2:0][package]vcdimager-0.7.23-76.i586
+>!> ESTABLISHED:3630: U__s_[S2:0][package]vcdimager-devel-0.7.23-76.i586
+>!> ESTABLISHED:3631: U__s_[S2:0][package]vdr-1.4.7-26.i586
+>!> ESTABLISHED:3632: U__s_[S2:0][package]viki-0.0-140.i586
+>!> ESTABLISHED:3633: I__s_[S1:0][package]vim-7.1-24.i586
+>!> ESTABLISHED:3634: U__s_[S2:0][package]vim-7.1-37.i586
+>!> ESTABLISHED:3635: I__s_[S1:0][package]vim-base-7.1-24.i586
+>!> ESTABLISHED:3636: U__s_[S2:0][package]vim-base-7.1-37.i586
+>!> ESTABLISHED:3637: U__s_[S2:0][package]vim-data-7.1-37.i586
+>!> ESTABLISHED:3638: U__s_[S2:0][package]vino-2.19.90-3.i586
+>!> ESTABLISHED:3639: U__s_[S2:0][package]virt-manager-0.4.0-55.i586
+>!> ESTABLISHED:3640: U__s_[S2:0][package]virtualbox-20070822-3.i586
+>!> ESTABLISHED:3641: U__s_[S2:0][package]virtualbox-kmp-default-20070822_2.6.22.5_10-3.i586
+>!> ESTABLISHED:3642: U__s_[S2:0][package]vkeybd-0.1.17a-93.i586
+>!> ESTABLISHED:3643: U__s_[S2:0][package]vlan-1.9-48.i586
+>!> ESTABLISHED:3644: U__s_[S2:0][package]vlna-1.2-246.i586
+>!> ESTABLISHED:3645: U__s_[S2:0][package]vlock-1.4-11.i586
+>!> ESTABLISHED:3646: U__s_[S2:0][package]vm-install-0.2.1-36.i586
+>!> ESTABLISHED:3647: U__s_[S2:0][package]vorbis-tools-1.1.1-102.i586
+>!> ESTABLISHED:3648: I__s_[S1:0][package]vorbis-tools-1.1.1-93.i586
+>!> ESTABLISHED:3649: U__s_[S2:0][package]vpnc-0.3.3-72.i586
+>!> ESTABLISHED:3650: U__s_[S2:0][package]vsftpd-2.0.5-74.i586
+>!> ESTABLISHED:3651: U__s_[S2:0][package]vtcl-1.6.0-110.noarch
+>!> ESTABLISHED:3652: U__s_[S2:0][package]vte-0.16.8-15.i586
+>!> ESTABLISHED:3653: U__s_[S2:0][package]vte-devel-0.16.8-15.i586
+>!> ESTABLISHED:3654: U__s_[S2:0][package]vte-sharp2-2.16.0-27.i586
+>!> ESTABLISHED:3655: U__s_[S2:0][package]vym-1.10.0-8.i586
+>!> ESTABLISHED:3656: I__s_[S1:0][package]w3m-0.5.2-15.i586
+>!> ESTABLISHED:3657: U__s_[S2:0][package]w3m-0.5.2-25.i586
+>!> ESTABLISHED:3658: U__s_[S2:0][package]w3m-el-1.4.4.20070717-23.noarch
+>!> ESTABLISHED:3659: U__s_[S2:0][package]w3m-el-xemacs-1.4.4.20070717-23.noarch
+>!> ESTABLISHED:3660: U__s_[S2:0][package]w3mir-1.0.10-590.i586
+>!> ESTABLISHED:3661: U__s_[S2:0][package]wadokujt-20030810-176.noarch
+>!> ESTABLISHED:3662: U__s_[S2:0][package]wavpack-4.41.0-11.i586
+>!> ESTABLISHED:3663: U__s_[S2:0][package]wbxml2-0.9.2_SVN48-26.i586
+>!> ESTABLISHED:3664: U__s_[S2:0][package]wdfs-1.4.2-33.i586
+>!> ESTABLISHED:3665: U__s_[S2:0][package]wdiff-0.5.2-731.i586
+>!> ESTABLISHED:3666: U__s_[S2:0][package]websh-3.5.0-180.i586
+>!> ESTABLISHED:3667: U__s_[S2:0][package]wesnoth-1.2.6-2.i586
+>!> ESTABLISHED:3668: U__s_[S2:0][package]wesnoth-campaign-server-1.2.6-2.i586
+>!> ESTABLISHED:3669: U__s_[S2:0][package]wesnoth-data-base-1.2.6-2.noarch
+>!> ESTABLISHED:3670: U__s_[S2:0][package]wesnoth-data-full-1.2.6-2.noarch
+>!> ESTABLISHED:3671: U__s_[S2:0][package]wesnoth-editor-1.2.6-2.i586
+>!> ESTABLISHED:3672: U__s_[S2:0][package]wesnoth-server-1.2.6-2.i586
+>!> ESTABLISHED:3673: U__s_[S2:0][package]wesnoth-tools-1.2.6-2.i586
+>!> ESTABLISHED:3674: I__s_[S1:0][package]wget-1.10.2-67.i586
+>!> ESTABLISHED:3675: U__s_[S2:0][package]wget-1.10.2-74.i586
+>!> ESTABLISHED:3676: U__s_[S2:0][package]whois-4.7.21-8.i586
+>!> ESTABLISHED:3677: U__s_[S2:0][package]wiggle-0.6-182.i586
+>!> ESTABLISHED:3678: U__s_[S2:0][package]wine-0.9.44-5.i586
+>!> ESTABLISHED:3679: U__s_[S2:0][package]wink-1.5-62.i586
+>!> ESTABLISHED:3680: U__s_[S2:0][package]wireless-tools-29pre22-10.i586
+>!> ESTABLISHED:3681: I__s_[S1:0][package]wireless-tools-29pre22-2.i586
+>!> ESTABLISHED:3682: U__s_[S2:0][package]wireshark-0.99.6-24.i586
+>!> ESTABLISHED:3683: U__s_[S2:0][package]wl-xemacs-2.12.0-112.noarch
+>!> ESTABLISHED:3684: U__s_[S2:0][package]wlan-ng-0.2.8-27.i586
+>!> ESTABLISHED:3685: U__s_[S2:0][package]wlan-ng-kmp-bigsmp-0.2.8_2.6.22.5_10-27.i586
+>!> ESTABLISHED:3686: U__s_[S2:0][package]wlan-ng-kmp-default-0.2.8_2.6.22.5_10-27.i586
+>!> ESTABLISHED:3687: U__s_[S2:0][package]wlan-ng-kmp-xen-0.2.8_2.6.22.5_10-27.i586
+>!> ESTABLISHED:3688: U__s_[S2:0][package]wlan-ng-kmp-xenpae-0.2.8_2.6.22.5_10-27.i586
+>!> ESTABLISHED:3689: U__s_[S2:0][package]wm-icons-0.3.0-528.noarch
+>!> ESTABLISHED:3690: I__s_[S1:0][package]wodim-1.1.6-10.i586
+>!> ESTABLISHED:3691: U__s_[S2:0][package]wodim-1.1.6-18.i586
+>!> ESTABLISHED:3692: U__s_[S2:0][package]wol-0.7.1-71.i586
+>!> ESTABLISHED:3693: U__s_[S2:0][package]wondershaper-1.1a-285.noarch
+>!> ESTABLISHED:3694: U__s_[S2:0][package]wordcut-0.5.1b2-88.i586
+>!> ESTABLISHED:3695: U__s_[S2:0][package]wordcut-devel-0.5.1b2-88.i586
+>!> ESTABLISHED:3696: U__s_[S2:0][package]words-6-78.noarch
+>!> ESTABLISHED:3697: U__s_[S2:0][package]wpa_supplicant-0.5.8-21.i586
+>!> ESTABLISHED:3698: I__s_[S1:0][package]wpa_supplicant-0.5.8-8.i586
+>!> ESTABLISHED:3699: U__s_[S2:0][package]wpa_supplicant-gui-0.5.8-21.i586
+>!> ESTABLISHED:3700: U__s_[S2:0][package]wsdl4j-1.5.1-146.noarch
+>!> ESTABLISHED:3701: U__s_[S2:0][package]wsndpref-1.1.1-1055.i586
+>!> ESTABLISHED:3702: U__s_[S2:0][package]wsndsrv-0.4.0-1087.i586
+>!> ESTABLISHED:3703: U__s_[S2:0][package]wv-1.2.2-67.i586
+>!> ESTABLISHED:3704: U__s_[S2:0][package]wv2-0.2.3-104.i586
+>!> ESTABLISHED:3705: U__s_[S2:0][package]wv2-devel-0.2.3-104.i586
+>!> ESTABLISHED:3706: I__s_[S1:0][package]wvdial-1.56-10.i586
+>!> ESTABLISHED:3707: U__s_[S2:0][package]wvdial-1.56-18.i586
+>!> ESTABLISHED:3708: I__s_[S1:0][package]wvstreams-4.2.2-48.i586
+>!> ESTABLISHED:3709: U__s_[S2:0][package]wvstreams-4.2.2-56.i586
+>!> ESTABLISHED:3710: U__s_[S2:0][package]wvstreams-devel-4.2.2-56.i586
+>!> ESTABLISHED:3711: U__s_[S2:0][package]wwwoffle-2.9c-13.i586
+>!> ESTABLISHED:3712: U__s_[S2:0][package]wxGTK-2.8.4.0-41.i586
+>!> ESTABLISHED:3713: U__s_[S2:0][package]x11-input-fujitsu-0.6.4-28.i586
+>!> ESTABLISHED:3714: I__s_[S1:0][package]x11-input-synaptics-0.14.6-82.i586
+>!> ESTABLISHED:3715: U__s_[S2:0][package]x11-input-synaptics-0.14.6-94.i586
+>!> ESTABLISHED:3716: I__s_[S1:0][package]x11-input-wacom-0.7.8-16.i586
+>!> ESTABLISHED:3717: U__s_[S2:0][package]x11-input-wacom-0.7.8-28.i586
+>!> ESTABLISHED:3718: I__s_[S1:0][package]x11-input-wacom-tools-0.7.8-16.i586
+>!> ESTABLISHED:3719: U__s_[S2:0][package]x11-input-wacom-tools-0.7.8-28.i586
+>!> ESTABLISHED:3720: U__s_[S2:0][package]x11-tools-0.1-97.i586
+>!> ESTABLISHED:3721: U__s_[S2:0][package]x2x-1.30_beta-104.i586
+>!> ESTABLISHED:3722: U__s_[S2:0][package]x3270-3.2.20-393.i586
+>!> ESTABLISHED:3723: U__s_[S2:0][package]xabacus-7.3-9.i586
+>!> ESTABLISHED:3724: I__s_[S1:0][package]xalan-j2-2.7.0-72.noarch
+>!> ESTABLISHED:3725: U__s_[S2:0][package]xalan-j2-2.7.0-95.noarch
+>!> ESTABLISHED:3726: U__s_[S2:0][package]xano-mincho-20040509-30.noarch
+>!> ESTABLISHED:3727: U__s_[S2:0][package]xaos-3.1-264.i586
+>!> ESTABLISHED:3728: U__s_[S2:0][package]xarchiver-0.4.6-57.i586
+>!> ESTABLISHED:3729: I__s_[S1:0][package]xaw3d-1.5E-308.i586
+>!> ESTABLISHED:3730: U__s_[S2:0][package]xaw3d-1.5E-315.i586
+>!> ESTABLISHED:3731: U__s_[S2:0][package]xawtv-3.95-90.i586
+>!> ESTABLISHED:3732: U__s_[S2:0][package]xbanner-1.31-946.i586
+>!> ESTABLISHED:3733: U__s_[S2:0][package]xbase-2.0.0-179.i586
+>!> ESTABLISHED:3734: U__s_[S2:0][package]xboard-4.2.7-148.i586
+>!> ESTABLISHED:3735: U__s_[S2:0][package]xbsql-0.11-179.i586
+>!> ESTABLISHED:3736: U__s_[S2:0][package]xchat-2.8.4-27.i586
+>!> ESTABLISHED:3737: U__s_[S2:0][package]xclass-0.9.2-69.i586
+>!> ESTABLISHED:3738: U__s_[S2:0][package]xcompmgr-051031-83.i586
+>!> ESTABLISHED:3739: U__s_[S2:0][package]xdelta-1.1.4-54.i586
+>!> ESTABLISHED:3740: I__s_[S1:0][package]xdg-menu-0.2-119.i586
+>!> ESTABLISHED:3741: U__s_[S2:0][package]xdg-menu-0.2-125.i586
+>!> ESTABLISHED:3742: I__s_[S1:0][package]xdg-utils-1.0.1-63.noarch
+>!> ESTABLISHED:3743: U__s_[S2:0][package]xdg-utils-1.0.1-75.noarch
+>!> ESTABLISHED:3744: U__s_[S2:0][package]xdmbgrd-0.6-83.i586
+>!> ESTABLISHED:3745: U__s_[S2:0][package]xemacs-21.5.28.20070807-15.i586
+>!> ESTABLISHED:3746: U__s_[S2:0][package]xemacs-info-21.5.28.20070807-15.i586
+>!> ESTABLISHED:3747: U__s_[S2:0][package]xemacs-packages-20070427-16.noarch
+>!> ESTABLISHED:3748: U__s_[S2:0][package]xemacs-packages-info-20070427-16.noarch
+>!> ESTABLISHED:3749: U__s_[S2:0][package]xen-3.1.0_15042-39.i586
+>!> ESTABLISHED:3750: U__s_[S2:0][package]xen-doc-html-3.1.0_15042-39.i586
+>!> ESTABLISHED:3751: U__s_[S2:0][package]xen-doc-pdf-3.1.0_15042-39.i586
+>!> ESTABLISHED:3752: U__s_[S2:0][package]xen-libs-3.1.0_15042-39.i586
+>!> ESTABLISHED:3753: U__s_[S2:0][package]xen-tools-3.1.0_15042-39.i586
+>!> ESTABLISHED:3754: U__s_[S2:0][package]xen-tools-ioemu-3.1.0_15042-39.i586
+>!> ESTABLISHED:3755: I__s_[S1:0][package]xerces-j2-2.8.1-72.noarch
+>!> ESTABLISHED:3756: U__s_[S2:0][package]xerces-j2-2.8.1-79.noarch
+>!> ESTABLISHED:3757: I__s_[S1:0][package]xerces-j2-xml-apis-2.8.1-72.noarch
+>!> ESTABLISHED:3758: U__s_[S2:0][package]xerces-j2-xml-apis-2.8.1-79.noarch
+>!> ESTABLISHED:3759: U__s_[S2:0][package]xerces-j2-xml-resolver-2.8.1-79.noarch
+>!> ESTABLISHED:3760: U__s_[S2:0][package]xfce-mcs-manager-4.4.1-47.i586
+>!> ESTABLISHED:3761: U__s_[S2:0][package]xfce-mcs-plugins-4.4.1-47.i586
+>!> ESTABLISHED:3762: U__s_[S2:0][package]xfce4-appfinder-4.4.1-34.i586
+>!> ESTABLISHED:3763: U__s_[S2:0][package]xfce4-desktop-4.4.1-58.i586
+>!> ESTABLISHED:3764: U__s_[S2:0][package]xfce4-icon-theme-4.4.1-29.noarch
+>!> ESTABLISHED:3765: U__s_[S2:0][package]xfce4-mixer-4.4.1-53.i586
+>!> ESTABLISHED:3766: U__s_[S2:0][package]xfce4-panel-4.4.1-52.i586
+>!> ESTABLISHED:3767: U__s_[S2:0][package]xfce4-session-4.4.1-50.i586
+>!> ESTABLISHED:3768: U__s_[S2:0][package]xfce4-volstatus-0.1.0-36.i586
+>!> ESTABLISHED:3769: U__s_[S2:0][package]xfig-3.2.5-18.i586
+>!> ESTABLISHED:3770: U__s_[S2:0][package]xfntjp-20020904-530.noarch
+>!> ESTABLISHED:3771: U__s_[S2:0][package]xfprint-4.4.1-47.i586
+>!> ESTABLISHED:3772: U__s_[S2:0][package]xfsdump-2.2.45-18.i586
+>!> ESTABLISHED:3773: U_Tl_[S2:0][package]xfsprogs-2.8.21-17.i586
+>!> ESTABLISHED:3774: U__s_[S2:0][package]xfwm4-4.4.1-51.i586
+>!> ESTABLISHED:3775: I__s_[S1:0][package]xgl-git_070104-54.i586
+>!> ESTABLISHED:3776: U__s_[S2:0][package]xgl-git_070104-68.i586
+>!> ESTABLISHED:3777: I__s_[S1:0][package]xgl-hardware-list-060526-69.noarch
+>!> ESTABLISHED:3778: U__s_[S2:0][package]xgl-hardware-list-060526-75.noarch
+>!> ESTABLISHED:3779: U__s_[S2:0][package]xgrabsc-2.41-1125.i586
+>!> ESTABLISHED:3780: U__s_[S2:0][package]xhtml-dtd-2002.8.9-139.noarch
+>!> ESTABLISHED:3781: I__s_[S1:0][package]xine-lib-1.1.7-16.i586
+>!> ESTABLISHED:3782: U__s_[S2:0][package]xine-lib-1.1.8-4.i586
+>!> ESTABLISHED:3783: U__s_[S2:0][package]xine-ui-0.99.5-52.i586
+>!> ESTABLISHED:3784: I__s_[S1:0][package]xinetd-2.3.14-66.i586
+>!> ESTABLISHED:3785: U__s_[S2:0][package]xinetd-2.3.14-74.i586
+>!> ESTABLISHED:3786: U__s_[S2:0][package]xiterm-0.5.20040304-133.i586
+>!> ESTABLISHED:3787: U__s_[S2:0][package]xjdic-2.4-171.i586
+>!> ESTABLISHED:3788: U__s_[S2:0][package]xjdic-data-2.4-171.i586
+>!> ESTABLISHED:3789: U__s_[S2:0][package]xjdic-indices-2.4-171.i586
+>!> ESTABLISHED:3790: I__s_[S1:0][package]xkeyboard-config-1.0-10.noarch
+>!> ESTABLISHED:3791: U__s_[S2:0][package]xkeyboard-config-1.0-22.noarch
+>!> ESTABLISHED:3792: I__s_[S1:0][package]xli-20061110-27.i586
+>!> ESTABLISHED:3793: U__s_[S2:0][package]xli-20061110-34.i586
+>!> ESTABLISHED:3794: U__s_[S2:0][package]xlockmore-5.24-12.i586
+>!> ESTABLISHED:3795: U__s_[S2:0][package]xlogical-1.0.7-1061.i586
+>!> ESTABLISHED:3796: U__s_[S2:0][package]xmahjong-2006.8.10-87.i586
+>!> ESTABLISHED:3797: U__s_[S2:0][package]xmanja-0.7-373.noarch
+>!> ESTABLISHED:3798: U__s_[S2:0][package]xmgrace-5.1.21-47.i586
+>!> ESTABLISHED:3799: U__s_[S2:0][package]xml-commons-1.3.02-118.noarch
+>!> ESTABLISHED:3800: U__s_[S2:0][package]xml-commons-apis-1.3.02-118.noarch
+>!> ESTABLISHED:3801: U__s_[S2:0][package]xml-commons-resolver-1.1-123.noarch
+>!> ESTABLISHED:3802: U__s_[S2:0][package]xml-commons-which-1.3.02-118.noarch
+>!> ESTABLISHED:3803: U__s_[S2:0][package]xmlcharent-0.3-331.noarch
+>!> ESTABLISHED:3804: U__s_[S2:0][package]xmlstarlet-1.0.1-75.i586
+>!> ESTABLISHED:3805: U__s_[S2:0][package]xmltex-2007.8.1-14.i586
+>!> ESTABLISHED:3806: U__s_[S2:0][package]xmlto-0.0.18-104.i586
+>!> ESTABLISHED:3807: U__s_[S2:0][package]xmorph-20060817-93.i586
+>!> ESTABLISHED:3808: U__s_[S2:0][package]xmoto-0.3.2-11.i586
+>!> ESTABLISHED:3809: U__s_[S2:0][package]xmountains-2.7-100.i586
+>!> ESTABLISHED:3810: U__s_[S2:0][package]xmset-1.2-118.i586
+>!> ESTABLISHED:3811: U__s_[S2:0][package]xntp-4.2.4p3-18.i586
+>!> ESTABLISHED:3812: I__s_[S1:0][package]xntp-4.2.4p3-9.i586
+>!> ESTABLISHED:3813: I__s_[S1:0][package]xorg-x11-7.2-107.i586
+>!> ESTABLISHED:3814: U__s_[S2:0][package]xorg-x11-7.2-126.i586
+>!> ESTABLISHED:3815: I__s_[S1:0][package]xorg-x11-Xvnc-7.1-77.i586
+>!> ESTABLISHED:3816: U__s_[S2:0][package]xorg-x11-Xvnc-7.1-85.i586
+>!> ESTABLISHED:3817: U__s_[S2:0][package]xorg-x11-devel-7.2-96.i586
+>!> ESTABLISHED:3818: I__s_[S1:0][package]xorg-x11-driver-input-7.2-86.i586
+>!> ESTABLISHED:3819: U__s_[S2:0][package]xorg-x11-driver-input-7.2-98.i586
+>!> ESTABLISHED:3820: I__s_[S1:0][package]xorg-x11-driver-video-7.2-145.i586
+>!> ESTABLISHED:3821: U__s_[S2:0][package]xorg-x11-driver-video-7.2-171.i586
+>!> ESTABLISHED:3822: U__s_[S2:0][package]xorg-x11-fonts-7.2-78.noarch
+>!> ESTABLISHED:3823: I__s_[S1:0][package]xorg-x11-fonts-core-7.2-67.noarch
+>!> ESTABLISHED:3824: U__s_[S2:0][package]xorg-x11-fonts-core-7.2-78.noarch
+>!> ESTABLISHED:3825: U__s_[S2:0][package]xorg-x11-fonts-devel-7.2-49.i586
+>!> ESTABLISHED:3826: I__s_[S1:0][package]xorg-x11-libICE-7.2-50.i586
+>!> ESTABLISHED:3827: U__s_[S2:0][package]xorg-x11-libICE-7.2-57.i586
+>!> ESTABLISHED:3828: U__s_[S2:0][package]xorg-x11-libICE-devel-7.2-57.i586
+>!> ESTABLISHED:3829: I__s_[S1:0][package]xorg-x11-libSM-7.2-48.i586
+>!> ESTABLISHED:3830: U__s_[S2:0][package]xorg-x11-libSM-7.2-54.i586
+>!> ESTABLISHED:3831: U__s_[S2:0][package]xorg-x11-libSM-devel-7.2-54.i586
+>!> ESTABLISHED:3832: I__s_[S1:0][package]xorg-x11-libX11-7.2-63.i586
+>!> ESTABLISHED:3833: U__s_[S2:0][package]xorg-x11-libX11-7.2-70.i586
+>!> ESTABLISHED:3834: I__s_[S1:0][package]xorg-x11-libX11-ccache-7.2-68.i586
+>!> ESTABLISHED:3835: U__s_[S2:0][package]xorg-x11-libX11-ccache-7.2-79.i586
+>!> ESTABLISHED:3836: U__s_[S2:0][package]xorg-x11-libX11-devel-7.2-70.i586
+>!> ESTABLISHED:3837: I__s_[S1:0][package]xorg-x11-libXau-7.2-44.i586
+>!> ESTABLISHED:3838: U__s_[S2:0][package]xorg-x11-libXau-7.2-50.i586
+>!> ESTABLISHED:3839: U__s_[S2:0][package]xorg-x11-libXau-devel-7.2-50.i586
+>!> ESTABLISHED:3840: I__s_[S1:0][package]xorg-x11-libXdmcp-7.2-43.i586
+>!> ESTABLISHED:3841: U__s_[S2:0][package]xorg-x11-libXdmcp-7.2-49.i586
+>!> ESTABLISHED:3842: U__s_[S2:0][package]xorg-x11-libXdmcp-devel-7.2-49.i586
+>!> ESTABLISHED:3843: I__s_[S1:0][package]xorg-x11-libXext-7.2-52.i586
+>!> ESTABLISHED:3844: U__s_[S2:0][package]xorg-x11-libXext-7.2-59.i586
+>!> ESTABLISHED:3845: U__s_[S2:0][package]xorg-x11-libXext-devel-7.2-59.i586
+>!> ESTABLISHED:3846: I__s_[S1:0][package]xorg-x11-libXfixes-7.2-52.i586
+>!> ESTABLISHED:3847: U__s_[S2:0][package]xorg-x11-libXfixes-7.2-59.i586
+>!> ESTABLISHED:3848: U__s_[S2:0][package]xorg-x11-libXfixes-devel-7.2-59.i586
+>!> ESTABLISHED:3849: I__s_[S1:0][package]xorg-x11-libXmu-7.2-52.i586
+>!> ESTABLISHED:3850: U__s_[S2:0][package]xorg-x11-libXmu-7.2-59.i586
+>!> ESTABLISHED:3851: U__s_[S2:0][package]xorg-x11-libXmu-devel-7.2-59.i586
+>!> ESTABLISHED:3852: I__s_[S1:0][package]xorg-x11-libXp-7.2-47.i586
+>!> ESTABLISHED:3853: U__s_[S2:0][package]xorg-x11-libXp-7.2-54.i586
+>!> ESTABLISHED:3854: U__s_[S2:0][package]xorg-x11-libXp-devel-7.2-54.i586
+>!> ESTABLISHED:3855: I__s_[S1:0][package]xorg-x11-libXpm-7.2-51.i586
+>!> ESTABLISHED:3856: U__s_[S2:0][package]xorg-x11-libXpm-7.2-59.i586
+>!> ESTABLISHED:3857: U__s_[S2:0][package]xorg-x11-libXpm-devel-7.2-59.i586
+>!> ESTABLISHED:3858: I__s_[S1:0][package]xorg-x11-libXprintUtil-7.2-47.i586
+>!> ESTABLISHED:3859: U__s_[S2:0][package]xorg-x11-libXprintUtil-7.2-54.i586
+>!> ESTABLISHED:3860: U__s_[S2:0][package]xorg-x11-libXprintUtil-devel-7.2-54.i586
+>!> ESTABLISHED:3861: I__s_[S1:0][package]xorg-x11-libXrender-7.2-51.i586
+>!> ESTABLISHED:3862: U__s_[S2:0][package]xorg-x11-libXrender-7.2-59.i586
+>!> ESTABLISHED:3863: U__s_[S2:0][package]xorg-x11-libXrender-devel-7.2-59.i586
+>!> ESTABLISHED:3864: I__s_[S1:0][package]xorg-x11-libXt-7.2-53.i586
+>!> ESTABLISHED:3865: U__s_[S2:0][package]xorg-x11-libXt-7.2-60.i586
+>!> ESTABLISHED:3866: U__s_[S2:0][package]xorg-x11-libXt-devel-7.2-60.i586
+>!> ESTABLISHED:3867: I__s_[S1:0][package]xorg-x11-libXv-7.2-48.i586
+>!> ESTABLISHED:3868: U__s_[S2:0][package]xorg-x11-libXv-7.2-55.i586
+>!> ESTABLISHED:3869: U__s_[S2:0][package]xorg-x11-libXv-devel-7.2-55.i586
+>!> ESTABLISHED:3870: I__s_[S1:0][package]xorg-x11-libfontenc-7.2-49.i586
+>!> ESTABLISHED:3871: U__s_[S2:0][package]xorg-x11-libfontenc-7.2-55.i586
+>!> ESTABLISHED:3872: U__s_[S2:0][package]xorg-x11-libfontenc-devel-7.2-55.i586
+>!> ESTABLISHED:3873: I__s_[S1:0][package]xorg-x11-libs-7.2-84.i586
+>!> ESTABLISHED:3874: U__s_[S2:0][package]xorg-x11-libs-7.2-96.i586
+>!> ESTABLISHED:3875: I__s_[S1:0][package]xorg-x11-libxcb-7.2-39.i586
+>!> ESTABLISHED:3876: U__s_[S2:0][package]xorg-x11-libxcb-7.2-46.i586
+>!> ESTABLISHED:3877: U__s_[S2:0][package]xorg-x11-libxcb-devel-7.2-46.i586
+>!> ESTABLISHED:3878: I__s_[S1:0][package]xorg-x11-libxkbfile-7.2-51.i586
+>!> ESTABLISHED:3879: U__s_[S2:0][package]xorg-x11-libxkbfile-7.2-58.i586
+>!> ESTABLISHED:3880: U__s_[S2:0][package]xorg-x11-libxkbfile-devel-7.2-58.i586
+>!> ESTABLISHED:3881: U__s_[S2:0][package]xorg-x11-proto-devel-7.2-62.i586
+>!> ESTABLISHED:3882: I__s_[S1:0][package]xorg-x11-server-7.2-115.i586
+>!> ESTABLISHED:3883: U__s_[S2:0][package]xorg-x11-server-7.2-130.i586
+>!> ESTABLISHED:3884: U__s_[S2:0][package]xorg-x11-server-extra-7.2-130.i586
+>!> ESTABLISHED:3885: U__s_[S2:0][package]xorg-x11-server-sdk-7.2-130.i586
+>!> ESTABLISHED:3886: U__s_[S2:0][package]xorg-x11-util-devel-7.2-50.i586
+>!> ESTABLISHED:3887: U__s_[S2:0][package]xorg-x11-xtrans-devel-7.2-52.i586
+>!> ESTABLISHED:3888: U__s_[S2:0][package]xosd-2.2.12-105.i586
+>!> ESTABLISHED:3889: U__s_[S2:0][package]xosview-1.8.3-89.i586
+>!> ESTABLISHED:3890: U__s_[S2:0][package]xournal-0.3.3-64.i586
+>!> ESTABLISHED:3891: U__s_[S2:0][package]xpdf-3.02-12.i586
+>!> ESTABLISHED:3892: I__s_[S1:0][package]xpdf-tools-3.01-103.i586
+>!> ESTABLISHED:3893: U__s_[S2:0][package]xpdf-tools-3.02-12.i586
+>!> ESTABLISHED:3894: U__s_[S2:0][package]xpenguins-2.2-719.i586
+>!> ESTABLISHED:3895: U__s_[S2:0][package]xpp-1.5-121.i586
+>!> ESTABLISHED:3896: U__s_[S2:0][package]xrestop-0.4-73.i586
+>!> ESTABLISHED:3897: U__s_[S2:0][package]xsane-0.994-69.i586
+>!> ESTABLISHED:3898: U__s_[S2:0][package]xscreensaver-5.03-14.i586
+>!> ESTABLISHED:3899: U__s_[S2:0][package]xsidplay-1.6.5.2-106.i586
+>!> ESTABLISHED:3900: U__s_[S2:0][package]xskat-4.0-102.i586
+>!> ESTABLISHED:3901: U__s_[S2:0][package]xslide-0.2.2-97.noarch
+>!> ESTABLISHED:3902: U__s_[S2:0][package]xsnow-1.42-344.i586
+>!> ESTABLISHED:3903: U__s_[S2:0][package]xsp-1.2.5-12.noarch
+>!> ESTABLISHED:3904: U__s_[S2:0][package]xstroke-0.6-103.i586
+>!> ESTABLISHED:3905: I__s_[S1:0][package]xstroke-0.6-93.i586
+>!> ESTABLISHED:3906: I__s_[S1:0][package]xterm-228-6.i586
+>!> ESTABLISHED:3907: U__s_[S2:0][package]xterm-229-9.i586
+>!> ESTABLISHED:3908: U__s_[S2:0][package]xtermset-0.5.2-191.i586
+>!> ESTABLISHED:3909: U__s_[S2:0][package]xv-3.10a-1163.i586
+>!> ESTABLISHED:3910: I__s_[S1:0][package]xvkbd-2.8-67.i586
+>!> ESTABLISHED:3911: U__s_[S2:0][package]xvkbd-2.8-74.i586
+>!> ESTABLISHED:3912: U__s_[S2:0][package]xyaku-1.4.0-92.i586
+>!> ESTABLISHED:3913: U__s_[S2:0][package]xzgv-0.8-220.i586
+>!> ESTABLISHED:3914: U__s_[S2:0][package]yafc-1.1.1-81.i586
+>!> ESTABLISHED:3915: U__s_[S2:0][package]yafray-0.0.8-98.i586
+>!> ESTABLISHED:3916: I__s_[S1:0][package]yast2-2.15.45-3.i586
+>!> ESTABLISHED:3917: U__s_[S2:0][package]yast2-2.15.54-2.i586
+>!> ESTABLISHED:3918: I__s_[S1:0][package]yast2-add-on-2.15.11-2.noarch
+>!> ESTABLISHED:3919: U__s_[S2:0][package]yast2-add-on-2.15.14-4.noarch
+>!> ESTABLISHED:3920: U__s_[S2:0][package]yast2-add-on-creator-2.15.20-8.noarch
+>!> ESTABLISHED:3921: I__s_[S1:0][package]yast2-apparmor-2.0.2-15.noarch
+>!> ESTABLISHED:3922: U__s_[S2:0][package]yast2-apparmor-2.1-10.noarch
+>!> ESTABLISHED:3923: U__s_[S2:0][package]yast2-autofs-2.15.2-52.noarch
+>!> ESTABLISHED:3924: I__s_[S1:0][package]yast2-backup-2.15.4-15.noarch
+>!> ESTABLISHED:3925: U__s_[S2:0][package]yast2-backup-2.15.4-32.noarch
+>!> ESTABLISHED:3926: I__s_[S1:0][package]yast2-bluetooth-2.15.2-30.noarch
+>!> ESTABLISHED:3927: U__s_[S2:0][package]yast2-bluetooth-2.15.4-2.noarch
+>!> ESTABLISHED:3928: I__s_[S1:0][package]yast2-bootloader-2.15.14-9.i586
+>!> ESTABLISHED:3929: U__s_[S2:0][package]yast2-bootloader-2.15.19-3.i586
+>!> ESTABLISHED:3930: U__s_[S2:0][package]yast2-ca-management-2.15.2-13.noarch
+>!> ESTABLISHED:3931: I__s_[S1:0][package]yast2-control-center-2.15.1-3.i586
+>!> ESTABLISHED:3932: U__s_[S2:0][package]yast2-control-center-2.15.4-3.i586
+>!> ESTABLISHED:3933: U__s_[S2:0][package]yast2-control-center-gnome-2.13.2-75.i586
+>!> ESTABLISHED:3934: I__s_[S1:0][package]yast2-control-center-qt-2.15.1-3.i586
+>!> ESTABLISHED:3935: U__s_[S2:0][package]yast2-control-center-qt-2.15.4-3.i586
+>!> ESTABLISHED:3936: U__s_[S2:0][package]yast2-core-2.15.10-2.i586
+>!> ESTABLISHED:3937: I__s_[S1:0][package]yast2-core-2.15.8-2.i586
+>!> ESTABLISHED:3938: U__s_[S2:0][package]yast2-core-devel-2.15.10-2.i586
+>!> ESTABLISHED:3939: I__s_[S1:0][package]yast2-country-2.15.16-2.i586
+>!> ESTABLISHED:3940: U__s_[S2:0][package]yast2-country-2.15.18-12.i586
+>!> ESTABLISHED:3941: U__s_[S2:0][package]yast2-devel-doc-2.15.54-2.i586
+>!> ESTABLISHED:3942: U__s_[S2:0][package]yast2-devtools-2.15.8-3.noarch
+>!> ESTABLISHED:3943: U__s_[S2:0][package]yast2-dhcp-server-2.15.4-31.noarch
+>!> ESTABLISHED:3944: U__s_[S2:0][package]yast2-dns-server-2.15.3-64.noarch
+>!> ESTABLISHED:3945: U__s_[S2:0][package]yast2-drbd-2.13.1-35.noarch
+>!> ESTABLISHED:3946: U__s_[S2:0][package]yast2-fingerprint-reader-2.15.2-12.i586
+>!> ESTABLISHED:3947: U__s_[S2:0][package]yast2-firewall-2.15.7-23.noarch
+>!> ESTABLISHED:3948: I__s_[S1:0][package]yast2-firewall-2.15.7-8.noarch
+>!> ESTABLISHED:3949: U__s_[S2:0][package]yast2-firstboot-2.15.1-76.noarch
+>!> ESTABLISHED:3950: U__s_[S2:0][package]yast2-ftp-server-2.15.9-7.noarch
+>!> ESTABLISHED:3951: U__s_[S2:0][package]yast2-gtk-2.15.9-16.i586
+>!> ESTABLISHED:3952: U__s_[S2:0][package]yast2-hardware-detection-2.15.8-22.i586
+>!> ESTABLISHED:3953: I__s_[S1:0][package]yast2-hardware-detection-2.15.8-9.i586
+>!> ESTABLISHED:3954: U__s_[S2:0][package]yast2-http-server-2.15.7-10.noarch
+>!> ESTABLISHED:3955: U__s_[S2:0][package]yast2-inetd-2.15.1-24.noarch
+>!> ESTABLISHED:3956: I__s_[S1:0][package]yast2-inetd-2.15.1-7.noarch
+>!> ESTABLISHED:3957: I__s_[S1:0][package]yast2-installation-2.15.40-2.noarch
+>!> ESTABLISHED:3958: U__s_[S2:0][package]yast2-installation-2.15.46-2.noarch
+>!> ESTABLISHED:3959: U__s_[S2:0][package]yast2-installation-devel-doc-2.15.46-2.noarch
+>!> ESTABLISHED:3960: U__s_[S2:0][package]yast2-instserver-2.15.4-27.noarch
+>!> ESTABLISHED:3961: I__s_[S1:0][package]yast2-irda-2.15.1-64.noarch
+>!> ESTABLISHED:3962: U__s_[S2:0][package]yast2-irda-2.15.1-79.noarch
+>!> ESTABLISHED:3963: U__s_[S2:0][package]yast2-iscsi-client-2.15.2-24.noarch
+>!> ESTABLISHED:3964: I__s_[S1:0][package]yast2-iscsi-client-2.15.2-9.noarch
+>!> ESTABLISHED:3965: U__s_[S2:0][package]yast2-iscsi-server-2.14.3-73.noarch
+>!> ESTABLISHED:3966: U__s_[S2:0][package]yast2-kdump-2.15.7-3.i586
+>!> ESTABLISHED:3967: U__s_[S2:0][package]yast2-kerberos-client-2.15.7-17.noarch
+>!> ESTABLISHED:3968: I__s_[S1:0][package]yast2-kerberos-client-2.15.7-2.noarch
+>!> ESTABLISHED:3969: I__s_[S1:0][package]yast2-ldap-2.15.1-53.i586
+>!> ESTABLISHED:3970: U__s_[S2:0][package]yast2-ldap-2.15.1-68.i586
+>!> ESTABLISHED:3971: U__s_[S2:0][package]yast2-ldap-client-2.15.12-20.noarch
+>!> ESTABLISHED:3972: I__s_[S1:0][package]yast2-ldap-client-2.15.12-3.noarch
+>!> ESTABLISHED:3973: U__s_[S2:0][package]yast2-ldap-server-2.15.5-61.noarch
+>!> ESTABLISHED:3974: U__s_[S2:0][package]yast2-mail-2.15.20-18.noarch
+>!> ESTABLISHED:3975: I__s_[S1:0][package]yast2-mail-2.15.9-38.noarch
+>!> ESTABLISHED:3976: U__s_[S2:0][package]yast2-mail-plugins-2.15.20-18.noarch
+>!> ESTABLISHED:3977: I__s_[S1:0][package]yast2-metapackage-handler-0.5.2-2.noarch
+>!> ESTABLISHED:3978: U__s_[S2:0][package]yast2-metapackage-handler-0.7.0-3.noarch
+>!> ESTABLISHED:3979: I__s_[S1:0][package]yast2-mouse-2.15.1-51.i586
+>!> ESTABLISHED:3980: U__s_[S2:0][package]yast2-mouse-2.15.1-66.i586
+>!> ESTABLISHED:3981: U__s_[S2:0][package]yast2-multipath-2.13.0-70.noarch
+>!> ESTABLISHED:3982: I__s_[S1:0][package]yast2-ncurses-2.15.23-4.i586
+>!> ESTABLISHED:3983: U__s_[S2:0][package]yast2-ncurses-2.15.26-7.i586
+>!> ESTABLISHED:3984: I__s_[S1:0][package]yast2-network-2.15.57-2.i586
+>!> ESTABLISHED:3985: U__s_[S2:0][package]yast2-network-2.15.72-2.i586
+>!> ESTABLISHED:3986: U__s_[S2:0][package]yast2-network-devel-doc-2.15.72-2.i586
+>!> ESTABLISHED:3987: I__s_[S1:0][package]yast2-nfs-client-2.14.0-71.noarch
+>!> ESTABLISHED:3988: U__s_[S2:0][package]yast2-nfs-client-2.15.0-10.noarch
+>!> ESTABLISHED:3989: U__s_[S2:0][package]yast2-nfs-server-2.15.4-10.noarch
+>!> ESTABLISHED:3990: I__s_[S1:0][package]yast2-nis-client-2.15.2-49.i586
+>!> ESTABLISHED:3991: U__s_[S2:0][package]yast2-nis-client-2.15.3-6.i586
+>!> ESTABLISHED:3992: U__s_[S2:0][package]yast2-nis-server-2.15.1-26.noarch
+>!> ESTABLISHED:3993: U__s_[S2:0][package]yast2-nis-server-devel-doc-2.15.1-26.noarch
+>!> ESTABLISHED:3994: I__s_[S1:0][package]yast2-ntp-client-2.15.6-2.noarch
+>!> ESTABLISHED:3995: U__s_[S2:0][package]yast2-ntp-client-2.15.8-2.noarch
+>!> ESTABLISHED:3996: U__s_[S2:0][package]yast2-online-update-2.15.20-20.noarch
+>!> ESTABLISHED:3997: I__s_[S1:0][package]yast2-online-update-2.15.20-3.noarch
+>!> ESTABLISHED:3998: U__s_[S2:0][package]yast2-online-update-frontend-2.15.20-20.noarch
+>!> ESTABLISHED:3999: I__s_[S1:0][package]yast2-online-update-frontend-2.15.20-3.noarch
+>!> ESTABLISHED:4000: I__s_[S1:0][package]yast2-packager-2.15.54-2.i586
+>!> ESTABLISHED:4001: U__s_[S2:0][package]yast2-packager-2.15.74-2.i586
+>!> ESTABLISHED:4002: U__s_[S2:0][package]yast2-pam-2.14.0-113.noarch
+>!> ESTABLISHED:4003: I__s_[S1:0][package]yast2-pam-2.14.0-98.noarch
+>!> ESTABLISHED:4004: I__s_[S1:0][package]yast2-perl-bindings-2.15.2-4.i586
+>!> ESTABLISHED:4005: U__s_[S2:0][package]yast2-perl-bindings-2.15.3-12.i586
+>!> ESTABLISHED:4006: U__s_[S2:0][package]yast2-phone-services-2.15.0-59.noarch
+>!> ESTABLISHED:4007: I__s_[S1:0][package]yast2-pkg-bindings-2.15.42-4.i586
+>!> ESTABLISHED:4008: U__s_[S2:0][package]yast2-pkg-bindings-2.15.49-2.i586
+>!> ESTABLISHED:4009: U__s_[S2:0][package]yast2-pkg-bindings-devel-doc-2.15.49-2.noarch
+>!> ESTABLISHED:4010: I__s_[S1:0][package]yast2-printer-2.15.4-2.i586
+>!> ESTABLISHED:4011: U__s_[S2:0][package]yast2-printer-2.15.5-2.i586
+>!> ESTABLISHED:4012: U__s_[S2:0][package]yast2-printer-devel-doc-2.15.5-2.i586
+>!> ESTABLISHED:4013: U__s_[S2:0][package]yast2-product-creator-2.15.6-7.noarch
+>!> ESTABLISHED:4014: I__s_[S1:0][package]yast2-profile-manager-2.15.0-18.i586
+>!> ESTABLISHED:4015: U__s_[S2:0][package]yast2-profile-manager-2.15.0-35.i586
+>!> ESTABLISHED:4016: U__s_[S2:0][package]yast2-python-bindings-2.15.2-12.i586
+>!> ESTABLISHED:4017: I__s_[S1:0][package]yast2-qt-2.15.11-4.i586
+>!> ESTABLISHED:4018: U__s_[S2:0][package]yast2-qt-2.15.16-2.i586
+>!> ESTABLISHED:4019: I__s_[S1:0][package]yast2-registration-2.15.0-3.noarch
+>!> ESTABLISHED:4020: U__s_[S2:0][package]yast2-registration-2.15.2-3.noarch
+>!> ESTABLISHED:4021: I__s_[S1:0][package]yast2-repair-2.15.7-24.noarch
+>!> ESTABLISHED:4022: U__s_[S2:0][package]yast2-repair-2.15.7-41.noarch
+>!> ESTABLISHED:4023: I__s_[S1:0][package]yast2-restore-2.15.2-7.noarch
+>!> ESTABLISHED:4024: U__s_[S2:0][package]yast2-restore-2.15.4-4.noarch
+>!> ESTABLISHED:4025: U__s_[S2:0][package]yast2-ruby-bindings-0.1.0-16.i586
+>!> ESTABLISHED:4026: I__s_[S1:0][package]yast2-runlevel-2.15.2-13.noarch
+>!> ESTABLISHED:4027: U__s_[S2:0][package]yast2-runlevel-2.15.3-4.noarch
+>!> ESTABLISHED:4028: U__s_[S2:0][package]yast2-samba-client-2.15.11-18.noarch
+>!> ESTABLISHED:4029: I__s_[S1:0][package]yast2-samba-client-2.15.11-3.noarch
+>!> ESTABLISHED:4030: I__s_[S1:0][package]yast2-samba-server-2.15.7-23.noarch
+>!> ESTABLISHED:4031: U__s_[S2:0][package]yast2-samba-server-2.15.7-40.noarch
+>!> ESTABLISHED:4032: I__s_[S1:0][package]yast2-scanner-2.15.5-12.noarch
+>!> ESTABLISHED:4033: U__s_[S2:0][package]yast2-scanner-2.15.5-27.noarch
+>!> ESTABLISHED:4034: U__s_[S2:0][package]yast2-schema-2.15.0-102.noarch
+>!> ESTABLISHED:4035: I__s_[S1:0][package]yast2-schema-2.15.0-75.noarch
+>!> ESTABLISHED:4036: I__s_[S1:0][package]yast2-security-2.15.0-59.noarch
+>!> ESTABLISHED:4037: U__s_[S2:0][package]yast2-security-2.15.1-8.noarch
+>!> ESTABLISHED:4038: I__s_[S1:0][package]yast2-slp-2.14.1-73.i586
+>!> ESTABLISHED:4039: U__s_[S2:0][package]yast2-slp-2.15.0-16.i586
+>!> ESTABLISHED:4040: U__s_[S2:0][package]yast2-slp-server-2.15.0-28.noarch
+>!> ESTABLISHED:4041: U__s_[S2:0][package]yast2-sound-2.15.11-3.i586
+>!> ESTABLISHED:4042: I__s_[S1:0][package]yast2-sound-2.15.9-3.i586
+>!> ESTABLISHED:4043: I__s_[S1:0][package]yast2-storage-2.15.20-2.i586
+>!> ESTABLISHED:4044: U__s_[S2:0][package]yast2-storage-2.15.24-2.i586
+>!> ESTABLISHED:4045: U__s_[S2:0][package]yast2-storage-devel-2.15.24-2.i586
+>!> ESTABLISHED:4046: U__s_[S2:0][package]yast2-storage-evms-2.15.24-2.i586
+>!> ESTABLISHED:4047: I__s_[S1:0][package]yast2-storage-lib-2.15.20-2.i586
+>!> ESTABLISHED:4048: U__s_[S2:0][package]yast2-storage-lib-2.15.24-2.i586
+>!> ESTABLISHED:4049: I__s_[S1:0][package]yast2-sudo-2.15.3-52.noarch
+>!> ESTABLISHED:4050: U__s_[S2:0][package]yast2-sudo-2.15.3-69.noarch
+>!> ESTABLISHED:4051: I__s_[S1:0][package]yast2-support-2.15.2-42.noarch
+>!> ESTABLISHED:4052: U__s_[S2:0][package]yast2-support-2.15.2-57.noarch
+>!> ESTABLISHED:4053: I__s_[S1:0][package]yast2-sysconfig-2.15.3-28.noarch
+>!> ESTABLISHED:4054: U__s_[S2:0][package]yast2-sysconfig-2.15.3-43.noarch
+>!> ESTABLISHED:4055: U__s_[S2:0][package]yast2-testsuite-2.15.1-12.noarch
+>!> ESTABLISHED:4056: U__s_[S2:0][package]yast2-tftp-server-2.14.0-90.noarch
+>!> ESTABLISHED:4057: U__s_[S2:0][package]yast2-theme-openSUSE-2.15.13-2.noarch
+>!> ESTABLISHED:4058: I__s_[S1:0][package]yast2-theme-openSUSE-2.15.6-3.noarch
+>!> ESTABLISHED:4059: U__s_[S2:0][package]yast2-trans-af-2.15.3-7.noarch
+>!> ESTABLISHED:4060: U__s_[S2:0][package]yast2-trans-ar-2.15.3-7.noarch
+>!> ESTABLISHED:4061: U__s_[S2:0][package]yast2-trans-bg-2.15.4-4.noarch
+>!> ESTABLISHED:4062: U__s_[S2:0][package]yast2-trans-bn-2.15.5-7.noarch
+>!> ESTABLISHED:4063: U__s_[S2:0][package]yast2-trans-bs-2.15.1-16.noarch
+>!> ESTABLISHED:4064: U__s_[S2:0][package]yast2-trans-ca-2.15.2-7.noarch
+>!> ESTABLISHED:4065: U__s_[S2:0][package]yast2-trans-cs-2.15.11-2.noarch
+>!> ESTABLISHED:4066: U__s_[S2:0][package]yast2-trans-cy-2.15.1-16.noarch
+>!> ESTABLISHED:4067: U__s_[S2:0][package]yast2-trans-da-2.15.10-2.noarch
+>!> ESTABLISHED:4068: U__s_[S2:0][package]yast2-trans-de-2.15.16-4.noarch
+>!> ESTABLISHED:4069: U__s_[S2:0][package]yast2-trans-el-2.15.10-4.noarch
+>!> ESTABLISHED:4070: U__s_[S2:0][package]yast2-trans-en_GB-2.15.5-4.noarch
+>!> ESTABLISHED:4071: I__s_[S1:0][package]yast2-trans-en_US-2.15.1-8.noarch
+>!> ESTABLISHED:4072: U__s_[S2:0][package]yast2-trans-en_US-2.15.4-4.noarch
+>!> ESTABLISHED:4073: U__s_[S2:0][package]yast2-trans-es-2.15.4-4.noarch
+>!> ESTABLISHED:4074: U__s_[S2:0][package]yast2-trans-et-2.15.10-4.noarch
+>!> ESTABLISHED:4075: U__s_[S2:0][package]yast2-trans-fi-2.15.15-4.noarch
+>!> ESTABLISHED:4076: U__s_[S2:0][package]yast2-trans-fr-2.15.8-2.noarch
+>!> ESTABLISHED:4077: U__s_[S2:0][package]yast2-trans-gl-2.15.1-16.noarch
+>!> ESTABLISHED:4078: U__s_[S2:0][package]yast2-trans-gu-2.13.5-7.noarch
+>!> ESTABLISHED:4079: U__s_[S2:0][package]yast2-trans-he-2.15.1-16.noarch
+>!> ESTABLISHED:4080: U__s_[S2:0][package]yast2-trans-hi-2.15.4-4.noarch
+>!> ESTABLISHED:4081: U__s_[S2:0][package]yast2-trans-hr-2.15.12-4.noarch
+>!> ESTABLISHED:4082: U__s_[S2:0][package]yast2-trans-hu-2.15.12-4.noarch
+>!> ESTABLISHED:4083: U__s_[S2:0][package]yast2-trans-it-2.15.9-4.noarch
+>!> ESTABLISHED:4084: U__s_[S2:0][package]yast2-trans-ja-2.15.6-4.noarch
+>!> ESTABLISHED:4085: U__s_[S2:0][package]yast2-trans-km-2.15.17-2.noarch
+>!> ESTABLISHED:4086: U__s_[S2:0][package]yast2-trans-ko-2.15.2-16.noarch
+>!> ESTABLISHED:4087: U__s_[S2:0][package]yast2-trans-lt-2.15.9-4.noarch
+>!> ESTABLISHED:4088: U__s_[S2:0][package]yast2-trans-mk-2.15.1-16.noarch
+>!> ESTABLISHED:4089: U__s_[S2:0][package]yast2-trans-mr-2.15.3-7.noarch
+>!> ESTABLISHED:4090: U__s_[S2:0][package]yast2-trans-nb-2.15.9-4.noarch
+>!> ESTABLISHED:4091: U__s_[S2:0][package]yast2-trans-nl-2.15.7-4.noarch
+>!> ESTABLISHED:4092: U__s_[S2:0][package]yast2-trans-pa-2.15.11-4.noarch
+>!> ESTABLISHED:4093: U__s_[S2:0][package]yast2-trans-pl-2.15.9-4.noarch
+>!> ESTABLISHED:4094: U__s_[S2:0][package]yast2-trans-pt-2.15.16-4.noarch
+>!> ESTABLISHED:4095: U__s_[S2:0][package]yast2-trans-pt_BR-2.15.8-2.noarch
+>!> ESTABLISHED:4096: U__s_[S2:0][package]yast2-trans-ro-2.15.13-2.noarch
+>!> ESTABLISHED:4097: U__s_[S2:0][package]yast2-trans-ru-2.15.20-4.noarch
+>!> ESTABLISHED:4098: U__s_[S2:0][package]yast2-trans-sk-2.15.6-2.noarch
+>!> ESTABLISHED:4099: U__s_[S2:0][package]yast2-trans-sl-2.15.2-7.noarch
+>!> ESTABLISHED:4100: U__s_[S2:0][package]yast2-trans-sr-2.15.1-16.noarch
+>!> ESTABLISHED:4101: I__s_[S1:0][package]yast2-trans-stats-2.15.0-12.noarch
+>!> ESTABLISHED:4102: U__s_[S2:0][package]yast2-trans-stats-2.15.0-22.noarch
+>!> ESTABLISHED:4103: U__s_[S2:0][package]yast2-trans-sv-2.15.9-4.noarch
+>!> ESTABLISHED:4104: U__s_[S2:0][package]yast2-trans-ta-2.15.3-7.noarch
+>!> ESTABLISHED:4105: U__s_[S2:0][package]yast2-trans-tr-2.15.1-16.noarch
+>!> ESTABLISHED:4106: U__s_[S2:0][package]yast2-trans-uk-2.15.13-2.noarch
+>!> ESTABLISHED:4107: U__s_[S2:0][package]yast2-trans-vi-2.15.1-16.noarch
+>!> ESTABLISHED:4108: U__s_[S2:0][package]yast2-trans-wa-2.15.16-4.noarch
+>!> ESTABLISHED:4109: U__s_[S2:0][package]yast2-trans-xh-2.13.7-7.noarch
+>!> ESTABLISHED:4110: U__s_[S2:0][package]yast2-trans-zh_CN-2.15.9-4.noarch
+>!> ESTABLISHED:4111: U__s_[S2:0][package]yast2-trans-zh_TW-2.15.11-2.noarch
+>!> ESTABLISHED:4112: U__s_[S2:0][package]yast2-trans-zu-2.13.8-7.noarch
+>!> ESTABLISHED:4113: I__s_[S1:0][package]yast2-transfer-2.14.0-77.i586
+>!> ESTABLISHED:4114: U__s_[S2:0][package]yast2-transfer-2.14.0-92.i586
+>!> ESTABLISHED:4115: I__s_[S1:0][package]yast2-tune-2.15.6-36.i586
+>!> ESTABLISHED:4116: U__s_[S2:0][package]yast2-tune-2.15.7-2.i586
+>!> ESTABLISHED:4117: I__s_[S1:0][package]yast2-tv-2.15.6-21.noarch
+>!> ESTABLISHED:4118: U__s_[S2:0][package]yast2-tv-2.15.7-8.noarch
+>!> ESTABLISHED:4119: I__s_[S1:0][package]yast2-update-2.15.19-3.i586
+>!> ESTABLISHED:4120: U__s_[S2:0][package]yast2-update-2.15.23-4.i586
+>!> ESTABLISHED:4121: I__s_[S1:0][package]yast2-users-2.15.34-3.i586
+>!> ESTABLISHED:4122: U__s_[S2:0][package]yast2-users-2.15.36-13.i586
+>!> ESTABLISHED:4123: U__s_[S2:0][package]yast2-vm-2.16.1-35.i586
+>!> ESTABLISHED:4124: I__s_[S1:0][package]yast2-x11-2.15.10-30.noarch
+>!> ESTABLISHED:4125: U__s_[S2:0][package]yast2-x11-2.15.11-5.noarch
+>!> ESTABLISHED:4126: I__s_[S1:0][package]yast2-xml-2.15.0-36.i586
+>!> ESTABLISHED:4127: U__s_[S2:0][package]yast2-xml-2.15.0-47.i586
+>!> ESTABLISHED:4128: U__s_[S2:0][package]yauap-0.2.1-13.i586
+>!> ESTABLISHED:4129: I__s_[S1:0][package]yauap-0.2.1-3.i586
+>!> ESTABLISHED:4130: U__s_[S2:0][package]yelp-2.19.90-3.i586
+>!> ESTABLISHED:4131: I__s_[S1:0][package]yp-tools-2.9-67.i586
+>!> ESTABLISHED:4132: U__s_[S2:0][package]yp-tools-2.9-73.i586
+>!> ESTABLISHED:4133: I__s_[S1:0][package]ypbind-1.20.5-38.i586
+>!> ESTABLISHED:4134: U__s_[S2:0][package]ypbind-1.20.5-46.i586
+>!> ESTABLISHED:4135: U__s_[S2:0][package]ypserv-2.19-75.i586
+>!> ESTABLISHED:4136: U__s_[S2:0][package]yudit-2.7.8-90.i586
+>!> ESTABLISHED:4137: U__s_[S2:0][package]yum-3.2.4-4.i586
+>!> ESTABLISHED:4138: U__s_[S2:0][package]yum-metadata-parser-1.1.2-3.i586
+>!> ESTABLISHED:4139: U__s_[S2:0][package]yum-utils-1.1.6-10.noarch
+>!> ESTABLISHED:4140: U__s_[S2:0][package]yumex-1.9.11-9.i586
+>!> ESTABLISHED:4141: U__s_[S2:0][package]zd1211-firmware-1.3-32.noarch
+>!> ESTABLISHED:4142: U__s_[S2:0][package]zenity-2.19.2-3.i586
+>!> ESTABLISHED:4143: U__s_[S2:0][package]zip-2.32-8.i586
+>!> ESTABLISHED:4144: U__s_[S2:0][package]ziptool-1.4.0-180.i586
+>!> ESTABLISHED:4145: I__s_[S1:0][package]zisofs-tools-1.0.6-66.i586
+>!> ESTABLISHED:4146: U__s_[S2:0][package]zisofs-tools-1.0.6-72.i586
+>!> ESTABLISHED:4147: I__s_[S1:0][package]zlib-1.2.3-66.i586
+>!> ESTABLISHED:4148: U__s_[S2:0][package]zlib-1.2.3-72.i586
+>!> ESTABLISHED:4149: U__s_[S2:0][package]zlib-devel-1.2.3-72.i586
+>!> ESTABLISHED:4150: U__s_[S2:0][package]zoo-2.10-935.i586
+>!> ESTABLISHED:4151: U__s_[S2:0][package]zsh-4.3.4-25.i586
+>!> ESTABLISHED:4152: I__s_[S1:0][package]zvbi-0.2.16-81.i586
+>!> ESTABLISHED:4153: U__s_[S2:0][package]zvbi-0.2.16-89.i586
+>!> ESTABLISHED:4154: I__s_[S1:0][package]zypper-0.8.10-2.i586
+>!> ESTABLISHED:4155: U__s_[S2:0][package]zypper-0.8.19-2.i586
+>!> Doing distribution upgrade ...
+>!> 1: U__s_[S2:0][package]3ddiag-0.740-73.i586
+>!> 2: I__s_[S1:0][package]915resolution-0.5.3-21.i586
+>!> 3: U_Th_[S2:0][package]915resolution-0.5.3-28.i586
+>!> 4: U__s_[S2:0][package]AdobeICCProfiles-2.0-71.noarch
+>!> 5: U__s_[S2:0][package]BitTorrent-4.0.3-107.i586
+>!> 6: U__s_[S2:0][package]CID-keyed-fonts-MOE-20021114-272.noarch
+>!> 7: U__s_[S2:0][package]CID-keyed-fonts-Wada-20021114-272.noarch
+>!> 8: U__s_[S2:0][package]CID-keyed-fonts-WadaH-20021114-272.noarch
+>!> 9: I__s_[S1:0][package]CheckHardware-0.1-1071.i586
+>!> 10: U_Th_[S2:0][package]CheckHardware-0.1-1080.i586
+>!> 11: U__s_[S2:0][package]ConsoleKit-0.2.1-48.i586
+>!> 12: U__s_[S2:0][package]Crystalcursors-0.5-124.noarch
+>!> 13: I__s_[S1:0][package]DirectFB-1.0.0-47.i586
+>!> 14: U_Th_[S2:0][package]DirectFB-1.0.0-57.i586
+>!> 15: U__s_[S2:0][package]DirectFB-devel-1.0.0-57.i586
+>!> 16: U__s_[S2:0][package]ElectricFence-2.2.2-600.i586
+>!> 17: U__s_[S2:0][package]FA_clalsadrv-1.1.0-75.i586
+>!> 18: U__s_[S2:0][package]FA_clthreads-2.2.1-40.i586
+>!> 19: U__s_[S2:0][package]FA_clxclient-3.3.1-53.i586
+>!> 20: U__s_[S2:0][package]FreeNX-0.7.0-15.i586
+>!> 21: U__s_[S2:0][package]GraphicsMagick-1.1.8-12.i586
+>!> 22: U__s_[S2:0][package]IPAGothic-001.000-98.noarch
+>!> 23: U__s_[S2:0][package]IPAMincho-001.000-98.noarch
+>!> 24: U__s_[S2:0][package]IPAPGothic-5.0.3-86.noarch
+>!> 25: U__s_[S2:0][package]IPAPMincho-001.000-98.noarch
+>!> 26: U__s_[S2:0][package]IPAUIGothic-001.000-98.noarch
+>!> 27: U__s_[S2:0][package]ImageMagick-6.3.5.3-20.i586
+>!> 28: U__s_[S2:0][package]ImageMagick-devel-6.3.5.3-20.i586
+>!> 29: I__s_[S1:0][package]LibVNCServer-0.9.1-11.i586
+>!> 30: U_Th_[S2:0][package]LibVNCServer-0.9.1-20.i586
+>!> 31: U__s_[S2:0][package]Maelstrom-3.0.6-106.i586
+>!> 32: U_Th_[S2:0][package]Mesa-7.0.1-12.i586
+>!> 33: I__s_[S1:0][package]Mesa-7.0.1-2.i586
+>!> 34: U__s_[S2:0][package]Mesa-devel-7.0.1-12.i586
+>!> 35: U__s_[S2:0][package]Mesa-devel-static-7.0.1-12.i586
+>!> 36: U__s_[S2:0][package]MesaGLw-7.0.1-10.i586
+>!> 37: U__s_[S2:0][package]MesaGLw-devel-7.0.1-10.i586
+>!> 38: U__s_[S2:0][package]Modules-3.1.6-121.i586
+>!> 39: I__s_[S1:0][package]MozillaFirefox-2.0.0.5-9.i586
+>!> 40: U_Th_[S2:0][package]MozillaFirefox-2.0.0.6-9.i586
+>!> 41: U__s_[S2:0][package]MozillaFirefox-translations-2.0.0.6-9.i586
+>!> 42: U__s_[S2:0][package]MozillaSunbird-0.5-20.i586
+>!> 43: U__s_[S2:0][package]MozillaSunbird-translations-0.5-20.i586
+>!> 44: U__s_[S2:0][package]MozillaThunderbird-2.0.0.6-8.i586
+>!> 45: U__s_[S2:0][package]MozillaThunderbird-translations-2.0.0.6-8.i586
+>!> 46: U__s_[S2:0][package]NX-2.1.0-31.i586
+>!> 47: U_Th_[S2:0][package]NetworkManager-0.6.5-22.i586
+>!> 48: I__s_[S1:0][package]NetworkManager-0.6.5-4.i586
+>!> 49: U__s_[S2:0][package]NetworkManager-devel-0.6.5-22.i586
+>!> 50: U__s_[S2:0][package]NetworkManager-glib-0.6.5-22.i586
+>!> 51: U__s_[S2:0][package]NetworkManager-gnome-0.6.5-22.i586
+>!> 52: I__s_[S1:0][package]NetworkManager-kde-0.2r674918-21.i586
+>!> 53: U_Th_[S2:0][package]NetworkManager-kde-0.2r674918-40.i586
+>!> 54: U__s_[S2:0][package]NetworkManager-openvpn-0.3.2cvs20060202-160.i586
+>!> 55: U__s_[S2:0][package]NetworkManager-openvpn-gnome-0.3.2cvs20060202-160.i586
+>!> 56: U__s_[S2:0][package]NetworkManager-openvpn-kde-0.2r674918-40.i586
+>!> 57: U__s_[S2:0][package]NetworkManager-vpnc-0.5.0cvs20060202-162.i586
+>!> 58: U__s_[S2:0][package]NetworkManager-vpnc-gnome-0.5.0cvs20060202-162.i586
+>!> 59: U__s_[S2:0][package]NetworkManager-vpnc-kde-0.2r674918-40.i586
+>!> 60: I__s_[S1:0][package]OpenEXR-1.4.0a-22.i586
+>!> 61: U_Th_[S2:0][package]OpenEXR-1.4.0a-30.i586
+>!> 62: I__s_[S1:0][package]OpenOffice_org-2.2.99.224-4.i586
+>!> 63: U_Th_[S2:0][package]OpenOffice_org-2.3.0.1-2.i586
+>!> 64: I__s_[S1:0][package]OpenOffice_org-Quickstarter-1.0-572.i586
+>!> 65: U_Th_[S2:0][package]OpenOffice_org-Quickstarter-1.0-582.i586
+>!> 66: U__s_[S2:0][package]OpenOffice_org-base-2.3.0.1-2.i586
+>!> 67: I__s_[S1:0][package]OpenOffice_org-calc-2.2.99.224-4.i586
+>!> 68: U_Th_[S2:0][package]OpenOffice_org-calc-2.3.0.1-2.i586
+>!> 69: U__s_[S2:0][package]OpenOffice_org-cs-2.3.0.1-2.noarch
+>!> 70: U__s_[S2:0][package]OpenOffice_org-da-2.3.0.1-2.noarch
+>!> 71: U__s_[S2:0][package]OpenOffice_org-de-2.3.0.1-2.noarch
+>!> 72: I__s_[S1:0][package]OpenOffice_org-draw-2.2.99.224-4.i586
+>!> 73: U_Th_[S2:0][package]OpenOffice_org-draw-2.3.0.1-2.i586
+>!> 74: U__s_[S2:0][package]OpenOffice_org-en-GB-2.3.0.1-2.noarch
+>!> 75: U__s_[S2:0][package]OpenOffice_org-es-2.3.0.1-2.noarch
+>!> 76: U__s_[S2:0][package]OpenOffice_org-fi-2.3.0.1-2.noarch
+>!> 77: U__s_[S2:0][package]OpenOffice_org-filters-2.3.0.1-2.i586
+>!> 78: U__s_[S2:0][package]OpenOffice_org-fr-2.3.0.1-2.noarch
+>!> 79: U__s_[S2:0][package]OpenOffice_org-gnome-2.3.0.1-2.i586
+>!> 80: U__s_[S2:0][package]OpenOffice_org-hu-2.3.0.1-2.noarch
+>!> 81: U__s_[S2:0][package]OpenOffice_org-hyphen-20070719-11.noarch
+>!> 82: I__s_[S1:0][package]OpenOffice_org-icon-themes-2.2.99.224-3.noarch
+>!> 83: U_Th_[S2:0][package]OpenOffice_org-icon-themes-2.3.0.1-2.noarch
+>!> 84: I__s_[S1:0][package]OpenOffice_org-impress-2.2.99.224-4.i586
+>!> 85: U_Th_[S2:0][package]OpenOffice_org-impress-2.3.0.1-2.i586
+>!> 86: U__s_[S2:0][package]OpenOffice_org-it-2.3.0.1-2.noarch
+>!> 87: U__s_[S2:0][package]OpenOffice_org-ja-2.3.0.1-2.noarch
+>!> 88: I__s_[S1:0][package]OpenOffice_org-kde-2.2.99.224-4.i586
+>!> 89: U_Th_[S2:0][package]OpenOffice_org-kde-2.3.0.1-2.i586
+>!> 90: U__s_[S2:0][package]OpenOffice_org-mailmerge-2.3.0.1-2.i586
+>!> 91: U__s_[S2:0][package]OpenOffice_org-math-2.3.0.1-2.i586
+>!> 92: U__s_[S2:0][package]OpenOffice_org-mono-2.3.0.1-2.i586
+>!> 93: U__s_[S2:0][package]OpenOffice_org-nb-2.3.0.1-2.noarch
+>!> 94: U__s_[S2:0][package]OpenOffice_org-nl-2.3.0.1-2.noarch
+>!> 95: U__s_[S2:0][package]OpenOffice_org-pl-2.3.0.1-2.noarch
+>!> 96: U__s_[S2:0][package]OpenOffice_org-pt-2.3.0.1-2.noarch
+>!> 97: U__s_[S2:0][package]OpenOffice_org-pt-BR-2.3.0.1-2.noarch
+>!> 98: U__s_[S2:0][package]OpenOffice_org-pyuno-2.3.0.1-2.i586
+>!> 99: U__s_[S2:0][package]OpenOffice_org-ru-2.3.0.1-2.noarch
+>!> 100: U__s_[S2:0][package]OpenOffice_org-sv-2.3.0.1-2.noarch
+>!> 101: U__s_[S2:0][package]OpenOffice_org-templates-de-2.0.4-48.noarch
+>!> 102: U__s_[S2:0][package]OpenOffice_org-templates-en-2.0.4-48.noarch
+>!> 103: U__s_[S2:0][package]OpenOffice_org-templates-labels-a4-1.0-2.noarch
+>!> 104: U__s_[S2:0][package]OpenOffice_org-templates-labels-letter-1.0-2.noarch
+>!> 105: U__s_[S2:0][package]OpenOffice_org-templates-presentation-layouts-2.0.4-50.noarch
+>!> 106: U__s_[S2:0][package]OpenOffice_org-thesaurus-cs-20060111-11.noarch
+>!> 107: U__s_[S2:0][package]OpenOffice_org-thesaurus-de-20070206-11.noarch
+>!> 108: U__s_[S2:0][package]OpenOffice_org-thesaurus-en-20060111-11.noarch
+>!> 109: U__s_[S2:0][package]OpenOffice_org-thesaurus-es-20050720-11.noarch
+>!> 110: U__s_[S2:0][package]OpenOffice_org-thesaurus-fr-20050329-11.noarch
+>!> 111: U__s_[S2:0][package]OpenOffice_org-thesaurus-nb-20060508-11.noarch
+>!> 112: U__s_[S2:0][package]OpenOffice_org-thesaurus-pl-20061223-11.noarch
+>!> 113: U__s_[S2:0][package]OpenOffice_org-thesaurus-pt-20060817-11.noarch
+>!> 114: I__s_[S1:0][package]OpenOffice_org-writer-2.2.99.224-4.i586
+>!> 115: U_Th_[S2:0][package]OpenOffice_org-writer-2.3.0.1-2.i586
+>!> 116: U__s_[S2:0][package]OpenOffice_org-zh-CN-2.3.0.1-2.noarch
+>!> 117: U__s_[S2:0][package]OpenOffice_org-zh-TW-2.3.0.1-2.noarch
+>!> 118: U__s_[S2:0][package]PgTcl-1.5-84.i586
+>!> 119: I__s_[S1:0][package]PolicyKit-0.2_git20060822-83.i586
+>!> 120: U_Th_[S2:0][package]PolicyKit-0.4-15.i586
+>!> 121: U__s_[S2:0][package]QtDMM-0.8.8-47.i586
+>!> 122: U__s_[S2:0][package]RealPlayer-10.0.9-8.i586
+>!> 123: U_Th_[S2:0][package]SDL-1.2.12-16.i586
+>!> 124: I__s_[S1:0][package]SDL-1.2.12-7.i586
+>!> 125: U__s_[S2:0][package]SDL-devel-1.2.12-16.i586
+>!> 126: U__s_[S2:0][package]SDL_Pango-0.1.2-74.i586
+>!> 127: U__s_[S2:0][package]SDL_Pango-devel-0.1.2-74.i586
+>!> 128: U__s_[S2:0][package]SDL_image-1.2.6-16.i586
+>!> 129: U_Th_[S2:0][package]SDL_mixer-1.2.8-16.i586
+>!> 130: I__s_[S1:0][package]SDL_mixer-1.2.8-7.i586
+>!> 131: U__s_[S2:0][package]SDL_net-1.2.7-16.i586
+>!> 132: U__s_[S2:0][package]SDL_perl-1.20.0-462.i586
+>!> 133: U__s_[S2:0][package]SDL_ttf-2.0.9-16.i586
+>!> 134: I__s_[S1:0][package]SuSEfirewall2-3.6_SVNr182-2.noarch
+>!> 135: U_Th_[S2:0][package]SuSEfirewall2-3.6_SVNr183-7.noarch
+>!> 136: U__s_[S2:0][package]TeX-Guy-1.3.1-59.i586
+>!> 137: U__s_[S2:0][package]TeX-Guy-devel-1.3.1-59.i586
+>!> 138: U__s_[S2:0][package]TeXmacs-1.0.6.9-48.i586
+>!> 139: U__s_[S2:0][package]Terminal-0.2.6_svn25932-23.i586
+>!> 140: U__s_[S2:0][package]VFlib3-3.6.14-59.i586
+>!> 141: U__s_[S2:0][package]VFlib3-devel-3.6.14-59.i586
+>!> 142: U__s_[S2:0][package]WindowMaker-0.92.0-101.i586
+>!> 143: U__s_[S2:0][package]WindowMaker-applets-1.0-756.i586
+>!> 144: U__s_[S2:0][package]WindowMaker-themes-0.1-309.noarch
+>!> 145: U__s_[S2:0][package]Xalan-c-1.10-71.i586
+>!> 146: U__s_[S2:0][package]Xerces-c-2.7.0-72.i586
+>!> 147: U__s_[S2:0][package]ZynAddSubFX-2.2.1-101.i586
+>!> 148: U__s_[S2:0][package]a2ps-4.13-1175.i586
+>!> 149: U__s_[S2:0][package]a2ps-h-20010113-591.noarch
+>!> 150: U__s_[S2:0][package]a2ps-perl-ja-1.45-10.noarch
+>!> 151: I__s_[S1:0][package]aaa_base-10.3-65.i586
+>!> 152: U_Th_[S2:0][package]aaa_base-10.3-78.i586
+>!> 153: I__s_[S1:0][package]aaa_skel-2007.3.7-27.i586
+>!> 154: U_Th_[S2:0][package]aaa_skel-2007.3.7-33.i586
+>!> 155: I__s_[S1:0][package]aalib-1.4.0-372.i586
+>!> 156: U_Th_[S2:0][package]aalib-1.4.0-379.i586
+>!> 157: U__s_[S2:0][package]aalib-devel-1.4.0-379.i586
+>!> 158: U__s_[S2:0][package]abiword-2.4.6-17.i586
+>!> 159: U__s_[S2:0][package]acct-6.3.5-751.i586
+>!> 160: I__s_[S1:0][package]acl-2.2.34-66.i586
+>!> 161: U_Th_[S2:0][package]acl-2.2.34-72.i586
+>!> 162: I__s_[S1:0][package]acpid-1.0.6-11.i586
+>!> 163: U_Th_[S2:0][package]acpid-1.0.6-18.i586
+>!> 164: U__s_[S2:0][package]acroread-7.0.9-54.i586
+>!> 165: U__s_[S2:0][package]acx-kmp-bigsmp-20070101_2.6.22.5_10-6.i586
+>!> 166: U__s_[S2:0][package]acx-kmp-default-20070101_2.6.22.5_10-6.i586
+>!> 167: U__s_[S2:0][package]acx-kmp-xen-20070101_2.6.22.5_10-6.i586
+>!> 168: U__s_[S2:0][package]acx-kmp-xenpae-20070101_2.6.22.5_10-6.i586
+>!> 169: U__s_[S2:0][package]adaptec-firmware-1.0-39.noarch
+>!> 170: U__s_[S2:0][package]adm8211-kmp-bigsmp-20070720_2.6.22.5_10-3.i586
+>!> 171: U__s_[S2:0][package]adm8211-kmp-default-20070720_2.6.22.5_10-3.i586
+>!> 172: U__s_[S2:0][package]adm8211-kmp-xen-20070720_2.6.22.5_10-3.i586
+>!> 173: U__s_[S2:0][package]adm8211-kmp-xenpae-20070720_2.6.22.5_10-3.i586
+>!> 174: U__s_[S2:0][package]aelfred-1.2-112.noarch
+>!> 175: U__s_[S2:0][package]aelfred-javadoc-1.2-112.noarch
+>!> 176: U__s_[S2:0][package]aeolus-0.6.6-81.i586
+>!> 177: U__s_[S2:0][package]agfa-fonts-2003.03.19-91.noarch
+>!> 178: U__s_[S2:0][package]aide-0.11-69.i586
+>!> 179: U__s_[S2:0][package]alacarte-0.11.3-67.i586
+>!> 180: U__s_[S2:0][package]alevt-1.6.1-297.i586
+>!> 181: U__s_[S2:0][package]alien-8.68-18.i586
+>!> 182: I__s_[S1:0][package]alsa-1.0.14-20.i586
+>!> 183: U_Th_[S2:0][package]alsa-1.0.14-27.i586
+>!> 184: U__s_[S2:0][package]alsa-devel-1.0.14-27.i586
+>!> 185: U__s_[S2:0][package]alsa-firmware-1.0.14-21.noarch
+>!> 186: I__s_[S1:0][package]alsa-oss-1.0.14-14.i586
+>!> 187: U_Th_[S2:0][package]alsa-oss-1.0.14-20.i586
+>!> 188: U__s_[S2:0][package]alsa-plugins-1.0.14-33.i586
+>!> 189: U__s_[S2:0][package]alsa-plugins-samplerate-1.0.14-33.i586
+>!> 190: U__s_[S2:0][package]alsa-tools-1.0.14-30.i586
+>!> 191: U__s_[S2:0][package]alsa-tools-gui-1.0.14-30.i586
+>!> 192: I__s_[S1:0][package]alsa-utils-1.0.14-15.i586
+>!> 193: U_Th_[S2:0][package]alsa-utils-1.0.14-22.i586
+>!> 194: U__s_[S2:0][package]alsamixergui-0.9.0rc1-638.i586
+>!> 195: I__s_[S1:0][package]amarok-1.4.6-17.i586
+>!> 196: U_Th_[S2:0][package]amarok-1.4.7-22.i586
+>!> 197: I__s_[S1:0][package]amarok-libvisual-1.4.6-17.i586
+>!> 198: U_Th_[S2:0][package]amarok-libvisual-1.4.7-22.i586
+>!> 199: I__s_[S1:0][package]amarok-xine-1.4.6-17.i586
+>!> 200: U_Th_[S2:0][package]amarok-xine-1.4.7-22.i586
+>!> 201: I__s_[S1:0][package]amarok-yauap-1.4.6-17.i586
+>!> 202: U_Th_[S2:0][package]amarok-yauap-1.4.7-22.i586
+>!> 203: U__s_[S2:0][package]amavisd-new-2.5.1-20.i586
+>!> 204: U__s_[S2:0][package]anjuta-1.2.4a-128.i586
+>!> 205: U__s_[S2:0][package]ant-1.7.0-20.noarch
+>!> 206: U__s_[S2:0][package]ant-antlr-1.7.0-27.noarch
+>!> 207: U__s_[S2:0][package]ant-apache-bcel-1.7.0-27.noarch
+>!> 208: U__s_[S2:0][package]ant-apache-bsf-1.7.0-27.noarch
+>!> 209: U__s_[S2:0][package]ant-apache-log4j-1.7.0-27.noarch
+>!> 210: U__s_[S2:0][package]ant-apache-oro-1.7.0-27.noarch
+>!> 211: U__s_[S2:0][package]ant-apache-regexp-1.7.0-27.noarch
+>!> 212: U__s_[S2:0][package]ant-apache-resolver-1.7.0-27.noarch
+>!> 213: U__s_[S2:0][package]ant-commons-logging-1.7.0-27.noarch
+>!> 214: U__s_[S2:0][package]ant-javadoc-1.7.0-20.noarch
+>!> 215: U__s_[S2:0][package]ant-javamail-1.7.0-27.noarch
+>!> 216: U__s_[S2:0][package]ant-jdepend-1.7.0-27.noarch
+>!> 217: U__s_[S2:0][package]ant-jmf-1.7.0-27.noarch
+>!> 218: U__s_[S2:0][package]ant-junit-1.7.0-27.noarch
+>!> 219: U__s_[S2:0][package]ant-manual-1.7.0-20.noarch
+>!> 220: U__s_[S2:0][package]ant-nodeps-1.7.0-27.noarch
+>!> 221: U__s_[S2:0][package]ant-scripts-1.7.0-20.noarch
+>!> 222: U__s_[S2:0][package]ant-swing-1.7.0-27.noarch
+>!> 223: U__s_[S2:0][package]ant-trax-1.7.0-27.noarch
+>!> 224: U__s_[S2:0][package]anthy-9100-16.i586
+>!> 225: U__s_[S2:0][package]anthy-devel-9100-16.i586
+>!> 226: U__s_[S2:0][package]antlr-2.7.6-104.noarch
+>!> 227: U__s_[S2:0][package]apache2-2.2.4-62.i586
+>!> 228: U__s_[S2:0][package]apache2-devel-2.2.4-62.i586
+>!> 229: U__s_[S2:0][package]apache2-doc-2.2.4-62.i586
+>!> 230: U__s_[S2:0][package]apache2-example-pages-2.2.4-62.i586
+>!> 231: U__s_[S2:0][package]apache2-mod_fcgid-2.1-12.i586
+>!> 232: U__s_[S2:0][package]apache2-mod_mono-1.2.5-14.i586
+>!> 233: U__s_[S2:0][package]apache2-mod_perl-2.0.3-48.i586
+>!> 234: U__s_[S2:0][package]apache2-mod_php5-5.2.4-3.i586
+>!> 235: U__s_[S2:0][package]apache2-mod_python-3.3.1-45.i586
+>!> 236: U__s_[S2:0][package]apache2-prefork-2.2.4-62.i586
+>!> 237: U__s_[S2:0][package]apache2-utils-2.2.4-62.i586
+>!> 238: U__s_[S2:0][package]apache2-worker-2.2.4-62.i586
+>!> 239: U__s_[S2:0][package]apel-10.6-151.noarch
+>!> 240: U__s_[S2:0][package]apel-xemacs-10.6-316.noarch
+>!> 241: U__s_[S2:0][package]apparmor-admin_en-10.3-7.noarch
+>!> 242: U__s_[S2:0][package]apparmor-dbus-1.2-10.i586
+>!> 243: U__s_[S2:0][package]apparmor-docs-2.1-10.noarch
+>!> 244: I__s_[S1:0][package]apparmor-parser-2.0.2-41.i586
+>!> 245: U_Th_[S2:0][package]apparmor-parser-2.1-10.i586
+>!> 246: I__s_[S1:0][package]apparmor-profiles-2.0.2-38.noarch
+>!> 247: U_Th_[S2:0][package]apparmor-profiles-2.1-9.noarch
+>!> 248: I__s_[S1:0][package]apparmor-utils-2.0.2-28.noarch
+>!> 249: U_Th_[S2:0][package]apparmor-utils-2.1-6.noarch
+>!> 250: U__s_[S2:0][package]aqbanking-2.2.9-19.i586
+>!> 251: U__s_[S2:0][package]aqbanking-devel-2.2.9-19.i586
+>!> 252: U__s_[S2:0][package]arcad_eval-102-57.i586
+>!> 253: U__s_[S2:0][package]armagetron-0.2.7.1-109.i586
+>!> 254: U__s_[S2:0][package]arpwatch-2.1a15-30.i586
+>!> 255: U__s_[S2:0][package]arpwatch-ethercodes-2007.9.1-2.noarch
+>!> 256: U__s_[S2:0][package]art-sharp2-2.16.0-27.i586
+>!> 257: I__s_[S1:0][package]arts-1.5.7-23.i586
+>!> 258: U_Th_[S2:0][package]arts-1.5.7-32.i586
+>!> 259: U__s_[S2:0][package]arts-devel-1.5.7-32.i586
+>!> 260: U__s_[S2:0][package]aseqview-0.2.7-46.i586
+>!> 261: U__s_[S2:0][package]asm-1.5.3-113.noarch
+>!> 262: I__s_[S1:0][package]aspell-0.60.5-33.i586
+>!> 263: U_Th_[S2:0][package]aspell-0.60.5-42.i586
+>!> 264: U__s_[S2:0][package]aspell-cs-0.60.0.20040614-65.i586
+>!> 265: U__s_[S2:0][package]aspell-da-1.4.42.1-64.i586
+>!> 266: U__s_[S2:0][package]aspell-de-0.60.20030222.1-64.i586
+>!> 267: U__s_[S2:0][package]aspell-devel-0.60.5-42.i586
+>!> 268: I__s_[S1:0][package]aspell-en-6.0-85.i586
+>!> 269: U_Th_[S2:0][package]aspell-en-6.0-93.i586
+>!> 270: U__s_[S2:0][package]aspell-es-0.50.2-430.i586
+>!> 271: U__s_[S2:0][package]aspell-fi-0.7-96.i586
+>!> 272: U__s_[S2:0][package]aspell-fr-0.50.3-430.i586
+>!> 273: U__s_[S2:0][package]aspell-hu-0.99.4.2-96.i586
+>!> 274: U__s_[S2:0][package]aspell-it-2.2_20050523-96.i586
+>!> 275: U__s_[S2:0][package]aspell-nb-0.50.10-103.i586
+>!> 276: U__s_[S2:0][package]aspell-nl-1.00.7-8.i586
+>!> 277: U__s_[S2:0][package]aspell-pl-0.60.2006.11.21-45.i586
+>!> 278: U__s_[S2:0][package]aspell-pt_BR-0.60.20070411-13.i586
+>!> 279: U__s_[S2:0][package]aspell-pt_PT-0.60.20070510-13.i586
+>!> 280: U__s_[S2:0][package]aspell-ru-0.99.f7.1-64.i586
+>!> 281: U__s_[S2:0][package]aspell-sv-0.51.0-117.i586
+>!> 282: U__s_[S2:0][package]at-3.1.8-996.i586
+>!> 283: U__s_[S2:0][package]at-spi-1.19.5-15.i586
+>!> 284: U__s_[S2:0][package]at-spi-devel-1.19.5-15.i586
+>!> 285: U__s_[S2:0][package]at-spi-doc-1.19.5-15.i586
+>!> 286: U__s_[S2:0][package]at76_usb-kmp-bigsmp-0.14beta1_2.6.22.5_10-5.i586
+>!> 287: U__s_[S2:0][package]at76_usb-kmp-default-0.14beta1_2.6.22.5_10-5.i586
+>!> 288: U__s_[S2:0][package]at76_usb-kmp-xen-0.14beta1_2.6.22.5_10-5.i586
+>!> 289: U__s_[S2:0][package]at76_usb-kmp-xenpae-0.14beta1_2.6.22.5_10-5.i586
+>!> 290: U_Th_[S2:0][package]atk-1.19.6-14.i586
+>!> 291: I__s_[S1:0][package]atk-1.19.6-3.i586
+>!> 292: U__s_[S2:0][package]atk-devel-1.19.6-14.i586
+>!> 293: U__s_[S2:0][package]atk-doc-1.19.6-14.i586
+>!> 294: U__s_[S2:0][package]atmel-firmware-1.3-73.noarch
+>!> 295: I__s_[S1:0][package]attr-2.4.28-72.i586
+>!> 296: U_Th_[S2:0][package]attr-2.4.28-78.i586
+>!> 297: U__s_[S2:0][package]audacity-1.3.3-35.i586
+>!> 298: I__s_[S1:0][package]audiofile-0.2.6-68.i586
+>!> 299: U_Th_[S2:0][package]audiofile-0.2.6-74.i586
+>!> 300: U__s_[S2:0][package]audiofile-devel-0.2.6-74.i586
+>!> 301: U__s_[S2:0][package]audit-1.5.5-10.i586
+>!> 302: U__s_[S2:0][package]audit-devel-1.5.5-10.i586
+>!> 303: U_Th_[S2:0][package]audit-libs-1.5.5-10.i586
+>!> 304: I__s_[S1:0][package]audit-libs-1.5.5-4.i586
+>!> 305: U__s_[S2:0][package]audit-visualize-1.5.2-25.noarch
+>!> 306: U__s_[S2:0][package]aumix-2.8-408.i586
+>!> 307: U__s_[S2:0][package]autoconf-2.61-44.i586
+>!> 308: I__s_[S1:0][package]autofs-5.0.2-12.i586
+>!> 309: U_Th_[S2:0][package]autofs-5.0.2-20.i586
+>!> 310: U__s_[S2:0][package]automake-1.10-43.i586
+>!> 311: U__s_[S2:0][package]autotrace-0.31.1-475.i586
+>!> 312: U__s_[S2:0][package]autotrace-devel-0.31.1-475.i586
+>!> 313: I__s_[S1:0][package]autoyast2-2.15.13-12.noarch
+>!> 314: U_Th_[S2:0][package]autoyast2-2.15.16-2.noarch
+>!> 315: I__s_[S1:0][package]autoyast2-installation-2.15.13-12.noarch
+>!> 316: U_Th_[S2:0][package]autoyast2-installation-2.15.16-2.noarch
+>!> 317: I__s_[S1:0][package]avahi-0.6.20-21.i586
+>!> 318: U_Th_[S2:0][package]avahi-0.6.20-31.i586
+>!> 319: U__s_[S2:0][package]avahi-compat-howl-0.6.20-31.i586
+>!> 320: I__s_[S1:0][package]avahi-compat-mDNSResponder-0.6.20-21.i586
+>!> 321: U_Th_[S2:0][package]avahi-compat-mDNSResponder-0.6.20-31.i586
+>!> 322: U__s_[S2:0][package]avahi-compat-mDNSResponder-devel-0.6.20-31.i586
+>!> 323: U__s_[S2:0][package]avahi-devel-0.6.20-31.i586
+>!> 324: I__s_[S1:0][package]avahi-glib-0.6.20-21.i586
+>!> 325: U_Th_[S2:0][package]avahi-glib-0.6.20-31.i586
+>!> 326: U__s_[S2:0][package]avahi-mono-0.6.20-36.i586
+>!> 327: U__s_[S2:0][package]avahi-python-0.6.20-31.i586
+>!> 328: U__s_[S2:0][package]avmailgate-2.1.2.14-2.i586
+>!> 329: U__s_[S2:0][package]awesfx-0.5.1a-10.i586
+>!> 330: U__s_[S2:0][package]axis-1.4-97.noarch
+>!> 331: U__s_[S2:0][package]banshee-0.13.1-10.i586
+>!> 332: U__s_[S2:0][package]banshee-devel-0.13.1-10.i586
+>!> 333: U__s_[S2:0][package]banshee-engine-gst-0.13.1-10.i586
+>!> 334: U__s_[S2:0][package]banshee-plugins-DAAP-0.13.1-10.i586
+>!> 335: U__s_[S2:0][package]banshee-plugins-default-0.13.1-10.i586
+>!> 336: U__s_[S2:0][package]banshee-plugins-extra-0.13.1-10.i586
+>!> 337: U__s_[S2:0][package]barcode-0.98-321.i586
+>!> 338: I__s_[S1:0][package]bash-3.2-46.i586
+>!> 339: U_Th_[S2:0][package]bash-3.2-56.i586
+>!> 340: U_Th_[S2:0][package]bash-doc-3.2-15.i586
+>!> 341: I__s_[S1:0][package]bash-doc-3.2-5.i586
+>!> 342: U__s_[S2:0][package]bayonne2-1.5.19-102.i586
+>!> 343: U__s_[S2:0][package]bayonne2-UsEng-1.5.19-102.i586
+>!> 344: U__s_[S2:0][package]bayonne2-devel-1.5.19-102.i586
+>!> 345: U__s_[S2:0][package]bbtools-2007.4.24-40.i586
+>!> 346: U__s_[S2:0][package]bbtools-gui-2007.6.11-27.i586
+>!> 347: U__s_[S2:0][package]bc-1.06-823.i586
+>!> 348: U__s_[S2:0][package]bcel-5.1-160.noarch
+>!> 349: U__s_[S2:0][package]bcm43xx-fwcutter-006-36.i586
+>!> 350: U__s_[S2:0][package]bdfresize-1.5-483.i586
+>!> 351: U__s_[S2:0][package]beagle-0.2.18-7.i586
+>!> 352: U__s_[S2:0][package]beagle-evolution-0.2.18-7.i586
+>!> 353: U__s_[S2:0][package]beagle-firefox-0.2.18-7.i586
+>!> 354: U__s_[S2:0][package]beagle-gui-0.2.18-7.i586
+>!> 355: U__s_[S2:0][package]beagle-index-10.3_20070203-88.i586
+>!> 356: U__s_[S2:0][package]bibview-2.2-893.i586
+>!> 357: U__s_[S2:0][package]bin86-0.16.17-34.i586
+>!> 358: U__s_[S2:0][package]bind-9.4.1.P1-8.i586
+>!> 359: U__s_[S2:0][package]bind-chrootenv-9.4.1.P1-8.i586
+>!> 360: U__s_[S2:0][package]bind-doc-9.4.1.P1-8.i586
+>!> 361: I__s_[S1:0][package]bind-libs-9.4.1-19.i586
+>!> 362: U_Th_[S2:0][package]bind-libs-9.4.1.P1-8.i586
+>!> 363: I__s_[S1:0][package]bind-utils-9.4.1-19.i586
+>!> 364: U_Th_[S2:0][package]bind-utils-9.4.1.P1-8.i586
+>!> 365: U__s_[S2:0][package]bing-1.0.5-69.i586
+>!> 366: U__s_[S2:0][package]binutils-2.17.50.20070726-10.i586
+>!> 367: U__s_[S2:0][package]bison-2.3-60.i586
+>!> 368: U__s_[S2:0][package]bitchx-1.1-77.i586
+>!> 369: U__s_[S2:0][package]bitstream-vera-1.10-237.noarch
+>!> 370: U__s_[S2:0][package]blackbox-0.70.1-90.i586
+>!> 371: U__s_[S2:0][package]blender-2.44-34.i586
+>!> 372: U__s_[S2:0][package]blktrace-0.99.3-3.i586
+>!> 373: I__s_[S1:0][package]blocxx-1.0.0-70.i586
+>!> 374: U_Th_[S2:0][package]blocxx-1.0.0-76.i586
+>!> 375: U__s_[S2:0][package]blocxx-devel-1.0.0-76.i586
+>!> 376: U__s_[S2:0][package]blt-2.4z-295.i586
+>!> 377: U__s_[S2:0][package]bluez-cups-3.18-2.i586
+>!> 378: U__s_[S2:0][package]bluez-firmware-1.2-59.i586
+>!> 379: U__s_[S2:0][package]bluez-gnome-0.6-88.i586
+>!> 380: U__s_[S2:0][package]bluez-hcidump-1.40-4.i586
+>!> 381: I__s_[S1:0][package]bluez-libs-3.13-4.i586
+>!> 382: U_Th_[S2:0][package]bluez-libs-3.18-2.i586
+>!> 383: U__s_[S2:0][package]bluez-test-3.18-2.i586
+>!> 384: I__s_[S1:0][package]bluez-utils-3.13-9.i586
+>!> 385: U_Th_[S2:0][package]bluez-utils-3.18-2.i586
+>!> 386: U__s_[S2:0][package]bogofilter-1.1.1-72.i586
+>!> 387: U__s_[S2:0][package]bonnie++-1.02-405.i586
+>!> 388: U__s_[S2:0][package]bonnie-1.4-409.i586
+>!> 389: U__s_[S2:0][package]boo-0.7.8.2559-16.noarch
+>!> 390: U__s_[S2:0][package]boost-1.33.1-102.i586
+>!> 391: I__s_[S1:0][package]boost-1.34.1-3.i586
+>!> 392: U__s_[S2:0][package]boost-devel-1.33.1-102.i586
+>!> 393: U__s_[S2:0][package]boost-doc-1.33.1-102.i586
+>!> 394: U__s_[S2:0][package]boost-jam-3.1.14-11.i586
+>!> 395: U__s_[S2:0][package]bootcycle-0.3-166.i586
+>!> 396: I__s_[S1:0][package]bootsplash-3.3-72.i586
+>!> 397: U_Th_[S2:0][package]bootsplash-3.3-78.i586
+>!> 398: I__s_[S1:0][package]bootsplash-theme-SuSE-3.1-154.i586
+>!> 399: U_Th_[S2:0][package]bootsplash-theme-SuSE-3.1-166.i586
+>!> 400: U__s_[S2:0][package]brasero-0.6.1-3.i586
+>!> 401: U__s_[S2:0][package]brasero-lang-0.6.1-3.i586
+>!> 402: U__s_[S2:0][package]bridge-utils-1.2-50.i586
+>!> 403: U__s_[S2:0][package]briquolo-0.5.6-20.i586
+>!> 404: U__s_[S2:0][package]bsd-games-2.17-9.i586
+>!> 405: U__s_[S2:0][package]bsf-2.3.0-144.noarch
+>!> 406: U__s_[S2:0][package]bsh2-2.0-139.noarch
+>!> 407: U__s_[S2:0][package]bsh2-bsf-2.0-139.noarch
+>!> 408: U__s_[S2:0][package]bsh2-classgen-2.0-139.noarch
+>!> 409: U__s_[S2:0][package]bsh2-demo-2.0-139.noarch
+>!> 410: U__s_[S2:0][package]bsh2-javadoc-2.0-139.noarch
+>!> 411: U__s_[S2:0][package]bsh2-manual-2.0-139.noarch
+>!> 412: U__s_[S2:0][package]bug-buddy-2.19.91-3.i586
+>!> 413: U__s_[S2:0][package]build-2007.08.02-8.noarch
+>!> 414: U__s_[S2:0][package]bundle-lang-common-cs-10.3-21.noarch
+>!> 415: U__s_[S2:0][package]bundle-lang-common-da-10.3-21.noarch
+>!> 416: U__s_[S2:0][package]bundle-lang-common-de-10.3-21.noarch
+>!> 417: U_Th_[S2:0][package]bundle-lang-common-en-10.3-21.noarch
+>!> 418: U__s_[S2:0][package]bundle-lang-common-es-10.3-21.noarch
+>!> 419: U__s_[S2:0][package]bundle-lang-common-fi-10.3-21.noarch
+>!> 420: U__s_[S2:0][package]bundle-lang-common-fr-10.3-21.noarch
+>!> 421: U__s_[S2:0][package]bundle-lang-common-hu-10.3-21.noarch
+>!> 422: U__s_[S2:0][package]bundle-lang-common-it-10.3-21.noarch
+>!> 423: U__s_[S2:0][package]bundle-lang-common-ja-10.3-21.noarch
+>!> 424: U__s_[S2:0][package]bundle-lang-common-nb-10.3-21.noarch
+>!> 425: U__s_[S2:0][package]bundle-lang-common-nl-10.3-21.noarch
+>!> 426: U__s_[S2:0][package]bundle-lang-common-pl-10.3-21.noarch
+>!> 427: U__s_[S2:0][package]bundle-lang-common-pt-10.3-21.noarch
+>!> 428: U__s_[S2:0][package]bundle-lang-common-ru-10.3-21.noarch
+>!> 429: U__s_[S2:0][package]bundle-lang-common-sv-10.3-21.noarch
+>!> 430: U__s_[S2:0][package]bundle-lang-common-zh-10.3-21.noarch
+>!> 431: U__s_[S2:0][package]bundle-lang-gnome-cs-10.3-35.noarch
+>!> 432: U__s_[S2:0][package]bundle-lang-gnome-da-10.3-35.noarch
+>!> 433: U__s_[S2:0][package]bundle-lang-gnome-de-10.3-35.noarch
+>!> 434: U__s_[S2:0][package]bundle-lang-gnome-en-10.3-35.noarch
+>!> 435: U__s_[S2:0][package]bundle-lang-gnome-es-10.3-35.noarch
+>!> 436: U__s_[S2:0][package]bundle-lang-gnome-fi-10.3-35.noarch
+>!> 437: U__s_[S2:0][package]bundle-lang-gnome-fr-10.3-35.noarch
+>!> 438: U__s_[S2:0][package]bundle-lang-gnome-hu-10.3-35.noarch
+>!> 439: U__s_[S2:0][package]bundle-lang-gnome-it-10.3-35.noarch
+>!> 440: U__s_[S2:0][package]bundle-lang-gnome-ja-10.3-35.noarch
+>!> 441: U__s_[S2:0][package]bundle-lang-gnome-nb-10.3-35.noarch
+>!> 442: U__s_[S2:0][package]bundle-lang-gnome-nl-10.3-35.noarch
+>!> 443: U__s_[S2:0][package]bundle-lang-gnome-pl-10.3-35.noarch
+>!> 444: U__s_[S2:0][package]bundle-lang-gnome-pt-10.3-35.noarch
+>!> 445: U__s_[S2:0][package]bundle-lang-gnome-ru-10.3-35.noarch
+>!> 446: U__s_[S2:0][package]bundle-lang-gnome-sv-10.3-35.noarch
+>!> 447: U__s_[S2:0][package]bundle-lang-gnome-zh-10.3-35.noarch
+>!> 448: U__s_[S2:0][package]bundle-lang-kde-cs-10.3-78.noarch
+>!> 449: U__s_[S2:0][package]bundle-lang-kde-da-10.3-78.noarch
+>!> 450: U__s_[S2:0][package]bundle-lang-kde-de-10.3-78.noarch
+>!> 451: I__s_[S1:0][package]bundle-lang-kde-en-10.3-42.noarch
+>!> 452: U_Th_[S2:0][package]bundle-lang-kde-en-10.3-78.noarch
+>!> 453: U__s_[S2:0][package]bundle-lang-kde-es-10.3-78.noarch
+>!> 454: U__s_[S2:0][package]bundle-lang-kde-fi-10.3-78.noarch
+>!> 455: U__s_[S2:0][package]bundle-lang-kde-fr-10.3-78.noarch
+>!> 456: U__s_[S2:0][package]bundle-lang-kde-hu-10.3-78.noarch
+>!> 457: U__s_[S2:0][package]bundle-lang-kde-it-10.3-78.noarch
+>!> 458: U__s_[S2:0][package]bundle-lang-kde-ja-10.3-78.noarch
+>!> 459: U__s_[S2:0][package]bundle-lang-kde-nb-10.3-78.noarch
+>!> 460: U__s_[S2:0][package]bundle-lang-kde-nl-10.3-78.noarch
+>!> 461: U__s_[S2:0][package]bundle-lang-kde-pl-10.3-78.noarch
+>!> 462: U__s_[S2:0][package]bundle-lang-kde-pt-10.3-78.noarch
+>!> 463: U__s_[S2:0][package]bundle-lang-kde-ru-10.3-78.noarch
+>!> 464: U__s_[S2:0][package]bundle-lang-kde-sv-10.3-78.noarch
+>!> 465: U__s_[S2:0][package]bundle-lang-kde-zh-10.3-78.noarch
+>!> 466: U__s_[S2:0][package]bundle-lang-other-10.3-4.noarch
+>!> 467: U__s_[S2:0][package]busybox-1.6.1-12.i586
+>!> 468: U__s_[S2:0][package]bwidget-1.7.0-116.noarch
+>!> 469: U__s_[S2:0][package]bytefx-data-mysql-1.2.5-11.i586
+>!> 470: U__s_[S2:0][package]bzflag-2.0.8-72.i586
+>!> 471: I__s_[S1:0][package]bzip2-1.0.4-33.i586
+>!> 472: U_Th_[S2:0][package]bzip2-1.0.4-39.i586
+>!> 473: U__s_[S2:0][package]bzip2-doc-1.0.4-39.i586
+>!> 474: U__s_[S2:0][package]cabextract-1.2-54.i586
+>!> 475: I__s_[S1:0][package]cairo-1.4.10-11.i586
+>!> 476: U_Th_[S2:0][package]cairo-1.4.10-19.i586
+>!> 477: U__s_[S2:0][package]cairo-devel-1.4.10-19.i586
+>!> 478: U__s_[S2:0][package]cairo-doc-1.4.10-19.i586
+>!> 479: U__s_[S2:0][package]cairomm-1.2.2-79.i586
+>!> 480: U__s_[S2:0][package]cairomm-devel-1.2.2-79.i586
+>!> 481: U__s_[S2:0][package]calamaris-2.59-71.i586
+>!> 482: U__s_[S2:0][package]canna-3.7p3-101.i586
+>!> 483: U__s_[S2:0][package]canna-devel-3.7p3-101.i586
+>!> 484: U__s_[S2:0][package]canna-libs-3.7p3-101.i586
+>!> 485: U__s_[S2:0][package]canna-yubin-0.0.20011101-444.i586
+>!> 486: U__s_[S2:0][package]cannadic-0.95a-131.i586
+>!> 487: U__s_[S2:0][package]capi4hylafax-01.03.00-14.i586
+>!> 488: U__s_[S2:0][package]capi4linux-2007.8.16-9.i586
+>!> 489: U__s_[S2:0][package]capisuite-0.4.5-113.i586
+>!> 490: U__s_[S2:0][package]ccache-2.4-72.i586
+>!> 491: U__s_[S2:0][package]ccaudio2-0.9.9-62.i586
+>!> 492: U__s_[S2:0][package]ccaudio2-devel-0.9.9-62.i586
+>!> 493: U__s_[S2:0][package]ccrtp-1.5.0-57.i586
+>!> 494: U__s_[S2:0][package]ccscript3-1.0.9-62.i586
+>!> 495: U__s_[S2:0][package]ccscript3-devel-1.0.9-62.i586
+>!> 496: U__s_[S2:0][package]cdk-4.9.13-72.i586
+>!> 497: I__s_[S1:0][package]cdparanoia-IIIalpha9.8-616.i586
+>!> 498: U_Th_[S2:0][package]cdparanoia-IIIalpha9.8-623.i586
+>!> 499: U_Th_[S2:0][package]cdrdao-1.2.2-107.i586
+>!> 500: I__s_[S1:0][package]cdrdao-1.2.2-94.i586
+>!> 501: I__s_[S1:0][package]cdrkit-cdrtools-compat-1.1.6-10.i586
+>!> 502: U_Th_[S2:0][package]cdrkit-cdrtools-compat-1.1.6-18.i586
+>!> 503: U__s_[S2:0][package]cecilia-2.0.5-194.noarch
+>!> 504: U__s_[S2:0][package]cedict-20070331-15.noarch
+>!> 505: U__s_[S2:0][package]cedilla-0.6-81.noarch
+>!> 506: U__s_[S2:0][package]cg-1.5-37.i586
+>!> 507: U__s_[S2:0][package]cg-devel-1.5-37.i586
+>!> 508: U__s_[S2:0][package]chasen-2.3.3-167.i586
+>!> 509: U__s_[S2:0][package]chasen-devel-2.3.3-167.i586
+>!> 510: I__s_[S1:0][package]check-0.9.5-25.i586
+>!> 511: U_Th_[S2:0][package]check-0.9.5-31.i586
+>!> 512: U__s_[S2:0][package]check-devel-0.9.5-31.i586
+>!> 513: U__s_[S2:0][package]checkinstall-1.6.1-30.i586
+>!> 514: U__s_[S2:0][package]checkmedia-2.1-73.i586
+>!> 515: U__s_[S2:0][package]chkrootkit-0.47-45.i586
+>!> 516: U__s_[S2:0][package]chromium-0.9.12-1107.i586
+>!> 517: U__s_[S2:0][package]cifs-mount-3.0.25c-3.i586
+>!> 518: U__s_[S2:0][package]circuslinux-1.0.3-1125.i586
+>!> 519: U__s_[S2:0][package]ckermit-8.0.211-80.i586
+>!> 520: U__s_[S2:0][package]clamav-0.91.2-5.i586
+>!> 521: U__s_[S2:0][package]clanbomber-1.05-113.i586
+>!> 522: U__s_[S2:0][package]clanlib-0.6.5-462.i586
+>!> 523: I__s_[S1:0][package]classpath-0.95-45.i586
+>!> 524: U_Th_[S2:0][package]classpath-0.95-62.i586
+>!> 525: U__s_[S2:0][package]classpath-devel-0.95-62.i586
+>!> 526: U__s_[S2:0][package]classpath-jta-0.93-63.noarch
+>!> 527: U__s_[S2:0][package]classpath-webplugin-0.95-62.i586
+>!> 528: U__s_[S2:0][package]clisp-2.41-27.i586
+>!> 529: U__s_[S2:0][package]cloop-2.04-105.i586
+>!> 530: U__s_[S2:0][package]cloop-kmp-bigsmp-2.04_2.6.22.5_10-105.i586
+>!> 531: U__s_[S2:0][package]cloop-kmp-default-2.04_2.6.22.5_10-105.i586
+>!> 532: U__s_[S2:0][package]cloop-kmp-xen-2.04_2.6.22.5_10-105.i586
+>!> 533: U__s_[S2:0][package]cloop-kmp-xenpae-2.04_2.6.22.5_10-105.i586
+>!> 534: I__s_[S1:0][package]clucene-core-0.9.16-28.i586
+>!> 535: U_Th_[S2:0][package]clucene-core-0.9.16-34.i586
+>!> 536: U__s_[S2:0][package]clucene-core-devel-0.9.16-34.i586
+>!> 537: U__s_[S2:0][package]cm-unicode-0.4.2-84.noarch
+>!> 538: U__s_[S2:0][package]cmake-2.4.7-12.i586
+>!> 539: U__s_[S2:0][package]cmatrix-1.2a-361.i586
+>!> 540: U__s_[S2:0][package]comgt-0.32-48.i586
+>!> 541: U__s_[S2:0][package]commoncpp2-1.5.7-9.i586
+>!> 542: U__s_[S2:0][package]commoncpp2-devel-1.5.7-9.i586
+>!> 543: U__s_[S2:0][package]commoncpp2-doc-1.5.7-9.i586
+>!> 544: U__s_[S2:0][package]compat-2007.4.18-28.i586
+>!> 545: U__s_[S2:0][package]compat-libstdc++-5.0.7-83.i586
+>!> 546: U__s_[S2:0][package]compat-openssl097g-0.9.7g-71.i586
+>!> 547: U__s_[S2:0][package]compat-readline4-4.3-72.i586
+>!> 548: I__s_[S1:0][package]compiz-0.5.2-4.i586
+>!> 549: U_Th_[S2:0][package]compiz-0.5.4-11.i586
+>!> 550: U__s_[S2:0][package]compiz-gnome-0.5.4-11.i586
+>!> 551: I__s_[S1:0][package]compiz-kde-0.5.2-4.i586
+>!> 552: U_Th_[S2:0][package]compiz-kde-0.5.4-11.i586
+>!> 553: U__s_[S2:0][package]conglomerate-0.9.1-126.i586
+>!> 554: U__s_[S2:0][package]contact-lookup-applet-0.13-129.i586
+>!> 555: U__s_[S2:0][package]control-center2-2.19.91-3.i586
+>!> 556: U__s_[S2:0][package]control-center2-devel-2.19.91-3.i586
+>!> 557: U__s_[S2:0][package]convert-1.3-873.i586
+>!> 558: U__s_[S2:0][package]convmv-1.10-58.noarch
+>!> 559: I__s_[S1:0][package]coreutils-6.9-34.i586
+>!> 560: U_Th_[S2:0][package]coreutils-6.9-40.i586
+>!> 561: U_Th_[S2:0][package]cpio-2.9-14.i586
+>!> 562: I__s_[S1:0][package]cpio-2.9-5.i586
+>!> 563: I__s_[S1:0][package]cpp-4.2-15.i586
+>!> 564: U_Th_[S2:0][package]cpp-4.2-21.i586
+>!> 565: U_Th_[S2:0][package]cpp42-4.2.1_20070724-12.i586
+>!> 566: I__s_[S1:0][package]cpp42-4.2.1_20070724-4.i586
+>!> 567: U__s_[S2:0][package]cpufrequtils-002-86.i586
+>!> 568: I__s_[S1:0][package]cracklib-2.8.10-26.i586
+>!> 569: U_Th_[S2:0][package]cracklib-2.8.10-34.i586
+>!> 570: U__s_[S2:0][package]cracklib-dict-full-2.8.10-28.i586
+>!> 571: I__s_[S1:0][package]cracklib-dict-small-2.8.10-26.i586
+>!> 572: U_Th_[S2:0][package]cracklib-dict-small-2.8.10-34.i586
+>!> 573: I__s_[S1:0][package]cron-4.1-113.i586
+>!> 574: U_Th_[S2:0][package]cron-4.1-119.i586
+>!> 575: U__s_[S2:0][package]cross-spu-binutils-2.17.50.20070726-10.i586
+>!> 576: U__s_[S2:0][package]cross-spu-gcc-4.3.0-33.i586
+>!> 577: U__s_[S2:0][package]cross-spu-newlib-1.15.0-31.i586
+>!> 578: U__s_[S2:0][package]cryptconfig-0.1.0-66.i586
+>!> 579: U__s_[S2:0][package]cryptsetup-1.0.5-26.i586
+>!> 580: U__s_[S2:0][package]cscope-15.6-52.i586
+>!> 581: U__s_[S2:0][package]csmash-0.6.6-110.i586
+>!> 582: U__s_[S2:0][package]csound-5.06.0-23.i586
+>!> 583: U__s_[S2:0][package]ctags-2007.2.6-36.i586
+>!> 584: U__s_[S2:0][package]ctapi-cyberjack-3.0.3-21.i586
+>!> 585: U__s_[S2:0][package]cups-1.2.12-13.i586
+>!> 586: U__s_[S2:0][package]cups-autoconfig-0.1.0-19.i586
+>!> 587: U__s_[S2:0][package]cups-backends-1.0-118.i586
+>!> 588: U_Th_[S2:0][package]cups-client-1.2.12-13.i586
+>!> 589: I__s_[S1:0][package]cups-client-1.2.12-5.i586
+>!> 590: U__s_[S2:0][package]cups-devel-1.2.12-13.i586
+>!> 591: U__s_[S2:0][package]cups-drivers-1.2.12-17.i586
+>!> 592: U_Th_[S2:0][package]cups-libs-1.2.12-13.i586
+>!> 593: I__s_[S1:0][package]cups-libs-1.2.12-5.i586
+>!> 594: U_Th_[S2:0][package]curl-7.16.4-10.i586
+>!> 595: I__s_[S1:0][package]curl-7.16.4-2.i586
+>!> 596: U_Th_[S2:0][package]curl-ca-bundle-7.16.4-10.i586
+>!> 597: I__s_[S1:0][package]curl-ca-bundle-7.16.4-2.i586
+>!> 598: U__s_[S2:0][package]cvs-1.12.12-82.i586
+>!> 599: U__s_[S2:0][package]cvs-doc-1.12.12-82.i586
+>!> 600: U__s_[S2:0][package]cvs2svn-1.5.1-53.i586
+>!> 601: U__s_[S2:0][package]cvsps-2.1-72.i586
+>!> 602: U__s_[S2:0][package]cyrus-imapd-2.3.8-44.i586
+>!> 603: I__s_[S1:0][package]cyrus-sasl-2.1.22-69.i586
+>!> 604: U_Th_[S2:0][package]cyrus-sasl-2.1.22-76.i586
+>!> 605: I__s_[S1:0][package]cyrus-sasl-crammd5-2.1.22-69.i586
+>!> 606: U_Th_[S2:0][package]cyrus-sasl-crammd5-2.1.22-76.i586
+>!> 607: U__s_[S2:0][package]cyrus-sasl-devel-2.1.22-76.i586
+>!> 608: I__s_[S1:0][package]cyrus-sasl-digestmd5-2.1.22-69.i586
+>!> 609: U_Th_[S2:0][package]cyrus-sasl-digestmd5-2.1.22-76.i586
+>!> 610: U__s_[S2:0][package]cyrus-sasl-gssapi-2.1.22-76.i586
+>!> 611: U__s_[S2:0][package]cyrus-sasl-otp-2.1.22-76.i586
+>!> 612: I__s_[S1:0][package]cyrus-sasl-plain-2.1.22-69.i586
+>!> 613: U_Th_[S2:0][package]cyrus-sasl-plain-2.1.22-76.i586
+>!> 614: I__s_[S1:0][package]cyrus-sasl-saslauthd-2.1.22-71.i586
+>!> 615: U_Th_[S2:0][package]cyrus-sasl-saslauthd-2.1.22-78.i586
+>!> 616: U__s_[S2:0][package]cyrus-sasl-sqlauxprop-2.1.22-78.i586
+>!> 617: U__s_[S2:0][package]dante-1.1.19-69.i586
+>!> 618: U__s_[S2:0][package]dante-devel-1.1.19-69.i586
+>!> 619: U__s_[S2:0][package]dar-2.3.4-15.i586
+>!> 620: U__s_[S2:0][package]darts-0.2-163.i586
+>!> 621: U__s_[S2:0][package]dasher-4.5.2-17.i586
+>!> 622: U__s_[S2:0][package]datakiosk-0.7-116.i586
+>!> 623: U__s_[S2:0][package]dazuko-2.3.3.4-46.i586
+>!> 624: U__s_[S2:0][package]dazuko-kmp-bigsmp-2.3.3.4_2.6.22.5_10-46.i586
+>!> 625: U__s_[S2:0][package]dazuko-kmp-default-2.3.3.4_2.6.22.5_10-46.i586
+>!> 626: U__s_[S2:0][package]dazuko-kmp-xen-2.3.3.4_2.6.22.5_10-46.i586
+>!> 627: I__s_[S1:0][package]db-utils-4.5.20-20.i586
+>!> 628: U_Th_[S2:0][package]db-utils-4.5.20-26.i586
+>!> 629: U__s_[S2:0][package]db1-1.85-158.i586
+>!> 630: U__s_[S2:0][package]db43-4.3.29-56.i586
+>!> 631: U__s_[S2:0][package]dbench-3.04-74.i586
+>!> 632: I__s_[S1:0][package]dbus-1-1.0.2-49.i586
+>!> 633: U_Th_[S2:0][package]dbus-1-1.0.2-56.i586
+>!> 634: U__s_[S2:0][package]dbus-1-devel-1.0.2-56.i586
+>!> 635: I__s_[S1:0][package]dbus-1-glib-0.74-11.i586
+>!> 636: U_Th_[S2:0][package]dbus-1-glib-0.74-19.i586
+>!> 637: U__s_[S2:0][package]dbus-1-glib-devel-0.74-19.i586
+>!> 638: U__s_[S2:0][package]dbus-1-mono-0.63-85.i586
+>!> 639: U__s_[S2:0][package]dbus-1-python-0.82.0-22.i586
+>!> 640: U_Th_[S2:0][package]dbus-1-qt3-0.62-102.i586
+>!> 641: I__s_[S1:0][package]dbus-1-qt3-0.62-93.i586
+>!> 642: U__s_[S2:0][package]dbus-1-qt3-devel-0.62-102.i586
+>!> 643: I__s_[S1:0][package]dbus-1-x11-1.0.2-53.i586
+>!> 644: U_Th_[S2:0][package]dbus-1-x11-1.0.2-61.i586
+>!> 645: U__s_[S2:0][package]dcraw-1.390-8.i586
+>!> 646: U__s_[S2:0][package]ddclient-3.7.3-8.i586
+>!> 647: U__s_[S2:0][package]ddd-3.3.11-123.i586
+>!> 648: U__s_[S2:0][package]ddrescue-1.14_0.0.6-3.i586
+>!> 649: U__s_[S2:0][package]ddskk-20050123-114.noarch
+>!> 650: U__s_[S2:0][package]ddskk-xemacs-20050123-114.noarch
+>!> 651: U__s_[S2:0][package]deb-1.10.27-109.i586
+>!> 652: U__s_[S2:0][package]decibel-0.5.0-11.i586
+>!> 653: U__s_[S2:0][package]dejagnu-1.4.4-74.i586
+>!> 654: I__s_[S1:0][package]dejavu-2.18-8.noarch
+>!> 655: U_Th_[S2:0][package]dejavu-2.19-8.noarch
+>!> 656: U__s_[S2:0][package]delta-2006.08.03-8.i586
+>!> 657: U__s_[S2:0][package]deltarpm-3.4-33.i586
+>!> 658: U__s_[S2:0][package]deskbar-applet-2.19.91-2.i586
+>!> 659: I__s_[S1:0][package]desktop-data-SuSE-10.3-61.noarch
+>!> 660: U_Th_[S2:0][package]desktop-data-SuSE-10.3-77.noarch
+>!> 661: I__s_[S1:0][package]desktop-file-utils-0.13-18.i586
+>!> 662: U_Th_[S2:0][package]desktop-file-utils-0.13-29.i586
+>!> 663: U__s_[S2:0][package]desktop-translations-10.3-59.noarch
+>!> 664: U__s_[S2:0][package]detex-2.7-709.i586
+>!> 665: U__s_[S2:0][package]devhelp-0.10-141.i586
+>!> 666: U__s_[S2:0][package]devhelp-devel-0.10-141.i586
+>!> 667: I__s_[S1:0][package]device-mapper-1.02.19-19.i586
+>!> 668: U_Th_[S2:0][package]device-mapper-1.02.19-25.i586
+>!> 669: U__s_[S2:0][package]devs-10.3-37.i586
+>!> 670: I__s_[S1:0][package]dhcdbd-1.14-53.i586
+>!> 671: U_Th_[S2:0][package]dhcdbd-1.14-61.i586
+>!> 672: U_Th_[S2:0][package]dhcp-3.0.6-17.i586
+>!> 673: I__s_[S1:0][package]dhcp-3.0.6-9.i586
+>!> 674: U_Th_[S2:0][package]dhcp-client-3.0.6-17.i586
+>!> 675: I__s_[S1:0][package]dhcp-client-3.0.6-9.i586
+>!> 676: U__s_[S2:0][package]dhcp-relay-3.0.6-17.i586
+>!> 677: U__s_[S2:0][package]dhcp-server-3.0.6-17.i586
+>!> 678: U__s_[S2:0][package]dhcp-tools-1.6-99.i586
+>!> 679: U__s_[S2:0][package]dhcp6-0.10-98.i586
+>!> 680: I__s_[S1:0][package]dhcpcd-1.3.22pl4-278.i586
+>!> 681: U_Th_[S2:0][package]dhcpcd-1.3.22pl4-284.i586
+>!> 682: U__s_[S2:0][package]dia-0.96.1-10.i586
+>!> 683: I__s_[S1:0][package]dialog-1.0-54.i586
+>!> 684: U_Th_[S2:0][package]dialog-1.0-60.i586
+>!> 685: U__s_[S2:0][package]diffmk-1.0-73.noarch
+>!> 686: U__s_[S2:0][package]diffstat-1.43-58.i586
+>!> 687: I__s_[S1:0][package]diffutils-2.8.7-71.i586
+>!> 688: U_Th_[S2:0][package]diffutils-2.8.7-77.i586
+>!> 689: I__s_[S1:0][package]digikam-0.9.2-19.i586
+>!> 690: U_Th_[S2:0][package]digikam-0.9.2-37.i586
+>!> 691: I__s_[S1:0][package]digikamimageplugins-0.9.2-19.i586
+>!> 692: U_Th_[S2:0][package]digikamimageplugins-0.9.2-37.i586
+>!> 693: U__s_[S2:0][package]digikamimageplugins-superimpose-0.9.2-37.i586
+>!> 694: U__s_[S2:0][package]ding-1.5-39.noarch
+>!> 695: U__s_[S2:0][package]dirdiff-2.1-71.i586
+>!> 696: U_Th_[S2:0][package]dirmngr-1.0.0-11.i586
+>!> 697: I__s_[S1:0][package]dirmngr-1.0.0-3.i586
+>!> 698: U__s_[S2:0][package]djvulibre-3.5.19-50.i586
+>!> 699: U__s_[S2:0][package]dmraid-1.0.0.rc14-17.i586
+>!> 700: U__s_[S2:0][package]docbook-dsssl-stylesheets-1.79-77.noarch
+>!> 701: U__s_[S2:0][package]docbook-toys-1.51.0-340.noarch
+>!> 702: U__s_[S2:0][package]docbook-utils-0.6.14-139.noarch
+>!> 703: U__s_[S2:0][package]docbook-xml-website-2.5.0-125.noarch
+>!> 704: U__s_[S2:0][package]docbook-xsl-stylesheets-1.73.1-5.noarch
+>!> 705: U__s_[S2:0][package]docbook2x-0.8.8-18.i586
+>!> 706: U__s_[S2:0][package]docbook_3-3.1-672.noarch
+>!> 707: U__s_[S2:0][package]docbook_4-4.5-38.noarch
+>!> 708: I__s_[S1:0][package]dockutils-0.2-12.i586
+>!> 709: U_Th_[S2:0][package]dockutils-0.2-18.i586
+>!> 710: U__s_[S2:0][package]dos2unix-3.1-373.i586
+>!> 711: U__s_[S2:0][package]dosbootdisk-1.1-127.i586
+>!> 712: I__s_[S1:0][package]dosfstools-2.11-70.i586
+>!> 713: U_Th_[S2:0][package]dosfstools-2.11-77.i586
+>!> 714: U__s_[S2:0][package]doxygen-1.5.3-10.i586
+>!> 715: U__s_[S2:0][package]dragonegg-0.1-118.i586
+>!> 716: U__s_[S2:0][package]drbd-kmp-bigsmp-0.7.23_2.6.22.5_10-63.i586
+>!> 717: U__s_[S2:0][package]drbd-kmp-default-0.7.23_2.6.22.5_10-63.i586
+>!> 718: U__s_[S2:0][package]drbd-kmp-xen-0.7.23_2.6.22.5_10-63.i586
+>!> 719: U__s_[S2:0][package]drgeo-1.1.0-111.i586
+>!> 720: U__s_[S2:0][package]dvb-1.1.0_CVS20070305-36.i586
+>!> 721: I__s_[S1:0][package]dvd+rw-tools-7.0-40.i586
+>!> 722: U_Th_[S2:0][package]dvd+rw-tools-7.0-46.i586
+>!> 723: U__s_[S2:0][package]dvi2tty-5.3.1-181.i586
+>!> 724: U__s_[S2:0][package]dviutils-94.3.19-1107.i586
+>!> 725: U_Th_[S2:0][package]e2fsprogs-1.40.2-15.i586
+>!> 726: I__s_[S1:0][package]e2fsprogs-1.40.2-9.i586
+>!> 727: U__s_[S2:0][package]e2fsprogs-devel-1.40.2-15.i586
+>!> 728: U__s_[S2:0][package]e3-2.6.3-70.i586
+>!> 729: U__s_[S2:0][package]eID-belgium-2.5.9-109.i586
+>!> 730: U__s_[S2:0][package]eIDconfig-belgium-1.0.1-12.i586
+>!> 731: U__s_[S2:0][package]eb-4.3-37.i586
+>!> 732: U__s_[S2:0][package]ebdev-4.3-37.i586
+>!> 733: U__s_[S2:0][package]eblook-1.6.1-70.i586
+>!> 734: U__s_[S2:0][package]ebview-0.3.6-97.i586
+>!> 735: U__s_[S2:0][package]ec-fonts-mftraced-1.0.12-109.noarch
+>!> 736: U__s_[S2:0][package]ecj-bootstrap-0.755-35.noarch
+>!> 737: U__s_[S2:0][package]ed-0.2-935.i586
+>!> 738: U__s_[S2:0][package]edict-20060807-58.noarch
+>!> 739: U__s_[S2:0][package]edict-emacs-0.9.8-814.noarch
+>!> 740: U__s_[S2:0][package]eel-2.19.90-3.i586
+>!> 741: U__s_[S2:0][package]eel-devel-2.19.90-3.i586
+>!> 742: U__s_[S2:0][package]efont-serif-ttf-20010312-574.noarch
+>!> 743: U__s_[S2:0][package]efont-unicode-0.4.2-106.noarch
+>!> 744: I__s_[S1:0][package]eject-2.1.0-62.i586
+>!> 745: U_Th_[S2:0][package]eject-2.1.0-68.i586
+>!> 746: U__s_[S2:0][package]ekiga-2.0.9-61.i586
+>!> 747: U__s_[S2:0][package]elilo-3.6-93.i586
+>!> 748: U__s_[S2:0][package]emacs-22.1-33.i586
+>!> 749: U__s_[S2:0][package]emacs-auctex-11.83-93.noarch
+>!> 750: U__s_[S2:0][package]emacs-info-22.1-33.i586
+>!> 751: U__s_[S2:0][package]emacs-nox-22.1-33.i586
+>!> 752: U__s_[S2:0][package]emacs-x11-22.1-33.i586
+>!> 753: U__s_[S2:0][package]encfs-1.3.2-38.i586
+>!> 754: U__s_[S2:0][package]enchant-1.2.0-90.i586
+>!> 755: U__s_[S2:0][package]enchant-devel-1.2.0-90.i586
+>!> 756: U__s_[S2:0][package]engdic-0.2-58.noarch
+>!> 757: U__s_[S2:0][package]enscript-1.6.4-80.i586
+>!> 758: U__s_[S2:0][package]eog-2.19.91-4.i586
+>!> 759: U__s_[S2:0][package]eog-devel-2.19.91-4.i586
+>!> 760: U__s_[S2:0][package]epic-2.6-38.i586
+>!> 761: U__s_[S2:0][package]epiphany-2.19.91-2.i586
+>!> 762: U__s_[S2:0][package]epiphany-devel-2.19.91-2.i586
+>!> 763: U__s_[S2:0][package]epiphany-doc-2.19.91-2.i586
+>!> 764: U__s_[S2:0][package]epiphany-extensions-2.19.90-2.i586
+>!> 765: U__s_[S2:0][package]epos-2.5.37-51.i586
+>!> 766: U_Th_[S2:0][package]esound-0.2.38-14.i586
+>!> 767: I__s_[S1:0][package]esound-0.2.38-8.i586
+>!> 768: U__s_[S2:0][package]esound-devel-0.2.38-14.i586
+>!> 769: U_Th_[S2:0][package]ethtool-6-10.i586
+>!> 770: I__s_[S1:0][package]ethtool-6-4.i586
+>!> 771: U__s_[S2:0][package]evince-2.19.4-4.i586
+>!> 772: U__s_[S2:0][package]evms-2.5.5-162.i586
+>!> 773: U__s_[S2:0][package]evms-gui-2.5.5-162.i586
+>!> 774: U__s_[S2:0][package]evolution-2.11.91-3.i586
+>!> 775: U__s_[S2:0][package]evolution-data-server-1.11.91-4.i586
+>!> 776: U__s_[S2:0][package]evolution-data-server-devel-1.11.91-4.i586
+>!> 777: U__s_[S2:0][package]evolution-devel-2.11.91-3.i586
+>!> 778: U__s_[S2:0][package]evolution-exchange-2.11.91-2.i586
+>!> 779: U__s_[S2:0][package]evolution-pilot-2.11.91-3.i586
+>!> 780: U__s_[S2:0][package]evolution-sharp-0.13.3-6.i586
+>!> 781: U__s_[S2:0][package]evolution-webcal-2.10.0-23.i586
+>!> 782: U__s_[S2:0][package]exiftool-6.90-8.i586
+>!> 783: U__s_[S2:0][package]exo-0.3.2-69.i586
+>!> 784: I__s_[S1:0][package]expat-2.0.1-15.i586
+>!> 785: U_Th_[S2:0][package]expat-2.0.1-21.i586
+>!> 786: U__s_[S2:0][package]expect-5.43.0-73.i586
+>!> 787: U__s_[S2:0][package]f-spot-0.4.0-18.i586
+>!> 788: I__s_[S1:0][package]fam-2.7.0-61.i586
+>!> 789: U_Th_[S2:0][package]fam-2.7.0-67.i586
+>!> 790: U__s_[S2:0][package]fam-devel-2.7.0-67.i586
+>!> 791: U__s_[S2:0][package]fam-server-2.7.0-67.i586
+>!> 792: U__s_[S2:0][package]fast-user-switch-applet-2.18.0-63.i586
+>!> 793: U__s_[S2:0][package]fastjar-0.92-61.i586
+>!> 794: U__s_[S2:0][package]fbiterm-0.5.20040304-133.i586
+>!> 795: U__s_[S2:0][package]fbset-2.1-852.i586
+>!> 796: U__s_[S2:0][package]fcwnn-1.1.1a017-618.i586
+>!> 797: U__s_[S2:0][package]fcwnncom-1.1.1a017-618.i586
+>!> 798: U__s_[S2:0][package]fcwnndev-1.1.1a017-618.i586
+>!> 799: U__s_[S2:0][package]festival-1.96-63.i586
+>!> 800: U__s_[S2:0][package]fetchmail-6.3.8-47.i586
+>!> 801: U__s_[S2:0][package]fftw-2.1.5-109.i586
+>!> 802: I__s_[S1:0][package]fftw3-3.1.2-53.i586
+>!> 803: U_Th_[S2:0][package]fftw3-3.1.2-59.i586
+>!> 804: I__s_[S1:0][package]file-4.20-32.i586
+>!> 805: U_Th_[S2:0][package]file-4.21-4.i586
+>!> 806: U__s_[S2:0][package]file-roller-2.19.91-3.i586
+>!> 807: I__s_[S1:0][package]fileshareset-2.0-329.i586
+>!> 808: U_Th_[S2:0][package]fileshareset-2.0-352.i586
+>!> 809: I__s_[S1:0][package]filesystem-10.3-40.i586
+>!> 810: U_Th_[S2:0][package]filesystem-10.3-47.i586
+>!> 811: U__s_[S2:0][package]fillets-ng-0.7.4-54.i586
+>!> 812: U__s_[S2:0][package]fillets-ng-data-0.7.4-34.noarch
+>!> 813: I__s_[S1:0][package]fillup-1.42-170.i586
+>!> 814: U_Th_[S2:0][package]fillup-1.42-176.i586
+>!> 815: U__s_[S2:0][package]filters-2007.8.9-15.i586
+>!> 816: I__s_[S1:0][package]findutils-4.2.31-15.i586
+>!> 817: U_Th_[S2:0][package]findutils-4.2.31-21.i586
+>!> 818: U__s_[S2:0][package]findutils-locate-4.2.31-21.i586
+>!> 819: U__s_[S2:0][package]finger-1.3-75.i586
+>!> 820: U__s_[S2:0][package]finger-server-1.3-75.i586
+>!> 821: U__s_[S2:0][package]firmwarekit-2-38.i586
+>!> 822: U__s_[S2:0][package]fkwnn-1.1.1a017-618.i586
+>!> 823: U__s_[S2:0][package]fkwnndev-1.1.1a017-618.i586
+>!> 824: U__s_[S2:0][package]flac-1.2.0-10.i586
+>!> 825: U_Th_[S2:0][package]flash-player-9.0.48.0-13.i586
+>!> 826: I__s_[S1:0][package]flash-player-9.0.48.0-8.i586
+>!> 827: U__s_[S2:0][package]flex-2.5.33-60.i586
+>!> 828: U__s_[S2:0][package]flim-1.14.7-99.noarch
+>!> 829: U__s_[S2:0][package]flim-xemacs-1.14.7-111.noarch
+>!> 830: U__s_[S2:0][package]fltk-1.1.7-79.i586
+>!> 831: U__s_[S2:0][package]fluidsynth-1.0.7a-89.i586
+>!> 832: I__s_[S1:0][package]fontconfig-2.4.2-34.i586
+>!> 833: U_Th_[S2:0][package]fontconfig-2.4.2-40.i586
+>!> 834: U__s_[S2:0][package]fontconfig-devel-2.4.2-40.i586
+>!> 835: I__s_[S1:0][package]fonts-config-20061025-45.noarch
+>!> 836: U_Th_[S2:0][package]fonts-config-20061025-51.noarch
+>!> 837: U__s_[S2:0][package]fonts-thryomanes-1.2-74.noarch
+>!> 838: U__s_[S2:0][package]fonttools-2.0b2.20070423-41.i586
+>!> 839: U__s_[S2:0][package]foomatic-filters-3.0.2-120.i586
+>!> 840: U__s_[S2:0][package]fop-0.93-35.noarch
+>!> 841: U__s_[S2:0][package]fortune-1.0-929.i586
+>!> 842: U__s_[S2:0][package]fping-2.4b2-71.i586
+>!> 843: U__s_[S2:0][package]free-ttf-fonts-1.0-246.noarch
+>!> 844: U__s_[S2:0][package]freealut-1.1.0-76.i586
+>!> 845: U__s_[S2:0][package]freeciv-2.1.0-95.i586
+>!> 846: U__s_[S2:0][package]freefont-0.20060718-84.noarch
+>!> 847: U__s_[S2:0][package]freeglut-060903-73.i586
+>!> 848: U__s_[S2:0][package]freeglut-devel-060903-73.i586
+>!> 849: U__s_[S2:0][package]freeradius-1.1.6-39.i586
+>!> 850: U__s_[S2:0][package]freetype-1.3.1-1259.i586
+>!> 851: U__s_[S2:0][package]freetype-tools-1.3.1-1259.i586
+>!> 852: U_Th_[S2:0][package]freetype2-2.3.5-15.i586
+>!> 853: I__s_[S1:0][package]freetype2-2.3.5-8.i586
+>!> 854: U__s_[S2:0][package]freetype2-devel-2.3.5-15.i586
+>!> 855: U__s_[S2:0][package]freqtweak-0.6.1-131.i586
+>!> 856: I__s_[S1:0][package]fribidi-0.10.4-565.i586
+>!> 857: U_Th_[S2:0][package]fribidi-0.10.4-574.i586
+>!> 858: U__s_[S2:0][package]fribidi-devel-0.10.4-574.i586
+>!> 859: U__s_[S2:0][package]frink-2.2.2-123.i586
+>!> 860: U__s_[S2:0][package]frozen-bubble-2.1.0-70.i586
+>!> 861: U__s_[S2:0][package]ft2demos-2.3.5-16.i586
+>!> 862: U__s_[S2:0][package]ftgl-2.1.2-87.i586
+>!> 863: U__s_[S2:0][package]ftwnn-1.1.1a017-618.i586
+>!> 864: U_Th_[S2:0][package]fuse-2.7.0-19.i586
+>!> 865: I__s_[S1:0][package]fuse-2.7.0-9.i586
+>!> 866: U__s_[S2:0][package]fuse_kio-0.0.cvs2005.12.08-129.i586
+>!> 867: U__s_[S2:0][package]fvwm-themes-0.6.2-301.noarch
+>!> 868: I__s_[S1:0][package]fvwm2-2.5.21-50.i586
+>!> 869: U_Th_[S2:0][package]fvwm2-2.5.21-62.i586
+>!> 870: U__s_[S2:0][package]fvwm2-gtk-2.5.21-62.i586
+>!> 871: U__s_[S2:0][package]fwnn-1.1.1a017-618.i586
+>!> 872: U__s_[S2:0][package]fwnncom-1.1.1a017-618.i586
+>!> 873: U__s_[S2:0][package]fxload-2002_04_11-172.i586
+>!> 874: U__s_[S2:0][package]g-wrap-1.9.6-94.i586
+>!> 875: U__s_[S2:0][package]g3utils-1.1.35-63.i586
+>!> 876: U_Th_[S2:0][package]gail-1.19.6-16.i586
+>!> 877: I__s_[S1:0][package]gail-1.19.6-5.i586
+>!> 878: U__s_[S2:0][package]gail-devel-1.19.6-16.i586
+>!> 879: U__s_[S2:0][package]gail-doc-1.19.6-16.i586
+>!> 880: U__s_[S2:0][package]gaim-otr-3.0.0-116.i586
+>!> 881: U__s_[S2:0][package]galago-daemon-0.5.1-47.i586
+>!> 882: U__s_[S2:0][package]galago-sharp-0.5.0-116.noarch
+>!> 883: U__s_[S2:0][package]gamix-1.99.p14-140.i586
+>!> 884: U__s_[S2:0][package]garlic-1.6-84.i586
+>!> 885: U__s_[S2:0][package]gau-0.4.1-833.i586
+>!> 886: I__s_[S1:0][package]gawk-3.1.5g-16.i586
+>!> 887: U_Th_[S2:0][package]gawk-3.1.5g-22.i586
+>!> 888: U__s_[S2:0][package]gbuffy-0.2.6-127.i586
+>!> 889: U__s_[S2:0][package]gcal-3.01-654.i586
+>!> 890: U__s_[S2:0][package]gcalctool-5.19.91-3.i586
+>!> 891: U__s_[S2:0][package]gcc-4.2-21.i586
+>!> 892: U__s_[S2:0][package]gcc-c++-4.2-21.i586
+>!> 893: I__s_[S1:0][package]gcc-gij-4.2-15.i586
+>!> 894: U_Th_[S2:0][package]gcc-gij-4.2-21.i586
+>!> 895: U__s_[S2:0][package]gcc-info-4.2-21.i586
+>!> 896: U__s_[S2:0][package]gcc-java-4.2-21.i586
+>!> 897: U__s_[S2:0][package]gcc42-4.2.1_20070724-12.i586
+>!> 898: U__s_[S2:0][package]gcc42-c++-4.2.1_20070724-12.i586
+>!> 899: U_Th_[S2:0][package]gcc42-gij-4.2.1_20070724-17.i586
+>!> 900: I__s_[S1:0][package]gcc42-gij-4.2.1_20070724-6.i586
+>!> 901: U__s_[S2:0][package]gcc42-info-4.2.1_20070724-12.i586
+>!> 902: U__s_[S2:0][package]gcc42-java-4.2.1_20070724-12.i586
+>!> 903: U__s_[S2:0][package]gconf-editor-2.18.2-3.i586
+>!> 904: U__s_[S2:0][package]gconf-sharp2-2.16.0-27.i586
+>!> 905: I__s_[S1:0][package]gconf2-2.19.1-10.i586
+>!> 906: U_Th_[S2:0][package]gconf2-2.19.1-21.i586
+>!> 907: U__s_[S2:0][package]gconf2-devel-2.19.1-21.i586
+>!> 908: U__s_[S2:0][package]gconf2-doc-2.19.1-21.i586
+>!> 909: U__s_[S2:0][package]gd-2.0.35-14.i586
+>!> 910: U_Th_[S2:0][package]gdb-6.6.50.20070726-16.i586
+>!> 911: I__s_[S1:0][package]gdb-6.6.50.20070726-7.i586
+>!> 912: I__s_[S1:0][package]gdbm-1.8.3-293.i586
+>!> 913: U_Th_[S2:0][package]gdbm-1.8.3-299.i586
+>!> 914: U__s_[S2:0][package]gdbm-devel-1.8.3-299.i586
+>!> 915: U__s_[S2:0][package]gdk-pixbuf-0.22.0-181.i586
+>!> 916: U__s_[S2:0][package]gdk-pixbuf-gnome-0.22.0-181.i586
+>!> 917: U__s_[S2:0][package]gdm-2.19.7-4.i586
+>!> 918: U__s_[S2:0][package]gecko-sharp2-0.12-26.noarch
+>!> 919: U__s_[S2:0][package]gedit-2.19.91-3.i586
+>!> 920: I__s_[S1:0][package]genisoimage-1.1.6-10.i586
+>!> 921: U_Th_[S2:0][package]genisoimage-1.1.6-18.i586
+>!> 922: I__s_[S1:0][package]gettext-0.16-35.i586
+>!> 923: U_Th_[S2:0][package]gettext-0.16-43.i586
+>!> 924: U__s_[S2:0][package]gettext-devel-0.16-43.i586
+>!> 925: U__s_[S2:0][package]gftp-2.0.18-114.i586
+>!> 926: U__s_[S2:0][package]gfxboot-3.3.34-6.i586
+>!> 927: U__s_[S2:0][package]ggreeter-0.1-12.i586
+>!> 928: U__s_[S2:0][package]ghex-2.8.2-105.i586
+>!> 929: U__s_[S2:0][package]ghostscript-cjk-20050315-79.noarch
+>!> 930: U__s_[S2:0][package]ghostscript-fonts-other-8.15.3-90.i586
+>!> 931: U__s_[S2:0][package]ghostscript-fonts-rus-8.15.3-90.i586
+>!> 932: I__s_[S1:0][package]ghostscript-fonts-std-8.15.3-82.i586
+>!> 933: U_Th_[S2:0][package]ghostscript-fonts-std-8.15.3-90.i586
+>!> 934: I__s_[S1:0][package]ghostscript-library-8.15.3-82.i586
+>!> 935: U_Th_[S2:0][package]ghostscript-library-8.15.3-90.i586
+>!> 936: I__s_[S1:0][package]ghostscript-x11-8.15.3-82.i586
+>!> 937: U_Th_[S2:0][package]ghostscript-x11-8.15.3-90.i586
+>!> 938: I__s_[S1:0][package]giflib-4.1.4-73.i586
+>!> 939: U_Th_[S2:0][package]giflib-4.1.4-80.i586
+>!> 940: U__s_[S2:0][package]giflib-devel-4.1.4-80.i586
+>!> 941: U_Th_[S2:0][package]gimp-2.2.17-25.i586
+>!> 942: I__s_[S1:0][package]gimp-2.2.17-8.i586
+>!> 943: U__s_[S2:0][package]gimp-cmyk-0.3-133.i586
+>!> 944: U__s_[S2:0][package]gimp-devel-2.2.17-25.i586
+>!> 945: U__s_[S2:0][package]gimp-help-0.9-129.noarch
+>!> 946: U__s_[S2:0][package]git-core-1.5.2.4-13.i586
+>!> 947: U__s_[S2:0][package]gjdoc-0.7.8-45.noarch
+>!> 948: U__s_[S2:0][package]gjiten-2.6-66.i586
+>!> 949: U__s_[S2:0][package]glade-2.12.1-124.i586
+>!> 950: U__s_[S2:0][package]glade-sharp2-2.10.2-17.i586
+>!> 951: U__s_[S2:0][package]gle-3.1.0-14.i586
+>!> 952: U__s_[S2:0][package]glib-1.2.10-669.i586
+>!> 953: U__s_[S2:0][package]glib-devel-1.2.10-669.i586
+>!> 954: U__s_[S2:0][package]glib-sharp2-2.10.2-17.i586
+>!> 955: I__s_[S1:0][package]glib2-2.14.0-1.i586
+>!> 956: U_Th_[S2:0][package]glib2-2.14.0-3.i586
+>!> 957: U__s_[S2:0][package]glib2-devel-2.14.0-3.i586
+>!> 958: U__s_[S2:0][package]glib2-doc-2.14.0-3.i586
+>!> 959: I_Th_[S1:0][package]glib2-lang-2.14.0-1.i586
+>!> 960: I__s_[S1:0][package]glibc-2.6-16.i686
+>!> 961: U__s_[S2:0][package]glibc-2.6.1-12.i586
+>!> 962: U_Th_[S2:0][package]glibc-2.6.1-12.i686
+>!> 963: U__s_[S2:0][package]glibc-devel-2.6.1-12.i586
+>!> 964: U__s_[S2:0][package]glibc-devel-2.6.1-12.i686
+>!> 965: U__s_[S2:0][package]glibc-html-2.6.1-12.i586
+>!> 966: I__s_[S1:0][package]glibc-i18ndata-2.6-16.i586
+>!> 967: U_Th_[S2:0][package]glibc-i18ndata-2.6.1-12.i586
+>!> 968: U__s_[S2:0][package]glibc-info-2.6.1-12.i586
+>!> 969: I__s_[S1:0][package]glibc-locale-2.6-16.i586
+>!> 970: U_Th_[S2:0][package]glibc-locale-2.6.1-12.i586
+>!> 971: U__s_[S2:0][package]glibc-obsolete-2.6.1-12.i586
+>!> 972: U__s_[S2:0][package]glibmm2-2.13.9-14.i586
+>!> 973: U__s_[S2:0][package]glibmm2-devel-2.13.9-14.i586
+>!> 974: I__s_[S1:0][package]glitz-0.5.6-72.i586
+>!> 975: U_Th_[S2:0][package]glitz-0.5.6-80.i586
+>!> 976: U__s_[S2:0][package]glitz-devel-0.5.6-80.i586
+>!> 977: U__s_[S2:0][package]gltt-2.5.2-572.i586
+>!> 978: U__s_[S2:0][package]gmime-2.2.10-19.i586
+>!> 979: U__s_[S2:0][package]gmime-devel-2.2.10-19.i586
+>!> 980: U__s_[S2:0][package]gmime-sharp-2.2.10-19.i586
+>!> 981: I__s_[S1:0][package]gmp-4.2.1-49.i586
+>!> 982: U_Th_[S2:0][package]gmp-4.2.1-55.i586
+>!> 983: U__s_[S2:0][package]gmp-devel-4.2.1-55.i586
+>!> 984: U__s_[S2:0][package]gnet-2.0.7-129.i586
+>!> 985: U__s_[S2:0][package]gnokii-0.6.18-19.i586
+>!> 986: U__s_[S2:0][package]gnome-applets-2.19.1-20.i586
+>!> 987: U__s_[S2:0][package]gnome-applets-devel-2.19.1-20.i586
+>!> 988: U__s_[S2:0][package]gnome-audio-2.0.0-193.noarch
+>!> 989: U__s_[S2:0][package]gnome-backgrounds-2.18.3-15.noarch
+>!> 990: U__s_[S2:0][package]gnome-blog-0.9.1-115.i586
+>!> 991: U__s_[S2:0][package]gnome-bluetooth-0.8.0-112.i586
+>!> 992: U__s_[S2:0][package]gnome-bluetooth-devel-0.8.0-112.i586
+>!> 993: U__s_[S2:0][package]gnome-certauth-devel-0.3-3.i586
+>!> 994: U__s_[S2:0][package]gnome-commander-1.2.4-18.i586
+>!> 995: U__s_[S2:0][package]gnome-common-2.18.0-8.noarch
+>!> 996: U__s_[S2:0][package]gnome-cups-manager-0.32cvs20060120-157.i586
+>!> 997: U__s_[S2:0][package]gnome-cups-manager-devel-0.32cvs20060120-157.i586
+>!> 998: U__s_[S2:0][package]gnome-desktop-2.19.90-3.i586
+>!> 999: U__s_[S2:0][package]gnome-desktop-devel-2.19.90-3.i586
+>!> 1000: U__s_[S2:0][package]gnome-doc-utils-0.11.2-2.noarch
+>!> 1001: U__s_[S2:0][package]gnome-doc-utils-devel-0.11.2-2.noarch
+>!> 1002: U__s_[S2:0][package]gnome-games-2.19.91.1-3.i586
+>!> 1003: I__s_[S1:0][package]gnome-icon-theme-2.18.0-30.noarch
+>!> 1004: U_Th_[S2:0][package]gnome-icon-theme-2.19.91-4.noarch
+>!> 1005: I__s_[S1:0][package]gnome-keyring-2.19.6.1-3.i586
+>!> 1006: U_Th_[S2:0][package]gnome-keyring-2.19.91-5.i586
+>!> 1007: U__s_[S2:0][package]gnome-keyring-devel-2.19.91-5.i586
+>!> 1008: U__s_[S2:0][package]gnome-keyring-manager-2.18.0-58.i586
+>!> 1009: U__s_[S2:0][package]gnome-libs-1.4.1.7-796.i586
+>!> 1010: U__s_[S2:0][package]gnome-mag-0.14.8-3.i586
+>!> 1011: U__s_[S2:0][package]gnome-main-menu-0.9.8-72.i586
+>!> 1012: U__s_[S2:0][package]gnome-main-menu-devel-0.9.8-72.i586
+>!> 1013: U__s_[S2:0][package]gnome-media-2.18.0-63.i586
+>!> 1014: U__s_[S2:0][package]gnome-media-cd-2.18.0-63.i586
+>!> 1015: U__s_[S2:0][package]gnome-media-devel-2.18.0-63.i586
+>!> 1016: U__s_[S2:0][package]gnome-menus-2.19.90-3.i586
+>!> 1017: U__s_[S2:0][package]gnome-menus-devel-2.19.90-3.i586
+>!> 1018: U__s_[S2:0][package]gnome-mount-0.6-17.i586
+>!> 1019: U__s_[S2:0][package]gnome-netstatus-2.12.1-63.i586
+>!> 1020: U__s_[S2:0][package]gnome-nettool-2.19.90-3.i586
+>!> 1021: U__s_[S2:0][package]gnome-panel-2.19.6-3.i586
+>!> 1022: U__s_[S2:0][package]gnome-panel-devel-2.19.6-3.i586
+>!> 1023: U__s_[S2:0][package]gnome-panel-doc-2.19.6-3.i586
+>!> 1024: U__s_[S2:0][package]gnome-phone-manager-0.8-109.i586
+>!> 1025: U__s_[S2:0][package]gnome-pilot-2.0.15-17.i586
+>!> 1026: U__s_[S2:0][package]gnome-pilot-conduits-2.0.14-108.i586
+>!> 1027: U__s_[S2:0][package]gnome-pilot-devel-2.0.15-17.i586
+>!> 1028: U__s_[S2:0][package]gnome-power-manager-2.19.6-17.i586
+>!> 1029: U__s_[S2:0][package]gnome-printer-add-1.0.1-126.i586
+>!> 1030: U__s_[S2:0][package]gnome-python-desktop-2.19.2-17.i586
+>!> 1031: U__s_[S2:0][package]gnome-reset-0.1.1-122.i586
+>!> 1032: U__s_[S2:0][package]gnome-screensaver-2.19.7-3.i586
+>!> 1033: U__s_[S2:0][package]gnome-session-2.19.90-3.i586
+>!> 1034: U__s_[S2:0][package]gnome-sharp2-2.16.0-27.i586
+>!> 1035: U__s_[S2:0][package]gnome-speech-0.4.16-15.i586
+>!> 1036: U__s_[S2:0][package]gnome-speech-devel-0.4.16-15.i586
+>!> 1037: U__s_[S2:0][package]gnome-spell2-1.0.7-109.i586
+>!> 1038: U__s_[S2:0][package]gnome-system-monitor-2.19.91.1-3.i586
+>!> 1039: U__s_[S2:0][package]gnome-terminal-2.18.1-24.i586
+>!> 1040: U__s_[S2:0][package]gnome-themes-2.19.91-2.noarch
+>!> 1041: U__s_[S2:0][package]gnome-utils-2.19.91-3.i586
+>!> 1042: U__s_[S2:0][package]gnome-vfs-sharp2-2.16.0-27.i586
+>!> 1043: I__s_[S1:0][package]gnome-vfs2-2.19.3-3.i586
+>!> 1044: U_Th_[S2:0][package]gnome-vfs2-2.19.91-3.i586
+>!> 1045: U__s_[S2:0][package]gnome-vfs2-devel-2.19.91-3.i586
+>!> 1046: U__s_[S2:0][package]gnome-vfs2-doc-2.19.91-3.i586
+>!> 1047: U__s_[S2:0][package]gnome-volume-manager-2.17.0-92.i586
+>!> 1048: U__s_[S2:0][package]gnome-web-photo-0.2-106.i586
+>!> 1049: U__s_[S2:0][package]gnome2-SuSE-10.3-81.noarch
+>!> 1050: U__s_[S2:0][package]gnome2-user-docs-2.18.2-16.noarch
+>!> 1051: U__s_[S2:0][package]gnomeicu-0.99.10-114.i586
+>!> 1052: U__s_[S2:0][package]gnopernicus-1.1.2-109.i586
+>!> 1053: U__s_[S2:0][package]gnopernicus-devel-1.1.2-109.i586
+>!> 1054: U__s_[S2:0][package]gnu-getopt-1.0.10-118.noarch
+>!> 1055: U__s_[S2:0][package]gnu-jaf-1.0-82.noarch
+>!> 1056: U__s_[S2:0][package]gnu-regexp-1.1.4-113.noarch
+>!> 1057: U__s_[S2:0][package]gnu-regexp-demo-1.1.4-113.noarch
+>!> 1058: U__s_[S2:0][package]gnu-regexp-javadoc-1.1.4-113.noarch
+>!> 1059: U__s_[S2:0][package]gnucash-2.2.0-19.i586
+>!> 1060: U__s_[S2:0][package]gnucash-docs-2.2.0-21.noarch
+>!> 1061: U__s_[S2:0][package]gnuchess-5.07-74.i586
+>!> 1062: U__s_[S2:0][package]gnumeric-1.7.11-17.i586
+>!> 1063: U__s_[S2:0][package]gnuplot-4.2.0-59.i586
+>!> 1064: I__s_[S1:0][package]gnutls-1.6.1-26.i586
+>!> 1065: U_Th_[S2:0][package]gnutls-1.6.1-33.i586
+>!> 1066: U__s_[S2:0][package]gnutls-devel-1.6.1-33.i586
+>!> 1067: U__s_[S2:0][package]gob2-2.0.14-83.i586
+>!> 1068: U__s_[S2:0][package]goffice-0.4.2-18.i586
+>!> 1069: U__s_[S2:0][package]gok-1.3.2-3.i586
+>!> 1070: I__s_[S1:0][package]gpart-0.1h-547.i586
+>!> 1071: U_Th_[S2:0][package]gpart-0.1h-553.i586
+>!> 1072: U__s_[S2:0][package]gperf-3.0.2-58.i586
+>!> 1073: I__s_[S1:0][package]gpg2-2.0.4-30.i586
+>!> 1074: U_Th_[S2:0][package]gpg2-2.0.4-38.i586
+>!> 1075: I__s_[S1:0][package]gpgme-1.1.5-11.i586
+>!> 1076: U_Th_[S2:0][package]gpgme-1.1.5-21.i586
+>!> 1077: U__s_[S2:0][package]gphoto-2.4.0-17.i586
+>!> 1078: I__s_[S1:0][package]gpm-1.20.1-378.i586
+>!> 1079: U_Th_[S2:0][package]gpm-1.20.1-385.i586
+>!> 1080: U__s_[S2:0][package]gpsdrive-2.09-127.i586
+>!> 1081: U__s_[S2:0][package]gqcam-0.9-152.i586
+>!> 1082: U__s_[S2:0][package]gramofile-1.6-307.i586
+>!> 1083: U__s_[S2:0][package]graphviz-2.12-42.i586
+>!> 1084: U__s_[S2:0][package]graphviz-devel-2.12-42.i586
+>!> 1085: U__s_[S2:0][package]graphviz-gd-2.12-42.i586
+>!> 1086: U__s_[S2:0][package]grass-5.0.3-112.i586
+>!> 1087: I__s_[S1:0][package]grep-2.5.2-19.i586
+>!> 1088: U_Th_[S2:0][package]grep-2.5.2-25.i586
+>!> 1089: U__s_[S2:0][package]grepmail-5.3033-31.i586
+>!> 1090: U__s_[S2:0][package]grip-3.2.0-161.i586
+>!> 1091: U__s_[S2:0][package]groff-1.18.1.1-96.i586
+>!> 1092: I__s_[S1:0][package]grub-0.97-72.i586
+>!> 1093: U_Th_[S2:0][package]grub-0.97-79.i586
+>!> 1094: U__s_[S2:0][package]gscpm-0.1-139.i586
+>!> 1095: U__s_[S2:0][package]gsf-sharp-0.8.1-72.i586
+>!> 1096: U__s_[S2:0][package]gsl-1.9-52.i586
+>!> 1097: U__s_[S2:0][package]gspcav-kmp-bigsmp-01.00.12_2.6.22.5_10-5.i586
+>!> 1098: U__s_[S2:0][package]gspcav-kmp-default-01.00.12_2.6.22.5_10-5.i586
+>!> 1099: I__s_[S1:0][package]gstreamer010-0.10.13-16.i586
+>!> 1100: U_Th_[S2:0][package]gstreamer010-0.10.13-27.i586
+>!> 1101: U__s_[S2:0][package]gstreamer010-devel-0.10.13-27.i586
+>!> 1102: U__s_[S2:0][package]gstreamer010-doc-0.10.13-31.i586
+>!> 1103: I__s_[S1:0][package]gstreamer010-plugins-base-0.10.13-15.i586
+>!> 1104: U_Th_[S2:0][package]gstreamer010-plugins-base-0.10.13-27.i586
+>!> 1105: U__s_[S2:0][package]gstreamer010-plugins-base-devel-0.10.13-27.i586
+>!> 1106: U__s_[S2:0][package]gstreamer010-plugins-base-doc-0.10.13-27.i586
+>!> 1107: I__s_[S1:0][package]gstreamer010-plugins-good-0.10.6-16.i586
+>!> 1108: U_Th_[S2:0][package]gstreamer010-plugins-good-0.10.6-29.i586
+>!> 1109: U__s_[S2:0][package]gstreamer010-plugins-good-doc-0.10.6-29.i586
+>!> 1110: U__s_[S2:0][package]gstreamer010-plugins-good-extra-0.10.6-29.i586
+>!> 1111: U__s_[S2:0][package]gthumb-2.7.9-106.i586
+>!> 1112: U__s_[S2:0][package]gtk-1.2.10-987.i586
+>!> 1113: U__s_[S2:0][package]gtk-devel-1.2.10-987.i586
+>!> 1114: U__s_[S2:0][package]gtk-doc-1.8-35.noarch
+>!> 1115: U__s_[S2:0][package]gtk-engines-0.12-1063.i586
+>!> 1116: U__s_[S2:0][package]gtk-sharp2-2.10.2-17.i586
+>!> 1117: U__s_[S2:0][package]gtk-sharp2-complete-2.10.2-17.i586
+>!> 1118: U__s_[S2:0][package]gtk-sharp2-doc-2.10.2-17.i586
+>!> 1119: U__s_[S2:0][package]gtk-sharp2-gapi-2.10.2-17.i586
+>!> 1120: U__s_[S2:0][package]gtk-xfce-engine-2.4.1-47.i586
+>!> 1121: U_Th_[S2:0][package]gtk2-2.11.6-20.i586
+>!> 1122: I__s_[S1:0][package]gtk2-2.11.6-7.i586
+>!> 1123: U__s_[S2:0][package]gtk2-devel-2.11.6-20.i586
+>!> 1124: U__s_[S2:0][package]gtk2-doc-2.11.6-20.i586
+>!> 1125: U__s_[S2:0][package]gtk2-engines-2.11.4-13.i586
+>!> 1126: U__s_[S2:0][package]gtk2-themes-0.1-711.noarch
+>!> 1127: U__s_[S2:0][package]gtkam-0.1.14.0.trunk-75.i586
+>!> 1128: U__s_[S2:0][package]gtkglarea-1.2.2-996.i586
+>!> 1129: U__s_[S2:0][package]gtkhtml-sharp2-2.16.0-27.i586
+>!> 1130: U__s_[S2:0][package]gtkhtml2-3.15.91-3.i586
+>!> 1131: U__s_[S2:0][package]gtkhtml2-devel-3.15.91-3.i586
+>!> 1132: U__s_[S2:0][package]gtkiterm-0.5.20040304-133.i586
+>!> 1133: U__s_[S2:0][package]gtklp-1.2.4-17.i586
+>!> 1134: U__s_[S2:0][package]gtkmm2-2.11.7-2.i586
+>!> 1135: U__s_[S2:0][package]gtkmm2-devel-2.11.7-2.i586
+>!> 1136: U__s_[S2:0][package]gtkpbbuttons-0.6.10-20.i586
+>!> 1137: U__s_[S2:0][package]gtksourceview-1.90.4-3.i586
+>!> 1138: U__s_[S2:0][package]gtksourceview-devel-1.90.4-3.i586
+>!> 1139: U__s_[S2:0][package]gtksourceview-doc-1.90.4-3.i586
+>!> 1140: U__s_[S2:0][package]gtksourceview-sharp2-0.11-30.noarch
+>!> 1141: U__s_[S2:0][package]gtksourceview18-1.8.5-8.i586
+>!> 1142: U__s_[S2:0][package]gtkspell-2.0.11-120.i586
+>!> 1143: U__s_[S2:0][package]gucharmap-1.10.0-60.i586
+>!> 1144: U__s_[S2:0][package]gucharmap-devel-1.10.0-60.i586
+>!> 1145: U__s_[S2:0][package]guile-1.8.1-68.i586
+>!> 1146: U__s_[S2:0][package]guile-devel-1.8.1-68.i586
+>!> 1147: U__s_[S2:0][package]gup-0.3-923.i586
+>!> 1148: U__s_[S2:0][package]gutenprint-5.0.1-1.i586
+>!> 1149: U__s_[S2:0][package]gv-3.5.8-1257.i586
+>!> 1150: U__s_[S2:0][package]gvim-7.1-37.i586
+>!> 1151: U__s_[S2:0][package]gwenhywfar-2.6.1-21.i586
+>!> 1152: U__s_[S2:0][package]gwenhywfar-devel-2.6.1-21.i586
+>!> 1153: I__s_[S1:0][package]gwenview-1.4.1-69.i586
+>!> 1154: U_Th_[S2:0][package]gwenview-1.4.1-81.i586
+>!> 1155: U__s_[S2:0][package]gwget-0.99-46.i586
+>!> 1156: U__s_[S2:0][package]gxmhtml-1.4.1.7-796.i586
+>!> 1157: I__s_[S1:0][package]gzip-1.3.12-25.i586
+>!> 1158: U_Th_[S2:0][package]gzip-1.3.12-31.i586
+>!> 1159: I__s_[S1:0][package]hal-0.5.8_git200704021230-51.i586
+>!> 1160: U_Th_[S2:0][package]hal-0.5.9_git20070831-2.i586
+>!> 1161: U__s_[S2:0][package]hal-devel-0.5.9_git20070831-2.i586
+>!> 1162: U__s_[S2:0][package]hal-doc-0.5.9_git20070831-2.i586
+>!> 1163: I__s_[S1:0][package]hal-resmgr-0.1_SVNr141-11.i586
+>!> 1164: U_Th_[S2:0][package]hal-resmgr-0.1_SVNr141-21.i586
+>!> 1165: U__s_[S2:0][package]handedict-20070618-15.noarch
+>!> 1166: U__s_[S2:0][package]hanout-0.1-837.i586
+>!> 1167: U__s_[S2:0][package]hcode-2.1-591.i586
+>!> 1168: I__s_[S1:0][package]hdparm-7.6-9.i586
+>!> 1169: U_Th_[S2:0][package]hdparm-7.7-7.i586
+>!> 1170: U__s_[S2:0][package]heap-buddy-0.2-58.i586
+>!> 1171: U__s_[S2:0][package]helix-banshee-0.13.1-10.i586
+>!> 1172: U__s_[S2:0][package]helix-banshee-devel-0.13.1-10.i586
+>!> 1173: U__s_[S2:0][package]helix-banshee-engine-gst-0.13.1-10.i586
+>!> 1174: U__s_[S2:0][package]helix-banshee-engine-helix-0.13.1-10.i586
+>!> 1175: U__s_[S2:0][package]helix-banshee-plugins-DAAP-0.13.1-10.i586
+>!> 1176: U__s_[S2:0][package]helix-banshee-plugins-default-0.13.1-10.i586
+>!> 1177: U__s_[S2:0][package]helix-banshee-plugins-extra-0.13.1-10.i586
+>!> 1178: U__s_[S2:0][package]helix-dbus-server-0.4.0-60.i586
+>!> 1179: U__s_[S2:0][package]hermes-1.3.2-515.i586
+>!> 1180: U__s_[S2:0][package]hfsplusutils-1.0.4-75.i586
+>!> 1181: U__s_[S2:0][package]hfsutils-3.2.6-1123.i586
+>!> 1182: I__s_[S1:0][package]hicolor-icon-theme-0.10-28.noarch
+>!> 1183: U_Th_[S2:0][package]hicolor-icon-theme-0.10-34.noarch
+>!> 1184: U__s_[S2:0][package]hk_classes-0.8.3-47.i586
+>!> 1185: U__s_[S2:0][package]hmconv-1.0pl5-586.i586
+>!> 1186: U__s_[S2:0][package]hostap-utils-0.4.7-52.i586
+>!> 1187: U__s_[S2:0][package]hostapd-0.5.8-17.i586
+>!> 1188: I__s_[S1:0][package]hotkey-setup-0.1-59.i586
+>!> 1189: U_Th_[S2:0][package]hotkey-setup-0.1-67.i586
+>!> 1190: U__s_[S2:0][package]hplip-2.7.7-22.i586
+>!> 1191: U_Th_[S2:0][package]hplip-hpijs-2.7.7-22.i586
+>!> 1192: I__s_[S1:0][package]hplip-hpijs-2.7.7-3.i586
+>!> 1193: U__s_[S2:0][package]htdig-3.2.0b6-103.i586
+>!> 1194: U__s_[S2:0][package]htdig-devel-3.2.0b6-103.i586
+>!> 1195: U__s_[S2:0][package]htdig-doc-3.2.0b6-103.i586
+>!> 1196: U__s_[S2:0][package]html-dtd-2004.1.26-136.noarch
+>!> 1197: U__s_[S2:0][package]html2text-1.3.2a-75.i586
+>!> 1198: I__s_[S1:0][package]hwinfo-13.41-3.i586
+>!> 1199: U_Th_[S2:0][package]hwinfo-13.49-2.i586
+>!> 1200: U__s_[S2:0][package]hwinfo-devel-13.49-2.i586
+>!> 1201: U__s_[S2:0][package]hydrogen-0.9.3-107.i586
+>!> 1202: U__s_[S2:0][package]hylafax-4.4.0-15.i586
+>!> 1203: U__s_[S2:0][package]hylafax-client-4.4.0-15.i586
+>!> 1204: U__s_[S2:0][package]i4l-base-2007.8.16-9.i586
+>!> 1205: U__s_[S2:0][package]i4l-isdnlog-2007.8.16-9.i586
+>!> 1206: U__s_[S2:0][package]i4l-vbox-2007.8.16-9.i586
+>!> 1207: U__s_[S2:0][package]i4lfirm-2007.8.16-9.i586
+>!> 1208: U__s_[S2:0][package]ia32el-6.5-101.i586
+>!> 1209: U__s_[S2:0][package]ibm-data-db2-1.2.5-11.i586
+>!> 1210: U__s_[S2:0][package]icecream-0.8.0-14.i586
+>!> 1211: U__s_[S2:0][package]icecream-monitor-1.0-109.i586
+>!> 1212: I__s_[S1:0][package]icedax-1.1.6-10.i586
+>!> 1213: U_Th_[S2:0][package]icedax-1.1.6-18.i586
+>!> 1214: U__s_[S2:0][package]icewm-1.2.32-12.i586
+>!> 1215: U__s_[S2:0][package]icewm-default-1.2.32-12.i586
+>!> 1216: U__s_[S2:0][package]icewm-gnome-1.2.32-12.i586
+>!> 1217: U__s_[S2:0][package]icewm-themes-0.1-601.noarch
+>!> 1218: U__s_[S2:0][package]icon-naming-utils-0.8.2-35.noarch
+>!> 1219: U__s_[S2:0][package]icu-3.6-10.i586
+>!> 1220: U__s_[S2:0][package]icu-data-3.6-10.i586
+>!> 1221: I__s_[S1:0][package]id3lib-3.8.3-157.i586
+>!> 1222: U_Th_[S2:0][package]id3lib-3.8.3-163.i586
+>!> 1223: U__s_[S2:0][package]idutils-4.2-85.i586
+>!> 1224: U__s_[S2:0][package]ifntchia-1.2.1-296.noarch
+>!> 1225: U__s_[S2:0][package]ifntchib-1.2.1-296.noarch
+>!> 1226: I__s_[S1:0][package]ifnteuro-1.2.1-285.noarch
+>!> 1227: U_Th_[S2:0][package]ifnteuro-1.2.1-296.noarch
+>!> 1228: U__s_[S2:0][package]ifntjapa-1.2.1-296.noarch
+>!> 1229: U__s_[S2:0][package]ifntjapb-1.2.1-296.noarch
+>!> 1230: U_Th_[S2:0][package]ifplugd-0.28-100.i586
+>!> 1231: I__s_[S1:0][package]ifplugd-0.28-92.i586
+>!> 1232: U__s_[S2:0][package]iftop-0.17-61.i586
+>!> 1233: U__s_[S2:0][package]ikvm-0.34.0.2-10.noarch
+>!> 1234: U__s_[S2:0][package]ilbc-3951-32.i586
+>!> 1235: U__s_[S2:0][package]imap-lib-2006c1_suse-47.i586
+>!> 1236: U__s_[S2:0][package]img2eps-0.2-69.i586
+>!> 1237: U__s_[S2:0][package]imgSeek-0.8.5-141.i586
+>!> 1238: U__s_[S2:0][package]imlib-1.9.14-299.i586
+>!> 1239: U__s_[S2:0][package]imlib-devel-1.9.14-299.i586
+>!> 1240: I__s_[S1:0][package]imlib2-1.3.0-52.i586
+>!> 1241: U_Th_[S2:0][package]imlib2-1.3.0-60.i586
+>!> 1242: U__s_[S2:0][package]imlib2-devel-1.3.0-60.i586
+>!> 1243: I__s_[S1:0][package]imlib2-loaders-1.3.0-52.i586
+>!> 1244: U_Th_[S2:0][package]imlib2-loaders-1.3.0-60.i586
+>!> 1245: U__s_[S2:0][package]indent-2.2.9-263.i586
+>!> 1246: U__s_[S2:0][package]indeview-0.6.6-103.i586
+>!> 1247: U_Th_[S2:0][package]info-4.9-12.i586
+>!> 1248: I__s_[S1:0][package]info-4.9-6.i586
+>!> 1249: I__s_[S1:0][package]info2html-2.0-71.noarch
+>!> 1250: U_Th_[S2:0][package]info2html-2.0-79.noarch
+>!> 1251: U__s_[S2:0][package]initviocons-0.5-12.i586
+>!> 1252: U__s_[S2:0][package]inkscape-0.45.1-60.i586
+>!> 1253: U__s_[S2:0][package]inn-2.4.2-95.i586
+>!> 1254: U__s_[S2:0][package]input-utils-2007.06.22-22.i586
+>!> 1255: I__s_[S1:0][package]insserv-1.09.0-36.i586
+>!> 1256: U_Th_[S2:0][package]insserv-1.09.0-43.i586
+>!> 1257: I__s_[S1:0][package]inst-source-utils-2007.8.7-1.noarch
+>!> 1258: U_Th_[S2:0][package]inst-source-utils-2007.9.2-1.noarch
+>!> 1259: U__s_[S2:0][package]install-initrd-1.0-205.i586
+>!> 1260: U__s_[S2:0][package]intlfnts-1.2.1-296.noarch
+>!> 1261: U__s_[S2:0][package]intlfonts-ttf-1.2.1-296.noarch
+>!> 1262: U__s_[S2:0][package]intltool-0.35.5-36.noarch
+>!> 1263: U__s_[S2:0][package]ipadic-2.6.3-177.noarch
+>!> 1264: U__s_[S2:0][package]ipod-sharp-0.6.3-60.i586
+>!> 1265: I__s_[S1:0][package]iproute2-2.6.22-11.i586
+>!> 1266: U_Th_[S2:0][package]iproute2-2.6.22-22.i586
+>!> 1267: U__s_[S2:0][package]ipsec-tools-0.6.5-93.i586
+>!> 1268: U_Th_[S2:0][package]iptables-1.3.8-17.i586
+>!> 1269: I__s_[S1:0][package]iptables-1.3.8-7.i586
+>!> 1270: U__s_[S2:0][package]iptraf-3.0.0-73.i586
+>!> 1271: I__s_[S1:0][package]iputils-ss021109-224.i586
+>!> 1272: U_Th_[S2:0][package]iputils-ss021109-230.i586
+>!> 1273: U__s_[S2:0][package]ipw-firmware-8-41.noarch
+>!> 1274: U__s_[S2:0][package]ipxrip-0.7-931.i586
+>!> 1275: U__s_[S2:0][package]ircd-2.11.1p1-59.i586
+>!> 1276: I__s_[S1:0][package]irda-0.9.18-80.i586
+>!> 1277: U_Th_[S2:0][package]irda-0.9.18-89.i586
+>!> 1278: I__s_[S1:0][package]irqbalance-0.55-28.i586
+>!> 1279: U_Th_[S2:0][package]irqbalance-0.55-36.i586
+>!> 1280: U__s_[S2:0][package]irssi-0.8.11-13.i586
+>!> 1281: U__s_[S2:0][package]isapnp-1.26-561.i586
+>!> 1282: U__s_[S2:0][package]iscan-2.8.0.1-16.i586
+>!> 1283: U__s_[S2:0][package]iscan-firmware-2.8.0.1-8.noarch
+>!> 1284: U__s_[S2:0][package]iscan-proprietary-drivers-2.8.0.1-8.i586
+>!> 1285: U__s_[S2:0][package]iso-codes-1.0a-43.noarch
+>!> 1286: U__s_[S2:0][package]iso-codes-devel-1.0a-43.noarch
+>!> 1287: U__s_[S2:0][package]iso_ent-2000.11.03-732.noarch
+>!> 1288: U__s_[S2:0][package]ispell-3.3.02-20.i586
+>!> 1289: U__s_[S2:0][package]ispell-american-3.3.02-20.i586
+>!> 1290: U__s_[S2:0][package]ispell-brazilian-1.5-319.i586
+>!> 1291: U__s_[S2:0][package]ispell-british-3.3.02-20.i586
+>!> 1292: U__s_[S2:0][package]ispell-czech-1.5-319.i586
+>!> 1293: U__s_[S2:0][package]ispell-danish-1.5-319.i586
+>!> 1294: U__s_[S2:0][package]ispell-dutch-1.5-319.i586
+>!> 1295: U__s_[S2:0][package]ispell-finnish-1.5-319.i586
+>!> 1296: U__s_[S2:0][package]ispell-french-1.5-319.i586
+>!> 1297: U__s_[S2:0][package]ispell-german-1.5-319.i586
+>!> 1298: U__s_[S2:0][package]ispell-hungarian-1.2-9.i586
+>!> 1299: U__s_[S2:0][package]ispell-italian-1.5-319.i586
+>!> 1300: U__s_[S2:0][package]ispell-ngerman-1.5-319.i586
+>!> 1301: U__s_[S2:0][package]ispell-norsk-1.5-319.i586
+>!> 1302: U__s_[S2:0][package]ispell-polish-1.5-319.i586
+>!> 1303: U__s_[S2:0][package]ispell-portuguese-1.5-319.i586
+>!> 1304: U__s_[S2:0][package]ispell-russian-1.5-319.i586
+>!> 1305: U__s_[S2:0][package]ispell-spanish-1.5-319.i586
+>!> 1306: U__s_[S2:0][package]ispell-swedish-1.5-319.i586
+>!> 1307: U__s_[S2:0][package]itcl-3.3-513.i586
+>!> 1308: U__s_[S2:0][package]ivman-0.6.14-64.i586
+>!> 1309: U__s_[S2:0][package]ivtv-0.10.3-28.i586
+>!> 1310: U__s_[S2:0][package]ivtv-firmware-0.10.3-28.i586
+>!> 1311: U__s_[S2:0][package]ivtv-kmp-bigsmp-0.10.3_2.6.22.5_10-28.i586
+>!> 1312: U__s_[S2:0][package]ivtv-kmp-default-0.10.3_2.6.22.5_10-28.i586
+>!> 1313: U__s_[S2:0][package]ivtv-kmp-xen-0.10.3_2.6.22.5_10-28.i586
+>!> 1314: U__s_[S2:0][package]ivtv-kmp-xenpae-0.10.3_2.6.22.5_10-28.i586
+>!> 1315: U__s_[S2:0][package]iwidgets-4.0.1-300.noarch
+>!> 1316: U__s_[S2:0][package]iwl3945-ucode-2.14.1.5-10.noarch
+>!> 1317: U__s_[S2:0][package]iwl4965-ucode-4.44.1.18-10.noarch
+>!> 1318: U__s_[S2:0][package]iwlwifi-kmp-bigsmp-0.1.14_2.6.22.5_10-2.i586
+>!> 1319: U__s_[S2:0][package]iwlwifi-kmp-default-0.1.14_2.6.22.5_10-2.i586
+>!> 1320: U__s_[S2:0][package]iwlwifi-kmp-xen-0.1.14_2.6.22.5_10-2.i586
+>!> 1321: U__s_[S2:0][package]iwlwifi-kmp-xenpae-0.1.14_2.6.22.5_10-2.i586
+>!> 1322: U__s_[S2:0][package]jaaa-0.4.0-80.i586
+>!> 1323: U__s_[S2:0][package]jack-0.103.0-50.i586
+>!> 1324: U__s_[S2:0][package]jack-devel-0.103.0-50.i586
+>!> 1325: U__s_[S2:0][package]jack-freebob-0.103.0-50.i586
+>!> 1326: U__s_[S2:0][package]jack-rack-1.4.6-18.i586
+>!> 1327: U__s_[S2:0][package]jackEQ-0.4.0-169.i586
+>!> 1328: U__s_[S2:0][package]jadetex-3.13-318.i586
+>!> 1329: U__s_[S2:0][package]jakarta-commons-beanutils-1.7.0-142.noarch
+>!> 1330: U__s_[S2:0][package]jakarta-commons-codec-1.3-143.noarch
+>!> 1331: U__s_[S2:0][package]jakarta-commons-collections-3.1-118.noarch
+>!> 1332: U__s_[S2:0][package]jakarta-commons-daemon-1.0.1-112.noarch
+>!> 1333: U__s_[S2:0][package]jakarta-commons-dbcp-1.2.1-119.noarch
+>!> 1334: U__s_[S2:0][package]jakarta-commons-digester-1.7-137.noarch
+>!> 1335: U__s_[S2:0][package]jakarta-commons-discovery-0.3-139.noarch
+>!> 1336: U__s_[S2:0][package]jakarta-commons-el-1.0-140.noarch
+>!> 1337: U__s_[S2:0][package]jakarta-commons-fileupload-1.0-152.noarch
+>!> 1338: U__s_[S2:0][package]jakarta-commons-httpclient3-3.0.1-128.noarch
+>!> 1339: U__s_[S2:0][package]jakarta-commons-httpclient3-demo-3.0.1-128.noarch
+>!> 1340: U__s_[S2:0][package]jakarta-commons-httpclient3-manual-3.0.1-128.noarch
+>!> 1341: U__s_[S2:0][package]jakarta-commons-lang-2.0-120.noarch
+>!> 1342: U__s_[S2:0][package]jakarta-commons-launcher-0.9-119.noarch
+>!> 1343: U__s_[S2:0][package]jakarta-commons-logging-1.0.4-144.noarch
+>!> 1344: U__s_[S2:0][package]jakarta-commons-modeler-2.0-91.noarch
+>!> 1345: U__s_[S2:0][package]jakarta-commons-pool-1.2-117.noarch
+>!> 1346: U__s_[S2:0][package]jamin-0.95.0-111.i586
+>!> 1347: I__s_[S1:0][package]jarnal-9.01-33.noarch
+>!> 1348: U_Th_[S2:0][package]jarnal-9.01-42.noarch
+>!> 1349: U__s_[S2:0][package]java-1_4_2-cacao-0.97-77.i586
+>!> 1350: U__s_[S2:0][package]java-1_4_2-cacao-devel-0.97-77.i586
+>!> 1351: I__s_[S1:0][package]java-1_4_2-gcj-compat-1.4.2.0-140.i586
+>!> 1352: U_Th_[S2:0][package]java-1_4_2-gcj-compat-1.4.2.0-166.i586
+>!> 1353: U__s_[S2:0][package]java-1_4_2-gcj-compat-devel-1.4.2.0-166.i586
+>!> 1354: U__s_[S2:0][package]java-1_5_0-sun-1.5.0_update12-20.i586
+>!> 1355: U__s_[S2:0][package]java-1_5_0-sun-alsa-1.5.0_update12-20.i586
+>!> 1356: U__s_[S2:0][package]java-1_5_0-sun-devel-1.5.0_update12-20.i586
+>!> 1357: U__s_[S2:0][package]java-1_5_0-sun-jdbc-1.5.0_update12-20.i586
+>!> 1358: U__s_[S2:0][package]java-1_5_0-sun-plugin-1.5.0_update12-20.i586
+>!> 1359: U__s_[S2:0][package]javamail-1.4-98.noarch
+>!> 1360: U__s_[S2:0][package]javamail-demo-1.4-98.noarch
+>!> 1361: U__s_[S2:0][package]javamail-javadoc-1.4-98.noarch
+>!> 1362: U__s_[S2:0][package]javamail-monolithic-1.4-98.noarch
+>!> 1363: U__s_[S2:0][package]jdepend-2.6-118.noarch
+>!> 1364: U__s_[S2:0][package]jedit-4.2-142.noarch
+>!> 1365: U__s_[S2:0][package]jedit-javadoc-4.2-142.noarch
+>!> 1366: U__s_[S2:0][package]jfbterm-0.3.10-588.i586
+>!> 1367: U__s_[S2:0][package]jfsutils-1.1.11-65.i586
+>!> 1368: U__s_[S2:0][package]jms-1.1-103.noarch
+>!> 1369: U__s_[S2:0][package]jms-javadoc-1.1-106.noarch
+>!> 1370: U__s_[S2:0][package]joe-3.5-61.i586
+>!> 1371: U__s_[S2:0][package]joy2key-1.6.1-88.i586
+>!> 1372: I__s_[S1:0][package]jpackage-utils-1.7.0-67.i586
+>!> 1373: U_Th_[S2:0][package]jpackage-utils-1.7.0-74.i586
+>!> 1374: I__s_[S1:0][package]jpeg-6b-803.i586
+>!> 1375: U_Th_[S2:0][package]jpeg-6b-809.i586
+>!> 1376: U__s_[S2:0][package]jtools-1.0-627.i586
+>!> 1377: U__s_[S2:0][package]junit-3.8.1-118.noarch
+>!> 1378: U_Th_[S2:0][package]k3b-1.0.3-20.i586
+>!> 1379: I__s_[S1:0][package]k3b-1.0.3-9.i586
+>!> 1380: U__s_[S2:0][package]kadslwatch-01.00.06-116.i586
+>!> 1381: U_Th_[S2:0][package]kaffeine-0.8.5-22.i586
+>!> 1382: I__s_[S1:0][package]kaffeine-0.8.5-7.i586
+>!> 1383: U__s_[S2:0][package]kaffeine-gstreamer-0.8.5-22.i586
+>!> 1384: U__s_[S2:0][package]kakasi-2.3.4-457.i586
+>!> 1385: U__s_[S2:0][package]kakasi-devel-2.3.4-457.i586
+>!> 1386: U__s_[S2:0][package]kakasi-dict-2.3.4-457.i586
+>!> 1387: U__s_[S2:0][package]kalsatools-1.5.0-459.i586
+>!> 1388: U__s_[S2:0][package]kanji-lookup-1.0-743.i586
+>!> 1389: U__s_[S2:0][package]kanjipad-2.0.0-293.i586
+>!> 1390: U__s_[S2:0][package]kasumi-2.2-55.i586
+>!> 1391: U__s_[S2:0][package]kbarcode-2.0.5-82.i586
+>!> 1392: I__s_[S1:0][package]kbd-1.12-126.i586
+>!> 1393: U_Th_[S2:0][package]kbd-1.12-135.i586
+>!> 1394: U__s_[S2:0][package]kbiff-3.8-117.i586
+>!> 1395: U__s_[S2:0][package]kcall-0.7.0-15.i586
+>!> 1396: I__s_[S1:0][package]kcm_gtk-0.7cvs20060209-86.i586
+>!> 1397: U_Th_[S2:0][package]kcm_gtk-0.7svn20070827-5.i586
+>!> 1398: U__s_[S2:0][package]kdbg-2.0.5-67.i586
+>!> 1399: U__s_[S2:0][package]kde3-i18n-cs-3.5.7-5.noarch
+>!> 1400: U__s_[S2:0][package]kde3-i18n-da-3.5.7-5.noarch
+>!> 1401: U__s_[S2:0][package]kde3-i18n-de-3.5.7-5.noarch
+>!> 1402: U__s_[S2:0][package]kde3-i18n-en_GB-3.5.7-5.noarch
+>!> 1403: U__s_[S2:0][package]kde3-i18n-es-3.5.7-5.noarch
+>!> 1404: U__s_[S2:0][package]kde3-i18n-fi-3.5.7-5.noarch
+>!> 1405: U__s_[S2:0][package]kde3-i18n-fr-3.5.7-5.noarch
+>!> 1406: U__s_[S2:0][package]kde3-i18n-hu-3.5.7-5.noarch
+>!> 1407: U__s_[S2:0][package]kde3-i18n-it-3.5.7-5.noarch
+>!> 1408: U__s_[S2:0][package]kde3-i18n-ja-3.5.7-5.noarch
+>!> 1409: U__s_[S2:0][package]kde3-i18n-nb-3.5.7-5.noarch
+>!> 1410: U__s_[S2:0][package]kde3-i18n-nl-3.5.7-5.noarch
+>!> 1411: U__s_[S2:0][package]kde3-i18n-pl-3.5.7-5.noarch
+>!> 1412: U__s_[S2:0][package]kde3-i18n-pt-3.5.7-5.noarch
+>!> 1413: U__s_[S2:0][package]kde3-i18n-pt_BR-3.5.7-5.noarch
+>!> 1414: U__s_[S2:0][package]kde3-i18n-ru-3.5.7-5.noarch
+>!> 1415: U__s_[S2:0][package]kde3-i18n-sv-3.5.7-5.noarch
+>!> 1416: U__s_[S2:0][package]kde3-i18n-zh_CN-3.5.7-5.noarch
+>!> 1417: U__s_[S2:0][package]kde3-i18n-zh_TW-3.5.7-5.noarch
+>!> 1418: U__s_[S2:0][package]kde4-dolphin-3.93.0-3.i586
+>!> 1419: I__s_[S1:0][package]kde4-filesystem-3.92.0-2.noarch
+>!> 1420: U_Th_[S2:0][package]kde4-filesystem-3.93.0-2.noarch
+>!> 1421: U__s_[S2:0][package]kde4-katomic-3.93.0-4.i586
+>!> 1422: U__s_[S2:0][package]kde4-kbackgammon-3.93.0-4.i586
+>!> 1423: U__s_[S2:0][package]kde4-kbattleship-3.93.0-4.i586
+>!> 1424: U__s_[S2:0][package]kde4-kblackbox-3.93.0-4.i586
+>!> 1425: U__s_[S2:0][package]kde4-kbounce-3.93.0-4.i586
+>!> 1426: I__s_[S1:0][package]kde4-kdialog-3.92.0-9.i586
+>!> 1427: U_Th_[S2:0][package]kde4-kdialog-3.93.0-3.i586
+>!> 1428: U__s_[S2:0][package]kde4-keditbookmarks-3.93.0-3.i586
+>!> 1429: U__s_[S2:0][package]kde4-kgoldrunner-3.93.0-4.i586
+>!> 1430: U__s_[S2:0][package]kde4-kiriki-3.93.0-4.i586
+>!> 1431: U__s_[S2:0][package]kde4-kjumpingcube-3.93.0-4.i586
+>!> 1432: U__s_[S2:0][package]kde4-klines-3.93.0-4.i586
+>!> 1433: I__s_[S1:0][package]kde4-kmahjongg-3.92.0-6.i586
+>!> 1434: U_Th_[S2:0][package]kde4-kmahjongg-3.93.0-4.i586
+>!> 1435: I__s_[S1:0][package]kde4-kmines-3.92.0-6.i586
+>!> 1436: U_Th_[S2:0][package]kde4-kmines-3.93.0-4.i586
+>!> 1437: U__s_[S2:0][package]kde4-knetwalk-3.93.0-4.i586
+>!> 1438: U__s_[S2:0][package]kde4-kolf-3.93.0-4.i586
+>!> 1439: U__s_[S2:0][package]kde4-konqueror-3.93.0-3.i586
+>!> 1440: U__s_[S2:0][package]kde4-konquest-3.93.0-4.i586
+>!> 1441: U__s_[S2:0][package]kde4-konsole-3.93.0-3.i586
+>!> 1442: I__s_[S1:0][package]kde4-kpat-3.92.0-6.i586
+>!> 1443: U_Th_[S2:0][package]kde4-kpat-3.93.0-4.i586
+>!> 1444: I__s_[S1:0][package]kde4-krdc-3.92.0-8.i586
+>!> 1445: U_Th_[S2:0][package]kde4-krdc-3.93.0-4.i586
+>!> 1446: I__s_[S1:0][package]kde4-kreversi-3.92.0-6.i586
+>!> 1447: U_Th_[S2:0][package]kde4-kreversi-3.93.0-4.i586
+>!> 1448: I__s_[S1:0][package]kde4-krfb-3.92.0-8.i586
+>!> 1449: U_Th_[S2:0][package]kde4-krfb-3.93.0-4.i586
+>!> 1450: U__s_[S2:0][package]kde4-ksame-3.93.0-4.i586
+>!> 1451: U__s_[S2:0][package]kde4-kshisen-3.93.0-4.i586
+>!> 1452: U__s_[S2:0][package]kde4-kspaceduel-3.93.0-4.i586
+>!> 1453: U__s_[S2:0][package]kde4-ksquares-3.93.0-4.i586
+>!> 1454: I__s_[S1:0][package]kde4-ksudoku-3.92.0-6.i586
+>!> 1455: U_Th_[S2:0][package]kde4-ksudoku-3.93.0-4.i586
+>!> 1456: U__s_[S2:0][package]kde4-ktuberling-3.93.0-4.i586
+>!> 1457: U__s_[S2:0][package]kde4-kwin-3.93.0-3.i586
+>!> 1458: U__s_[S2:0][package]kde4-kwin4-3.93.0-4.i586
+>!> 1459: U__s_[S2:0][package]kde4-kwrite-3.93.0-3.i586
+>!> 1460: U__s_[S2:0][package]kde4-l10n-cs-3.92.0-7.noarch
+>!> 1461: U__s_[S2:0][package]kde4-l10n-da-3.92.0-7.noarch
+>!> 1462: U__s_[S2:0][package]kde4-l10n-de-3.92.0-7.noarch
+>!> 1463: U__s_[S2:0][package]kde4-l10n-en_GB-3.92.0-7.noarch
+>!> 1464: U__s_[S2:0][package]kde4-l10n-es-3.92.0-7.noarch
+>!> 1465: U__s_[S2:0][package]kde4-l10n-fi-3.92.0-7.noarch
+>!> 1466: U__s_[S2:0][package]kde4-l10n-fr-3.92.0-7.noarch
+>!> 1467: U__s_[S2:0][package]kde4-l10n-hu-3.92.0-7.noarch
+>!> 1468: U__s_[S2:0][package]kde4-l10n-it-3.92.0-7.noarch
+>!> 1469: U__s_[S2:0][package]kde4-l10n-ja-3.92.0-7.noarch
+>!> 1470: U__s_[S2:0][package]kde4-l10n-nb-3.92.0-7.noarch
+>!> 1471: U__s_[S2:0][package]kde4-l10n-nl-3.92.0-7.noarch
+>!> 1472: U__s_[S2:0][package]kde4-l10n-pl-3.92.0-7.noarch
+>!> 1473: U__s_[S2:0][package]kde4-l10n-pt-3.92.0-7.noarch
+>!> 1474: U__s_[S2:0][package]kde4-l10n-pt_BR-3.92.0-7.noarch
+>!> 1475: U__s_[S2:0][package]kde4-l10n-ru-3.92.0-7.noarch
+>!> 1476: U__s_[S2:0][package]kde4-l10n-sv-3.92.0-7.noarch
+>!> 1477: U__s_[S2:0][package]kde4-l10n-zh_CN-3.92.0-7.noarch
+>!> 1478: U__s_[S2:0][package]kde4-l10n-zh_TW-3.92.0-7.noarch
+>!> 1479: U__s_[S2:0][package]kde4-lskat-3.93.0-4.i586
+>!> 1480: U__s_[S2:0][package]kdeaccessibility3-3.5.7-39.i586
+>!> 1481: U__s_[S2:0][package]kdeaddons3-games-3.5.7-6.i586
+>!> 1482: U__s_[S2:0][package]kdeaddons3-kate-3.5.7-6.i586
+>!> 1483: U__s_[S2:0][package]kdeaddons3-kicker-3.5.7-6.i586
+>!> 1484: I__s_[S1:0][package]kdeaddons3-konqueror-3.5.7-6.i586
+>!> 1485: U__s_[S2:0][package]kdeaddons3-konqueror-3.5.7-6.i586
+>!> 1486: U__s_[S2:0][package]kdeaddons3-kontact-3.5.7-6.i586
+>!> 1487: U__s_[S2:0][package]kdeaddons3-sound-3.5.7-6.i586
+>!> 1488: U__s_[S2:0][package]kdeadmin3-3.5.7-43.i586
+>!> 1489: U__s_[S2:0][package]kdeartwork3-3.5.7-47.i586
+>!> 1490: I__s_[S1:0][package]kdeartwork3-kscreensaver-3.5.7-32.i586
+>!> 1491: U_Th_[S2:0][package]kdeartwork3-kscreensaver-3.5.7-47.i586
+>!> 1492: U__s_[S2:0][package]kdeartwork3-sound-3.5.7-47.i586
+>!> 1493: U__s_[S2:0][package]kdeartwork3-xscreensaver-3.5.7-47.i586
+>!> 1494: I__s_[S1:0][package]kdebase3-3.5.7-44.i586
+>!> 1495: U_Th_[S2:0][package]kdebase3-3.5.7-67.i586
+>!> 1496: I__s_[S1:0][package]kdebase3-SuSE-10.3-103.i586
+>!> 1497: U_Th_[S2:0][package]kdebase3-SuSE-10.3-128.i586
+>!> 1498: U__s_[S2:0][package]kdebase3-beagle-3.5.7-67.i586
+>!> 1499: U__s_[S2:0][package]kdebase3-devel-3.5.7-67.i586
+>!> 1500: U__s_[S2:0][package]kdebase3-extra-3.5.7-67.i586
+>!> 1501: I__s_[S1:0][package]kdebase3-kdm-3.5.7-44.i586
+>!> 1502: U_Th_[S2:0][package]kdebase3-kdm-3.5.7-67.i586
+>!> 1503: I__s_[S1:0][package]kdebase3-ksysguardd-3.5.7-44.i586
+>!> 1504: U_Th_[S2:0][package]kdebase3-ksysguardd-3.5.7-67.i586
+>!> 1505: I__s_[S1:0][package]kdebase3-nsplugin-3.5.7-44.i586
+>!> 1506: U_Th_[S2:0][package]kdebase3-nsplugin-3.5.7-67.i586
+>!> 1507: I__s_[S1:0][package]kdebase3-samba-3.5.7-44.i586
+>!> 1508: U_Th_[S2:0][package]kdebase3-samba-3.5.7-67.i586
+>!> 1509: I__s_[S1:0][package]kdebase3-session-3.5.7-44.i586
+>!> 1510: U_Th_[S2:0][package]kdebase3-session-3.5.7-67.i586
+>!> 1511: U__s_[S2:0][package]kdebase4-3.93.0-3.i586
+>!> 1512: U__s_[S2:0][package]kdebase4-libkonq-3.93.0-3.i586
+>!> 1513: U__s_[S2:0][package]kdebase4-nsplugin-3.93.0-3.i586
+>!> 1514: I__s_[S1:0][package]kdebase4-runtime-3.92.0-9.i586
+>!> 1515: U_Th_[S2:0][package]kdebase4-runtime-3.93.0-3.i586
+>!> 1516: U__s_[S2:0][package]kdebase4-session-3.93.0-2.i586
+>!> 1517: U__s_[S2:0][package]kdebase4-workspace-3.93.0-3.i586
+>!> 1518: U__s_[S2:0][package]kdebindings3-3.5.7-49.i586
+>!> 1519: U__s_[S2:0][package]kdebindings3-javascript-3.5.7-47.i586
+>!> 1520: U__s_[S2:0][package]kdebindings3-perl-3.5.7-49.i586
+>!> 1521: U__s_[S2:0][package]kdebindings3-ruby-3.5.7-49.i586
+>!> 1522: I__s_[S1:0][package]kdebluetooth-1.0_beta5-8.i586
+>!> 1523: U_Th_[S2:0][package]kdebluetooth-1.0_beta7-2.i586
+>!> 1524: U__s_[S2:0][package]kdedesktopcheck-0.1-70.noarch
+>!> 1525: U__s_[S2:0][package]kdeedu4-3.93.0-3.i586
+>!> 1526: U__s_[S2:0][package]kdegames3-3.5.7-42.i586
+>!> 1527: U__s_[S2:0][package]kdegames3-arcade-3.5.7-42.i586
+>!> 1528: U__s_[S2:0][package]kdegames3-board-3.5.7-42.i586
+>!> 1529: U__s_[S2:0][package]kdegames3-card-3.5.7-42.i586
+>!> 1530: U__s_[S2:0][package]kdegames3-tactic-3.5.7-42.i586
+>!> 1531: I__s_[S1:0][package]kdegames4-3.92.0-6.i586
+>!> 1532: U_Th_[S2:0][package]kdegames4-3.93.0-4.i586
+>!> 1533: I__s_[S1:0][package]kdegames4-carddecks-default-3.92.0-2.noarch
+>!> 1534: U_Th_[S2:0][package]kdegames4-carddecks-default-3.93.0-2.noarch
+>!> 1535: U__s_[S2:0][package]kdegames4-carddecks-other-3.93.0-2.noarch
+>!> 1536: I__s_[S1:0][package]kdegraphics3-3.5.7-31.i586
+>!> 1537: U_Th_[S2:0][package]kdegraphics3-3.5.7-46.i586
+>!> 1538: U__s_[S2:0][package]kdegraphics3-devel-3.5.7-46.i586
+>!> 1539: U__s_[S2:0][package]kdegraphics3-extra-3.5.7-46.i586
+>!> 1540: U__s_[S2:0][package]kdegraphics3-fax-3.5.7-46.i586
+>!> 1541: U__s_[S2:0][package]kdegraphics3-imaging-3.5.7-46.i586
+>!> 1542: I__s_[S1:0][package]kdegraphics3-kamera-3.5.7-31.i586
+>!> 1543: U_Th_[S2:0][package]kdegraphics3-kamera-3.5.7-46.i586
+>!> 1544: I__s_[S1:0][package]kdegraphics3-pdf-3.5.7-31.i586
+>!> 1545: U_Th_[S2:0][package]kdegraphics3-pdf-3.5.7-46.i586
+>!> 1546: I__s_[S1:0][package]kdegraphics3-postscript-3.5.7-31.i586
+>!> 1547: U_Th_[S2:0][package]kdegraphics3-postscript-3.5.7-46.i586
+>!> 1548: I__s_[S1:0][package]kdegraphics3-scan-3.5.7-31.i586
+>!> 1549: U_Th_[S2:0][package]kdegraphics3-scan-3.5.7-46.i586
+>!> 1550: U__s_[S2:0][package]kdegraphics3-tex-3.5.7-46.i586
+>!> 1551: I__s_[S1:0][package]kdelibs3-3.5.7-43.i586
+>!> 1552: U_Th_[S2:0][package]kdelibs3-3.5.7-58.i586
+>!> 1553: U__s_[S2:0][package]kdelibs3-arts-3.5.7-58.i586
+>!> 1554: I__s_[S1:0][package]kdelibs3-default-style-3.5.7-43.i586
+>!> 1555: U_Th_[S2:0][package]kdelibs3-default-style-3.5.7-58.i586
+>!> 1556: U__s_[S2:0][package]kdelibs3-devel-3.5.7-58.i586
+>!> 1557: U__s_[S2:0][package]kdelibs3-devel-doc-3.5.7-60.noarch
+>!> 1558: U__s_[S2:0][package]kdelibs3-doc-3.5.7-58.i586
+>!> 1559: I__s_[S1:0][package]kdelibs4-3.92.0-8.i586
+>!> 1560: U_Th_[S2:0][package]kdelibs4-3.93.0-3.i586
+>!> 1561: I__s_[S1:0][package]kdelibs4-core-3.92.0-8.i586
+>!> 1562: U_Th_[S2:0][package]kdelibs4-core-3.93.0-3.i586
+>!> 1563: U__s_[S2:0][package]kdelibs4-doc-3.93.0-3.i586
+>!> 1564: I_Th_[S1:0][package]kdelibs4-icons-3.92.0-9.noarch
+>!> 1565: I__s_[S1:0][package]kdemultimedia3-3.5.7-35.i586
+>!> 1566: U_Th_[S2:0][package]kdemultimedia3-3.5.7-48.i586
+>!> 1567: I__s_[S1:0][package]kdemultimedia3-CD-3.5.7-35.i586
+>!> 1568: U_Th_[S2:0][package]kdemultimedia3-CD-3.5.7-48.i586
+>!> 1569: U__s_[S2:0][package]kdemultimedia3-arts-3.5.7-48.i586
+>!> 1570: U__s_[S2:0][package]kdemultimedia3-devel-3.5.7-48.i586
+>!> 1571: U__s_[S2:0][package]kdemultimedia3-extra-3.5.7-48.i586
+>!> 1572: U__s_[S2:0][package]kdemultimedia3-jukebox-3.5.7-48.i586
+>!> 1573: U__s_[S2:0][package]kdemultimedia3-midi-3.5.7-48.i586
+>!> 1574: I__s_[S1:0][package]kdemultimedia3-mixer-3.5.7-35.i586
+>!> 1575: U_Th_[S2:0][package]kdemultimedia3-mixer-3.5.7-48.i586
+>!> 1576: U__s_[S2:0][package]kdemultimedia3-sound-3.5.7-48.i586
+>!> 1577: U__s_[S2:0][package]kdemultimedia3-video-3.5.7-48.i586
+>!> 1578: U__s_[S2:0][package]kdemultimedia3-video-xine-3.5.7-48.i586
+>!> 1579: I__s_[S1:0][package]kdenetwork3-3.5.7-39.i586
+>!> 1580: U_Th_[S2:0][package]kdenetwork3-3.5.7-54.i586
+>!> 1581: U__s_[S2:0][package]kdenetwork3-IRC-3.5.7-54.i586
+>!> 1582: I__s_[S1:0][package]kdenetwork3-InstantMessenger-3.5.7-39.i586
+>!> 1583: U_Th_[S2:0][package]kdenetwork3-InstantMessenger-3.5.7-54.i586
+>!> 1584: U__s_[S2:0][package]kdenetwork3-dialup-3.5.7-54.i586
+>!> 1585: U__s_[S2:0][package]kdenetwork3-lan-3.5.7-54.i586
+>!> 1586: U__s_[S2:0][package]kdenetwork3-lisa-3.5.7-54.i586
+>!> 1587: I__s_[S1:0][package]kdenetwork3-news-3.5.7-39.i586
+>!> 1588: U_Th_[S2:0][package]kdenetwork3-news-3.5.7-54.i586
+>!> 1589: U__s_[S2:0][package]kdenetwork3-query-3.5.7-54.i586
+>!> 1590: U__s_[S2:0][package]kdenetwork3-wireless-3.5.7-54.i586
+>!> 1591: I__s_[S1:0][package]kdepim3-3.5.7.enterprise.0.20070731.694771-2.i586
+>!> 1592: U_Th_[S2:0][package]kdepim3-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> 1593: U__s_[S2:0][package]kdepim3-devel-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> 1594: I__s_[S1:0][package]kdepim3-kpilot-3.5.7.enterprise.0.20070731.694771-2.i586
+>!> 1595: U_Th_[S2:0][package]kdepim3-kpilot-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> 1596: U__s_[S2:0][package]kdepim3-mobile-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> 1597: I__s_[S1:0][package]kdepim3-notes-3.5.7.enterprise.0.20070731.694771-2.i586
+>!> 1598: U_Th_[S2:0][package]kdepim3-notes-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> 1599: U__s_[S2:0][package]kdepim3-time-management-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> 1600: I__s_[S1:0][package]kdepimlibs4-3.92.0-6.i586
+>!> 1601: U_Th_[S2:0][package]kdepimlibs4-3.93.0-3.i586
+>!> 1602: U__s_[S2:0][package]kdesdk3-3.5.7-48.i586
+>!> 1603: U__s_[S2:0][package]kdesdk3-devel-3.5.7-48.i586
+>!> 1604: U__s_[S2:0][package]kdesdk3-kdecvs-3.5.7-48.i586
+>!> 1605: U__s_[S2:0][package]kdesdk3-profile-3.5.7-48.i586
+>!> 1606: U__s_[S2:0][package]kdesdk3-translate-3.5.7-48.i586
+>!> 1607: U__s_[S2:0][package]kdesvn-0.12.1-22.i586
+>!> 1608: U__s_[S2:0][package]kdetoys3-3.5.7-44.i586
+>!> 1609: I__s_[S1:0][package]kdetv-0.8.9-74.i586
+>!> 1610: U_Th_[S2:0][package]kdetv-0.8.9-84.i586
+>!> 1611: I__s_[S1:0][package]kdeutils3-3.5.7-32.i586
+>!> 1612: U_Th_[S2:0][package]kdeutils3-3.5.7-47.i586
+>!> 1613: U__s_[S2:0][package]kdeutils3-devel-3.5.7-47.i586
+>!> 1614: U__s_[S2:0][package]kdeutils3-extra-3.5.7-47.i586
+>!> 1615: U__s_[S2:0][package]kdevelop3-3.4.1-49.i586
+>!> 1616: U__s_[S2:0][package]kdewebdev3-3.5.7-47.i586
+>!> 1617: U__s_[S2:0][package]kdiff3-0.9.92-62.i586
+>!> 1618: U__s_[S2:0][package]kdirstat-2.4.4-119.i586
+>!> 1619: U__s_[S2:0][package]kdissert-1.0.6c-80.i586
+>!> 1620: U__s_[S2:0][package]kdrill-6.4-102.i586
+>!> 1621: U__s_[S2:0][package]kdump-helpers-0.2.4-18.i586
+>!> 1622: U__s_[S2:0][package]kernel-bigsmp-2.6.22.5-10.i586
+>!> 1623: I__s_[S1:0][package]kernel-default-2.6.22.1-16.i586
+>!> 1624: U_Th_[S2:0][package]kernel-default-2.6.22.5-10.i586
+>!> 1625: U__s_[S2:0][package]kernel-docs-2.6.22.5-10.noarch
+>!> 1626: U__s_[S2:0][package]kernel-source-2.6.22.5-10.i586
+>!> 1627: U__s_[S2:0][package]kernel-syms-2.6.22.5-10.i586
+>!> 1628: U__s_[S2:0][package]kernel-xen-2.6.22.5-10.i586
+>!> 1629: U__s_[S2:0][package]kernel-xenpae-2.6.22.5-10.i586
+>!> 1630: U__s_[S2:0][package]kerry-0.2.2-77.i586
+>!> 1631: U__s_[S2:0][package]kexec-tools-1.101-136.i586
+>!> 1632: U__s_[S2:0][package]keychain-2.6.8-15.noarch
+>!> 1633: U__s_[S2:0][package]keyutils-1.2-39.i586
+>!> 1634: U__s_[S2:0][package]keyutils-devel-1.2-39.i586
+>!> 1635: I__s_[S1:0][package]keyutils-libs-1.2-33.i586
+>!> 1636: U_Th_[S2:0][package]keyutils-libs-1.2-39.i586
+>!> 1637: U__s_[S2:0][package]kiax-0.8.4-106.i586
+>!> 1638: U__s_[S2:0][package]kile-1.9.3-86.i586
+>!> 1639: U__s_[S2:0][package]kinput2-v3.1-418.i586
+>!> 1640: U__s_[S2:0][package]kinternet-0.75-141.i586
+>!> 1641: U__s_[S2:0][package]kio-locate-0.4.5-100.i586
+>!> 1642: U__s_[S2:0][package]kio_beagle-0.3.1-106.i586
+>!> 1643: U_Th_[S2:0][package]kio_ipodslave-0.8.pre1-102.i586
+>!> 1644: I__s_[S1:0][package]kio_ipodslave-0.8.pre1-91.i586
+>!> 1645: U_Th_[S2:0][package]kio_iso-1.80.0-26.i586
+>!> 1646: I__s_[S1:0][package]kio_iso-1.80.0-9.i586
+>!> 1647: I__s_[S1:0][package]kio_slp-0.4.1-103.i586
+>!> 1648: U_Th_[S2:0][package]kio_slp-0.4.1-113.i586
+>!> 1649: I__s_[S1:0][package]kio_sysinfo-10.3-103.i586
+>!> 1650: U_Th_[S2:0][package]kio_sysinfo-10.3-128.i586
+>!> 1651: U__s_[S2:0][package]kiosktool-1.0-116.i586
+>!> 1652: U_Th_[S2:0][package]kipi-plugins-0.1.4-25.i586
+>!> 1653: I__s_[S1:0][package]kipi-plugins-0.1.4-9.i586
+>!> 1654: U__s_[S2:0][package]kisdnwatch-01.00.10-118.i586
+>!> 1655: U__s_[S2:0][package]kismet-2007_01_R1b-62.i586
+>!> 1656: I__s_[S1:0][package]kitchensync-0.01svn691344-2.i586
+>!> 1657: U_Th_[S2:0][package]kitchensync-3.5.7.enterprise.0.20070831.706868-6.i586
+>!> 1658: U__s_[S2:0][package]kiwi-1.59-2.i586
+>!> 1659: U__s_[S2:0][package]kiwi-desc-isoboot-1.59-2.i586
+>!> 1660: U__s_[S2:0][package]kiwi-desc-netboot-1.59-2.i586
+>!> 1661: U__s_[S2:0][package]kiwi-desc-oemboot-1.59-2.i586
+>!> 1662: U__s_[S2:0][package]kiwi-desc-usbboot-1.59-2.i586
+>!> 1663: U__s_[S2:0][package]kiwi-desc-vmxboot-1.59-2.i586
+>!> 1664: U__s_[S2:0][package]kiwi-desc-xenboot-1.59-2.i586
+>!> 1665: U__s_[S2:0][package]kiwi-desc-xennetboot-1.59-2.i586
+>!> 1666: U__s_[S2:0][package]kiwi-pxeboot-1.59-2.i586
+>!> 1667: U__s_[S2:0][package]klipsi-0.16-89.i586
+>!> 1668: I__s_[S1:0][package]klogd-1.4.1-622.i586
+>!> 1669: U_Th_[S2:0][package]klogd-1.4.1-629.i586
+>!> 1670: U__s_[S2:0][package]kmobiletools-0.4.99+0.5.0beta3-19.i586
+>!> 1671: U__s_[S2:0][package]kmobiletools-lang-0.4.99+0.5.0beta3-19.i586
+>!> 1672: U__s_[S2:0][package]kmymoney-0.8.7-21.i586
+>!> 1673: U__s_[S2:0][package]knights-0.6-539.i586
+>!> 1674: U__s_[S2:0][package]knoda-0.8.2-98.i586
+>!> 1675: U_Tl_[S2:0][package]koffice-1.6.3-38.i586
+>!> 1676: U__s_[S2:0][package]koffice-database-1.6.3-38.i586
+>!> 1677: U__s_[S2:0][package]koffice-devel-1.6.3-38.i586
+>!> 1678: U__s_[S2:0][package]koffice-extra-1.6.3-38.i586
+>!> 1679: U__s_[S2:0][package]koffice-i18n-cs-1.6.3-2.noarch
+>!> 1680: U__s_[S2:0][package]koffice-i18n-da-1.6.3-2.noarch
+>!> 1681: U__s_[S2:0][package]koffice-i18n-da-doc-1.6.3-2.noarch
+>!> 1682: U__s_[S2:0][package]koffice-i18n-de-1.6.3-2.noarch
+>!> 1683: U__s_[S2:0][package]koffice-i18n-de-doc-1.6.3-2.noarch
+>!> 1684: U__s_[S2:0][package]koffice-i18n-en_GB-1.6.3-2.noarch
+>!> 1685: U__s_[S2:0][package]koffice-i18n-en_GB-doc-1.6.3-2.noarch
+>!> 1686: U__s_[S2:0][package]koffice-i18n-es-1.6.3-2.noarch
+>!> 1687: U__s_[S2:0][package]koffice-i18n-es-doc-1.6.3-2.noarch
+>!> 1688: U__s_[S2:0][package]koffice-i18n-fi-1.6.3-2.noarch
+>!> 1689: U__s_[S2:0][package]koffice-i18n-fr-1.6.3-2.noarch
+>!> 1690: U__s_[S2:0][package]koffice-i18n-fr-doc-1.6.3-2.noarch
+>!> 1691: U__s_[S2:0][package]koffice-i18n-hu-1.6.3-2.noarch
+>!> 1692: U__s_[S2:0][package]koffice-i18n-it-1.6.3-2.noarch
+>!> 1693: U__s_[S2:0][package]koffice-i18n-it-doc-1.6.3-2.noarch
+>!> 1694: U__s_[S2:0][package]koffice-i18n-ja-1.6.3-2.noarch
+>!> 1695: U__s_[S2:0][package]koffice-i18n-nb-1.6.3-2.noarch
+>!> 1696: U__s_[S2:0][package]koffice-i18n-nl-1.6.3-2.noarch
+>!> 1697: U__s_[S2:0][package]koffice-i18n-nl-doc-1.6.3-2.noarch
+>!> 1698: U__s_[S2:0][package]koffice-i18n-pl-1.6.3-2.noarch
+>!> 1699: U__s_[S2:0][package]koffice-i18n-pt-1.6.3-2.noarch
+>!> 1700: U__s_[S2:0][package]koffice-i18n-pt-doc-1.6.3-2.noarch
+>!> 1701: U__s_[S2:0][package]koffice-i18n-pt_BR-1.6.3-2.noarch
+>!> 1702: U__s_[S2:0][package]koffice-i18n-pt_BR-doc-1.6.3-2.noarch
+>!> 1703: U__s_[S2:0][package]koffice-i18n-ru-1.6.3-2.noarch
+>!> 1704: U__s_[S2:0][package]koffice-i18n-ru-doc-1.6.3-2.noarch
+>!> 1705: U__s_[S2:0][package]koffice-i18n-sv-1.6.3-2.noarch
+>!> 1706: U__s_[S2:0][package]koffice-i18n-sv-doc-1.6.3-2.noarch
+>!> 1707: U__s_[S2:0][package]koffice-i18n-zh_CN-1.6.3-2.noarch
+>!> 1708: U__s_[S2:0][package]koffice-i18n-zh_TW-1.6.3-2.noarch
+>!> 1709: U_Tl_[S2:0][package]koffice-illustration-1.6.3-38.i586
+>!> 1710: U__s_[S2:0][package]koffice-presentation-1.6.3-38.i586
+>!> 1711: U__s_[S2:0][package]koffice-spreadsheet-1.6.3-38.i586
+>!> 1712: U__s_[S2:0][package]koffice-wordprocessing-1.6.3-38.i586
+>!> 1713: U__s_[S2:0][package]kommander-3.5.7-47.i586
+>!> 1714: U__s_[S2:0][package]kommander-runtime-3.5.7-47.i586
+>!> 1715: U__s_[S2:0][package]konserve-0.10.3-119.i586
+>!> 1716: U_Th_[S2:0][package]konversation-1.0.1-101.i586
+>!> 1717: I__s_[S1:0][package]konversation-1.0.1-91.i586
+>!> 1718: U__s_[S2:0][package]kover-2.9.6-121.i586
+>!> 1719: U__s_[S2:0][package]kpartx-0.4.7-75.i586
+>!> 1720: U__s_[S2:0][package]kpl-3.3-115.i586
+>!> 1721: I__s_[S1:0][package]kpowersave-0.7.2_SVN20070724-10.i586
+>!> 1722: U_Th_[S2:0][package]kpowersave-0.7.2_SVN20070830-3.i586
+>!> 1723: U__s_[S2:0][package]kpsion-0.16-89.i586
+>!> 1724: U__s_[S2:0][package]kradio-1.0beta3b_20060920-84.i586
+>!> 1725: U_Th_[S2:0][package]krb5-1.6.2-15.i586
+>!> 1726: I__s_[S1:0][package]krb5-1.6.2-8.i586
+>!> 1727: U__s_[S2:0][package]krb5-apps-clients-1.6.2-15.i586
+>!> 1728: U__s_[S2:0][package]krb5-apps-servers-1.6.2-15.i586
+>!> 1729: U__s_[S2:0][package]krb5-client-1.6.2-15.i586
+>!> 1730: U__s_[S2:0][package]krb5-devel-1.6.2-15.i586
+>!> 1731: U__s_[S2:0][package]krb5-doc-1.6.2-23.noarch
+>!> 1732: U__s_[S2:0][package]krb5-plugin-kdb-ldap-1.6.2-3.i586
+>!> 1733: U__s_[S2:0][package]krb5-server-1.6.2-15.i586
+>!> 1734: I__s_[S1:0][package]krecord-1.16-117.i586
+>!> 1735: U_Th_[S2:0][package]krecord-1.16-127.i586
+>!> 1736: U__s_[S2:0][package]krename-3.0.14-53.i586
+>!> 1737: U__s_[S2:0][package]krpmbuilder-1.2-116.i586
+>!> 1738: U__s_[S2:0][package]krusader-1.80.0-26.i586
+>!> 1739: U_Tl_[S2:0][package]kscpm-0.5.3-124.i586
+>!> 1740: U__s_[S2:0][package]kseg-0.4-299.i586
+>!> 1741: U__s_[S2:0][package]ksh-93s-41.i586
+>!> 1742: U__s_[S2:0][package]ksimus-0.3.6.2-118.i586
+>!> 1743: U__s_[S2:0][package]kst-1.4.0-16.i586
+>!> 1744: U__s_[S2:0][package]kst-lang-1.4.0-16.i586
+>!> 1745: U__s_[S2:0][package]ksudoku-0.4-56.i586
+>!> 1746: U__s_[S2:0][package]ksymoops-2.4.11-73.i586
+>!> 1747: U__s_[S2:0][package]ksystemlog-0.3.2-118.i586
+>!> 1748: U__s_[S2:0][package]kterm-6.2.0-906.i586
+>!> 1749: U__s_[S2:0][package]ktoblzcheck-1.14-13.i586
+>!> 1750: U__s_[S2:0][package]ktoblzcheck-devel-1.14-13.i586
+>!> 1751: U_Th_[S2:0][package]ktorrent-2.2.1-22.i586
+>!> 1752: I__s_[S1:0][package]ktorrent-2.2.1-9.i586
+>!> 1753: U__s_[S2:0][package]ktray-0.1-116.i586
+>!> 1754: U__s_[S2:0][package]kvirc-3.2.6-72.i586
+>!> 1755: U__s_[S2:0][package]kvocabs-0.3.4-97.i586
+>!> 1756: U__s_[S2:0][package]kvpnc-0.8.9-46.i586
+>!> 1757: U__s_[S2:0][package]kwatch-2.3.3-115.i586
+>!> 1758: U_Th_[S2:0][package]kwin-decor-suse2-0.4.1-19.i586
+>!> 1759: I__s_[S1:0][package]kwin-decor-suse2-0.4.1-2.i586
+>!> 1760: U__s_[S2:0][package]kxmleditor-1.1.4-135.i586
+>!> 1761: U__s_[S2:0][package]kyum-0.7.5-117.i586
+>!> 1762: U__s_[S2:0][package]lacheck-1.26-72.i586
+>!> 1763: U__s_[S2:0][package]ladspa-1.12.code10.3-50.i586
+>!> 1764: U__s_[S2:0][package]ladspa-devel-1.12.code10.3-33.noarch
+>!> 1765: U_Tu_[S0:0][language]en-.noarch
+>!> 1766: U_Tu_[S0:0][language]en_US-.noarch
+>!> 1767: U__s_[S2:0][package]lash-0.5.0-101.i586
+>!> 1768: U__s_[S2:0][package]lash-devel-0.5.0-101.i586
+>!> 1769: U__s_[S2:0][package]lash-libs-0.5.0-101.i586
+>!> 1770: U__s_[S2:0][package]latex2html-2002.2.1-469.noarch
+>!> 1771: U__s_[S2:0][package]latex2html-pngicons-2002.2.1-469.noarch
+>!> 1772: U_Th_[S2:0][package]lbreakout-2.5.2-106.i586
+>!> 1773: I__s_[S1:0][package]lbreakout-2.5.2-97.i586
+>!> 1774: I__s_[S1:0][package]ldapcpplib-0.0.4-81.i586
+>!> 1775: U_Th_[S2:0][package]ldapcpplib-0.0.4-88.i586
+>!> 1776: U_Th_[S2:0][package]less-406-11.i586
+>!> 1777: I__s_[S1:0][package]less-406-4.i586
+>!> 1778: U__s_[S2:0][package]lessons4lizards_en-0.2-8.noarch
+>!> 1779: U__s_[S2:0][package]lftp-3.5.11-12.i586
+>!> 1780: U__s_[S2:0][package]lha-1.14.20070523-12.i586
+>!> 1781: U__s_[S2:0][package]libEMF-1.0-250.i586
+>!> 1782: U__s_[S2:0][package]libEMF-devel-1.0-250.i586
+>!> 1783: U_Th_[S2:0][package]libFLAC++6-1.2.0-10.i586
+>!> 1784: I__s_[S1:0][package]libFLAC++6-1.2.0-4.i586
+>!> 1785: U_Th_[S2:0][package]libFLAC8-1.2.0-10.i586
+>!> 1786: I__s_[S1:0][package]libFLAC8-1.2.0-4.i586
+>!> 1787: U__s_[S2:0][package]libGraphicsMagick++1-1.1.8-12.i586
+>!> 1788: U_Tl_[S2:0][package]libGraphicsMagick1-1.1.8-12.i586
+>!> 1789: U__s_[S2:0][package]libGraphicsMagickWand0-1.1.8-12.i586
+>!> 1790: U__s_[S2:0][package]libMagick++-devel-6.3.5.3-20.i586
+>!> 1791: U__s_[S2:0][package]libMagick++10-6.3.5.3-20.i586
+>!> 1792: U_Tl_[S2:0][package]libMagick10-6.3.5.3-20.i586
+>!> 1793: U__s_[S2:0][package]libPropList-0.10.1-706.i586
+>!> 1794: U__s_[S2:0][package]libQtTapioca0-0.14.1+svn2032-11.i586
+>!> 1795: U__s_[S2:0][package]libQtTelepathy0-0.14.1-11.i586
+>!> 1796: U_Tl_[S2:0][package]libWand10-6.3.5.3-20.i586
+>!> 1797: U__s_[S2:0][package]libXalan-c-110-1.10-71.i586
+>!> 1798: U__s_[S2:0][package]libXerces-c-27-2.7.0-72.i586
+>!> 1799: U__s_[S2:0][package]libXiterm-0.5.20040304-133.i586
+>!> 1800: U__s_[S2:0][package]libXiterm-devel-0.5.20040304-133.i586
+>!> 1801: U__s_[S2:0][package]libaal-1_0-5-1.0.5-9.i586
+>!> 1802: U__s_[S2:0][package]libaal-minimal0-1.0.5-9.i586
+>!> 1803: I__s_[S1:0][package]libacl-2.2.34-66.i586
+>!> 1804: U_Th_[S2:0][package]libacl-2.2.34-72.i586
+>!> 1805: U__s_[S2:0][package]libacl-devel-2.2.34-72.i586
+>!> 1806: U__s_[S2:0][package]libadns1-1.4-7.i586
+>!> 1807: U__s_[S2:0][package]libaio-0.3.104-71.i586
+>!> 1808: U__s_[S2:0][package]libaio-devel-0.3.104-71.i586
+>!> 1809: I__s_[S1:0][package]libakode-2.0.2-41.i586
+>!> 1810: U_Th_[S2:0][package]libakode-2.0.2-51.i586
+>!> 1811: U__s_[S2:0][package]libakode-devel-2.0.2-51.i586
+>!> 1812: U_Th_[S2:0][package]libao-0.8.8-12.i586
+>!> 1813: I__s_[S1:0][package]libao-0.8.8-3.i586
+>!> 1814: U__s_[S2:0][package]libao-devel-0.8.8-12.i586
+>!> 1815: U__s_[S2:0][package]libapparmor-devel-2.2-10.i586
+>!> 1816: U_Th_[S2:0][package]libapparmor1-2.2-10.i586
+>!> 1817: I__s_[S1:0][package]libapparmor1-2.2-2.i586
+>!> 1818: U__s_[S2:0][package]libapr-util1-1.2.8-60.i586
+>!> 1819: U__s_[S2:0][package]libapr-util1-devel-1.2.8-60.i586
+>!> 1820: U__s_[S2:0][package]libapr1-1.2.9-6.i586
+>!> 1821: U__s_[S2:0][package]libapr1-devel-1.2.9-6.i586
+>!> 1822: I__s_[S1:0][package]libart_lgpl-2.3.19-26.i586
+>!> 1823: U_Th_[S2:0][package]libart_lgpl-2.3.19-32.i586
+>!> 1824: U__s_[S2:0][package]libart_lgpl-devel-2.3.19-32.i586
+>!> 1825: I__s_[S1:0][package]libasound2-1.0.14-20.i586
+>!> 1826: U_Th_[S2:0][package]libasound2-1.0.14-27.i586
+>!> 1827: U__s_[S2:0][package]libassuan-devel-1.0.2-3.i586
+>!> 1828: I__s_[S1:0][package]libattr-2.4.28-72.i586
+>!> 1829: U_Th_[S2:0][package]libattr-2.4.28-78.i586
+>!> 1830: U__s_[S2:0][package]libattr-devel-2.4.28-78.i586
+>!> 1831: U__s_[S2:0][package]libavc1394-0-0.5.3-61.i586
+>!> 1832: U__s_[S2:0][package]libavc1394-0.5.3-61.i586
+>!> 1833: U__s_[S2:0][package]libavc1394-devel-0.5.3-61.i586
+>!> 1834: U__s_[S2:0][package]libbeagle-0.2.18-8.i586
+>!> 1835: U__s_[S2:0][package]libbeagle-devel-0.2.18-8.i586
+>!> 1836: U__s_[S2:0][package]libbeagle-python-0.2.18-8.i586
+>!> 1837: U__s_[S2:0][package]libblkid-devel-1.40.2-15.i586
+>!> 1838: U_Th_[S2:0][package]libblkid1-1.40.2-15.i586
+>!> 1839: I__s_[S1:0][package]libblkid1-1.40.2-9.i586
+>!> 1840: U_Th_[S2:0][package]libbonobo-2.19.6-13.i586
+>!> 1841: I__s_[S1:0][package]libbonobo-2.19.6-3.i586
+>!> 1842: U__s_[S2:0][package]libbonobo-devel-2.19.6-13.i586
+>!> 1843: U__s_[S2:0][package]libbonobo-doc-2.19.6-13.i586
+>!> 1844: U_Th_[S2:0][package]libbonoboui-2.19.6-17.i586
+>!> 1845: I__s_[S1:0][package]libbonoboui-2.19.6-4.i586
+>!> 1846: U__s_[S2:0][package]libbonoboui-devel-2.19.6-17.i586
+>!> 1847: U__s_[S2:0][package]libbonoboui-doc-2.19.6-17.i586
+>!> 1848: U__s_[S2:0][package]libbtctl-0.8.0-100.i586
+>!> 1849: U__s_[S2:0][package]libbtctl-devel-0.8.0-100.i586
+>!> 1850: I__s_[S1:0][package]libbz2-1-1.0.4-33.i586
+>!> 1851: U_Th_[S2:0][package]libbz2-1-1.0.4-39.i586
+>!> 1852: U__s_[S2:0][package]libbz2-devel-1.0.4-39.i586
+>!> 1853: I__s_[S1:0][package]libcap-1.10-34.i586
+>!> 1854: U_Th_[S2:0][package]libcap-1.10-40.i586
+>!> 1855: U__s_[S2:0][package]libcap-progs-1.10-40.i586
+>!> 1856: U__s_[S2:0][package]libcddb-1.3.0-54.i586
+>!> 1857: U__s_[S2:0][package]libcddb-devel-1.3.0-54.i586
+>!> 1858: U__s_[S2:0][package]libcdio++0-0.78.2-4.i586
+>!> 1859: U__s_[S2:0][package]libcdio-devel-0.78.2-4.i586
+>!> 1860: U__s_[S2:0][package]libcdio-utils-0.78.2-4.i586
+>!> 1861: I__s_[S1:0][package]libcdio7-0.78.2-3.i586
+>!> 1862: U_Th_[S2:0][package]libcdio7-0.78.2-4.i586
+>!> 1863: U__s_[S2:0][package]libcdio_cdda0-0.78.2-4.i586
+>!> 1864: U__s_[S2:0][package]libcdio_paranoia0-0.78.2-4.i586
+>!> 1865: U__s_[S2:0][package]libchewing-0.3.0-70.i586
+>!> 1866: U__s_[S2:0][package]libchipcard2-2.1.9-17.i586
+>!> 1867: U__s_[S2:0][package]libchipcard2-devel-2.1.9-17.i586
+>!> 1868: U__s_[S2:0][package]libcom_err-devel-1.40.2-15.i586
+>!> 1869: U_Th_[S2:0][package]libcom_err2-1.40.2-15.i586
+>!> 1870: I__s_[S1:0][package]libcom_err2-1.40.2-9.i586
+>!> 1871: I__s_[S1:0][package]libcroco-0.6.1-56.i586
+>!> 1872: U_Th_[S2:0][package]libcroco-0.6.1-64.i586
+>!> 1873: U__s_[S2:0][package]libcroco-devel-0.6.1-64.i586
+>!> 1874: U__s_[S2:0][package]libcurl-devel-7.16.4-10.i586
+>!> 1875: U__s_[S2:0][package]libcurl2-7.11.0-28.i586
+>!> 1876: U_Th_[S2:0][package]libcurl4-7.16.4-10.i586
+>!> 1877: I__s_[S1:0][package]libcurl4-7.16.4-2.i586
+>!> 1878: U_Th_[S2:0][package]libdaemon-0.12-14.i586
+>!> 1879: I__s_[S1:0][package]libdaemon-0.12-8.i586
+>!> 1880: U__s_[S2:0][package]libdar-4-2.3.4-15.i586
+>!> 1881: U__s_[S2:0][package]libdb-4_4-4.4.20-25.i586
+>!> 1882: I__s_[S1:0][package]libdb-4_5-4.5.20-20.i586
+>!> 1883: U_Th_[S2:0][package]libdb-4_5-4.5.20-26.i586
+>!> 1884: U__s_[S2:0][package]libdb-4_5-devel-4.5.20-26.i586
+>!> 1885: U__s_[S2:0][package]libdc1394-2.0.0-1.i586
+>!> 1886: U__s_[S2:0][package]libdc1394-20-2.0.0-1.i586
+>!> 1887: U__s_[S2:0][package]libdigikam-devel-0.9.2-37.i586
+>!> 1888: U__s_[S2:0][package]libdjvulibre15-3.5.19-50.i586
+>!> 1889: U__s_[S2:0][package]libdnet-1.11-79.i586
+>!> 1890: I__s_[S1:0][package]libdrm-2.3.0-34.i586
+>!> 1891: U_Th_[S2:0][package]libdrm-2.3.0-40.i586
+>!> 1892: U__s_[S2:0][package]libdrm-devel-2.3.0-40.i586
+>!> 1893: U__s_[S2:0][package]libdv-devel-1.0.0-11.i586
+>!> 1894: U__s_[S2:0][package]libdv4-1.0.0-11.i586
+>!> 1895: U__s_[S2:0][package]libdvdnav-0.1.10-72.i586
+>!> 1896: I__s_[S1:0][package]libdvdread3-0.9.7-3.i586
+>!> 1897: U_Th_[S2:0][package]libdvdread3-0.9.7-4.i586
+>!> 1898: U__s_[S2:0][package]libedit0-2.10.snap20070831-2.i586
+>!> 1899: U__s_[S2:0][package]libelf0-0.8.9-14.i586
+>!> 1900: U__s_[S2:0][package]libelf1-0.128-14.i586
+>!> 1901: U__s_[S2:0][package]liberation-fonts-0.1-28.noarch
+>!> 1902: I__s_[S1:0][package]libevent-1.3b-27.i586
+>!> 1903: U_Th_[S2:0][package]libevent-1.3b-33.i586
+>!> 1904: I__s_[S1:0][package]libexif-0.6.16-10.i586
+>!> 1905: U_Th_[S2:0][package]libexif-0.6.16-18.i586
+>!> 1906: U__s_[S2:0][package]libexif-devel-0.6.16-18.i586
+>!> 1907: U__s_[S2:0][package]libexif-gtk-0.3.3-408.i586
+>!> 1908: I__s_[S1:0][package]libexiv2-0.14-35.i586
+>!> 1909: U_Th_[S2:0][package]libexiv2-0.15-2.i586
+>!> 1910: U__s_[S2:0][package]libexiv2-devel-0.15-2.i586
+>!> 1911: U__s_[S2:0][package]libexpat-devel-2.0.1-21.i586
+>!> 1912: U__s_[S2:0][package]libexpat0-1.95.8-29.i586
+>!> 1913: I__s_[S1:0][package]libexpat1-2.0.1-15.i586
+>!> 1914: U_Th_[S2:0][package]libexpat1-2.0.1-21.i586
+>!> 1915: U__s_[S2:0][package]libext2fs-devel-1.40.2-15.i586
+>!> 1916: U_Th_[S2:0][package]libext2fs2-1.40.2-15.i586
+>!> 1917: I__s_[S1:0][package]libext2fs2-1.40.2-9.i586
+>!> 1918: U__s_[S2:0][package]libffi42-4.2.1_20070724-17.i586
+>!> 1919: U__s_[S2:0][package]libfluidsynth1-1.0.7a-89.i586
+>!> 1920: U__s_[S2:0][package]libfreebob-1.0.3-38.i586
+>!> 1921: U__s_[S2:0][package]libfuse2-2.7.0-19.i586
+>!> 1922: U__s_[S2:0][package]libgadu-1.7.1-26.i586
+>!> 1923: U__s_[S2:0][package]libgail-gnome-1.19.5-17.i586
+>!> 1924: U__s_[S2:0][package]libgail-gnome-devel-1.19.5-17.i586
+>!> 1925: U__s_[S2:0][package]libgalago-0.5.2-50.i586
+>!> 1926: U_Th_[S2:0][package]libgcc42-4.2.1_20070724-12.i586
+>!> 1927: I__s_[S1:0][package]libgcc42-4.2.1_20070724-4.i586
+>!> 1928: U__s_[S2:0][package]libgcj-devel-4.2-21.i586
+>!> 1929: U_Th_[S2:0][package]libgcj42-4.2.1_20070724-17.i586
+>!> 1930: I__s_[S1:0][package]libgcj42-4.2.1_20070724-6.i586
+>!> 1931: U__s_[S2:0][package]libgcj42-devel-4.2.1_20070724-17.i586
+>!> 1932: U__s_[S2:0][package]libgcj_bc42-4.2.1_20070724-17.i586
+>!> 1933: I__s_[S1:0][package]libgcrypt-1.2.4-29.i586
+>!> 1934: U_Th_[S2:0][package]libgcrypt-1.2.4-35.i586
+>!> 1935: U__s_[S2:0][package]libgcrypt-devel-1.2.4-35.i586
+>!> 1936: U__s_[S2:0][package]libgda-1.3.91-137.i586
+>!> 1937: U__s_[S2:0][package]libgda-devel-1.3.91-137.i586
+>!> 1938: U__s_[S2:0][package]libgdiplus-1.2.5-11.i586
+>!> 1939: U__s_[S2:0][package]libghttp-1.0.9-724.i586
+>!> 1940: I__s_[S1:0][package]libgimpprint-4.2.7-159.i586
+>!> 1941: U_Th_[S2:0][package]libgimpprint-4.2.7-168.i586
+>!> 1942: U_Th_[S2:0][package]libglade2-2.6.2-12.i586
+>!> 1943: I__s_[S1:0][package]libglade2-2.6.2-3.i586
+>!> 1944: U__s_[S2:0][package]libglade2-devel-2.6.2-12.i586
+>!> 1945: U__s_[S2:0][package]libglade2-doc-2.6.2-12.i586
+>!> 1946: U__s_[S2:0][package]libgmime-2_0-2-2.2.10-19.i586
+>!> 1947: U_Th_[S2:0][package]libgnome-2.19.1-17.i586
+>!> 1948: I__s_[S1:0][package]libgnome-2.19.1-3.i586
+>!> 1949: U__s_[S2:0][package]libgnome-certauth0-0.3-3.i586
+>!> 1950: U__s_[S2:0][package]libgnome-devel-2.19.1-17.i586
+>!> 1951: U__s_[S2:0][package]libgnome-doc-2.19.1-17.i586
+>!> 1952: I__s_[S1:0][package]libgnomecanvas-2.19.1-3.i586
+>!> 1953: U_Th_[S2:0][package]libgnomecanvas-2.19.2-4.i586
+>!> 1954: U__s_[S2:0][package]libgnomecanvas-devel-2.19.2-4.i586
+>!> 1955: U__s_[S2:0][package]libgnomecanvas-doc-2.19.2-4.i586
+>!> 1956: I__s_[S1:0][package]libgnomecups-0.2.2-104.i586
+>!> 1957: U_Th_[S2:0][package]libgnomecups-0.2.2-115.i586
+>!> 1958: U__s_[S2:0][package]libgnomecups-devel-0.2.2-115.i586
+>!> 1959: U__s_[S2:0][package]libgnomedb-1.3.91-131.i586
+>!> 1960: U__s_[S2:0][package]libgnomedb-devel-1.3.91-131.i586
+>!> 1961: U__s_[S2:0][package]libgnomekbd-2.19.91-3.i586
+>!> 1962: U__s_[S2:0][package]libgnomekbd-devel-2.19.91-3.i586
+>!> 1963: I__s_[S1:0][package]libgnomeprint-2.18.0-34.i586
+>!> 1964: U_Th_[S2:0][package]libgnomeprint-2.18.1-3.i586
+>!> 1965: U__s_[S2:0][package]libgnomeprint-devel-2.18.1-3.i586
+>!> 1966: U__s_[S2:0][package]libgnomeprint-doc-2.18.1-3.i586
+>!> 1967: I__s_[S1:0][package]libgnomeprintui-2.18.0-40.i586
+>!> 1968: U_Th_[S2:0][package]libgnomeprintui-2.18.0-52.i586
+>!> 1969: U__s_[S2:0][package]libgnomeprintui-devel-2.18.0-52.i586
+>!> 1970: U__s_[S2:0][package]libgnomeprintui-doc-2.18.0-52.i586
+>!> 1971: I__s_[S1:0][package]libgnomesu-1.0.0-130.i586
+>!> 1972: U_Th_[S2:0][package]libgnomesu-1.0.0-144.i586
+>!> 1973: U__s_[S2:0][package]libgnomesu-devel-1.0.0-144.i586
+>!> 1974: U_Th_[S2:0][package]libgnomeui-2.19.1-17.i586
+>!> 1975: I__s_[S1:0][package]libgnomeui-2.19.1-3.i586
+>!> 1976: U__s_[S2:0][package]libgnomeui-devel-2.19.1-17.i586
+>!> 1977: U__s_[S2:0][package]libgnomeui-doc-2.19.1-17.i586
+>!> 1978: U__s_[S2:0][package]libgomp42-4.2.1_20070724-12.i586
+>!> 1979: I__s_[S1:0][package]libgpg-error-1.4-50.i586
+>!> 1980: U_Th_[S2:0][package]libgpg-error-1.4-56.i586
+>!> 1981: U__s_[S2:0][package]libgpg-error-devel-1.4-56.i586
+>!> 1982: I__s_[S1:0][package]libgpgme11-1.1.5-11.i586
+>!> 1983: U_Th_[S2:0][package]libgpgme11-1.1.5-21.i586
+>!> 1984: U_Th_[S2:0][package]libgphoto2-2.4.0-16.i586
+>!> 1985: I__s_[S1:0][package]libgphoto2-2.4.0-3.i586
+>!> 1986: U__s_[S2:0][package]libgphoto2-devel-2.4.0-16.i586
+>!> 1987: I__s_[S1:0][package]libgpod2-0.5.2-13.i586
+>!> 1988: U_Th_[S2:0][package]libgpod2-0.5.2-23.i586
+>!> 1989: U_Th_[S2:0][package]libgsf-1.14.5-15.i586
+>!> 1990: I__s_[S1:0][package]libgsf-1.14.5-3.i586
+>!> 1991: U__s_[S2:0][package]libgsf-devel-1.14.5-15.i586
+>!> 1992: U__s_[S2:0][package]libgsf-doc-1.14.5-15.i586
+>!> 1993: U__s_[S2:0][package]libgsf-gnome-1.14.5-15.i586
+>!> 1994: U__s_[S2:0][package]libgsm-1.0.10-69.i586
+>!> 1995: I__s_[S1:0][package]libgssapi-0.11-21.i586
+>!> 1996: U_Th_[S2:0][package]libgssapi-0.11-27.i586
+>!> 1997: U_Th_[S2:0][package]libgtkhtml-2.11.0-104.i586
+>!> 1998: I__s_[S1:0][package]libgtkhtml-2.11.0-94.i586
+>!> 1999: U__s_[S2:0][package]libgtkhtml-devel-2.11.0-104.i586
+>!> 2000: U__s_[S2:0][package]libgtksourceview-2_0-0-1.90.4-3.i586
+>!> 2001: U__s_[S2:0][package]libgtop-2.19.5-14.i586
+>!> 2002: U__s_[S2:0][package]libgtop-2_0-7-2.19.5-14.i586
+>!> 2003: U__s_[S2:0][package]libgtop-devel-2.19.5-14.i586
+>!> 2004: U__s_[S2:0][package]libgwenhywfar38-2.6.1-21.i586
+>!> 2005: U__s_[S2:0][package]libhangul-0.0.4-29.i586
+>!> 2006: U__s_[S2:0][package]libhangul-devel-0.0.4-29.i586
+>!> 2007: U__s_[S2:0][package]libical-0.24.RC4-137.i586
+>!> 2008: U_Th_[S2:0][package]libicu-3.6-10.i586
+>!> 2009: I__s_[S1:0][package]libicu-3.6-4.i586
+>!> 2010: U__s_[S2:0][package]libicu-devel-3.6-10.i586
+>!> 2011: U__s_[S2:0][package]libicu-doc-3.6-10.i586
+>!> 2012: U__s_[S2:0][package]libid3tag-0.15.1b-92.i586
+>!> 2013: I__s_[S1:0][package]libidl-0.8.8-29.i586
+>!> 2014: U_Th_[S2:0][package]libidl-0.8.8-37.i586
+>!> 2015: U__s_[S2:0][package]libidl-devel-0.8.8-37.i586
+>!> 2016: I__s_[S1:0][package]libidn-1.0-2.i586
+>!> 2017: U_Th_[S2:0][package]libidn-1.0-8.i586
+>!> 2018: U__s_[S2:0][package]libidn-devel-1.0-8.i586
+>!> 2019: U__s_[S2:0][package]libiec61883-1.1.0-54.i586
+>!> 2020: I__s_[S1:0][package]libieee1284-0.2.10-90.i586
+>!> 2021: U_Th_[S2:0][package]libieee1284-0.2.10-99.i586
+>!> 2022: U__s_[S2:0][package]libiniparser-2.17-22.i586
+>!> 2023: U__s_[S2:0][package]libiniparser-devel-2.17-22.i586
+>!> 2024: U__s_[S2:0][package]libipoddevice-0.5.3-60.i586
+>!> 2025: U__s_[S2:0][package]libiptcdata-0.2.1-71.i586
+>!> 2026: U__s_[S2:0][package]libiso9660-5-0.78.2-4.i586
+>!> 2027: U__s_[S2:0][package]libiterm-0.5.20040304-133.i586
+>!> 2028: U__s_[S2:0][package]libiterm-devel-0.5.20040304-133.i586
+>!> 2029: I__s_[S1:0][package]libjack-0.103.0-43.i586
+>!> 2030: U_Th_[S2:0][package]libjack-0.103.0-50.i586
+>!> 2031: I__s_[S1:0][package]libjasper-1.900.1-30.i586
+>!> 2032: U_Th_[S2:0][package]libjasper-1.900.1-38.i586
+>!> 2033: U__s_[S2:0][package]libjasper-devel-1.900.1-38.i586
+>!> 2034: I__s_[S1:0][package]libjpeg-6.2.0-803.i586
+>!> 2035: U_Th_[S2:0][package]libjpeg-6.2.0-809.i586
+>!> 2036: U__s_[S2:0][package]libjpeg-devel-6.2.0-75.i586
+>!> 2037: U__s_[S2:0][package]libkdcraw-devel-0.1.1-12.i586
+>!> 2038: U_Th_[S2:0][package]libkdcraw1-0.1.1-12.i586
+>!> 2039: I__s_[S1:0][package]libkdcraw1-0.1.1-2.i586
+>!> 2040: I__s_[S1:0][package]libkde4-3.92.0-8.i586
+>!> 2041: U_Th_[S2:0][package]libkde4-3.93.0-3.i586
+>!> 2042: U__s_[S2:0][package]libkde4-devel-3.93.0-3.i586
+>!> 2043: I__s_[S1:0][package]libkdecore4-3.92.0-8.i586
+>!> 2044: U_Th_[S2:0][package]libkdecore4-3.93.0-3.i586
+>!> 2045: U__s_[S2:0][package]libkdecore4-devel-3.93.0-3.i586
+>!> 2046: U__s_[S2:0][package]libkdeedu4-3.93.0-3.i586
+>!> 2047: U__s_[S2:0][package]libkdeedu4-devel-3.93.0-3.i586
+>!> 2048: I__s_[S1:0][package]libkdegames4-3.92.0-6.i586
+>!> 2049: U_Th_[S2:0][package]libkdegames4-3.93.0-4.i586
+>!> 2050: U__s_[S2:0][package]libkdegames4-devel-3.93.0-4.i586
+>!> 2051: I__s_[S1:0][package]libkdepimlibs4-3.92.0-6.i586
+>!> 2052: U_Th_[S2:0][package]libkdepimlibs4-3.93.0-3.i586
+>!> 2053: U__s_[S2:0][package]libkdepimlibs4-devel-3.93.0-3.i586
+>!> 2054: I__s_[S1:0][package]libkexiv2-0.1.5-14.i586
+>!> 2055: U_Th_[S2:0][package]libkexiv2-0.1.5-26.i586
+>!> 2056: U__s_[S2:0][package]libkexiv2-devel-0.1.5-26.i586
+>!> 2057: I__s_[S1:0][package]libkipi-0.1.5-61.i586
+>!> 2058: U_Th_[S2:0][package]libkipi-0.1.5-74.i586
+>!> 2059: U__s_[S2:0][package]libkonq4-3.93.0-3.i586
+>!> 2060: U__s_[S2:0][package]libkonq4-devel-3.93.0-3.i586
+>!> 2061: I__s_[S1:0][package]libksba-1.0.2-2.i586
+>!> 2062: U_Th_[S2:0][package]libksba-1.0.2-8.i586
+>!> 2063: U__s_[S2:0][package]libksba-devel-1.0.2-8.i586
+>!> 2064: I__s_[S1:0][package]liblazy-0.1.1-40.i586
+>!> 2065: U_Th_[S2:0][package]liblazy-0.2-8.i586
+>!> 2066: I__s_[S1:0][package]liblcms-1.16-30.i586
+>!> 2067: U_Th_[S2:0][package]liblcms-1.16-36.i586
+>!> 2068: U__s_[S2:0][package]liblcms-devel-1.16-36.i586
+>!> 2069: U__s_[S2:0][package]liblo-0.24-31.i586
+>!> 2070: U__s_[S2:0][package]liblrdf-0.4.0-97.i586
+>!> 2071: U_Th_[S2:0][package]libltdl-3-1.5.24-14.i586
+>!> 2072: I__s_[S1:0][package]libltdl-3-1.5.24-8.i586
+>!> 2073: I__s_[S1:0][package]libmal-0.31-260.i586
+>!> 2074: U_Th_[S2:0][package]libmal-0.31-270.i586
+>!> 2075: U__s_[S2:0][package]libmcal-0.7-190.i586
+>!> 2076: U__s_[S2:0][package]libmcrypt-2.5.8-26.i586
+>!> 2077: I__s_[S1:0][package]libmikmod-3.1.11a-24.i586
+>!> 2078: U_Th_[S2:0][package]libmikmod-3.1.11a-31.i586
+>!> 2079: U__s_[S2:0][package]libmikmod-devel-3.1.11a-31.i586
+>!> 2080: U__s_[S2:0][package]libmm14-1.4.2-15.i586
+>!> 2081: U_Th_[S2:0][package]libmng-1.0.10-11.i586
+>!> 2082: I__s_[S1:0][package]libmng-1.0.10-5.i586
+>!> 2083: U__s_[S2:0][package]libmng-devel-1.0.10-11.i586
+>!> 2084: I__s_[S1:0][package]libmpcdec5-1.2.6-3.i586
+>!> 2085: U_Th_[S2:0][package]libmpcdec5-1.2.6-5.i586
+>!> 2086: U__s_[S2:0][package]libmspack-0.0.20060920alpha-48.i586
+>!> 2087: U__s_[S2:0][package]libmsrpc-3.0.25c-3.i586
+>!> 2088: I__s_[S1:0][package]libmtp-0.2.0-2.i586
+>!> 2089: U_Th_[S2:0][package]libmtp-0.2.1-7.i586
+>!> 2090: U__s_[S2:0][package]libmudflap42-4.2.1_20070724-12.i586
+>!> 2091: U__s_[S2:0][package]libmusicbrainz-devel-2.1.5-3.i586
+>!> 2092: I__s_[S1:0][package]libmusicbrainz4-2.1.5-3.i586
+>!> 2093: U__s_[S2:0][package]libmusicbrainz4-2.1.5-3.i586
+>!> 2094: U__s_[S2:0][package]libmysqlclient15-5.0.45-15.i586
+>!> 2095: U__s_[S2:0][package]libmysqlclient_r15-5.0.45-15.i586
+>!> 2096: U__s_[S2:0][package]libnet-1.1.2.1-77.i586
+>!> 2097: I_Th_[S1:0][package]libnetpbm-1.0.0-709.i586
+>!> 2098: U_Th_[S2:0][package]libnetpbm10-10.26.44-7.i586
+>!> 2099: I__s_[S1:0][package]libnjb-2.2.5-85.i586
+>!> 2100: U_Th_[S2:0][package]libnjb-2.2.5-95.i586
+>!> 2101: I__s_[S1:0][package]libnl-1.0-68.i586
+>!> 2102: U_Th_[S2:0][package]libnl-1.0-78.i586
+>!> 2103: U__s_[S2:0][package]libnotify-0.4.4-51.i586
+>!> 2104: U__s_[S2:0][package]libnotify-devel-0.4.4-51.i586
+>!> 2105: I__s_[S1:0][package]libnscd-2.0.2-34.i586
+>!> 2106: U_Th_[S2:0][package]libnscd-2.0.2-40.i586
+>!> 2107: U__s_[S2:0][package]libnscd-devel-2.0.2-40.i586
+>!> 2108: U__s_[S2:0][package]libnvtv-0.4.7a-116.i586
+>!> 2109: I__s_[S1:0][package]libofa-0.9.3-48.i586
+>!> 2110: U_Th_[S2:0][package]libofa-0.9.3-55.i586
+>!> 2111: U__s_[S2:0][package]libofx-0.8.2-83.i586
+>!> 2112: U__s_[S2:0][package]libofx-devel-0.8.2-83.i586
+>!> 2113: I__s_[S1:0][package]libogg-1.1.3-65.i586
+>!> 2114: U_Th_[S2:0][package]libogg-1.1.3-71.i586
+>!> 2115: U__s_[S2:0][package]libogg-devel-1.1.3-71.i586
+>!> 2116: U__s_[S2:0][package]liboggz-0.9.5-56.i586
+>!> 2117: I__s_[S1:0][package]liboil-0.3.9-55.i586
+>!> 2118: U_Th_[S2:0][package]liboil-0.3.9-63.i586
+>!> 2119: U__s_[S2:0][package]liboil-devel-0.3.9-63.i586
+>!> 2120: I__s_[S1:0][package]libopencdk-0.5.11-31.i586
+>!> 2121: U_Th_[S2:0][package]libopencdk-0.5.11-37.i586
+>!> 2122: U__s_[S2:0][package]libopencdk-devel-0.5.11-37.i586
+>!> 2123: I__s_[S1:0][package]libopenct1-0.6.12-6.i586
+>!> 2124: U_Th_[S2:0][package]libopenct1-0.6.13-4.i586
+>!> 2125: U_Th_[S2:0][package]libopensc2-0.11.3-13.i586
+>!> 2126: I__s_[S1:0][package]libopensc2-0.11.3-5.i586
+>!> 2127: U__s_[S2:0][package]libopenssl-devel-0.9.8e-40.i586
+>!> 2128: I__s_[S1:0][package]libopenssl0_9_8-0.9.8e-33.i586
+>!> 2129: U_Th_[S2:0][package]libopenssl0_9_8-0.9.8e-40.i586
+>!> 2130: U__s_[S2:0][package]libopensync-0.22-44.i586
+>!> 2131: U__s_[S2:0][package]libopensync-devel-0.22-44.i586
+>!> 2132: U__s_[S2:0][package]libopensync-plugin-evolution2-0.22-56.i586
+>!> 2133: U__s_[S2:0][package]libopensync-plugin-file-0.22-42.i586
+>!> 2134: U__s_[S2:0][package]libopensync-plugin-gnokii-0.22-48.i586
+>!> 2135: U__s_[S2:0][package]libopensync-plugin-google-calendar-0.22-42.i586
+>!> 2136: U__s_[S2:0][package]libopensync-plugin-irmc-0.22-46.i586
+>!> 2137: U__s_[S2:0][package]libopensync-plugin-kdepim-0.22-63.i586
+>!> 2138: U__s_[S2:0][package]libopensync-plugin-moto-0.22-46.i586
+>!> 2139: U__s_[S2:0][package]libopensync-plugin-opie-0.22-42.i586
+>!> 2140: U__s_[S2:0][package]libopensync-plugin-palm-0.22-52.i586
+>!> 2141: U__s_[S2:0][package]libopensync-plugin-python-module-0.22-43.i586
+>!> 2142: U__s_[S2:0][package]libopensync-plugin-syncml-0.22-47.i586
+>!> 2143: U__s_[S2:0][package]libopensync-tools-0.22-44.i586
+>!> 2144: I__s_[S1:0][package]libopensync1-0.32-3.i586
+>!> 2145: U__s_[S2:0][package]libosip2-2.2.0-98.i586
+>!> 2146: U__s_[S2:0][package]libotf-0.9.6-9.i586
+>!> 2147: U__s_[S2:0][package]libotf-devel-0.9.6-9.i586
+>!> 2148: U__s_[S2:0][package]libotr-3.0.0-73.i586
+>!> 2149: U_Th_[S2:0][package]libpcap-0.9.7-10.i586
+>!> 2150: I__s_[S1:0][package]libpcap-0.9.7-4.i586
+>!> 2151: U__s_[S2:0][package]libpisock-devel-0.12.2-20.i586
+>!> 2152: I__s_[S1:0][package]libpisock9-0.12.2-10.i586
+>!> 2153: U_Th_[S2:0][package]libpisock9-0.12.2-20.i586
+>!> 2154: U__s_[S2:0][package]libpisync0-0.12.2-20.i586
+>!> 2155: U_Th_[S2:0][package]libpng-1.2.18-12.i586
+>!> 2156: I__s_[S1:0][package]libpng-1.2.18-6.i586
+>!> 2157: U__s_[S2:0][package]libpng-devel-1.2.18-12.i586
+>!> 2158: U__s_[S2:0][package]libpqxx-2.6.9-10.i586
+>!> 2159: U__s_[S2:0][package]libpurple-2.1.0-22.i586
+>!> 2160: U__s_[S2:0][package]libpurple-devel-2.1.0-22.i586
+>!> 2161: I__s_[S1:0][package]libqt4-4.3.0-25.i586
+>!> 2162: U_Th_[S2:0][package]libqt4-4.3.1-13.i586
+>!> 2163: I__s_[S1:0][package]libqt4-dbus-1-4.3.0-25.i586
+>!> 2164: U_Th_[S2:0][package]libqt4-dbus-1-4.3.1-13.i586
+>!> 2165: U__s_[S2:0][package]libqt4-devel-4.3.1-13.i586
+>!> 2166: U__s_[S2:0][package]libqt4-devel-doc-4.3.1-13.i586
+>!> 2167: U__s_[S2:0][package]libqt4-devel-doc-data-4.3.1-13.noarch
+>!> 2168: I__s_[S1:0][package]libqt4-qt3support-4.3.0-25.i586
+>!> 2169: U_Th_[S2:0][package]libqt4-qt3support-4.3.1-13.i586
+>!> 2170: I__s_[S1:0][package]libqt4-sql-4.3.0-25.i586
+>!> 2171: U_Th_[S2:0][package]libqt4-sql-4.3.1-13.i586
+>!> 2172: U__s_[S2:0][package]libqt4-sql-mysql-4.3.1-6.i586
+>!> 2173: U__s_[S2:0][package]libqt4-sql-postgresql-4.3.1-6.i586
+>!> 2174: U__s_[S2:0][package]libqt4-sql-sqlite-4.3.1-6.i586
+>!> 2175: U__s_[S2:0][package]libqt4-sql-unixODBC-4.3.1-6.i586
+>!> 2176: I__s_[S1:0][package]libqt4-x11-4.3.0-25.i586
+>!> 2177: U_Th_[S2:0][package]libqt4-x11-4.3.1-13.i586
+>!> 2178: I__s_[S1:0][package]libqtpod-0.3-69.i586
+>!> 2179: U_Th_[S2:0][package]libqtpod-0.3-78.i586
+>!> 2180: U__s_[S2:0][package]libquicktime-1.0.0-45.i586
+>!> 2181: U__s_[S2:0][package]libquicktime-devel-1.0.0-45.i586
+>!> 2182: U__s_[S2:0][package]libraptor1-1.4.15-35.i586
+>!> 2183: U__s_[S2:0][package]libraw1394-1.2.1-61.i586
+>!> 2184: U__s_[S2:0][package]libraw1394-8-1.2.1-61.i586
+>!> 2185: U__s_[S2:0][package]libraw1394-devel-1.2.1-61.i586
+>!> 2186: U_Th_[S2:0][package]libreadline5-5.2-15.i586
+>!> 2187: I__s_[S1:0][package]libreadline5-5.2-5.i586
+>!> 2188: U__s_[S2:0][package]libreiserfs-0.3.0.5-73.i586
+>!> 2189: I__s_[S1:0][package]librpcsecgss-0.14-60.i586
+>!> 2190: U_Th_[S2:0][package]librpcsecgss-0.14-66.i586
+>!> 2191: U__s_[S2:0][package]librsaref2-2.0-15.i586
+>!> 2192: I__s_[S1:0][package]librsvg-2.18.0-3.i586
+>!> 2193: U_Th_[S2:0][package]librsvg-2.18.1-2.i586
+>!> 2194: U__s_[S2:0][package]librsvg-devel-2.18.1-2.i586
+>!> 2195: I__s_[S1:0][package]libsamplerate-0.1.2-67.i586
+>!> 2196: U_Th_[S2:0][package]libsamplerate-0.1.2-73.i586
+>!> 2197: U__s_[S2:0][package]libsap-1.51.1-591.i586
+>!> 2198: U__s_[S2:0][package]libsexy-0.1.11-47.i586
+>!> 2199: U__s_[S2:0][package]libshout-2.2.2-85.i586
+>!> 2200: U__s_[S2:0][package]libsidplay-2.1.1-74.i586
+>!> 2201: U__s_[S2:0][package]libsidplay1-1.36.59-69.i586
+>!> 2202: U__s_[S2:0][package]libsigc++12-1.2.7-76.i586
+>!> 2203: U__s_[S2:0][package]libsigc++12-devel-1.2.7-76.i586
+>!> 2204: U__s_[S2:0][package]libsigc++2-2.0.17-74.i586
+>!> 2205: U__s_[S2:0][package]libsigc++2-devel-2.0.17-74.i586
+>!> 2206: I__s_[S1:0][package]libsmbclient-3.0.25b-13.i586
+>!> 2207: U_Th_[S2:0][package]libsmbclient-3.0.25c-3.i586
+>!> 2208: U__s_[S2:0][package]libsmbclient-devel-3.0.25c-3.i586
+>!> 2209: I__s_[S1:0][package]libsmbios-libs-0.13.6-2.i586
+>!> 2210: U__s_[S2:0][package]libsmbios-libs-0.13.6-2.i586
+>!> 2211: U__s_[S2:0][package]libsmbsharemodes-3.0.25c-3.i586
+>!> 2212: U__s_[S2:0][package]libsmbsharemodes-devel-3.0.25c-3.i586
+>!> 2213: I__s_[S1:0][package]libsndfile-1.0.17-68.i586
+>!> 2214: U_Th_[S2:0][package]libsndfile-1.0.17-75.i586
+>!> 2215: U__s_[S2:0][package]libsndfile-progs-1.0.17-75.i586
+>!> 2216: U_Th_[S2:0][package]libsnmp15-5.4.1-11.i586
+>!> 2217: I__s_[S1:0][package]libsnmp15-5.4.1-2.i586
+>!> 2218: I__s_[S1:0][package]libsoprano3-0.9.0-20.i586
+>!> 2219: U_Th_[S2:0][package]libsoprano3-0.9.0-31.i586
+>!> 2220: U__s_[S2:0][package]libsoup-2.2.100-41.i586
+>!> 2221: U__s_[S2:0][package]libsoup-devel-2.2.100-41.i586
+>!> 2222: I__s_[S1:0][package]libspeex-1.1.99.2-16.i586
+>!> 2223: U_Th_[S2:0][package]libspeex-1.1.99.2-23.i586
+>!> 2224: U__s_[S2:0][package]libssui-0.5.7-12.i586
+>!> 2225: U__s_[S2:0][package]libstdc++-devel-4.2-21.i586
+>!> 2226: U_Th_[S2:0][package]libstdc++42-4.2.1_20070724-12.i586
+>!> 2227: I__s_[S1:0][package]libstdc++42-4.2.1_20070724-4.i586
+>!> 2228: U__s_[S2:0][package]libstdc++42-devel-4.2.1_20070724-12.i586
+>!> 2229: I__s_[S1:0][package]libstroke-0.5.1-88.i586
+>!> 2230: U_Th_[S2:0][package]libstroke-0.5.1-99.i586
+>!> 2231: U__s_[S2:0][package]libstroke-devel-0.5.1-99.i586
+>!> 2232: U__s_[S2:0][package]libsvg-0.1.4-74.i586
+>!> 2233: U__s_[S2:0][package]libsvg-cairo-0.1.6-93.i586
+>!> 2234: U__s_[S2:0][package]libsyncml-tools-0.4.4-38.i586
+>!> 2235: U__s_[S2:0][package]libsyncml0-0.4.4-38.i586
+>!> 2236: U__s_[S2:0][package]libtabe-0.2.6-500.i586
+>!> 2237: U__s_[S2:0][package]libtabe-devel-0.2.6-500.i586
+>!> 2238: I_Th_[S1:0][package]libtheora-0.99.0.7-40.i586
+>!> 2239: U_Th_[S2:0][package]libtheora0-0.99.0.7-44.i586
+>!> 2240: U__s_[S2:0][package]libthinkfinger-0.3-2.i586
+>!> 2241: U__s_[S2:0][package]libtidy-1.0-48.i586
+>!> 2242: U__s_[S2:0][package]libtiff-devel-3.8.2-65.i586
+>!> 2243: I__s_[S1:0][package]libtiff3-3.8.2-59.i586
+>!> 2244: U_Th_[S2:0][package]libtiff3-3.8.2-65.i586
+>!> 2245: U__s_[S2:0][package]libtomoe-gtk-0.5.1-17.i586
+>!> 2246: U__s_[S2:0][package]libtool-1.5.24-14.i586
+>!> 2247: U_Th_[S2:0][package]libtunepimp-0.5.3-14.i586
+>!> 2248: I__s_[S1:0][package]libtunepimp-0.5.3-6.i586
+>!> 2249: U_Th_[S2:0][package]libtunepimp5-0.5.3-14.i586
+>!> 2250: I__s_[S1:0][package]libtunepimp5-0.5.3-6.i586
+>!> 2251: U__s_[S2:0][package]libudf0-0.78.2-4.i586
+>!> 2252: U__s_[S2:0][package]libunwind-0.98.5-75.i586
+>!> 2253: U__s_[S2:0][package]libunwind-devel-0.98.5-75.i586
+>!> 2254: I__s_[S1:0][package]libusb-0.1.12-63.i586
+>!> 2255: U_Th_[S2:0][package]libusb-0.1.12-69.i586
+>!> 2256: U__s_[S2:0][package]libusb-devel-0.1.12-69.i586
+>!> 2257: U__s_[S2:0][package]libuuid-devel-1.40.2-15.i586
+>!> 2258: U_Th_[S2:0][package]libuuid1-1.40.2-15.i586
+>!> 2259: I__s_[S1:0][package]libuuid1-1.40.2-9.i586
+>!> 2260: U__s_[S2:0][package]libvirt-0.3.0-21.i586
+>!> 2261: U__s_[S2:0][package]libvirt-python-0.3.0-21.i586
+>!> 2262: I__s_[S1:0][package]libvisual-0.4.0-71.i586
+>!> 2263: U_Th_[S2:0][package]libvisual-0.4.0-79.i586
+>!> 2264: U__s_[S2:0][package]libvisual-devel-0.4.0-79.i586
+>!> 2265: U__s_[S2:0][package]libvisual-plugins-0.4.0-103.i586
+>!> 2266: U_Th_[S2:0][package]libvolume_id-114-10.i586
+>!> 2267: I__s_[S1:0][package]libvolume_id-114-2.i586
+>!> 2268: I__s_[S1:0][package]libvorbis-1.2.0-2.i586
+>!> 2269: U_Th_[S2:0][package]libvorbis-1.2.0-8.i586
+>!> 2270: U__s_[S2:0][package]libvorbis-devel-1.2.0-8.i586
+>!> 2271: U_Th_[S2:0][package]libwavpack1-4.41.0-11.i586
+>!> 2272: I__s_[S1:0][package]libwavpack1-4.41.0-4.i586
+>!> 2273: U__s_[S2:0][package]libwbxml2-0-0.9.2_SVN48-26.i586
+>!> 2274: U__s_[S2:0][package]libwbxml2-devel-0.9.2_SVN48-26.i586
+>!> 2275: I__s_[S1:0][package]libwmf-0.2.8.4-75.i586
+>!> 2276: U_Th_[S2:0][package]libwmf-0.2.8.4-84.i586
+>!> 2277: U__s_[S2:0][package]libwmf-devel-0.2.8.4-84.i586
+>!> 2278: U__s_[S2:0][package]libwmf-gnome-0.2.8.4-84.i586
+>!> 2279: U__s_[S2:0][package]libwnck-1-22-2.19.90-3.i586
+>!> 2280: U__s_[S2:0][package]libwnck-2.19.90-3.i586
+>!> 2281: U__s_[S2:0][package]libwnck-devel-2.19.90-3.i586
+>!> 2282: U__s_[S2:0][package]libwpd-0.8.10-26.i586
+>!> 2283: U__s_[S2:0][package]libwpd-devel-0.8.10-26.i586
+>!> 2284: U__s_[S2:0][package]libwpd-tools-0.8.10-26.i586
+>!> 2285: I__s_[S1:0][package]libx86-0.99-27.i586
+>!> 2286: U_Th_[S2:0][package]libx86-0.99-33.i586
+>!> 2287: I__s_[S1:0][package]libxcrypt-2.4-62.i586
+>!> 2288: U_Th_[S2:0][package]libxcrypt-2.4-68.i586
+>!> 2289: U__s_[S2:0][package]libxcrypt-devel-2.4-68.i586
+>!> 2290: U__s_[S2:0][package]libxfce4mcs-4.4.1-42.i586
+>!> 2291: U__s_[S2:0][package]libxfce4util-4.4.1-35.i586
+>!> 2292: U__s_[S2:0][package]libxfcegui4-4.4.1-47.i586
+>!> 2293: U__s_[S2:0][package]libxklavier-3.2-17.i586
+>!> 2294: U__s_[S2:0][package]libxklavier-devel-3.2-17.i586
+>!> 2295: U__s_[S2:0][package]libxml++-2.18.0-47.i586
+>!> 2296: U__s_[S2:0][package]libxml-1.8.17-447.i586
+>!> 2297: U_Th_[S2:0][package]libxml2-2.6.29-17.i586
+>!> 2298: I__s_[S1:0][package]libxml2-2.6.29-8.i586
+>!> 2299: U__s_[S2:0][package]libxml2-devel-2.6.29-17.i586
+>!> 2300: U__s_[S2:0][package]libxml2-python-2.6.29-22.i586
+>!> 2301: I__s_[S1:0][package]libxslt-1.1.20-29.i586
+>!> 2302: U_Th_[S2:0][package]libxslt-1.1.20-37.i586
+>!> 2303: U__s_[S2:0][package]libxslt-devel-1.1.20-37.i586
+>!> 2304: I__s_[S1:0][package]liby2util-2.14.0-52.i586
+>!> 2305: U_Th_[S2:0][package]liby2util-2.14.0-60.i586
+>!> 2306: U__s_[S2:0][package]liby2util-devel-2.14.0-60.i586
+>!> 2307: U__s_[S2:0][package]libyaz-3.0.6-18.i586
+>!> 2308: I__s_[S1:0][package]libzio-0.4-34.i586
+>!> 2309: U_Th_[S2:0][package]libzio-0.4-40.i586
+>!> 2310: U__s_[S2:0][package]libzrtpcpp-0.9.0-37.i586
+>!> 2311: I__s_[S1:0][package]libzypp-3.14.0-4.i586
+>!> 2312: U_Th_[S2:0][package]libzypp-3.22.1-3.i586
+>!> 2313: U__s_[S2:0][package]libzypp-devel-3.22.1-3.i586
+>!> 2314: I__s_[S1:0][package]licenses-20070130-34.noarch
+>!> 2315: U_Th_[S2:0][package]licenses-20070810-9.noarch
+>!> 2316: U__s_[S2:0][package]liferea-1.2.20-17.i586
+>!> 2317: I__s_[S1:0][package]lilo-22.7-101.i586
+>!> 2318: U_Th_[S2:0][package]lilo-22.7-111.i586
+>!> 2319: U__s_[S2:0][package]lilo-doc-22.7-111.i586
+>!> 2320: U__s_[S2:0][package]lilypond-2.10.29-14.i586
+>!> 2321: U__s_[S2:0][package]lilypond-documentation-2.10.29-14.i586
+>!> 2322: I__s_[S1:0][package]limal-1.3.0-9.i586
+>!> 2323: U_Th_[S2:0][package]limal-1.3.1-6.i586
+>!> 2324: U__s_[S2:0][package]limal-ca-mgm-1.3.1-7.i586
+>!> 2325: U__s_[S2:0][package]limal-ca-mgm-perl-1.3.1-7.i586
+>!> 2326: U__s_[S2:0][package]limal-nfs-server-1.3.1-6.i586
+>!> 2327: U__s_[S2:0][package]limal-nfs-server-perl-1.3.1-6.i586
+>!> 2328: I__s_[S1:0][package]limal-perl-1.3.0-9.i586
+>!> 2329: U_Th_[S2:0][package]limal-perl-1.3.1-6.i586
+>!> 2330: U__s_[S2:0][package]lincity-1.12.0-161.i586
+>!> 2331: U__s_[S2:0][package]lineak_defaultplugin-0.9-90.i586
+>!> 2332: U__s_[S2:0][package]lineak_kde-0.9-102.i586
+>!> 2333: U__s_[S2:0][package]lineak_xosdplugin-0.9-99.i586
+>!> 2334: U__s_[S2:0][package]lineakd-0.9-89.i586
+>!> 2335: U__s_[S2:0][package]links-2.1pre30-6.i586
+>!> 2336: U__s_[S2:0][package]linphone-1.3.0-114.i586
+>!> 2337: U__s_[S2:0][package]linphone-applet-1.3.0-114.i586
+>!> 2338: I__s_[S1:0][package]linux-atm-lib-2.5.0-64.i586
+>!> 2339: U_Th_[S2:0][package]linux-atm-lib-2.5.0-70.i586
+>!> 2340: U__s_[S2:0][package]linux-kernel-headers-2.6.22-15.noarch
+>!> 2341: U__s_[S2:0][package]lirc-0.8.2-8.i586
+>!> 2342: U__s_[S2:0][package]lirc-kmp-bigsmp-0.8.2_2.6.22.5_10-2.i586
+>!> 2343: U__s_[S2:0][package]lirc-kmp-default-0.8.2_2.6.22.5_10-2.i586
+>!> 2344: U__s_[S2:0][package]lirc-kmp-xen-0.8.2_2.6.22.5_10-2.i586
+>!> 2345: U__s_[S2:0][package]lirc-kmp-xenpae-0.8.2_2.6.22.5_10-2.i586
+>!> 2346: U__s_[S2:0][package]log4j-1.2.12-136.noarch
+>!> 2347: U__s_[S2:0][package]log4net-1.2.9-99.noarch
+>!> 2348: I__s_[S1:0][package]logrotate-3.7.4-53.i586
+>!> 2349: U_Th_[S2:0][package]logrotate-3.7.5-6.i586
+>!> 2350: U__s_[S2:0][package]lomoco-1.0-10.i586
+>!> 2351: U__s_[S2:0][package]loudmouth-1.2.0-26.i586
+>!> 2352: U__s_[S2:0][package]loudmouth-devel-1.2.0-26.i586
+>!> 2353: U__s_[S2:0][package]loudmouth-doc-1.2.0-26.i586
+>!> 2354: U__s_[S2:0][package]lphdisk-0.9.1-364.i586
+>!> 2355: U__s_[S2:0][package]lsb-3.1-60.i586
+>!> 2356: U__s_[S2:0][package]lsof-4.78-8.i586
+>!> 2357: U__s_[S2:0][package]ltrace-0.4-72.i586
+>!> 2358: U__s_[S2:0][package]ltris-1.0.11-52.i586
+>!> 2359: U__s_[S2:0][package]ltxml-1.2.7-74.i586
+>!> 2360: U__s_[S2:0][package]lua-5.1.2-11.i586
+>!> 2361: U__s_[S2:0][package]lua-devel-5.1.2-11.i586
+>!> 2362: U__s_[S2:0][package]lua-libs-5.1.2-11.i586
+>!> 2363: U__s_[S2:0][package]lukemftp-1.5-657.i586
+>!> 2364: U__s_[S2:0][package]lv-4.51-59.i586
+>!> 2365: U__s_[S2:0][package]lvm2-2.02.25-25.i586
+>!> 2366: U__s_[S2:0][package]lynx-2.8.6-41.i586
+>!> 2367: I__s_[S1:0][package]lzo-2.02-65.i586
+>!> 2368: U_Th_[S2:0][package]lzo-2.02-71.i586
+>!> 2369: U__s_[S2:0][package]lzo-devel-2.02-71.i586
+>!> 2370: U__s_[S2:0][package]m17n-db-1.4.0-7.noarch
+>!> 2371: U__s_[S2:0][package]m17n-lib-1.4.0-16.i586
+>!> 2372: U__s_[S2:0][package]m17n-lib-devel-1.4.0-16.i586
+>!> 2373: U__s_[S2:0][package]m4-1.4.10-14.i586
+>!> 2374: U__s_[S2:0][package]madbomber-0.2.5-378.i586
+>!> 2375: U__s_[S2:0][package]mailman-2.1.9-82.i586
+>!> 2376: I__s_[S1:0][package]mailx-12.2-31.i586
+>!> 2377: U_Th_[S2:0][package]mailx-12.2-39.i586
+>!> 2378: U__s_[S2:0][package]make-3.81-62.i586
+>!> 2379: U__s_[S2:0][package]makedev-2.6-476.noarch
+>!> 2380: U__s_[S2:0][package]makedumpfile-1.1.6-6.i586
+>!> 2381: U__s_[S2:0][package]makewhat-2006.1.25-67.i586
+>!> 2382: U__s_[S2:0][package]man-2.4.3-81.i586
+>!> 2383: U__s_[S2:0][package]man-pages-2.64-7.noarch
+>!> 2384: U__s_[S2:0][package]man-pages-cs-0.17.20070715-4.noarch
+>!> 2385: U__s_[S2:0][package]man-pages-de-0.5-16.noarch
+>!> 2386: U__s_[S2:0][package]man-pages-es-1.55-58.noarch
+>!> 2387: U__s_[S2:0][package]man-pages-fr-1.58.1-69.noarch
+>!> 2388: U__s_[S2:0][package]man-pages-it-0.3.0-610.noarch
+>!> 2389: U__s_[S2:0][package]man-pages-ja-20070615-24.noarch
+>!> 2390: U__s_[S2:0][package]man-pages-pl-2007.7.5-14.noarch
+>!> 2391: U__s_[S2:0][package]man-pages-ru-0.98-15.noarch
+>!> 2392: U__s_[S2:0][package]man-pages-zh_CN-1.5-9.noarch
+>!> 2393: U__s_[S2:0][package]manufacturer-PPDs-10.2-92.noarch
+>!> 2394: I__s_[S1:0][package]master-boot-code-1.14-15.i586
+>!> 2395: U_Th_[S2:0][package]master-boot-code-1.14-21.i586
+>!> 2396: U__s_[S2:0][package]mc-4.6.1-131.i586
+>!> 2397: U__s_[S2:0][package]mcpp-2.6.4-15.i586
+>!> 2398: U_Th_[S2:0][package]mdadm-2.6.2-13.i586
+>!> 2399: I__s_[S1:0][package]mdadm-2.6.2-7.i586
+>!> 2400: I__s_[S1:0][package]meanwhile-1.0.2-22.i586
+>!> 2401: U_Th_[S2:0][package]meanwhile-1.0.2-30.i586
+>!> 2402: U__s_[S2:0][package]meanwhile-devel-1.0.2-30.i586
+>!> 2403: U__s_[S2:0][package]meanwhile-doc-1.0.2-30.i586
+>!> 2404: U__s_[S2:0][package]memtest86+-1.70-37.i586
+>!> 2405: U__s_[S2:0][package]mergeant-0.62-119.i586
+>!> 2406: U__s_[S2:0][package]metacity-2.19.55-3.i586
+>!> 2407: U__s_[S2:0][package]metacity-devel-2.19.55-3.i586
+>!> 2408: U__s_[S2:0][package]metacity-themes-0.1-604.noarch
+>!> 2409: U__s_[S2:0][package]metamail-2.7.19-1134.i586
+>!> 2410: U__s_[S2:0][package]meterbridge-0.9.2-339.i586
+>!> 2411: U__s_[S2:0][package]mgetty-1.1.35-63.i586
+>!> 2412: U__s_[S2:0][package]mgp-1.12a-14.i586
+>!> 2413: U__s_[S2:0][package]mhash-0.9.9-31.i586
+>!> 2414: I__s_[S1:0][package]microcode_ctl-1.17-22.i586
+>!> 2415: U_Th_[S2:0][package]microcode_ctl-1.17-29.i586
+>!> 2416: U__s_[S2:0][package]mikachan-fonts-9.1.2006.08.09-72.noarch
+>!> 2417: U__s_[S2:0][package]mined-2000.14-14.i586
+>!> 2418: I__s_[S1:0][package]mingetty-1.0.7s-16.i586
+>!> 2419: U_Th_[S2:0][package]mingetty-1.0.7s-22.i586
+>!> 2420: U__s_[S2:0][package]minicom-2.2-56.i586
+>!> 2421: U__s_[S2:0][package]mirror-2.9-822.i586
+>!> 2422: U__s_[S2:0][package]mjpegtools-1.9.0rc2-44.i586
+>!> 2423: U__s_[S2:0][package]mjpegtools-devel-1.9.0rc2-44.i586
+>!> 2424: I__s_[S1:0][package]mkinitrd-2.1-17.i586
+>!> 2425: U_Th_[S2:0][package]mkinitrd-2.1-28.i586
+>!> 2426: I__s_[S1:0][package]mktemp-1.5-795.i586
+>!> 2427: U_Th_[S2:0][package]mktemp-1.5-801.i586
+>!> 2428: U__s_[S2:0][package]mlterm-2.9.3.20070123-71.i586
+>!> 2429: U__s_[S2:0][package]mlterm-scim-2.9.3.20070123-71.i586
+>!> 2430: U__s_[S2:0][package]mlterm-uim-2.9.3.20070123-71.i586
+>!> 2431: U__s_[S2:0][package]mmv-1.01b-864.i586
+>!> 2432: I__s_[S1:0][package]module-init-tools-3.2.99.pre11-11.i586
+>!> 2433: U_Th_[S2:0][package]module-init-tools-3.2.99.pre11-19.i586
+>!> 2434: U__s_[S2:0][package]mono-basic-1.2.5-10.noarch
+>!> 2435: U__s_[S2:0][package]mono-core-1.2.5-11.i586
+>!> 2436: U__s_[S2:0][package]mono-data-1.2.5-11.i586
+>!> 2437: U__s_[S2:0][package]mono-data-firebird-1.2.5-11.i586
+>!> 2438: U__s_[S2:0][package]mono-data-oracle-1.2.5-11.i586
+>!> 2439: U__s_[S2:0][package]mono-data-postgresql-1.2.5-11.i586
+>!> 2440: U__s_[S2:0][package]mono-data-sqlite-1.2.5-11.i586
+>!> 2441: U__s_[S2:0][package]mono-data-sybase-1.2.5-11.i586
+>!> 2442: U__s_[S2:0][package]mono-debugger-0.50-20.i586
+>!> 2443: U__s_[S2:0][package]mono-devel-1.2.5-11.i586
+>!> 2444: U__s_[S2:0][package]mono-extras-1.2.5-11.i586
+>!> 2445: U__s_[S2:0][package]mono-jscript-1.2.5-11.i586
+>!> 2446: U__s_[S2:0][package]mono-locale-extras-1.2.5-11.i586
+>!> 2447: U__s_[S2:0][package]mono-nunit-1.2.5-11.i586
+>!> 2448: U__s_[S2:0][package]mono-tools-1.2.4-32.noarch
+>!> 2449: U__s_[S2:0][package]mono-web-1.2.5-11.i586
+>!> 2450: U__s_[S2:0][package]mono-winforms-1.2.5-11.i586
+>!> 2451: U__s_[S2:0][package]monodevelop-0.15-18.noarch
+>!> 2452: U__s_[S2:0][package]monodoc-core-1.2.5-10.noarch
+>!> 2453: U__s_[S2:0][package]motv-3.95-90.i586
+>!> 2454: U__s_[S2:0][package]mousepad-0.2.12-56.i586
+>!> 2455: I__s_[S1:0][package]mozilla-nspr-4.6.7-11.i586
+>!> 2456: U_Th_[S2:0][package]mozilla-nspr-4.6.7-17.i586
+>!> 2457: U__s_[S2:0][package]mozilla-nspr-devel-4.6.7-17.i586
+>!> 2458: I__s_[S1:0][package]mozilla-nss-3.11.7-3.i586
+>!> 2459: U_Th_[S2:0][package]mozilla-nss-3.11.7-9.i586
+>!> 2460: U__s_[S2:0][package]mozilla-nss-devel-3.11.7-9.i586
+>!> 2461: U__s_[S2:0][package]mozilla-nss-tools-3.11.7-9.i586
+>!> 2462: U__s_[S2:0][package]mozilla-xulrunner181-1.8.1.4-19.i586
+>!> 2463: U__s_[S2:0][package]mozilla-xulrunner181-devel-1.8.1.4-19.i586
+>!> 2464: U__s_[S2:0][package]mpfr-2.2.1-42.i586
+>!> 2465: U__s_[S2:0][package]mpt-firmware-1.0-74.noarch
+>!> 2466: U__s_[S2:0][package]mpt-status-1.2.0-61.i586
+>!> 2467: U__s_[S2:0][package]mrtg-2.15.2-39.i586
+>!> 2468: U__s_[S2:0][package]msynctool-0.22-42.i586
+>!> 2469: U__s_[S2:0][package]mtools-3.9.11-30.i586
+>!> 2470: U__s_[S2:0][package]mtr-0.72-86.i586
+>!> 2471: U__s_[S2:0][package]multipath-tools-0.4.7-75.i586
+>!> 2472: U__s_[S2:0][package]multisync-gui-0.91.0-85.i586
+>!> 2473: U__s_[S2:0][package]muse-0.8.1-90.i586
+>!> 2474: U__s_[S2:0][package]musictex-T.99-936.i586
+>!> 2475: U__s_[S2:0][package]mutt-1.5.16-25.i586
+>!> 2476: U__s_[S2:0][package]mwavem-2.0-67.i586
+>!> 2477: U__s_[S2:0][package]mx4j-3.0.1-103.noarch
+>!> 2478: U__s_[S2:0][package]mxml-2.3-13.i586
+>!> 2479: U__s_[S2:0][package]myldapklient-0.6.6-424.i586
+>!> 2480: U_Th_[S2:0][package]myspell-american-20060207-10.noarch
+>!> 2481: I__s_[S1:0][package]myspell-american-20060207-3.noarch
+>!> 2482: U__s_[S2:0][package]myspell-brazilian-20070606-10.noarch
+>!> 2483: U__s_[S2:0][package]myspell-british-20050526-82.noarch
+>!> 2484: U__s_[S2:0][package]myspell-czech-20060303-10.noarch
+>!> 2485: U__s_[S2:0][package]myspell-danish-20061018-10.noarch
+>!> 2486: U__s_[S2:0][package]myspell-dutch-20070603-10.noarch
+>!> 2487: U__s_[S2:0][package]myspell-french-20060914-50.noarch
+>!> 2488: U__s_[S2:0][package]myspell-german-old-20030428-178.noarch
+>!> 2489: U__s_[S2:0][package]myspell-hungarian-1.2-10.noarch
+>!> 2490: U__s_[S2:0][package]myspell-italian-20050711-82.noarch
+>!> 2491: U__s_[S2:0][package]myspell-norsk-bokmaal-20060428-50.noarch
+>!> 2492: U__s_[S2:0][package]myspell-polish-20061202-10.noarch
+>!> 2493: U__s_[S2:0][package]myspell-portuguese-20020629-303.noarch
+>!> 2494: U__s_[S2:0][package]myspell-russian-20040406-88.noarch
+>!> 2495: U__s_[S2:0][package]myspell-spanish-20051029-80.noarch
+>!> 2496: U__s_[S2:0][package]myspell-swedish-20061207-31.noarch
+>!> 2497: U__s_[S2:0][package]mysql-5.0.45-15.i586
+>!> 2498: U__s_[S2:0][package]mysql-client-5.0.45-15.i586
+>!> 2499: U__s_[S2:0][package]nagios-2.9-40.i586
+>!> 2500: U__s_[S2:0][package]namazu-2.0.16-36.i586
+>!> 2501: U__s_[S2:0][package]namazu-cgi-2.0.16-36.i586
+>!> 2502: U__s_[S2:0][package]namazu-devel-2.0.16-36.i586
+>!> 2503: U__s_[S2:0][package]nano-2.0.6-26.i586
+>!> 2504: U__s_[S2:0][package]nant-0.85.0-71.noarch
+>!> 2505: U__s_[S2:0][package]nautilus-2.19.91-2.i586
+>!> 2506: U__s_[S2:0][package]nautilus-cd-burner-2.19.6-17.i586
+>!> 2507: U__s_[S2:0][package]nautilus-cd-burner-devel-2.19.6-17.i586
+>!> 2508: U__s_[S2:0][package]nautilus-devel-2.19.91-2.i586
+>!> 2509: U__s_[S2:0][package]nautilus-open-terminal-0.7-107.i586
+>!> 2510: U__s_[S2:0][package]nautilus-sendto-0.10-37.i586
+>!> 2511: U__s_[S2:0][package]nautilus-share-0.7.0-109.i586
+>!> 2512: U__s_[S2:0][package]ncpfs-2.2.6-85.i586
+>!> 2513: I__s_[S1:0][package]ncurses-5.6-31.i586
+>!> 2514: U_Th_[S2:0][package]ncurses-5.6-37.i586
+>!> 2515: U__s_[S2:0][package]ncurses-devel-5.6-37.i586
+>!> 2516: U__s_[S2:0][package]ndiswrapper-1.47-22.i586
+>!> 2517: U__s_[S2:0][package]ndiswrapper-kmp-bigsmp-1.47_2.6.22.5_10-22.i586
+>!> 2518: U__s_[S2:0][package]ndiswrapper-kmp-default-1.47_2.6.22.5_10-22.i586
+>!> 2519: U__s_[S2:0][package]ndiswrapper-kmp-xen-1.47_2.6.22.5_10-22.i586
+>!> 2520: U_Th_[S2:0][package]neon-0.26.4-13.i586
+>!> 2521: I__s_[S1:0][package]neon-0.26.4-6.i586
+>!> 2522: U__s_[S2:0][package]neon-devel-0.26.4-13.i586
+>!> 2523: U__s_[S2:0][package]net-snmp-5.4.1-11.i586
+>!> 2524: I__s_[S1:0][package]net-tools-1.60-641.i586
+>!> 2525: U_Th_[S2:0][package]net-tools-1.60-647.i586
+>!> 2526: U__s_[S2:0][package]netacct-0.71-567.i586
+>!> 2527: U__s_[S2:0][package]netatalk-2.0.3-119.i586
+>!> 2528: I__s_[S1:0][package]netcat-1.10-934.i586
+>!> 2529: U_Th_[S2:0][package]netcat-1.10-940.i586
+>!> 2530: I__s_[S1:0][package]netcfg-10.3-30.noarch
+>!> 2531: U_Th_[S2:0][package]netcfg-10.3-36.noarch
+>!> 2532: U__s_[S2:0][package]netdate-1.2-648.i586
+>!> 2533: U__s_[S2:0][package]netdiag-20060324-55.i586
+>!> 2534: I__s_[S1:0][package]netpbm-10.26.22-66.i586
+>!> 2535: U_Th_[S2:0][package]netpbm-10.26.44-7.i586
+>!> 2536: U__s_[S2:0][package]neverball-1.4.0-113.i586
+>!> 2537: U__s_[S2:0][package]newt-0.52.7-25.i586
+>!> 2538: I__s_[S1:0][package]nfs-client-1.1.0-6.i586
+>!> 2539: U__s_[S2:0][package]nfs-client-1.1.0-6.i586
+>!> 2540: U__s_[S2:0][package]nfs-kernel-server-1.1.0-6.i586
+>!> 2541: U_Th_[S2:0][package]nfsidmap-0.20-14.i586
+>!> 2542: I__s_[S1:0][package]nfsidmap-0.20-7.i586
+>!> 2543: U__s_[S2:0][package]nfsidmap-devel-0.20-14.i586
+>!> 2544: U__s_[S2:0][package]nh2ps-2.3.1-587.i586
+>!> 2545: U__s_[S2:0][package]nicolatter-1.7.8-94.i586
+>!> 2546: U__s_[S2:0][package]nkf-2.0.5-70.i586
+>!> 2547: U__s_[S2:0][package]nmap-4.20-52.i586
+>!> 2548: U__s_[S2:0][package]noteedit-2.8.1-88.i586
+>!> 2549: U__s_[S2:0][package]notification-daemon-0.3.7-56.i586
+>!> 2550: U__s_[S2:0][package]notification-daemon-xfce-0.3.7-35.i586
+>!> 2551: U__s_[S2:0][package]novfs-kmp-bigsmp-2.0.0_2.6.22.5_10-22.i586
+>!> 2552: U__s_[S2:0][package]novfs-kmp-default-2.0.0_2.6.22.5_10-22.i586
+>!> 2553: U__s_[S2:0][package]novfs-kmp-xen-2.0.0_2.6.22.5_10-22.i586
+>!> 2554: I__s_[S1:0][package]nscd-2.6-16.i586
+>!> 2555: U_Th_[S2:0][package]nscd-2.6.1-12.i586
+>!> 2556: U__s_[S2:0][package]nspluginwrapper-0.9.91.4-49.i586
+>!> 2557: I__s_[S1:0][package]nss-mdns-0.9-30.i586
+>!> 2558: U_Th_[S2:0][package]nss-mdns-0.9-36.i586
+>!> 2559: U__s_[S2:0][package]nss_ldap-257-10.i586
+>!> 2560: U__s_[S2:0][package]ntfs-3g-1.826-3.i586
+>!> 2561: I__s_[S1:0][package]ntfsprogs-1.13.1-39.i586
+>!> 2562: U_Th_[S2:0][package]ntfsprogs-1.13.1-46.i586
+>!> 2563: U__s_[S2:0][package]ntfsprogs-fuse-1.13.1-46.i586
+>!> 2564: U__s_[S2:0][package]ntop-3.3-13.i586
+>!> 2565: I__s_[S1:0][package]numlockx-1.1-68.i586
+>!> 2566: U_Th_[S2:0][package]numlockx-1.1-75.i586
+>!> 2567: U__s_[S2:0][package]nvtv-0.4.7-118.i586
+>!> 2568: U__s_[S2:0][package]nxml-mode-20041004-99.noarch
+>!> 2569: U__s_[S2:0][package]nxtvepg-2.7.7-8.i586
+>!> 2570: U__s_[S2:0][package]obconf-2.0.1-24.i586
+>!> 2571: I__s_[S1:0][package]obexftp-0.21-81.i586
+>!> 2572: U_Th_[S2:0][package]obexftp-0.21-92.i586
+>!> 2573: U__s_[S2:0][package]ocfs2-tools-1.2.6-10.i586
+>!> 2574: U__s_[S2:0][package]ocfs2console-1.2.6-10.i586
+>!> 2575: I__s_[S1:0][package]ocrad-0.17-3.i586
+>!> 2576: U_Th_[S2:0][package]ocrad-0.17-9.i586
+>!> 2577: U__s_[S2:0][package]oggztools-0.9.5-56.i586
+>!> 2578: U__s_[S2:0][package]omnibook-kmp-bigsmp-20070530_2.6.22.5_10-2.i586
+>!> 2579: U__s_[S2:0][package]omnibook-kmp-default-20070530_2.6.22.5_10-2.i586
+>!> 2580: U__s_[S2:0][package]omnibook-kmp-xen-20070530_2.6.22.5_10-2.i586
+>!> 2581: U__s_[S2:0][package]omnibook-kmp-xenpae-20070530_2.6.22.5_10-2.i586
+>!> 2582: U__s_[S2:0][package]opal-2.2.8-50.i586
+>!> 2583: U__s_[S2:0][package]open-iscsi-2.0.866-12.i586
+>!> 2584: I__s_[S1:0][package]openSUSE-release-10.3-51.i586
+>!> 2585: U_Th_[S2:0][package]openSUSE-release-10.3-65.i586
+>!> 2586: U__s_[S2:0][package]openal-0.0.8-80.i586
+>!> 2587: U__s_[S2:0][package]openbox-3.4.2-24.i586
+>!> 2588: U__s_[S2:0][package]openclipart-0.18-71.noarch
+>!> 2589: I__s_[S1:0][package]openct-0.6.12-6.i586
+>!> 2590: U_Th_[S2:0][package]openct-0.6.13-4.i586
+>!> 2591: U__s_[S2:0][package]openct-devel-0.6.13-4.i586
+>!> 2592: U__s_[S2:0][package]openh323-1.19.0.1-97.i586
+>!> 2593: U__s_[S2:0][package]openh323-devel-1.19.0.1-97.i586
+>!> 2594: U__s_[S2:0][package]openjade-1.3.2-281.i586
+>!> 2595: U__s_[S2:0][package]openldap2-2.3.35-12.i586
+>!> 2596: U_Th_[S2:0][package]openldap2-client-2.3.37-13.i586
+>!> 2597: I__s_[S1:0][package]openldap2-client-2.3.37-5.i586
+>!> 2598: U__s_[S2:0][package]openldap2-devel-2.3.37-13.i586
+>!> 2599: U__s_[S2:0][package]openmotif-2.3.0-17.i586
+>!> 2600: U__s_[S2:0][package]openmotif-libs-2.3.0-17.i586
+>!> 2601: U__s_[S2:0][package]openmotif22-libs-2.2.4-79.i586
+>!> 2602: I__s_[S1:0][package]openobex-1.3-63.i586
+>!> 2603: U_Th_[S2:0][package]openobex-1.3-74.i586
+>!> 2604: U__s_[S2:0][package]openobex-devel-1.3-74.i586
+>!> 2605: U__s_[S2:0][package]openobex-glib-1.3-74.i586
+>!> 2606: U_Th_[S2:0][package]opensc-0.11.3-13.i586
+>!> 2607: I__s_[S1:0][package]opensc-0.11.3-5.i586
+>!> 2608: U__s_[S2:0][package]opensc-devel-0.11.3-13.i586
+>!> 2609: I__s_[S1:0][package]openslp-1.2.0-83.i586
+>!> 2610: U_Th_[S2:0][package]openslp-1.2.0-90.i586
+>!> 2611: U__s_[S2:0][package]openslp-server-1.2.0-90.i586
+>!> 2612: U__s_[S2:0][package]opensp-1.5.2-24.i586
+>!> 2613: U__s_[S2:0][package]opensp-devel-1.5.2-24.i586
+>!> 2614: I__s_[S1:0][package]openssh-4.6p1-38.i586
+>!> 2615: U_Th_[S2:0][package]openssh-4.6p1-49.i586
+>!> 2616: I__s_[S1:0][package]openssh-askpass-4.6p1-38.i586
+>!> 2617: U_Th_[S2:0][package]openssh-askpass-4.6p1-49.i586
+>!> 2618: I__s_[S1:0][package]openssl-0.9.8e-33.i586
+>!> 2619: U_Th_[S2:0][package]openssl-0.9.8e-40.i586
+>!> 2620: I__s_[S1:0][package]openssl-certs-0.9.8e-33.i586
+>!> 2621: U_Th_[S2:0][package]openssl-certs-0.9.8e-40.i586
+>!> 2622: U__s_[S2:0][package]opensuse-codecs-installer-10.3.0-8.noarch
+>!> 2623: U__s_[S2:0][package]opensuse-gnomeuser_en-10.3-14.noarch
+>!> 2624: U__s_[S2:0][package]opensuse-gnomeuser_en-pdf-10.3-14.noarch
+>!> 2625: U__s_[S2:0][package]opensuse-manual_de-10.3-7.noarch
+>!> 2626: U_Th_[S2:0][package]opensuse-manual_en-10.3-23.noarch
+>!> 2627: I__s_[S1:0][package]opensuse-manual_en-10.3-9.noarch
+>!> 2628: U__s_[S2:0][package]opensuse-updater-gnome-0.4.2-2.i586
+>!> 2629: I__s_[S1:0][package]opensuse-updater-kde-0.5-10.i586
+>!> 2630: U_Th_[S2:0][package]opensuse-updater-kde-0.6-8.i586
+>!> 2631: U__s_[S2:0][package]openswan-2.4.7-54.i586
+>!> 2632: U__s_[S2:0][package]openvpn-2.0.9-40.i586
+>!> 2633: U__s_[S2:0][package]opera-9.23-9.i586
+>!> 2634: U__s_[S2:0][package]opie-2.4-627.i586
+>!> 2635: U__s_[S2:0][package]oprofile-0.9.3-17.i586
+>!> 2636: U__s_[S2:0][package]orage-4.4.1-48.i586
+>!> 2637: U__s_[S2:0][package]orbit-0.5.17-412.i586
+>!> 2638: U_Th_[S2:0][package]orbit2-2.14.8-10.i586
+>!> 2639: I__s_[S1:0][package]orbit2-2.14.8-2.i586
+>!> 2640: U__s_[S2:0][package]orbit2-devel-2.14.8-10.i586
+>!> 2641: U__s_[S2:0][package]orca-2.19.91-3.i586
+>!> 2642: U__s_[S2:0][package]oro-2.0.8-117.noarch
+>!> 2643: U__s_[S2:0][package]oto-0.4-304.i586
+>!> 2644: U_Th_[S2:0][package]oxygen-icon-theme-3.93.0-3.noarch
+>!> 2645: U__s_[S2:0][package]oxygen-icon-theme-scalable-3.93.0-3.noarch
+>!> 2646: U__s_[S2:0][package]p54-kmp-default-20070806_2.6.22.5_10-3.i586
+>!> 2647: U__s_[S2:0][package]pacman-1.001-949.i586
+>!> 2648: U_Th_[S2:0][package]pam-0.99.8.1-12.i586
+>!> 2649: I__s_[S1:0][package]pam-0.99.8.1-6.i586
+>!> 2650: I__s_[S1:0][package]pam-config-0.21-4.i586
+>!> 2651: U_Th_[S2:0][package]pam-config-0.23-6.i586
+>!> 2652: U__s_[S2:0][package]pam-devel-0.99.8.1-12.i586
+>!> 2653: U__s_[S2:0][package]pam-doc-0.99.8.1-12.i586
+>!> 2654: I__s_[S1:0][package]pam-modules-10.3-36.i586
+>!> 2655: U_Th_[S2:0][package]pam-modules-10.3-44.i586
+>!> 2656: U__s_[S2:0][package]pam_cifs-0.5.1-4.i586
+>!> 2657: U__s_[S2:0][package]pam_krb5-2.2.17-8.i586
+>!> 2658: U__s_[S2:0][package]pam_ldap-184-41.i586
+>!> 2659: U__s_[S2:0][package]pam_mount-0.18-77.i586
+>!> 2660: U__s_[S2:0][package]pam_smb-2.0.0rc6-78.i586
+>!> 2661: U__s_[S2:0][package]pam_ssh-1.94-88.i586
+>!> 2662: U__s_[S2:0][package]pam_thinkfinger-0.3-2.i586
+>!> 2663: U__s_[S2:0][package]pan-0.132-18.i586
+>!> 2664: I__s_[S1:0][package]pango-1.17.5-3.i586
+>!> 2665: U_Th_[S2:0][package]pango-1.18.1-2.i586
+>!> 2666: U__s_[S2:0][package]pango-devel-1.18.1-2.i586
+>!> 2667: U__s_[S2:0][package]pango-doc-1.18.1-2.i586
+>!> 2668: U__s_[S2:0][package]par-1.1-100.i586
+>!> 2669: I__s_[S1:0][package]parted-1.8.7-26.i586
+>!> 2670: U_Th_[S2:0][package]parted-1.8.7-34.i586
+>!> 2671: U__s_[S2:0][package]passivetex-2004.3.10-74.noarch
+>!> 2672: I__s_[S1:0][package]patch-2.5.9-210.i586
+>!> 2673: U_Th_[S2:0][package]patch-2.5.9-216.i586
+>!> 2674: U__s_[S2:0][package]patchrpm-1.1-68.i586
+>!> 2675: U__s_[S2:0][package]patchutils-0.2.31-69.i586
+>!> 2676: I__s_[S1:0][pattern]apparmor-10.3-100.i586
+>!> 2677: U_Th_[S2:0][pattern]apparmor-10.3-133.i586
+>!> 2678: U__s_[S2:0][pattern]apparmor_opt-10.3-133.i586
+>!> 2679: I__s_[S1:0][pattern]base-10.3-100.i586
+>!> 2680: USTh_[S2:0][pattern]base-10.3-133.i586
+>!> 2681: U__s_[S2:0][pattern]console-10.3-133.i586
+>!> 2682: US_s_[S2:0][pattern]default-10.3-133.i586
+>!> 2683: U__s_[S2:0][pattern]devel_C_C++-10.3-133.i586
+>!> 2684: U__s_[S2:0][pattern]devel_basis-10.3-133.i586
+>!> 2685: U__s_[S2:0][pattern]devel_gnome-10.3-133.i586
+>!> 2686: U__s_[S2:0][pattern]devel_ide-10.3-133.i586
+>!> 2687: U__s_[S2:0][pattern]devel_java-10.3-133.i586
+>!> 2688: U__s_[S2:0][pattern]devel_kde-10.3-133.i586
+>!> 2689: U__s_[S2:0][pattern]devel_kernel-10.3-133.i586
+>!> 2690: U__s_[S2:0][pattern]devel_mono-10.3-133.i586
+>!> 2691: US_s_[S2:0][pattern]devel_perl-10.3-133.i586
+>!> 2692: U__s_[S2:0][pattern]devel_python-10.3-133.i586
+>!> 2693: U__s_[S2:0][pattern]devel_qt4-10.3-133.i586
+>!> 2694: U__s_[S2:0][pattern]devel_rails-10.3-133.i586
+>!> 2695: U__s_[S2:0][pattern]devel_rpm_build-10.3-133.i586
+>!> 2696: U__s_[S2:0][pattern]devel_ruby-10.3-133.i586
+>!> 2697: U__s_[S2:0][pattern]devel_tcl-10.3-133.i586
+>!> 2698: U__s_[S2:0][pattern]devel_web-10.3-133.i586
+>!> 2699: U__s_[S2:0][pattern]devel_yast-10.3-133.i586
+>!> 2700: U__s_[S2:0][pattern]dhcp_dns_server-10.3-133.i586
+>!> 2701: U__s_[S2:0][pattern]directory_server-10.3-133.i586
+>!> 2702: I__s_[S1:0][pattern]enhanced_base-10.3-100.i586
+>!> 2703: U_Th_[S2:0][pattern]enhanced_base-10.3-133.i586
+>!> 2704: US_s_[S2:0][pattern]enhanced_base_opt-10.3-133.i586
+>!> 2705: U__s_[S2:0][pattern]file_server-10.3-133.i586
+>!> 2706: I__s_[S1:0][pattern]fonts-10.3-100.i586
+>!> 2707: USTh_[S2:0][pattern]fonts-10.3-133.i586
+>!> 2708: US_s_[S2:0][pattern]fonts_opt-10.3-133.i586
+>!> 2709: I__s_[S1:0][pattern]games-10.3-100.i586
+>!> 2710: USTh_[S2:0][pattern]games-10.3-133.i586
+>!> 2711: US_s_[S2:0][pattern]games_opt-10.3-133.i586
+>!> 2712: US_s_[S2:0][pattern]gateway_server-10.3-133.i586
+>!> 2713: U__s_[S2:0][pattern]gnome-10.3-133.i586
+>!> 2714: U__s_[S2:0][pattern]gnome_admin-10.3-133.i586
+>!> 2715: U__s_[S2:0][pattern]gnome_basis-10.3-133.i586
+>!> 2716: US_s_[S2:0][pattern]gnome_basis_opt-10.3-133.i586
+>!> 2717: UU_s_[S2:0][pattern]gnome_games-10.3-133.i586
+>!> 2718: UU_s_[S2:0][pattern]gnome_ide-10.3-133.i586
+>!> 2719: UU_s_[S2:0][pattern]gnome_imaging-10.3-133.i586
+>!> 2720: UU_s_[S2:0][pattern]gnome_imaging_opt-10.3-133.i586
+>!> 2721: U__s_[S2:0][pattern]gnome_internet-10.3-133.i586
+>!> 2722: UU_s_[S2:0][pattern]gnome_laptop-10.3-133.i586
+>!> 2723: UU_s_[S2:0][pattern]gnome_multimedia-10.3-133.i586
+>!> 2724: UU_s_[S2:0][pattern]gnome_multimedia_opt-10.3-133.i586
+>!> 2725: UU_s_[S2:0][pattern]gnome_office-10.3-133.i586
+>!> 2726: UU_s_[S2:0][pattern]gnome_office_opt-10.3-133.i586
+>!> 2727: U__s_[S2:0][pattern]gnome_utilities-10.3-133.i586
+>!> 2728: U__s_[S2:0][pattern]gnome_utilities_opt-10.3-133.i586
+>!> 2729: UU_s_[S2:0][pattern]gnome_xgl-10.3-133.i586
+>!> 2730: UU_s_[S2:0][pattern]gnome_yast-10.3-133.i586
+>!> 2731: I__s_[S1:0][pattern]imaging-10.3-100.i586
+>!> 2732: USTh_[S2:0][pattern]imaging-10.3-133.i586
+>!> 2733: US_s_[S2:0][pattern]imaging_opt-10.3-133.i586
+>!> 2734: I__s_[S1:0][pattern]kde-10.3-100.i586
+>!> 2735: USTh_[S2:0][pattern]kde-10.3-133.i586
+>!> 2736: U__s_[S2:0][pattern]kde4_basis-10.3-133.i586
+>!> 2737: I__s_[S1:0][pattern]kde_basis-10.3-100.i586
+>!> 2738: USTh_[S2:0][pattern]kde_basis-10.3-133.i586
+>!> 2739: US_s_[S2:0][pattern]kde_basis_opt-10.3-133.i586
+>!> 2740: I__s_[S1:0][pattern]kde_games-10.3-100.i586
+>!> 2741: USTh_[S2:0][pattern]kde_games-10.3-133.i586
+>!> 2742: UU_s_[S2:0][pattern]kde_ide-10.3-133.i586
+>!> 2743: I__s_[S1:0][pattern]kde_imaging-10.3-100.i586
+>!> 2744: USTh_[S2:0][pattern]kde_imaging-10.3-133.i586
+>!> 2745: U_Tl_[S2:0][pattern]kde_imaging_opt-10.3-133.i586
+>!> 2746: I__s_[S1:0][pattern]kde_internet-10.3-100.i586
+>!> 2747: USTh_[S2:0][pattern]kde_internet-10.3-133.i586
+>!> 2748: U_Tl_[S2:0][pattern]kde_laptop-10.3-133.i586
+>!> 2749: I__s_[S1:0][pattern]kde_multimedia-10.3-100.i586
+>!> 2750: U_Th_[S2:0][pattern]kde_multimedia-10.3-133.i586
+>!> 2751: I__s_[S1:0][pattern]kde_office-10.3-100.i586
+>!> 2752: USTh_[S2:0][pattern]kde_office-10.3-133.i586
+>!> 2753: U_Tl_[S2:0][pattern]kde_office_opt-10.3-133.i586
+>!> 2754: I__s_[S1:0][pattern]kde_utilities-10.3-100.i586
+>!> 2755: USTh_[S2:0][pattern]kde_utilities-10.3-133.i586
+>!> 2756: U__s_[S2:0][pattern]kde_utilities_opt-10.3-133.i586
+>!> 2757: I__s_[S1:0][pattern]kde_xgl-10.3-100.i586
+>!> 2758: USTh_[S2:0][pattern]kde_xgl-10.3-133.i586
+>!> 2759: U__s_[S2:0][pattern]lamp_server-10.3-133.i586
+>!> 2760: I__s_[S1:0][pattern]laptop-10.3-100.i586
+>!> 2761: USTh_[S2:0][pattern]laptop-10.3-133.i586
+>!> 2762: US_s_[S2:0][pattern]mail_server-10.3-133.i586
+>!> 2763: US_s_[S2:0][pattern]misc_server-10.3-133.i586
+>!> 2764: I__s_[S1:0][pattern]multimedia-10.3-100.i586
+>!> 2765: USTh_[S2:0][pattern]multimedia-10.3-133.i586
+>!> 2766: US_s_[S2:0][pattern]multimedia_opt-10.3-133.i586
+>!> 2767: U__s_[S2:0][pattern]network_admin-10.3-133.i586
+>!> 2768: US_s_[S2:0][pattern]non_oss-10.3-133.i586
+>!> 2769: U__s_[S2:0][pattern]non_oss_java-10.3-133.i586
+>!> 2770: I__s_[S1:0][pattern]office-10.3-100.i586
+>!> 2771: USTh_[S2:0][pattern]office-10.3-133.i586
+>!> 2772: US_s_[S2:0][pattern]office_opt-10.3-133.i586
+>!> 2773: U__s_[S2:0][pattern]print_server-10.3-133.i586
+>!> 2774: US_s_[S2:0][pattern]remote_desktop-10.3-133.i586
+>!> 2775: U__s_[S2:0][pattern]rest_cd_gnome-10.3-133.i586
+>!> 2776: U__s_[S2:0][pattern]rest_cd_kde-10.3-133.i586
+>!> 2777: U__s_[S2:0][pattern]rest_dvd-10.3-133.i586
+>!> 2778: I__s_[S1:0][pattern]sw_management-10.3-100.i586
+>!> 2779: USTh_[S2:0][pattern]sw_management-10.3-133.i586
+>!> 2780: UU_s_[S2:0][pattern]sw_management_gnome-10.3-133.i586
+>!> 2781: I__s_[S1:0][pattern]sw_management_kde-10.3-100.i586
+>!> 2782: USTh_[S2:0][pattern]sw_management_kde-10.3-133.i586
+>!> 2783: U__s_[S2:0][pattern]update_test-10.3-133.i586
+>!> 2784: US_s_[S2:0][pattern]voip-10.3-133.i586
+>!> 2785: I__s_[S1:0][pattern]x11-10.3-100.i586
+>!> 2786: USTh_[S2:0][pattern]x11-10.3-133.i586
+>!> 2787: US_s_[S2:0][pattern]x11_opt-10.3-133.i586
+>!> 2788: U__s_[S2:0][pattern]xen_server-10.3-133.i586
+>!> 2789: U__s_[S2:0][pattern]xfce-10.3-133.i586
+>!> 2790: I__s_[S1:0][pattern]xgl-10.3-100.i586
+>!> 2791: USTh_[S2:0][pattern]xgl-10.3-133.i586
+>!> 2792: U__s_[S2:0][pattern]xml-10.3-133.i586
+>!> 2793: I__s_[S1:0][pattern]yast2_basis-10.3-100.i586
+>!> 2794: U_Th_[S2:0][pattern]yast2_basis-10.3-133.i586
+>!> 2795: I__s_[S1:0][pattern]yast2_install_wf-10.3-100.i586
+>!> 2796: USTh_[S2:0][pattern]yast2_install_wf-10.3-133.i586
+>!> 2797: U__s_[S2:0][package]pax-3.4-70.i586
+>!> 2798: U__s_[S2:0][package]pbbuttonsd-0.8.1a-13.i586
+>!> 2799: U__s_[S2:0][package]pbm2l7k-990321-864.i586
+>!> 2800: U_Th_[S2:0][package]pciutils-2.2.6-14.i586
+>!> 2801: I__s_[S1:0][package]pciutils-2.2.6-8.i586
+>!> 2802: I__s_[S1:0][package]pciutils-ids-2007.8.4-1.noarch
+>!> 2803: U_Th_[S2:0][package]pciutils-ids-2007.9.1-1.noarch
+>!> 2804: I__s_[S1:0][package]pcmciautils-014-32.i586
+>!> 2805: U_Th_[S2:0][package]pcmciautils-014-38.i586
+>!> 2806: U_Th_[S2:0][package]pcre-7.2-11.i586
+>!> 2807: I__s_[S1:0][package]pcre-7.2-4.i586
+>!> 2808: U__s_[S2:0][package]pcre-devel-7.2-11.i586
+>!> 2809: U__s_[S2:0][package]pcsc-acr38-1.7.9-26.i586
+>!> 2810: U__s_[S2:0][package]pcsc-ccid-1.3.0-11.i586
+>!> 2811: U__s_[S2:0][package]pcsc-cyberjack-3.0.3-21.i586
+>!> 2812: U_Th_[S2:0][package]pcsc-lite-1.4.3-12.i586
+>!> 2813: I__s_[S1:0][package]pcsc-lite-1.4.3-5.i586
+>!> 2814: U__s_[S2:0][package]pcsc-lite-devel-1.4.3-12.i586
+>!> 2815: U__s_[S2:0][package]penguin-command-1.6.11-16.i586
+>!> 2816: I__s_[S1:0][package]perl-5.8.8-67.i586
+>!> 2817: U_Th_[S2:0][package]perl-5.8.8-73.i586
+>!> 2818: U__s_[S2:0][package]perl-Algorithm-Diff-1.1902-59.i586
+>!> 2819: U__s_[S2:0][package]perl-Apache-AuthCookie-3.10-68.i586
+>!> 2820: U__s_[S2:0][package]perl-Apache-AuthNetLDAP-0.29-97.i586
+>!> 2821: U__s_[S2:0][package]perl-Apache-DBI-1.06-46.i586
+>!> 2822: U__s_[S2:0][package]perl-Apache-Session-1.83-24.i586
+>!> 2823: U__s_[S2:0][package]perl-Apache-SessionX-2.01-95.i586
+>!> 2824: U__s_[S2:0][package]perl-AppConfig-1.66-13.i586
+>!> 2825: U__s_[S2:0][package]perl-Archive-Tar-1.32-15.i586
+>!> 2826: U__s_[S2:0][package]perl-Archive-Zip-1.20-16.i586
+>!> 2827: U__s_[S2:0][package]perl-Authen-SASL-2.10-57.i586
+>!> 2828: U__s_[S2:0][package]perl-Authen-SASL-Cyrus-0.12-83.i586
+>!> 2829: U__s_[S2:0][package]perl-BerkeleyDB-0.32-10.i586
+>!> 2830: U__s_[S2:0][package]perl-Bit-Vector-6.4-68.i586
+>!> 2831: I__s_[S1:0][package]perl-Bootloader-0.4.18-2.i586
+>!> 2832: U_Th_[S2:0][package]perl-Bootloader-0.4.23-8.i586
+>!> 2833: U__s_[S2:0][package]perl-CDDB_get-2.27-68.i586
+>!> 2834: U__s_[S2:0][package]perl-CGI-Application-4.06-46.i586
+>!> 2835: U__s_[S2:0][package]perl-Cairo-1.041-20.i586
+>!> 2836: U__s_[S2:0][package]perl-Carp-Clan-5.9-14.i586
+>!> 2837: U__s_[S2:0][package]perl-Chart-2.4.1-83.i586
+>!> 2838: U_Th_[S2:0][package]perl-Compress-Raw-Zlib-2.005-14.i586
+>!> 2839: I__s_[S1:0][package]perl-Compress-Raw-Zlib-2.005-8.i586
+>!> 2840: U_Th_[S2:0][package]perl-Compress-Zlib-2.005-10.i586
+>!> 2841: I__s_[S1:0][package]perl-Compress-Zlib-2.005-4.i586
+>!> 2842: I__s_[S1:0][package]perl-Config-Crontab-1.21-2.i586
+>!> 2843: U_Th_[S2:0][package]perl-Config-Crontab-1.21-8.i586
+>!> 2844: U__s_[S2:0][package]perl-Config-General-2.33-8.i586
+>!> 2845: U__s_[S2:0][package]perl-Config-IniFiles-2.39-69.i586
+>!> 2846: U__s_[S2:0][package]perl-Convert-ASN1-0.21-34.i586
+>!> 2847: U__s_[S2:0][package]perl-Convert-TNEF-0.17-329.i586
+>!> 2848: U__s_[S2:0][package]perl-Convert-UUlib-1.051-69.i586
+>!> 2849: U__s_[S2:0][package]perl-Crypt-Blowfish-2.10-69.i586
+>!> 2850: U__s_[S2:0][package]perl-Crypt-CBC-2.22-40.i586
+>!> 2851: U__s_[S2:0][package]perl-Crypt-DES-2.05-68.i586
+>!> 2852: U_Th_[S2:0][package]perl-Crypt-SSLeay-0.56-12.i586
+>!> 2853: I__s_[S1:0][package]perl-Crypt-SSLeay-0.56-5.i586
+>!> 2854: I__s_[S1:0][package]perl-Crypt-SmbHash-0.12-63.i586
+>!> 2855: U_Th_[S2:0][package]perl-Crypt-SmbHash-0.12-69.i586
+>!> 2856: U__s_[S2:0][package]perl-Cyrus-IMAP-2.3.8-44.i586
+>!> 2857: U__s_[S2:0][package]perl-Cyrus-SIEVE-managesieve-2.3.8-44.i586
+>!> 2858: U__s_[S2:0][package]perl-DBD-CSV-0.22-70.i586
+>!> 2859: U__s_[S2:0][package]perl-DBD-ODBC-1.14-10.i586
+>!> 2860: U__s_[S2:0][package]perl-DBD-Pg-1.49-70.i586
+>!> 2861: I__s_[S1:0][package]perl-DBD-SQLite-1.13-63.i586
+>!> 2862: U_Th_[S2:0][package]perl-DBD-SQLite-1.13-70.i586
+>!> 2863: U__s_[S2:0][package]perl-DBD-XBase-0.241-98.i586
+>!> 2864: U__s_[S2:0][package]perl-DBD-mysql-4.005-19.i586
+>!> 2865: U_Th_[S2:0][package]perl-DBI-1.58-14.i586
+>!> 2866: I__s_[S1:0][package]perl-DBI-1.58-8.i586
+>!> 2867: U__s_[S2:0][package]perl-Data-ShowTable-3.3-640.i586
+>!> 2868: U__s_[S2:0][package]perl-Date-Calc-5.4-69.i586
+>!> 2869: U__s_[S2:0][package]perl-DateManip-5.44-68.i586
+>!> 2870: U__s_[S2:0][package]perl-Digest-HMAC-1.01-563.i586
+>!> 2871: I__s_[S1:0][package]perl-Digest-MD4-1.5-62.i586
+>!> 2872: U_Th_[S2:0][package]perl-Digest-MD4-1.5-68.i586
+>!> 2873: I__s_[S1:0][package]perl-Digest-SHA1-2.11-52.i586
+>!> 2874: U_Th_[S2:0][package]perl-Digest-SHA1-2.11-58.i586
+>!> 2875: U__s_[S2:0][package]perl-Encode-HanExtra-0.10-69.i586
+>!> 2876: U__s_[S2:0][package]perl-Encode-JIS2K-0.02-70.i586
+>!> 2877: U__s_[S2:0][package]perl-ExtUtils-Depends-0.205-69.i586
+>!> 2878: U__s_[S2:0][package]perl-ExtUtils-PkgConfig-1.07-70.i586
+>!> 2879: U__s_[S2:0][package]perl-File-HomeDir-0.65-23.i586
+>!> 2880: U__s_[S2:0][package]perl-File-MMagic-1.27-38.i586
+>!> 2881: I__s_[S1:0][package]perl-File-Tail-0.99.3-62.i586
+>!> 2882: U_Th_[S2:0][package]perl-File-Tail-0.99.3-68.i586
+>!> 2883: U__s_[S2:0][package]perl-File-Type-0.22-72.i586
+>!> 2884: U__s_[S2:0][package]perl-FileHandle-Unget-0.1621-68.i586
+>!> 2885: U__s_[S2:0][package]perl-Filter-1.34-13.i586
+>!> 2886: U__s_[S2:0][package]perl-Finance-Quote-1.13-4.i586
+>!> 2887: U__s_[S2:0][package]perl-GD-2.35-68.i586
+>!> 2888: U__s_[S2:0][package]perl-GDGraph-1.44-44.i586
+>!> 2889: U__s_[S2:0][package]perl-GDTextUtil-0.85-210.i586
+>!> 2890: U__s_[S2:0][package]perl-HTML-Clean-0.8-765.i586
+>!> 2891: U__s_[S2:0][package]perl-HTML-FillInForm-1.06-67.i586
+>!> 2892: I__s_[S1:0][package]perl-HTML-Parser-3.56-30.i586
+>!> 2893: U_Th_[S2:0][package]perl-HTML-Parser-3.56-36.i586
+>!> 2894: U__s_[S2:0][package]perl-HTML-SimpleParse-0.12-190.i586
+>!> 2895: U__s_[S2:0][package]perl-HTML-TableExtract-2.10-4.i586
+>!> 2896: I__s_[S1:0][package]perl-HTML-Tagset-3.10-62.i586
+>!> 2897: U_Th_[S2:0][package]perl-HTML-Tagset-3.10-68.i586
+>!> 2898: U__s_[S2:0][package]perl-HTML-Template-2.9-37.i586
+>!> 2899: U__s_[S2:0][package]perl-HTML-Template-Expr-0.07-59.i586
+>!> 2900: U__s_[S2:0][package]perl-HTML-Template-JIT-0.05-67.i586
+>!> 2901: U__s_[S2:0][package]perl-HTML-Tree-3.23-39.i586
+>!> 2902: U__s_[S2:0][package]perl-HTTP-DAV-0.31-117.i586
+>!> 2903: U__s_[S2:0][package]perl-HTTPS-Daemon-1.02-79.i586
+>!> 2904: U_Th_[S2:0][package]perl-IO-Compress-Base-2.005-14.i586
+>!> 2905: I__s_[S1:0][package]perl-IO-Compress-Base-2.005-8.i586
+>!> 2906: U_Th_[S2:0][package]perl-IO-Compress-Zlib-2.005-13.i586
+>!> 2907: I__s_[S1:0][package]perl-IO-Compress-Zlib-2.005-7.i586
+>!> 2908: U__s_[S2:0][package]perl-IO-Multiplex-1.09-33.i586
+>!> 2909: U__s_[S2:0][package]perl-IO-Socket-SSL-1.07-18.i586
+>!> 2910: U__s_[S2:0][package]perl-IO-String-1.08-68.i586
+>!> 2911: U__s_[S2:0][package]perl-IO-Stty-.02-588.i586
+>!> 2912: U__s_[S2:0][package]perl-IO-Zlib-1.06-10.i586
+>!> 2913: U__s_[S2:0][package]perl-IO-stringy-2.110-69.i586
+>!> 2914: U__s_[S2:0][package]perl-Image-Size-3.01-56.i586
+>!> 2915: U__s_[S2:0][package]perl-Inline-0.44-262.i586
+>!> 2916: U__s_[S2:0][package]perl-Log-Log4perl-1.12-12.i586
+>!> 2917: U__s_[S2:0][package]perl-MIME-Lite-3.01-211.i586
+>!> 2918: U__s_[S2:0][package]perl-MIME-Types-1.20-16.i586
+>!> 2919: U__s_[S2:0][package]perl-MIME-tools-5.420-58.i586
+>!> 2920: U__s_[S2:0][package]perl-MP3-Info-1.23-7.i586
+>!> 2921: U__s_[S2:0][package]perl-Mail-Mbox-MessageParser-1.5000-36.i586
+>!> 2922: U__s_[S2:0][package]perl-MailTools-1.77-23.i586
+>!> 2923: U__s_[S2:0][package]perl-NKF-2.0.5-70.i586
+>!> 2924: U__s_[S2:0][package]perl-Net-DNS-0.60-13.i586
+>!> 2925: U_Th_[S2:0][package]perl-Net-Daemon-0.43-12.i586
+>!> 2926: I__s_[S1:0][package]perl-Net-Daemon-0.43-6.i586
+>!> 2927: U__s_[S2:0][package]perl-Net-IP-1.23-70.i586
+>!> 2928: U__s_[S2:0][package]perl-Net-IPv4Addr-0.10-73.i586
+>!> 2929: U__s_[S2:0][package]perl-Net-Netmask-1.9015-39.i586
+>!> 2930: U__s_[S2:0][package]perl-Net-SNMP-5.2.0-67.i586
+>!> 2931: U__s_[S2:0][package]perl-Net-Server-0.96-30.i586
+>!> 2932: U__s_[S2:0][package]perl-Net-Telnet-3.03-251.i586
+>!> 2933: U__s_[S2:0][package]perl-Net-XMPP-1.02-33.i586
+>!> 2934: U__s_[S2:0][package]perl-NetAddr-IP-4.004-36.i586
+>!> 2935: U__s_[S2:0][package]perl-Net_SSLeay-1.30-71.i586
+>!> 2936: U__s_[S2:0][package]perl-NetxAP-0.02-628.i586
+>!> 2937: U__s_[S2:0][package]perl-PDA-Pilot-0.12.2-20.i586
+>!> 2938: I__s_[S1:0][package]perl-Parse-RecDescent-1.80-309.i586
+>!> 2939: U_Th_[S2:0][package]perl-Parse-RecDescent-1.80-315.i586
+>!> 2940: U__s_[S2:0][package]perl-PerlMagick-6.3.5.3-20.i586
+>!> 2941: U_Th_[S2:0][package]perl-PlRPC-0.2019-15.i586
+>!> 2942: I__s_[S1:0][package]perl-PlRPC-0.2019-9.i586
+>!> 2943: U__s_[S2:0][package]perl-PostScript-Simple-0.07-68.i586
+>!> 2944: U__s_[S2:0][package]perl-Qt-3.008-268.i586
+>!> 2945: I__s_[S1:0][package]perl-RPC-XML-0.59-55.i586
+>!> 2946: U_Th_[S2:0][package]perl-RPC-XML-0.59-62.i586
+>!> 2947: U__s_[S2:0][package]perl-SGMLS-1.03ii-453.i586
+>!> 2948: U__s_[S2:0][package]perl-SNMP-5.4.1-11.i586
+>!> 2949: U__s_[S2:0][package]perl-SOAP-Lite-0.69-53.i586
+>!> 2950: U__s_[S2:0][package]perl-SQL-Statement-1.15-48.i586
+>!> 2951: U__s_[S2:0][package]perl-SVN-Simple-0.27-106.i586
+>!> 2952: U__s_[S2:0][package]perl-Template-Toolkit-2.19-27.i586
+>!> 2953: U__s_[S2:0][package]perl-TermReadKey-2.30-69.i586
+>!> 2954: U__s_[S2:0][package]perl-TermReadLine-Gnu-1.16-35.i586
+>!> 2955: U__s_[S2:0][package]perl-Text-CSV_XS-0.29-12.i586
+>!> 2956: U__s_[S2:0][package]perl-Text-ChaSen-2.3.3-167.i586
+>!> 2957: U__s_[S2:0][package]perl-Text-Iconv-1.4-70.i586
+>!> 2958: U__s_[S2:0][package]perl-Text-Kakasi-2.04-69.i586
+>!> 2959: U__s_[S2:0][package]perl-Tie-Cache-0.17-312.i586
+>!> 2960: U__s_[S2:0][package]perl-Tie-IxHash-1.21-656.i586
+>!> 2961: U__s_[S2:0][package]perl-Time-Duration-1.04-58.i586
+>!> 2962: U__s_[S2:0][package]perl-Time-Period-1.20-373.i586
+>!> 2963: U__s_[S2:0][package]perl-Time-modules-2006.0814-55.i586
+>!> 2964: I__s_[S1:0][package]perl-TimeDate-1.16-186.i586
+>!> 2965: U_Th_[S2:0][package]perl-TimeDate-1.16-192.i586
+>!> 2966: U__s_[S2:0][package]perl-Tk-804.027-86.i586
+>!> 2967: I__s_[S1:0][package]perl-URI-1.35-65.i586
+>!> 2968: U_Th_[S2:0][package]perl-URI-1.35-71.i586
+>!> 2969: U__s_[S2:0][package]perl-Unicode-Map8-0.12-218.i586
+>!> 2970: U__s_[S2:0][package]perl-Unicode-String-2.09-68.i586
+>!> 2971: U__s_[S2:0][package]perl-Unix-Syslog-0.100-96.i586
+>!> 2972: U__s_[S2:0][package]perl-WeakRef-0.01-52.i586
+>!> 2973: U_Th_[S2:0][package]perl-X500-DN-0.29-12.i586
+>!> 2974: I__s_[S1:0][package]perl-X500-DN-0.29-6.i586
+>!> 2975: U_Th_[S2:0][package]perl-XML-Bare-0.11-12.i586
+>!> 2976: I__s_[S1:0][package]perl-XML-Bare-0.11-6.i586
+>!> 2977: U__s_[S2:0][package]perl-XML-DOM-1.44-74.i586
+>!> 2978: U__s_[S2:0][package]perl-XML-Generator-0.99-72.i586
+>!> 2979: U__s_[S2:0][package]perl-XML-LibXML-1.62001-53.i586
+>!> 2980: U__s_[S2:0][package]perl-XML-LibXML-Common-0.13-88.i586
+>!> 2981: U__s_[S2:0][package]perl-XML-LibXSLT-1.59-60.i586
+>!> 2982: U__s_[S2:0][package]perl-XML-NamespaceSupport-1.09-69.i586
+>!> 2983: U_Th_[S2:0][package]perl-XML-Parser-2.34-104.i586
+>!> 2984: I__s_[S1:0][package]perl-XML-Parser-2.34-98.i586
+>!> 2985: U__s_[S2:0][package]perl-XML-RegExp-0.03-547.i586
+>!> 2986: U__s_[S2:0][package]perl-XML-SAX-0.12-88.i586
+>!> 2987: U__s_[S2:0][package]perl-XML-Simple-2.16-41.i586
+>!> 2988: U__s_[S2:0][package]perl-XML-Stream-1.22-76.i586
+>!> 2989: U_Th_[S2:0][package]perl-XML-Writer-0.603-14.i586
+>!> 2990: I__s_[S1:0][package]perl-XML-Writer-0.603-8.i586
+>!> 2991: I__s_[S1:0][package]perl-XML-XPath-1.13-3.i586
+>!> 2992: U_Th_[S2:0][package]perl-XML-XPath-1.13-9.i586
+>!> 2993: U__s_[S2:0][package]perl-XML-XSLT-0.48-100.i586
+>!> 2994: I__s_[S1:0][package]perl-base-5.8.8-67.i586
+>!> 2995: U_Th_[S2:0][package]perl-base-5.8.8-73.i586
+>!> 2996: I__s_[S1:0][package]perl-gettext-1.05-64.i586
+>!> 2997: U_Th_[S2:0][package]perl-gettext-1.05-70.i586
+>!> 2998: U__s_[S2:0][package]perl-ldap-0.33-77.i586
+>!> 2999: U__s_[S2:0][package]perl-ldap-ssl-0.33-77.i586
+>!> 3000: U__s_[S2:0][package]perl-libapparmor-2.2-10.i586
+>!> 3001: U__s_[S2:0][package]perl-libconfigfile-1.1.1-69.i586
+>!> 3002: U_Th_[S2:0][package]perl-libwww-perl-5.806-10.i586
+>!> 3003: I__s_[S1:0][package]perl-libwww-perl-5.806-4.i586
+>!> 3004: U__s_[S2:0][package]perl-libxml-perl-0.08-70.i586
+>!> 3005: U__s_[S2:0][package]perl-razor-agents-2.77-66.i586
+>!> 3006: U__s_[S2:0][package]perl-spamassassin-3.2.3-7.i586
+>!> 3007: U__s_[S2:0][package]perlref-5.004.1-251.noarch
+>!> 3008: I__s_[S1:0][package]permissions-2007.6.12-10.i586
+>!> 3009: U_Th_[S2:0][package]permissions-2007.8.10-8.i586
+>!> 3010: U__s_[S2:0][package]pessulus-2.16.2-58.i586
+>!> 3011: U__s_[S2:0][package]pgcalc-2.2-126.i586
+>!> 3012: U__s_[S2:0][package]php5-5.2.4-3.i586
+>!> 3013: U__s_[S2:0][package]php5-bcmath-5.2.4-3.i586
+>!> 3014: U__s_[S2:0][package]php5-bz2-5.2.4-3.i586
+>!> 3015: U__s_[S2:0][package]php5-calendar-5.2.4-3.i586
+>!> 3016: U__s_[S2:0][package]php5-ctype-5.2.4-3.i586
+>!> 3017: U__s_[S2:0][package]php5-curl-5.2.4-3.i586
+>!> 3018: U__s_[S2:0][package]php5-dbase-5.2.4-3.i586
+>!> 3019: U__s_[S2:0][package]php5-devel-5.2.4-3.i586
+>!> 3020: U__s_[S2:0][package]php5-dom-5.2.4-3.i586
+>!> 3021: U__s_[S2:0][package]php5-exif-5.2.4-3.i586
+>!> 3022: U__s_[S2:0][package]php5-fastcgi-5.2.4-3.i586
+>!> 3023: U__s_[S2:0][package]php5-ftp-5.2.4-3.i586
+>!> 3024: U__s_[S2:0][package]php5-gd-5.2.4-3.i586
+>!> 3025: U__s_[S2:0][package]php5-gettext-5.2.4-3.i586
+>!> 3026: U__s_[S2:0][package]php5-gmp-5.2.4-3.i586
+>!> 3027: U__s_[S2:0][package]php5-hash-5.2.4-3.i586
+>!> 3028: U__s_[S2:0][package]php5-iconv-5.2.4-3.i586
+>!> 3029: U__s_[S2:0][package]php5-imap-5.2.4-3.i586
+>!> 3030: U__s_[S2:0][package]php5-json-5.2.4-3.i586
+>!> 3031: U__s_[S2:0][package]php5-ldap-5.2.4-3.i586
+>!> 3032: U__s_[S2:0][package]php5-mbstring-5.2.4-3.i586
+>!> 3033: U__s_[S2:0][package]php5-mcrypt-5.2.4-3.i586
+>!> 3034: U__s_[S2:0][package]php5-mhash-5.2.4-3.i586
+>!> 3035: U__s_[S2:0][package]php5-mysql-5.2.4-3.i586
+>!> 3036: U__s_[S2:0][package]php5-ncurses-5.2.4-3.i586
+>!> 3037: U__s_[S2:0][package]php5-odbc-5.2.4-3.i586
+>!> 3038: U__s_[S2:0][package]php5-openssl-5.2.4-3.i586
+>!> 3039: U__s_[S2:0][package]php5-pcntl-5.2.4-3.i586
+>!> 3040: U__s_[S2:0][package]php5-pdo-5.2.4-3.i586
+>!> 3041: U__s_[S2:0][package]php5-pear-5.2.4-3.i586
+>!> 3042: U__s_[S2:0][package]php5-pear-log-1.9.11-12.noarch
+>!> 3043: U__s_[S2:0][package]php5-pgsql-5.2.4-3.i586
+>!> 3044: U__s_[S2:0][package]php5-posix-5.2.4-3.i586
+>!> 3045: U__s_[S2:0][package]php5-pspell-5.2.4-3.i586
+>!> 3046: U__s_[S2:0][package]php5-shmop-5.2.4-3.i586
+>!> 3047: U__s_[S2:0][package]php5-snmp-5.2.4-3.i586
+>!> 3048: U__s_[S2:0][package]php5-soap-5.2.4-3.i586
+>!> 3049: U__s_[S2:0][package]php5-sockets-5.2.4-3.i586
+>!> 3050: U__s_[S2:0][package]php5-sqlite-5.2.4-3.i586
+>!> 3051: U__s_[S2:0][package]php5-sysvmsg-5.2.4-3.i586
+>!> 3052: U__s_[S2:0][package]php5-sysvsem-5.2.4-3.i586
+>!> 3053: U__s_[S2:0][package]php5-sysvshm-5.2.4-3.i586
+>!> 3054: U__s_[S2:0][package]php5-tokenizer-5.2.4-3.i586
+>!> 3055: U__s_[S2:0][package]php5-wddx-5.2.4-3.i586
+>!> 3056: U__s_[S2:0][package]php5-xmlreader-5.2.4-3.i586
+>!> 3057: U__s_[S2:0][package]php5-xmlrpc-5.2.4-3.i586
+>!> 3058: U__s_[S2:0][package]php5-xmlwriter-5.2.4-3.i586
+>!> 3059: U__s_[S2:0][package]php5-xsl-5.2.4-3.i586
+>!> 3060: U__s_[S2:0][package]php5-zip-5.2.4-3.i586
+>!> 3061: U__s_[S2:0][package]php5-zlib-5.2.4-3.i586
+>!> 3062: U__s_[S2:0][package]physfs-1.0.1-73.i586
+>!> 3063: U__s_[S2:0][package]pia-3.95-90.i586
+>!> 3064: U__s_[S2:0][package]pico-4.64N-1.i586
+>!> 3065: U__s_[S2:0][package]pidgin-2.1.0-22.i586
+>!> 3066: U__s_[S2:0][package]pilot-4.64N-1.i586
+>!> 3067: U__s_[S2:0][package]pilot-link-0.12.2-20.i586
+>!> 3068: U__s_[S2:0][package]pin-0.38-26.noarch
+>!> 3069: U__s_[S2:0][package]pine-4.64N-83.i586
+>!> 3070: I__s_[S1:0][package]pinentry-0.7.2-102.i586
+>!> 3071: U_Th_[S2:0][package]pinentry-0.7.2-111.i586
+>!> 3072: U__s_[S2:0][package]pinentry-gtk2-0.7.2-1.i586
+>!> 3073: I__s_[S1:0][package]pinentry-qt-0.7.2-1.i586
+>!> 3074: U__s_[S2:0][package]pinentry-qt-0.7.2-1.i586
+>!> 3075: U__s_[S2:0][package]pinepg-1.02-252.i586
+>!> 3076: U__s_[S2:0][package]pinfo-0.6.9-22.i586
+>!> 3077: U__s_[S2:0][package]pingus-0.6.0-391.i586
+>!> 3078: U__s_[S2:0][package]pixmap-2.6-13.i586
+>!> 3079: I__s_[S1:0][package]pkg-config-0.21-29.i586
+>!> 3080: U_Th_[S2:0][package]pkg-config-0.21-35.i586
+>!> 3081: U__s_[S2:0][package]planmaker-2007.3.26-39.i586
+>!> 3082: U__s_[S2:0][package]planner-0.14.2-21.i586
+>!> 3083: U__s_[S2:0][package]planner-devel-0.14.2-21.i586
+>!> 3084: U__s_[S2:0][package]plib-1.8.4-105.i586
+>!> 3085: U__s_[S2:0][package]plotutils-2.5-87.i586
+>!> 3086: U__s_[S2:0][package]plptools-0.16-89.i586
+>!> 3087: U__s_[S2:0][package]plptools-kde-0.16-89.i586
+>!> 3088: U_Th_[S2:0][package]pm-utils-0.99.3.20070618-13.i586
+>!> 3089: I__s_[S1:0][package]pm-utils-0.99.3.20070618-5.i586
+>!> 3090: U__s_[S2:0][package]pmidi-1.6.0-166.i586
+>!> 3091: I__s_[S1:0][package]pmtools-20061026-35.i586
+>!> 3092: U_Th_[S2:0][package]pmtools-20061026-41.i586
+>!> 3093: U__s_[S2:0][package]po-utils-0.5-881.i586
+>!> 3094: I__s_[S1:0][package]poppler-0.5.4-83.i586
+>!> 3095: U_Th_[S2:0][package]poppler-0.5.4-92.i586
+>!> 3096: U__s_[S2:0][package]poppler-devel-0.5.4-92.i586
+>!> 3097: U__s_[S2:0][package]poppler-glib-0.5.4-92.i586
+>!> 3098: I__s_[S1:0][package]poppler-qt-0.5.4-83.i586
+>!> 3099: U_Th_[S2:0][package]poppler-qt-0.5.4-92.i586
+>!> 3100: U__s_[S2:0][package]poppler-qt4-0.5.4-92.i586
+>!> 3101: I__s_[S1:0][package]popt-1.7-355.i586
+>!> 3102: U_Th_[S2:0][package]popt-1.7-364.i586
+>!> 3103: U__s_[S2:0][package]popt-devel-1.7-364.i586
+>!> 3104: I__s_[S1:0][package]portaudio-19-163.i586
+>!> 3105: U_Th_[S2:0][package]portaudio-19-170.i586
+>!> 3106: I__s_[S1:0][package]portmap-6.0+git20070513-16.i586
+>!> 3107: U_Th_[S2:0][package]portmap-6.0+git20070513-22.i586
+>!> 3108: U__s_[S2:0][package]posix_cc-1.4-425.i586
+>!> 3109: U__s_[S2:0][package]poster-20060221-6.i586
+>!> 3110: U_Th_[S2:0][package]postfix-2.4.5-12.i586
+>!> 3111: I__s_[S1:0][package]postfix-2.4.5-2.i586
+>!> 3112: U__s_[S2:0][package]postgresql-8.2.4-21.i586
+>!> 3113: U__s_[S2:0][package]postgresql-contrib-8.2.4-21.i586
+>!> 3114: U__s_[S2:0][package]postgresql-devel-8.2.4-21.i586
+>!> 3115: U__s_[S2:0][package]postgresql-libs-8.2.4-21.i586
+>!> 3116: U__s_[S2:0][package]postgresql-server-8.2.4-21.i586
+>!> 3117: U__s_[S2:0][package]powerprefs-0.8.0-52.i586
+>!> 3118: I__s_[S1:0][package]powersave-0.15.13-38.i586
+>!> 3119: U_Th_[S2:0][package]powersave-0.15.17-2.i586
+>!> 3120: U__s_[S2:0][package]powersave-devel-0.15.17-2.i586
+>!> 3121: I__s_[S1:0][package]powersave-libs-0.15.13-38.i586
+>!> 3122: U_Th_[S2:0][package]powersave-libs-0.15.17-2.i586
+>!> 3123: U__s_[S2:0][package]powertop-1.7-15.i586
+>!> 3124: I__s_[S1:0][package]ppp-2.4.4-60.i586
+>!> 3125: U_Th_[S2:0][package]ppp-2.4.4-67.i586
+>!> 3126: I__s_[S1:0][package]pptp-1.7.1-42.i586
+>!> 3127: U_Th_[S2:0][package]pptp-1.7.1-48.i586
+>!> 3128: U__s_[S2:0][package]pptpd-1.3.4-29.i586
+>!> 3129: U__s_[S2:0][package]prctl-1.3-424.i586
+>!> 3130: U_Th_[S2:0][package]preload-0.2-101.i586
+>!> 3131: I__s_[S1:0][package]preload-0.2-87.i586
+>!> 3132: U__s_[S2:0][package]privoxy-3.0.6-63.i586
+>!> 3133: U__s_[S2:0][package]procinfo-18-125.i586
+>!> 3134: U__s_[S2:0][package]procmail-3.22-132.i586
+>!> 3135: I__s_[S1:0][package]procps-3.2.7-58.i586
+>!> 3136: U_Th_[S2:0][package]procps-3.2.7-64.i586
+>!> 3137: US_s_[S2:0][product]openSUSE-DVD5-download-10.3.i686
+>!> 3138: U__s_[S2:0][package]providers-2006.11.21-41.noarch
+>!> 3139: U__s_[S2:0][package]psgml-1.3.2-96.noarch
+>!> 3140: U__s_[S2:0][package]psgplay-0.6-776.i586
+>!> 3141: U__s_[S2:0][package]psiconv-0.9.8-104.i586
+>!> 3142: I__s_[S1:0][package]psmisc-22.5-21.i586
+>!> 3143: U_Th_[S2:0][package]psmisc-22.5-27.i586
+>!> 3144: U__s_[S2:0][package]pstoedit-3.44-103.i586
+>!> 3145: U__s_[S2:0][package]pstoedit-devel-3.44-103.i586
+>!> 3146: U__s_[S2:0][package]psutils-p17-936.i586
+>!> 3147: I__s_[S1:0][package]pth-2.0.7-34.i586
+>!> 3148: U_Th_[S2:0][package]pth-2.0.7-40.i586
+>!> 3149: I__s_[S1:0][package]pwdutils-3.1.4-12.i586
+>!> 3150: U_Th_[S2:0][package]pwdutils-3.1.4-20.i586
+>!> 3151: U__s_[S2:0][package]pwgen-2.06-14.i586
+>!> 3152: U__s_[S2:0][package]pwlib-1.10.7-52.i586
+>!> 3153: U__s_[S2:0][package]pybluez-0.9.2-54.i586
+>!> 3154: U__s_[S2:0][package]pychecker-0.8.17-74.i586
+>!> 3155: U_Tl_[S2:0][package]python-2.5.1-32.i586
+>!> 3156: U__s_[S2:0][package]python-cairo-1.2.2-83.i586
+>!> 3157: U__s_[S2:0][package]python-curl-7.16.4-8.i586
+>!> 3158: U__s_[S2:0][package]python-curses-2.5.1-32.i586
+>!> 3159: U__s_[S2:0][package]python-dateutil-1.1-69.i586
+>!> 3160: U__s_[S2:0][package]python-devel-2.5.1-32.i586
+>!> 3161: U__s_[S2:0][package]python-fcgi-2000.09.21-242.i586
+>!> 3162: U__s_[S2:0][package]python-gdbm-2.5.1-32.i586
+>!> 3163: U__s_[S2:0][package]python-gnome-2.18.2-19.i586
+>!> 3164: U__s_[S2:0][package]python-gnome-extras-2.14.2-115.i586
+>!> 3165: U__s_[S2:0][package]python-gobject2-2.12.3-54.i586
+>!> 3166: U__s_[S2:0][package]python-gtk-2.10.6-17.i586
+>!> 3167: U__s_[S2:0][package]python-httplib2-0.2.0-69.i586
+>!> 3168: U__s_[S2:0][package]python-imaging-1.1.6-59.i586
+>!> 3169: U__s_[S2:0][package]python-kde3-3.16.0-15.i586
+>!> 3170: U__s_[S2:0][package]python-ldap-2.3.1-10.i586
+>!> 3171: U__s_[S2:0][package]python-numeric-24.2-95.i586
+>!> 3172: U__s_[S2:0][package]python-openssl-0.6-97.i586
+>!> 3173: U__s_[S2:0][package]python-opensync-0.22-44.i586
+>!> 3174: U__s_[S2:0][package]python-orbit-2.14.3-12.i586
+>!> 3175: U__s_[S2:0][package]python-pam-0.4.2-99.i586
+>!> 3176: U__s_[S2:0][package]python-pygame-1.7.1release-111.i586
+>!> 3177: U__s_[S2:0][package]python-qt-3.17.3-10.i586
+>!> 3178: U__s_[S2:0][package]python-serial-2.2-94.i586
+>!> 3179: U__s_[S2:0][package]python-sip-4.7-14.i586
+>!> 3180: U__s_[S2:0][package]python-tk-2.5.1-32.i586
+>!> 3181: U__s_[S2:0][package]python-twisted-2.5.0-10.i586
+>!> 3182: U__s_[S2:0][package]python-twisted-doc-2.5.0-10.i586
+>!> 3183: U__s_[S2:0][package]python-twisted-web-0.7.0-10.i586
+>!> 3184: U__s_[S2:0][package]python-urlgrabber-3.1.0-77.i586
+>!> 3185: U__s_[S2:0][package]python-xml-2.5.1-32.i586
+>!> 3186: U__s_[S2:0][package]python-zopeinterface-3.3.0-10.i586
+>!> 3187: U__s_[S2:0][package]pyxml-0.8.4-97.i586
+>!> 3188: U__s_[S2:0][package]qamix-0.0.7e-248.i586
+>!> 3189: I__s_[S1:0][package]qca-1.0-101.i586
+>!> 3190: U_Th_[S2:0][package]qca-1.0-110.i586
+>!> 3191: U__s_[S2:0][package]qemacs-0.3.1-287.i586
+>!> 3192: U__s_[S2:0][package]qemu-0.9.0.cvs-28.i586
+>!> 3193: U__s_[S2:0][package]qjackconnect-0.0.3b-653.i586
+>!> 3194: U__s_[S2:0][package]qjackctl-0.3.1a-18.i586
+>!> 3195: U__s_[S2:0][package]qlogic-firmware-1.0-81.noarch
+>!> 3196: U__s_[S2:0][package]qnotify-0.5.2-97.i586
+>!> 3197: U__s_[S2:0][package]qnotify-libs-0.5.2-97.i586
+>!> 3198: U__s_[S2:0][package]qpopper-4.0.8-87.i586
+>!> 3199: I__s_[S1:0][package]qt3-3.3.8-56.i586
+>!> 3200: U_Th_[S2:0][package]qt3-3.3.8-67.i586
+>!> 3201: U__s_[S2:0][package]qt3-devel-3.3.8-67.i586
+>!> 3202: U__s_[S2:0][package]qt3-devel-doc-3.3.8-67.noarch
+>!> 3203: U__s_[S2:0][package]qt3-devel-tools-3.3.8-67.i586
+>!> 3204: U__s_[S2:0][package]qt3-man-3.3.8-67.i586
+>!> 3205: U__s_[S2:0][package]qt3-mysql-3.3.8-67.i586
+>!> 3206: U__s_[S2:0][package]qt3-postgresql-3.3.8-67.i586
+>!> 3207: U__s_[S2:0][package]qt3-sqlite-3.3.8-67.i586
+>!> 3208: U__s_[S2:0][package]qt3-unixODBC-3.3.8-67.i586
+>!> 3209: I__s_[S1:0][package]qtcurve-gtk2-0.52.3-11.i586
+>!> 3210: U_Th_[S2:0][package]qtcurve-gtk2-0.52.3-21.i586
+>!> 3211: U__s_[S2:0][package]qtcurve-kde-0.52.3-21.i586
+>!> 3212: U__s_[S2:0][package]quagga-0.99.7-28.i586
+>!> 3213: U__s_[S2:0][package]quilt-0.46-57.i586
+>!> 3214: U__s_[S2:0][package]quota-3.15-14.i586
+>!> 3215: U__s_[S2:0][package]radvd-0.9-69.i586
+>!> 3216: U__s_[S2:0][package]raptor-1.4.15-35.i586
+>!> 3217: U__s_[S2:0][package]rarian-0.5.6-11.i586
+>!> 3218: U__s_[S2:0][package]rarpd-1.1-658.i586
+>!> 3219: U__s_[S2:0][package]rasmol-2.7.3.1-94.i586
+>!> 3220: U__s_[S2:0][package]rcs-5.7-938.i586
+>!> 3221: U__s_[S2:0][package]rdesktop-1.5.0-73.i586
+>!> 3222: U__s_[S2:0][package]readline-devel-5.2-56.i586
+>!> 3223: U__s_[S2:0][package]readline-doc-5.2-15.i586
+>!> 3224: I__s_[S1:0][package]recode-3.6-554.i586
+>!> 3225: U_Th_[S2:0][package]recode-3.6-560.i586
+>!> 3226: U__s_[S2:0][package]regexp-1.3-118.noarch
+>!> 3227: I__s_[S1:0][package]reiserfs-3.6.19-79.i586
+>!> 3228: U_Th_[S2:0][package]reiserfs-3.6.19-87.i586
+>!> 3229: U__s_[S2:0][package]rekall-2.4.5-58.i586
+>!> 3230: U__s_[S2:0][package]rekall-xbase-2.4.5-58.i586
+>!> 3231: I__s_[S1:0][package]release-notes-10.3.3-3.noarch
+>!> 3232: U_Th_[S2:0][package]release-notes-10.3.8-2.noarch
+>!> 3233: U__s_[S2:0][package]resapplet-0.1.4-77.i586
+>!> 3234: I__s_[S1:0][package]resmgr-1.1.0_SVNr143-2.i586
+>!> 3235: U_Th_[S2:0][package]resmgr-1.1.0_SVNr143-8.i586
+>!> 3236: U__s_[S2:0][package]rfb-0.6.1-570.i586
+>!> 3237: U__s_[S2:0][package]rfbplaymacro-0.2.0-309.i586
+>!> 3238: U__s_[S2:0][package]rfbproxy-0.6.5-337.i586
+>!> 3239: U__s_[S2:0][package]rfswitch-kmp-bigsmp-1.1_2.6.22.5_10-4.i586
+>!> 3240: U__s_[S2:0][package]rfswitch-kmp-default-1.1_2.6.22.5_10-4.i586
+>!> 3241: U__s_[S2:0][package]rfswitch-kmp-xen-1.1_2.6.22.5_10-4.i586
+>!> 3242: U__s_[S2:0][package]rfswitch-kmp-xenpae-1.1_2.6.22.5_10-4.i586
+>!> 3243: U__s_[S2:0][package]rinetd-0.61-875.i586
+>!> 3244: U__s_[S2:0][package]ripit-3.6.0-15.noarch
+>!> 3245: U__s_[S2:0][package]rlog-1.3.7-68.i586
+>!> 3246: U__s_[S2:0][package]root-tail-1.2-102.i586
+>!> 3247: I__s_[S1:0][package]rpm-4.4.2-127.i586
+>!> 3248: U_Th_[S2:0][package]rpm-4.4.2-136.i586
+>!> 3249: U__s_[S2:0][package]rpm-devel-4.4.2-136.i586
+>!> 3250: U__s_[S2:0][package]rpm-python-4.4.2-157.i586
+>!> 3251: I__s_[S1:0][package]rrdtool-1.2.23-34.i586
+>!> 3252: U_Th_[S2:0][package]rrdtool-1.2.23-41.i586
+>!> 3253: U__s_[S2:0][package]rsh-0.17-635.i586
+>!> 3254: U__s_[S2:0][package]rsh-server-0.17-635.i586
+>!> 3255: U__s_[S2:0][package]rsvg-sharp2-2.16.0-27.i586
+>!> 3256: U__s_[S2:0][package]rsync-2.6.9-41.i586
+>!> 3257: U__s_[S2:0][package]rt2x00-kmp-bigsmp-2.0.6+git20070816_2.6.22.5_10-2.i586
+>!> 3258: U__s_[S2:0][package]rt2x00-kmp-default-2.0.6+git20070816_2.6.22.5_10-2.i586
+>!> 3259: U__s_[S2:0][package]rt2x00-kmp-xen-2.0.6+git20070816_2.6.22.5_10-2.i586
+>!> 3260: U__s_[S2:0][package]rt2x00-kmp-xenpae-2.0.6+git20070816_2.6.22.5_10-2.i586
+>!> 3261: U_Th_[S2:0][package]ruby-1.8.6.p36-13.i586
+>!> 3262: I__s_[S1:0][package]ruby-1.8.6.p36-2.i586
+>!> 3263: U__s_[S2:0][package]ruby-devel-1.8.6.p36-13.i586
+>!> 3264: U__s_[S2:0][package]ruby-gettext-1.10.0-13.i586
+>!> 3265: U__s_[S2:0][package]ruby-ldap-0.9.7-82.i586
+>!> 3266: U__s_[S2:0][package]rubygem-actionmailer-1.3.3-13.i586
+>!> 3267: U__s_[S2:0][package]rubygem-actionpack-1.13.3-13.i586
+>!> 3268: U__s_[S2:0][package]rubygem-actionwebservice-1.2.3-13.i586
+>!> 3269: U__s_[S2:0][package]rubygem-activerecord-1.15.3-13.i586
+>!> 3270: U__s_[S2:0][package]rubygem-activesupport-1.4.2-13.i586
+>!> 3271: U__s_[S2:0][package]rubygem-daemons-1.0.7-13.i586
+>!> 3272: U__s_[S2:0][package]rubygem-gem_plugin-0.2.2-13.i586
+>!> 3273: U__s_[S2:0][package]rubygem-mongrel-0.3.13.4-79.i586
+>!> 3274: U__s_[S2:0][package]rubygem-rails-1.2.3-13.i586
+>!> 3275: U__s_[S2:0][package]rubygem-rake-0.7.3-13.i586
+>!> 3276: U__s_[S2:0][package]rubygems-0.9.2-56.i586
+>!> 3277: U__s_[S2:0][package]rxp-1.4.8-7.i586
+>!> 3278: U__s_[S2:0][package]rxvt-unicode-8.3-10.i586
+>!> 3279: U__s_[S2:0][package]rzsz-0.12.20-909.i586
+>!> 3280: U__s_[S2:0][package]sabayon-2.19.2-11.i586
+>!> 3281: U__s_[S2:0][package]sabayon-admin-2.19.2-11.i586
+>!> 3282: U__s_[S2:0][package]sablot-1.0.3-41.i586
+>!> 3283: U__s_[S2:0][package]samba-3.0.25c-3.i586
+>!> 3284: U__s_[S2:0][package]samba-client-3.0.25c-3.i586
+>!> 3285: U__s_[S2:0][package]samba-doc-3.0.25c-3.noarch
+>!> 3286: U__s_[S2:0][package]samba-vscan-0.3.6b-171.i586
+>!> 3287: U__s_[S2:0][package]samba-winbind-3.0.25c-3.i586
+>!> 3288: I__s_[S1:0][package]sane-backends-1.0.18-56.i586
+>!> 3289: U_Th_[S2:0][package]sane-backends-1.0.18-71.i586
+>!> 3290: U__s_[S2:0][package]sane-frontends-1.0.14-129.i586
+>!> 3291: U__s_[S2:0][package]sash-3.7-105.i586
+>!> 3292: I__s_[S1:0][package]sax2-8.1-197.i586
+>!> 3293: U_Th_[S2:0][package]sax2-8.1-235.i586
+>!> 3294: I__s_[S1:0][package]sax2-gui-8.1-197.i586
+>!> 3295: U_Th_[S2:0][package]sax2-gui-8.1-235.i586
+>!> 3296: I__s_[S1:0][package]sax2-ident-8.1-197.i586
+>!> 3297: U_Th_[S2:0][package]sax2-ident-8.1-235.i586
+>!> 3298: I__s_[S1:0][package]sax2-libsax-8.1-197.i586
+>!> 3299: U_Th_[S2:0][package]sax2-libsax-8.1-235.i586
+>!> 3300: I__s_[S1:0][package]sax2-libsax-perl-8.1-197.i586
+>!> 3301: U_Th_[S2:0][package]sax2-libsax-perl-8.1-235.i586
+>!> 3302: I__s_[S1:0][package]sax2-tools-8.1-197.i586
+>!> 3303: U_Th_[S2:0][package]sax2-tools-8.1-235.i586
+>!> 3304: U__s_[S2:0][package]sazanami-fonts-20040629-96.noarch
+>!> 3305: U__s_[S2:0][package]sbl-3.0f-13.i586
+>!> 3306: U__s_[S2:0][package]scim-1.4.7-15.i586
+>!> 3307: U__s_[S2:0][package]scim-anthy-1.2.4-17.i586
+>!> 3308: U__s_[S2:0][package]scim-bridge-0.4.13-16.i586
+>!> 3309: U__s_[S2:0][package]scim-bridge-gtk-0.4.13-16.i586
+>!> 3310: U__s_[S2:0][package]scim-bridge-qt-0.4.13-16.i586
+>!> 3311: U__s_[S2:0][package]scim-canna-1.0.0-98.i586
+>!> 3312: U__s_[S2:0][package]scim-chewing-0.3.1-102.i586
+>!> 3313: U__s_[S2:0][package]scim-devel-1.4.7-15.i586
+>!> 3314: U__s_[S2:0][package]scim-input-pad-0.1.1-117.i586
+>!> 3315: U__s_[S2:0][package]scim-m17n-0.2.2-59.i586
+>!> 3316: U__s_[S2:0][package]scim-pinyin-0.5.91.20060705-108.i586
+>!> 3317: U__s_[S2:0][package]scim-pinyin-skim-0.5.91.20060705-108.i586
+>!> 3318: U__s_[S2:0][package]scim-qtimm-0.9.4-111.i586
+>!> 3319: U__s_[S2:0][package]scim-skk-0.5.2-121.i586
+>!> 3320: U__s_[S2:0][package]scim-tables-0.5.7-99.i586
+>!> 3321: U__s_[S2:0][package]scim-tables-additional-0.5.7-99.i586
+>!> 3322: U__s_[S2:0][package]scim-tables-ja-0.5.7-99.i586
+>!> 3323: U__s_[S2:0][package]scim-tables-skim-0.5.7-99.i586
+>!> 3324: U__s_[S2:0][package]scim-tables-zh-0.5.7-99.i586
+>!> 3325: U__s_[S2:0][package]scim-tomoe-0.5.0-14.i586
+>!> 3326: U__s_[S2:0][package]scim-uim-0.2.0-17.i586
+>!> 3327: U__s_[S2:0][package]scotty-2.1.11-702.i586
+>!> 3328: I__s_[S1:0][package]scpm-1.1.6pre1-23.i586
+>!> 3329: U_Th_[S2:0][package]scpm-1.1.6pre2-6.i586
+>!> 3330: U__s_[S2:0][package]screen-4.0.2-124.i586
+>!> 3331: U__s_[S2:0][package]scrollkeeper-0.3.14-174.i586
+>!> 3332: U_Th_[S2:0][package]scsi-1.7_2.37_1.25_0.19_1.02_0.93-13.i586
+>!> 3333: I__s_[S1:0][package]scsi-1.7_2.37_1.25_0.19_1.02_0.93-6.i586
+>!> 3334: U__s_[S2:0][package]scsirastools-1.4.10-72.i586
+>!> 3335: U__s_[S2:0][package]seahorse-1.0.1-53.i586
+>!> 3336: U__s_[S2:0][package]seamonkey-1.1.4-7.i586
+>!> 3337: U__s_[S2:0][package]seamonkey-dom-inspector-1.1.4-7.i586
+>!> 3338: U__s_[S2:0][package]seamonkey-irc-1.1.4-7.i586
+>!> 3339: U__s_[S2:0][package]seamonkey-mail-1.1.4-7.i586
+>!> 3340: U__s_[S2:0][package]seamonkey-spellchecker-1.1.4-7.i586
+>!> 3341: U__s_[S2:0][package]seamonkey-venkman-1.1.4-7.i586
+>!> 3342: U__s_[S2:0][package]seccheck-2.0-590.noarch
+>!> 3343: I__s_[S1:0][package]sed-4.1.5-55.i586
+>!> 3344: U_Th_[S2:0][package]sed-4.1.5-61.i586
+>!> 3345: U__s_[S2:0][package]semi-xemacs-1.14.6-111.noarch
+>!> 3346: U__s_[S2:0][package]sendfax-1.1.35-63.i586
+>!> 3347: U__s_[S2:0][package]sendmail-8.14.1-46.i586
+>!> 3348: U_Th_[S2:0][package]sensors-2.10.4-15.i586
+>!> 3349: I__s_[S1:0][package]sensors-2.10.4-3.i586
+>!> 3350: U__s_[S2:0][package]seq24-0.8.7-97.i586
+>!> 3351: U__s_[S2:0][package]servletapi4-4.0.4-118.noarch
+>!> 3352: U__s_[S2:0][package]servletapi5-5.0.18-117.noarch
+>!> 3353: U__s_[S2:0][package]sesam_srv-3.0.1-65.i586
+>!> 3354: U__s_[S2:0][package]setserial-2.17-651.i586
+>!> 3355: U__s_[S2:0][package]sfftobmp-3.1-47.i586
+>!> 3356: U__s_[S2:0][package]sgi-fonts-1.0-812.noarch
+>!> 3357: U__s_[S2:0][package]sgml-skel-0.6-342.noarch
+>!> 3358: U__s_[S2:0][package]sgmltool-1.0.9-983.i586
+>!> 3359: U__s_[S2:0][package]sgmltools-lite-3.0.2-1181.noarch
+>!> 3360: U__s_[S2:0][package]sgrep-1.92a-893.i586
+>!> 3361: U_Th_[S2:0][package]shared-mime-info-0.22-10.i586
+>!> 3362: I__s_[S1:0][package]shared-mime-info-0.22-2.i586
+>!> 3363: U__s_[S2:0][package]sharutils-4.6.2-74.i586
+>!> 3364: U__s_[S2:0][package]sidplay-2.0.9-73.i586
+>!> 3365: I__s_[S1:0][package]siga-10.101-64.noarch
+>!> 3366: U_Th_[S2:0][package]siga-10.101-70.noarch
+>!> 3367: U__s_[S2:0][package]sil-charis-4.0.02-62.noarch
+>!> 3368: U__s_[S2:0][package]sil-doulos-4.0.14-62.noarch
+>!> 3369: U__s_[S2:0][package]silc-toolkit-1.1.2-10.i586
+>!> 3370: U__s_[S2:0][package]siproxd-0.5.13-83.i586
+>!> 3371: U__s_[S2:0][package]sisctrl-0.0.20051202-97.i586
+>!> 3372: U__s_[S2:0][package]sitar-1.0.6-63.noarch
+>!> 3373: U__s_[S2:0][package]skencil-0.6.17-123.i586
+>!> 3374: U__s_[S2:0][package]skim-1.4.5-110.i586
+>!> 3375: U__s_[S2:0][package]skim-scim-anthy-1.2.2-55.i586
+>!> 3376: U__s_[S2:0][package]skim-scim-canna-1.0.0-105.i586
+>!> 3377: U__s_[S2:0][package]skim-scim-skk-0.5.2.1-106.i586
+>!> 3378: U__s_[S2:0][package]skkdic-20050123-114.noarch
+>!> 3379: U_Th_[S2:0][package]slang-2.1.1-13.i586
+>!> 3380: I__s_[S1:0][package]slang-2.1.1-7.i586
+>!> 3381: U__s_[S2:0][package]slang-devel-2.1.1-13.i586
+>!> 3382: U__s_[S2:0][package]slib-3a1-122.noarch
+>!> 3383: U__s_[S2:0][package]slrn-0.9.8.1pl1-87.i586
+>!> 3384: U__s_[S2:0][package]smart-0.51-44.i586
+>!> 3385: U__s_[S2:0][package]smart-gui-0.51-44.i586
+>!> 3386: I__s_[S1:0][package]smartlink-softmodem-2.9.10-126.i586
+>!> 3387: U_Th_[S2:0][package]smartlink-softmodem-2.9.10-138.i586
+>!> 3388: U__s_[S2:0][package]smartlink-softmodem-kmp-bigsmp-2.9.10_2.6.22.5_10-138.i586
+>!> 3389: U__s_[S2:0][package]smartlink-softmodem-kmp-default-2.9.10_2.6.22.5_10-138.i586
+>!> 3390: U__s_[S2:0][package]smartmontools-5.37-12.i586
+>!> 3391: U__s_[S2:0][package]smolt-0.9.8.3-14.noarch
+>!> 3392: U__s_[S2:0][package]smpppd-1.59-80.i586
+>!> 3393: U__s_[S2:0][package]snd_sf2-0.1.2-594.noarch
+>!> 3394: U_Th_[S2:0][package]snmp-mibs-5.4.1-11.i586
+>!> 3395: I__s_[S1:0][package]snmp-mibs-5.4.1-2.i586
+>!> 3396: U__s_[S2:0][package]socat-1.5.0.0-60.i586
+>!> 3397: U__s_[S2:0][package]solarwolf-1.5-127.i586
+>!> 3398: U__s_[S2:0][package]solfege-3.8.2-22.i586
+>!> 3399: U__s_[S2:0][package]sound-juicer-2.19.3-3.i586
+>!> 3400: U__s_[S2:0][package]soundtouch-1.3.1-16.i586
+>!> 3401: U__s_[S2:0][package]sox-13.0.0-37.i586
+>!> 3402: U__s_[S2:0][package]spamassassin-3.2.3-7.i586
+>!> 3403: U__s_[S2:0][package]spandsp-0.0.3-36.i586
+>!> 3404: U__s_[S2:0][package]spectcl-1.2.1.9-16.noarch
+>!> 3405: U__s_[S2:0][package]speex-1.1.99.2-23.i586
+>!> 3406: I__s_[S1:0][package]splashy-0.3.3-16.i586
+>!> 3407: U_Th_[S2:0][package]splashy-0.3.3-32.i586
+>!> 3408: U_Th_[S2:0][package]sqlite-3.4.1-10.i586
+>!> 3409: I__s_[S1:0][package]sqlite-3.4.1-2.i586
+>!> 3410: U__s_[S2:0][package]sqlite-devel-3.4.1-10.i586
+>!> 3411: I__s_[S1:0][package]sqlite2-2.8.17-77.i586
+>!> 3412: U_Th_[S2:0][package]sqlite2-2.8.17-84.i586
+>!> 3413: U__s_[S2:0][package]sqlite2-devel-2.8.17-84.i586
+>!> 3414: U__s_[S2:0][package]squid-2.6.STABLE14-14.i586
+>!> 3415: U__s_[S2:0][package]squidGuard-1.2.1-31.i586
+>!> 3416: U__s_[S2:0][package]src_vipa-2.0.3-71.i586
+>!> 3417: U__s_[S2:0][package]sshfs-1.8-28.i586
+>!> 3418: U__s_[S2:0][package]star-1.5a70-78.i586
+>!> 3419: I__s_[S1:0][package]startup-notification-0.9-2.i586
+>!> 3420: U_Th_[S2:0][package]startup-notification-0.9-9.i586
+>!> 3421: U__s_[S2:0][package]startup-notification-devel-0.9-9.i586
+>!> 3422: U__s_[S2:0][package]statserial-1.1-647.i586
+>!> 3423: U__s_[S2:0][package]strace-4.5.16-8.i586
+>!> 3424: I__s_[S1:0][package]strigi-0.5.4.svn696918-2.i586
+>!> 3425: U_Th_[S2:0][package]strigi-0.5.5-11.i586
+>!> 3426: U__s_[S2:0][package]strigi-devel-0.5.5-11.i586
+>!> 3427: U__s_[S2:0][package]subversion-1.4.4-22.i586
+>!> 3428: U__s_[S2:0][package]subversion-doc-1.4-18.noarch
+>!> 3429: U__s_[S2:0][package]subversion-perl-1.4.4-22.i586
+>!> 3430: U__s_[S2:0][package]subversion-python-1.4.4-22.i586
+>!> 3431: U__s_[S2:0][package]subversion-server-1.4.4-22.i586
+>!> 3432: U__s_[S2:0][package]subversion-tools-1.4.4-22.i586
+>!> 3433: U__s_[S2:0][package]suck-4.3.0-614.i586
+>!> 3434: U_Th_[S2:0][package]sudo-1.6.9p2-16.i586
+>!> 3435: I__s_[S1:0][package]sudo-1.6.9p2-3.i586
+>!> 3436: I__s_[S1:0][package]sumf-0.2.4pre1-126.i586
+>!> 3437: U_Th_[S2:0][package]sumf-0.2.4pre2-13.i586
+>!> 3438: U__s_[S2:0][package]supertux-0.1.3-82.i586
+>!> 3439: I__s_[S1:0][package]suse-build-key-1.0-752.noarch
+>!> 3440: U_Th_[S2:0][package]suse-build-key-1.0-762.noarch
+>!> 3441: I__s_[S1:0][package]suseRegister-1.2-62.noarch
+>!> 3442: U_Th_[S2:0][package]suseRegister-1.2-73.noarch
+>!> 3443: I__s_[S1:0][package]susehelp-2007.05.30-20.noarch
+>!> 3444: U_Th_[S2:0][package]susehelp-2007.08.22-6.noarch
+>!> 3445: U__s_[S2:0][package]susehelp_cz-2007.08.22-6.noarch
+>!> 3446: U__s_[S2:0][package]susehelp_de-2007.08.22-6.noarch
+>!> 3447: I__s_[S1:0][package]susehelp_en-2007.05.30-20.noarch
+>!> 3448: U_Th_[S2:0][package]susehelp_en-2007.08.22-6.noarch
+>!> 3449: U__s_[S2:0][package]susehelp_es-2007.08.22-6.noarch
+>!> 3450: U__s_[S2:0][package]susehelp_fr-2007.08.22-6.noarch
+>!> 3451: U__s_[S2:0][package]susehelp_hu-2007.08.22-6.noarch
+>!> 3452: U__s_[S2:0][package]susehelp_it-2007.08.22-6.noarch
+>!> 3453: U__s_[S2:0][package]susevbox-1.1-1636.i586
+>!> 3454: I__s_[S1:0][package]suspend-0.50.20070731-5.i586
+>!> 3455: U_Th_[S2:0][package]suspend-0.69.9-2.i586
+>!> 3456: U__s_[S2:0][package]svg-schema-20030114-26.noarch
+>!> 3457: U__s_[S2:0][package]swig-1.3.31-44.i586
+>!> 3458: U_Th_[S2:0][package]sysconfig-0.70.0-10.i586
+>!> 3459: I__s_[S1:0][package]sysconfig-0.70.0-3.i586
+>!> 3460: I__s_[S1:0][package]sysfsutils-2.1.0-52.i586
+>!> 3461: U_Th_[S2:0][package]sysfsutils-2.1.0-58.i586
+>!> 3462: U__s_[S2:0][package]syslinux-3.31-55.i586
+>!> 3463: I__s_[S1:0][package]syslog-ng-1.6.12-24.i586
+>!> 3464: U_Th_[S2:0][package]syslog-ng-1.6.12-30.i586
+>!> 3465: U__s_[S2:0][package]syslogd-1.4.1-629.i586
+>!> 3466: U__s_[S2:0][package]sysstat-7.1.6-13.i586
+>!> 3467: U__s_[S2:0][package]sysstat-isag-7.1.6-13.i586
+>!> 3468: I_Lu_[S0:0][system]system-.noarch
+>!> 3469: I__s_[S1:0][package]sysvinit-2.86-93.i586
+>!> 3470: U_Th_[S2:0][package]sysvinit-2.86-99.i586
+>!> 3471: U__s_[S2:0][package]t1lib-5.1.1-8.i586
+>!> 3472: U__s_[S2:0][package]t1lib-devel-5.1.1-8.i586
+>!> 3473: U__s_[S2:0][package]tack-5.6-37.i586
+>!> 3474: U_Th_[S2:0][package]taglib-1.4-106.i586
+>!> 3475: I__s_[S1:0][package]taglib-1.4-97.i586
+>!> 3476: U__s_[S2:0][package]talk-0.17-630.i586
+>!> 3477: U__s_[S2:0][package]talk-server-0.17-630.i586
+>!> 3478: U__s_[S2:0][package]tamago-4.0.6_20011017cvs-707.noarch
+>!> 3479: U__s_[S2:0][package]tango-icon-theme-0.8.0-69.noarch
+>!> 3480: U_Th_[S2:0][package]tar-1.17-18.i586
+>!> 3481: I__s_[S1:0][package]tar-1.17-8.i586
+>!> 3482: U__s_[S2:0][package]tcl-8.4.15-19.i586
+>!> 3483: U__s_[S2:0][package]tcl-devel-8.4.15-19.i586
+>!> 3484: U__s_[S2:0][package]tcllib-1.9-50.noarch
+>!> 3485: U__s_[S2:0][package]tclplug-3.0.2-86.i586
+>!> 3486: U__s_[S2:0][package]tcludp-1.0.7-74.i586
+>!> 3487: U__s_[S2:0][package]tclx-8.4-403.i586
+>!> 3488: I__s_[S1:0][package]tcpd-7.6-782.i586
+>!> 3489: U_Th_[S2:0][package]tcpd-7.6-788.i586
+>!> 3490: U__s_[S2:0][package]tcpd-devel-7.6-788.i586
+>!> 3491: U__s_[S2:0][package]tcpdump-3.9.7-11.i586
+>!> 3492: U__s_[S2:0][package]tcsh-6.15.00-17.i586
+>!> 3493: U__s_[S2:0][package]tdom-0.8.2-8.i586
+>!> 3494: U__s_[S2:0][package]tei-xsl-stylesheets-5.4.24-30.noarch
+>!> 3495: U__s_[S2:0][package]tei_4-2004.1.30-122.noarch
+>!> 3496: U__s_[S2:0][package]tellico-1.2.13-19.i586
+>!> 3497: U__s_[S2:0][package]telnet-1.2-74.i586
+>!> 3498: U__s_[S2:0][package]telnet-server-1.2-74.i586
+>!> 3499: U__s_[S2:0][package]termcap-2.0.8-948.i586
+>!> 3500: U__s_[S2:0][package]terminfo-5.6-37.i586
+>!> 3501: U__s_[S2:0][package]terminus-font-4.20-87.noarch
+>!> 3502: U__s_[S2:0][package]testgart-0.1-259.i586
+>!> 3503: U__s_[S2:0][package]texinfo-4.9-12.i586
+>!> 3504: U__s_[S2:0][package]texlive-2007-62.noarch
+>!> 3505: U__s_[S2:0][package]texlive-bin-2007-61.i586
+>!> 3506: U__s_[S2:0][package]texlive-bin-cjk-2007-61.i586
+>!> 3507: U__s_[S2:0][package]texlive-bin-devel-2007-61.i586
+>!> 3508: U__s_[S2:0][package]texlive-bin-dvilj-2007-61.i586
+>!> 3509: U__s_[S2:0][package]texlive-bin-latex-2007-61.i586
+>!> 3510: U__s_[S2:0][package]texlive-bin-metapost-2007-61.i586
+>!> 3511: U__s_[S2:0][package]texlive-bin-omega-2007-61.i586
+>!> 3512: U__s_[S2:0][package]texlive-bin-xetex-2007-61.i586
+>!> 3513: U__s_[S2:0][package]texlive-cjk-2007-62.noarch
+>!> 3514: U__s_[S2:0][package]texlive-cjk-latex-extras-20070515-36.noarch
+>!> 3515: U__s_[S2:0][package]texlive-context-2007-62.noarch
+>!> 3516: U__s_[S2:0][package]texlive-devel-2007-62.noarch
+>!> 3517: U__s_[S2:0][package]texlive-dvilj-2007-62.noarch
+>!> 3518: U__s_[S2:0][package]texlive-latex-2007-62.noarch
+>!> 3519: U__s_[S2:0][package]texlive-metapost-2007-62.noarch
+>!> 3520: U__s_[S2:0][package]texlive-omega-2007-62.noarch
+>!> 3521: U__s_[S2:0][package]texlive-xetex-2007-62.noarch
+>!> 3522: U__s_[S2:0][package]textmaker-2007.3.26-39.i586
+>!> 3523: U__s_[S2:0][package]tftp-0.48-36.i586
+>!> 3524: U__s_[S2:0][package]tgt-0.1-30.i586
+>!> 3525: U__s_[S2:0][package]thinkeramik-3.2.1-140.i586
+>!> 3526: U__s_[S2:0][package]thinkeramik-style-3.2.1-140.i586
+>!> 3527: U__s_[S2:0][package]thunar-0.8.0-72.i586
+>!> 3528: U__s_[S2:0][package]thunar-volman-0.1.2-65.i586
+>!> 3529: U__s_[S2:0][package]tidy-1.0-48.i586
+>!> 3530: U__s_[S2:0][package]tiff-3.8.2-65.i586
+>!> 3531: I__s_[S1:0][package]tightvnc-1.3.9-2.i586
+>!> 3532: U_Th_[S2:0][package]tightvnc-1.3.9-9.i586
+>!> 3533: I__s_[S1:0][package]timezone-2.6-16.i586
+>!> 3534: U_Th_[S2:0][package]timezone-2007g-4.i586
+>!> 3535: U__s_[S2:0][package]timidity-2.13.2-120.i586
+>!> 3536: U__s_[S2:0][package]tix-8.4.0-22.i586
+>!> 3537: U__s_[S2:0][package]tk-8.4.15-19.i586
+>!> 3538: U__s_[S2:0][package]tk-devel-8.4.15-19.i586
+>!> 3539: U__s_[S2:0][package]tkcon-2.4-71.noarch
+>!> 3540: U__s_[S2:0][package]tkimg-1.3-119.i586
+>!> 3541: U__s_[S2:0][package]tktable-2.9-80.i586
+>!> 3542: U__s_[S2:0][package]tla-1.3.3-79.i586
+>!> 3543: U__s_[S2:0][package]tls-1.5.1-67.i586
+>!> 3544: U__s_[S2:0][package]tomboy-0.7.6-2.i586
+>!> 3545: U__s_[S2:0][package]tomcat55-5.5.23-101.noarch
+>!> 3546: U__s_[S2:0][package]tomcat55-common-lib-5.5.23-101.noarch
+>!> 3547: U__s_[S2:0][package]tomcat55-jasper-5.5.23-101.noarch
+>!> 3548: U__s_[S2:0][package]tomcat55-jsp-2_0-api-5.5.23-101.noarch
+>!> 3549: U__s_[S2:0][package]tomcat55-server-lib-5.5.23-101.noarch
+>!> 3550: U__s_[S2:0][package]tomcat55-servlet-2_4-api-5.5.23-101.noarch
+>!> 3551: U__s_[S2:0][package]tomoe-0.5.1-13.i586
+>!> 3552: U__s_[S2:0][package]toshutils-2.0.1-1246.i586
+>!> 3553: U__s_[S2:0][package]totem-2.19.90-3.i586
+>!> 3554: U__s_[S2:0][package]totem-plugin-2.19.90-3.i586
+>!> 3555: U__s_[S2:0][package]tpb-0.6.4-102.i586
+>!> 3556: U__s_[S2:0][package]tpctl-4.17-121.i586
+>!> 3557: U__s_[S2:0][package]tpctl-kmp-bigsmp-4.17_2.6.22.5_10-121.i586
+>!> 3558: U__s_[S2:0][package]tpctl-kmp-default-4.17_2.6.22.5_10-121.i586
+>!> 3559: U__s_[S2:0][package]trackballs-1.1.4-10.i586
+>!> 3560: U__s_[S2:0][package]traffic-vis-0.35-240.i586
+>!> 3561: U__s_[S2:0][package]transfig-3.2.5-18.i586
+>!> 3562: U__s_[S2:0][package]transset-20040120-91.i586
+>!> 3563: U__s_[S2:0][package]tree-1.5.1-29.i586
+>!> 3564: U__s_[S2:0][package]tsclient-0.148-108.i586
+>!> 3565: U__s_[S2:0][package]tse3-0.3.1-75.i586
+>!> 3566: U__s_[S2:0][package]ttf-arphic-20001125-673.noarch
+>!> 3567: U__s_[S2:0][package]ttf-arphic-bkai00mp-20001125-673.noarch
+>!> 3568: U__s_[S2:0][package]ttf-arphic-bsmi00lp-20001125-673.noarch
+>!> 3569: U__s_[S2:0][package]ttf-arphic-gbsn00lp-20001125-673.noarch
+>!> 3570: U__s_[S2:0][package]ttf-arphic-gkai00mp-20001125-673.noarch
+>!> 3571: U__s_[S2:0][package]ttf-caslon-20031202-147.noarch
+>!> 3572: U__s_[S2:0][package]ttf-cmex-kai-0.20061030-1.noarch
+>!> 3573: U__s_[S2:0][package]ttf-cmex-song-0.20061030-1.noarch
+>!> 3574: U__s_[S2:0][package]ttf-founder-simplified-0.20040419-1.noarch
+>!> 3575: U__s_[S2:0][package]ttf-founder-traditional-0.20040419-1.noarch
+>!> 3576: U__s_[S2:0][package]tv-common-3.95-90.i586
+>!> 3577: U__s_[S2:0][package]tv-fonts-1.1-313.noarch
+>!> 3578: U__s_[S2:0][package]twinkle-1.1-14.i586
+>!> 3579: U_Th_[S2:0][package]udev-114-10.i586
+>!> 3580: I__s_[S1:0][package]udev-114-2.i586
+>!> 3581: U_Th_[S2:0][package]ufraw-0.12-19.i586
+>!> 3582: I__s_[S1:0][package]ufraw-0.12-2.i586
+>!> 3583: U_Th_[S2:0][package]ufraw-gimp-0.12-19.i586
+>!> 3584: I__s_[S1:0][package]ufraw-gimp-0.12-2.i586
+>!> 3585: U__s_[S2:0][package]uim-1.2.1-117.i586
+>!> 3586: U__s_[S2:0][package]uim-devel-1.2.1-117.i586
+>!> 3587: U__s_[S2:0][package]uim-gtk2-1.2.1-117.i586
+>!> 3588: U__s_[S2:0][package]uim-qt-1.2.1-117.i586
+>!> 3589: U__s_[S2:0][package]ulimit-1.1-205.noarch
+>!> 3590: U__s_[S2:0][package]umtsmon-0.6.9-3.i586
+>!> 3591: U__s_[S2:0][package]unace-2.5-199.i586
+>!> 3592: U__s_[S2:0][package]unarj-2.65-211.i586
+>!> 3593: U__s_[S2:0][package]unclutter-8-936.i586
+>!> 3594: U__s_[S2:0][package]ungifsicle-1.39-244.i586
+>!> 3595: U__s_[S2:0][package]unison-2.27.24-50.i586
+>!> 3596: U__s_[S2:0][package]units-1.86-41.i586
+>!> 3597: U__s_[S2:0][package]unix2dos-2.2-296.i586
+>!> 3598: U__s_[S2:0][package]unixODBC-2.2.12-52.i586
+>!> 3599: U__s_[S2:0][package]unrar-3.70-18.i586
+>!> 3600: U__s_[S2:0][package]unsermake-0.4_20070504-36.i586
+>!> 3601: I__s_[S1:0][package]unzip-5.52-68.i586
+>!> 3602: U_Th_[S2:0][package]unzip-5.52-74.i586
+>!> 3603: I__s_[S1:0][package]update-alternatives-1.8.3-66.noarch
+>!> 3604: U_Th_[S2:0][package]update-alternatives-1.8.3-72.noarch
+>!> 3605: U__s_[S2:0][package]update-desktop-files-10.3-59.noarch
+>!> 3606: U__s_[S2:0][package]update-test-affects-package-manager-0-1.3.noarch
+>!> 3607: U__s_[S2:0][package]update-test-interactive-0-1.3.noarch
+>!> 3608: U__s_[S2:0][package]update-test-optional-0-1.3.noarch
+>!> 3609: U__s_[S2:0][package]update-test-reboot-needed-0-1.3.noarch
+>!> 3610: U__s_[S2:0][package]update-test-security-0-1.3.noarch
+>!> 3611: U__s_[S2:0][package]update-test-trival-0-1.3.noarch
+>!> 3612: U__s_[S2:0][package]upx-3.00-11.i586
+>!> 3613: U__s_[S2:0][package]usbutils-0.72-60.i586
+>!> 3614: U__s_[S2:0][package]usbview-1.0-939.i586
+>!> 3615: I__s_[S1:0][package]utempter-0.5.5-67.i586
+>!> 3616: U_Th_[S2:0][package]utempter-0.5.5-73.i586
+>!> 3617: U_Th_[S2:0][package]util-linux-2.12r+2.13rc2+git20070725-18.i586
+>!> 3618: I__s_[S1:0][package]util-linux-2.12r+2.13rc2+git20070725-5.i586
+>!> 3619: U__s_[S2:0][package]uvcvideo-kmp-bigsmp-r117_2.6.22.5_10-2.i586
+>!> 3620: U__s_[S2:0][package]uvcvideo-kmp-default-r117_2.6.22.5_10-2.i586
+>!> 3621: U__s_[S2:0][package]uvcvideo-kmp-xen-r117_2.6.22.5_10-2.i586
+>!> 3622: U__s_[S2:0][package]uvcvideo-kmp-xenpae-r117_2.6.22.5_10-2.i586
+>!> 3623: I__s_[S1:0][package]v4l-conf-3.95-82.i586
+>!> 3624: U_Th_[S2:0][package]v4l-conf-3.95-90.i586
+>!> 3625: U__s_[S2:0][package]v4l-tools-3.95-90.i586
+>!> 3626: U__s_[S2:0][package]vacation-1.2.6.2-59.i586
+>!> 3627: U__s_[S2:0][package]valgrind-3.2.3-50.i586
+>!> 3628: U__s_[S2:0][package]vbetool-1.0-31.i586
+>!> 3629: U__s_[S2:0][package]vcdimager-0.7.23-76.i586
+>!> 3630: U__s_[S2:0][package]vcdimager-devel-0.7.23-76.i586
+>!> 3631: U__s_[S2:0][package]vdr-1.4.7-26.i586
+>!> 3632: U__s_[S2:0][package]viki-0.0-140.i586
+>!> 3633: I__s_[S1:0][package]vim-7.1-24.i586
+>!> 3634: U_Th_[S2:0][package]vim-7.1-37.i586
+>!> 3635: I__s_[S1:0][package]vim-base-7.1-24.i586
+>!> 3636: U_Th_[S2:0][package]vim-base-7.1-37.i586
+>!> 3637: U__s_[S2:0][package]vim-data-7.1-37.i586
+>!> 3638: U__s_[S2:0][package]vino-2.19.90-3.i586
+>!> 3639: U__s_[S2:0][package]virt-manager-0.4.0-55.i586
+>!> 3640: U__s_[S2:0][package]virtualbox-20070822-3.i586
+>!> 3641: U__s_[S2:0][package]virtualbox-kmp-default-20070822_2.6.22.5_10-3.i586
+>!> 3642: U__s_[S2:0][package]vkeybd-0.1.17a-93.i586
+>!> 3643: U__s_[S2:0][package]vlan-1.9-48.i586
+>!> 3644: U__s_[S2:0][package]vlna-1.2-246.i586
+>!> 3645: U__s_[S2:0][package]vlock-1.4-11.i586
+>!> 3646: U__s_[S2:0][package]vm-install-0.2.1-36.i586
+>!> 3647: U_Th_[S2:0][package]vorbis-tools-1.1.1-102.i586
+>!> 3648: I__s_[S1:0][package]vorbis-tools-1.1.1-93.i586
+>!> 3649: U__s_[S2:0][package]vpnc-0.3.3-72.i586
+>!> 3650: U__s_[S2:0][package]vsftpd-2.0.5-74.i586
+>!> 3651: U__s_[S2:0][package]vtcl-1.6.0-110.noarch
+>!> 3652: U__s_[S2:0][package]vte-0.16.8-15.i586
+>!> 3653: U__s_[S2:0][package]vte-devel-0.16.8-15.i586
+>!> 3654: U__s_[S2:0][package]vte-sharp2-2.16.0-27.i586
+>!> 3655: U__s_[S2:0][package]vym-1.10.0-8.i586
+>!> 3656: I__s_[S1:0][package]w3m-0.5.2-15.i586
+>!> 3657: U_Th_[S2:0][package]w3m-0.5.2-25.i586
+>!> 3658: U__s_[S2:0][package]w3m-el-1.4.4.20070717-23.noarch
+>!> 3659: U__s_[S2:0][package]w3m-el-xemacs-1.4.4.20070717-23.noarch
+>!> 3660: U__s_[S2:0][package]w3mir-1.0.10-590.i586
+>!> 3661: U__s_[S2:0][package]wadokujt-20030810-176.noarch
+>!> 3662: U__s_[S2:0][package]wavpack-4.41.0-11.i586
+>!> 3663: U__s_[S2:0][package]wbxml2-0.9.2_SVN48-26.i586
+>!> 3664: U__s_[S2:0][package]wdfs-1.4.2-33.i586
+>!> 3665: U__s_[S2:0][package]wdiff-0.5.2-731.i586
+>!> 3666: U__s_[S2:0][package]websh-3.5.0-180.i586
+>!> 3667: U__s_[S2:0][package]wesnoth-1.2.6-2.i586
+>!> 3668: U__s_[S2:0][package]wesnoth-campaign-server-1.2.6-2.i586
+>!> 3669: U__s_[S2:0][package]wesnoth-data-base-1.2.6-2.noarch
+>!> 3670: U__s_[S2:0][package]wesnoth-data-full-1.2.6-2.noarch
+>!> 3671: U__s_[S2:0][package]wesnoth-editor-1.2.6-2.i586
+>!> 3672: U__s_[S2:0][package]wesnoth-server-1.2.6-2.i586
+>!> 3673: U__s_[S2:0][package]wesnoth-tools-1.2.6-2.i586
+>!> 3674: I__s_[S1:0][package]wget-1.10.2-67.i586
+>!> 3675: U_Th_[S2:0][package]wget-1.10.2-74.i586
+>!> 3676: U__s_[S2:0][package]whois-4.7.21-8.i586
+>!> 3677: U__s_[S2:0][package]wiggle-0.6-182.i586
+>!> 3678: U__s_[S2:0][package]wine-0.9.44-5.i586
+>!> 3679: U__s_[S2:0][package]wink-1.5-62.i586
+>!> 3680: U_Th_[S2:0][package]wireless-tools-29pre22-10.i586
+>!> 3681: I__s_[S1:0][package]wireless-tools-29pre22-2.i586
+>!> 3682: U__s_[S2:0][package]wireshark-0.99.6-24.i586
+>!> 3683: U__s_[S2:0][package]wl-xemacs-2.12.0-112.noarch
+>!> 3684: U__s_[S2:0][package]wlan-ng-0.2.8-27.i586
+>!> 3685: U__s_[S2:0][package]wlan-ng-kmp-bigsmp-0.2.8_2.6.22.5_10-27.i586
+>!> 3686: U__s_[S2:0][package]wlan-ng-kmp-default-0.2.8_2.6.22.5_10-27.i586
+>!> 3687: U__s_[S2:0][package]wlan-ng-kmp-xen-0.2.8_2.6.22.5_10-27.i586
+>!> 3688: U__s_[S2:0][package]wlan-ng-kmp-xenpae-0.2.8_2.6.22.5_10-27.i586
+>!> 3689: U__s_[S2:0][package]wm-icons-0.3.0-528.noarch
+>!> 3690: I__s_[S1:0][package]wodim-1.1.6-10.i586
+>!> 3691: U_Th_[S2:0][package]wodim-1.1.6-18.i586
+>!> 3692: U__s_[S2:0][package]wol-0.7.1-71.i586
+>!> 3693: U__s_[S2:0][package]wondershaper-1.1a-285.noarch
+>!> 3694: U__s_[S2:0][package]wordcut-0.5.1b2-88.i586
+>!> 3695: U__s_[S2:0][package]wordcut-devel-0.5.1b2-88.i586
+>!> 3696: U__s_[S2:0][package]words-6-78.noarch
+>!> 3697: U_Th_[S2:0][package]wpa_supplicant-0.5.8-21.i586
+>!> 3698: I__s_[S1:0][package]wpa_supplicant-0.5.8-8.i586
+>!> 3699: U__s_[S2:0][package]wpa_supplicant-gui-0.5.8-21.i586
+>!> 3700: U__s_[S2:0][package]wsdl4j-1.5.1-146.noarch
+>!> 3701: U__s_[S2:0][package]wsndpref-1.1.1-1055.i586
+>!> 3702: U__s_[S2:0][package]wsndsrv-0.4.0-1087.i586
+>!> 3703: U__s_[S2:0][package]wv-1.2.2-67.i586
+>!> 3704: U__s_[S2:0][package]wv2-0.2.3-104.i586
+>!> 3705: U__s_[S2:0][package]wv2-devel-0.2.3-104.i586
+>!> 3706: I__s_[S1:0][package]wvdial-1.56-10.i586
+>!> 3707: U_Th_[S2:0][package]wvdial-1.56-18.i586
+>!> 3708: I__s_[S1:0][package]wvstreams-4.2.2-48.i586
+>!> 3709: U_Th_[S2:0][package]wvstreams-4.2.2-56.i586
+>!> 3710: U__s_[S2:0][package]wvstreams-devel-4.2.2-56.i586
+>!> 3711: U__s_[S2:0][package]wwwoffle-2.9c-13.i586
+>!> 3712: U__s_[S2:0][package]wxGTK-2.8.4.0-41.i586
+>!> 3713: U__s_[S2:0][package]x11-input-fujitsu-0.6.4-28.i586
+>!> 3714: I__s_[S1:0][package]x11-input-synaptics-0.14.6-82.i586
+>!> 3715: U_Th_[S2:0][package]x11-input-synaptics-0.14.6-94.i586
+>!> 3716: I__s_[S1:0][package]x11-input-wacom-0.7.8-16.i586
+>!> 3717: U_Th_[S2:0][package]x11-input-wacom-0.7.8-28.i586
+>!> 3718: I__s_[S1:0][package]x11-input-wacom-tools-0.7.8-16.i586
+>!> 3719: U_Th_[S2:0][package]x11-input-wacom-tools-0.7.8-28.i586
+>!> 3720: U__s_[S2:0][package]x11-tools-0.1-97.i586
+>!> 3721: U__s_[S2:0][package]x2x-1.30_beta-104.i586
+>!> 3722: U__s_[S2:0][package]x3270-3.2.20-393.i586
+>!> 3723: U__s_[S2:0][package]xabacus-7.3-9.i586
+>!> 3724: I__s_[S1:0][package]xalan-j2-2.7.0-72.noarch
+>!> 3725: U_Th_[S2:0][package]xalan-j2-2.7.0-95.noarch
+>!> 3726: U__s_[S2:0][package]xano-mincho-20040509-30.noarch
+>!> 3727: U__s_[S2:0][package]xaos-3.1-264.i586
+>!> 3728: U__s_[S2:0][package]xarchiver-0.4.6-57.i586
+>!> 3729: I__s_[S1:0][package]xaw3d-1.5E-308.i586
+>!> 3730: U_Th_[S2:0][package]xaw3d-1.5E-315.i586
+>!> 3731: U__s_[S2:0][package]xawtv-3.95-90.i586
+>!> 3732: U__s_[S2:0][package]xbanner-1.31-946.i586
+>!> 3733: U__s_[S2:0][package]xbase-2.0.0-179.i586
+>!> 3734: U__s_[S2:0][package]xboard-4.2.7-148.i586
+>!> 3735: U__s_[S2:0][package]xbsql-0.11-179.i586
+>!> 3736: U__s_[S2:0][package]xchat-2.8.4-27.i586
+>!> 3737: U__s_[S2:0][package]xclass-0.9.2-69.i586
+>!> 3738: U__s_[S2:0][package]xcompmgr-051031-83.i586
+>!> 3739: U__s_[S2:0][package]xdelta-1.1.4-54.i586
+>!> 3740: I__s_[S1:0][package]xdg-menu-0.2-119.i586
+>!> 3741: U_Th_[S2:0][package]xdg-menu-0.2-125.i586
+>!> 3742: I__s_[S1:0][package]xdg-utils-1.0.1-63.noarch
+>!> 3743: U_Th_[S2:0][package]xdg-utils-1.0.1-75.noarch
+>!> 3744: U__s_[S2:0][package]xdmbgrd-0.6-83.i586
+>!> 3745: U__s_[S2:0][package]xemacs-21.5.28.20070807-15.i586
+>!> 3746: U__s_[S2:0][package]xemacs-info-21.5.28.20070807-15.i586
+>!> 3747: U__s_[S2:0][package]xemacs-packages-20070427-16.noarch
+>!> 3748: U__s_[S2:0][package]xemacs-packages-info-20070427-16.noarch
+>!> 3749: U__s_[S2:0][package]xen-3.1.0_15042-39.i586
+>!> 3750: U__s_[S2:0][package]xen-doc-html-3.1.0_15042-39.i586
+>!> 3751: U__s_[S2:0][package]xen-doc-pdf-3.1.0_15042-39.i586
+>!> 3752: U__s_[S2:0][package]xen-libs-3.1.0_15042-39.i586
+>!> 3753: U__s_[S2:0][package]xen-tools-3.1.0_15042-39.i586
+>!> 3754: U__s_[S2:0][package]xen-tools-ioemu-3.1.0_15042-39.i586
+>!> 3755: I__s_[S1:0][package]xerces-j2-2.8.1-72.noarch
+>!> 3756: U_Th_[S2:0][package]xerces-j2-2.8.1-79.noarch
+>!> 3757: I__s_[S1:0][package]xerces-j2-xml-apis-2.8.1-72.noarch
+>!> 3758: U_Th_[S2:0][package]xerces-j2-xml-apis-2.8.1-79.noarch
+>!> 3759: U__s_[S2:0][package]xerces-j2-xml-resolver-2.8.1-79.noarch
+>!> 3760: U__s_[S2:0][package]xfce-mcs-manager-4.4.1-47.i586
+>!> 3761: U__s_[S2:0][package]xfce-mcs-plugins-4.4.1-47.i586
+>!> 3762: U__s_[S2:0][package]xfce4-appfinder-4.4.1-34.i586
+>!> 3763: U__s_[S2:0][package]xfce4-desktop-4.4.1-58.i586
+>!> 3764: U__s_[S2:0][package]xfce4-icon-theme-4.4.1-29.noarch
+>!> 3765: U__s_[S2:0][package]xfce4-mixer-4.4.1-53.i586
+>!> 3766: U__s_[S2:0][package]xfce4-panel-4.4.1-52.i586
+>!> 3767: U__s_[S2:0][package]xfce4-session-4.4.1-50.i586
+>!> 3768: U__s_[S2:0][package]xfce4-volstatus-0.1.0-36.i586
+>!> 3769: U__s_[S2:0][package]xfig-3.2.5-18.i586
+>!> 3770: U__s_[S2:0][package]xfntjp-20020904-530.noarch
+>!> 3771: U__s_[S2:0][package]xfprint-4.4.1-47.i586
+>!> 3772: U__s_[S2:0][package]xfsdump-2.2.45-18.i586
+>!> 3773: U_Tl_[S2:0][package]xfsprogs-2.8.21-17.i586
+>!> 3774: U__s_[S2:0][package]xfwm4-4.4.1-51.i586
+>!> 3775: I__s_[S1:0][package]xgl-git_070104-54.i586
+>!> 3776: U_Th_[S2:0][package]xgl-git_070104-68.i586
+>!> 3777: I__s_[S1:0][package]xgl-hardware-list-060526-69.noarch
+>!> 3778: U_Th_[S2:0][package]xgl-hardware-list-060526-75.noarch
+>!> 3779: U__s_[S2:0][package]xgrabsc-2.41-1125.i586
+>!> 3780: U__s_[S2:0][package]xhtml-dtd-2002.8.9-139.noarch
+>!> 3781: I__s_[S1:0][package]xine-lib-1.1.7-16.i586
+>!> 3782: U_Th_[S2:0][package]xine-lib-1.1.8-4.i586
+>!> 3783: U__s_[S2:0][package]xine-ui-0.99.5-52.i586
+>!> 3784: I__s_[S1:0][package]xinetd-2.3.14-66.i586
+>!> 3785: U_Th_[S2:0][package]xinetd-2.3.14-74.i586
+>!> 3786: U__s_[S2:0][package]xiterm-0.5.20040304-133.i586
+>!> 3787: U__s_[S2:0][package]xjdic-2.4-171.i586
+>!> 3788: U__s_[S2:0][package]xjdic-data-2.4-171.i586
+>!> 3789: U__s_[S2:0][package]xjdic-indices-2.4-171.i586
+>!> 3790: I__s_[S1:0][package]xkeyboard-config-1.0-10.noarch
+>!> 3791: U_Th_[S2:0][package]xkeyboard-config-1.0-22.noarch
+>!> 3792: I__s_[S1:0][package]xli-20061110-27.i586
+>!> 3793: U_Th_[S2:0][package]xli-20061110-34.i586
+>!> 3794: U__s_[S2:0][package]xlockmore-5.24-12.i586
+>!> 3795: U__s_[S2:0][package]xlogical-1.0.7-1061.i586
+>!> 3796: U__s_[S2:0][package]xmahjong-2006.8.10-87.i586
+>!> 3797: U__s_[S2:0][package]xmanja-0.7-373.noarch
+>!> 3798: U__s_[S2:0][package]xmgrace-5.1.21-47.i586
+>!> 3799: U__s_[S2:0][package]xml-commons-1.3.02-118.noarch
+>!> 3800: U__s_[S2:0][package]xml-commons-apis-1.3.02-118.noarch
+>!> 3801: U__s_[S2:0][package]xml-commons-resolver-1.1-123.noarch
+>!> 3802: U__s_[S2:0][package]xml-commons-which-1.3.02-118.noarch
+>!> 3803: U__s_[S2:0][package]xmlcharent-0.3-331.noarch
+>!> 3804: U__s_[S2:0][package]xmlstarlet-1.0.1-75.i586
+>!> 3805: U__s_[S2:0][package]xmltex-2007.8.1-14.i586
+>!> 3806: U__s_[S2:0][package]xmlto-0.0.18-104.i586
+>!> 3807: U__s_[S2:0][package]xmorph-20060817-93.i586
+>!> 3808: U__s_[S2:0][package]xmoto-0.3.2-11.i586
+>!> 3809: U__s_[S2:0][package]xmountains-2.7-100.i586
+>!> 3810: U__s_[S2:0][package]xmset-1.2-118.i586
+>!> 3811: U_Th_[S2:0][package]xntp-4.2.4p3-18.i586
+>!> 3812: I__s_[S1:0][package]xntp-4.2.4p3-9.i586
+>!> 3813: I__s_[S1:0][package]xorg-x11-7.2-107.i586
+>!> 3814: U_Th_[S2:0][package]xorg-x11-7.2-126.i586
+>!> 3815: I__s_[S1:0][package]xorg-x11-Xvnc-7.1-77.i586
+>!> 3816: U_Th_[S2:0][package]xorg-x11-Xvnc-7.1-85.i586
+>!> 3817: U__s_[S2:0][package]xorg-x11-devel-7.2-96.i586
+>!> 3818: I__s_[S1:0][package]xorg-x11-driver-input-7.2-86.i586
+>!> 3819: U_Th_[S2:0][package]xorg-x11-driver-input-7.2-98.i586
+>!> 3820: I__s_[S1:0][package]xorg-x11-driver-video-7.2-145.i586
+>!> 3821: U_Th_[S2:0][package]xorg-x11-driver-video-7.2-171.i586
+>!> 3822: U__s_[S2:0][package]xorg-x11-fonts-7.2-78.noarch
+>!> 3823: I__s_[S1:0][package]xorg-x11-fonts-core-7.2-67.noarch
+>!> 3824: U_Th_[S2:0][package]xorg-x11-fonts-core-7.2-78.noarch
+>!> 3825: U__s_[S2:0][package]xorg-x11-fonts-devel-7.2-49.i586
+>!> 3826: I__s_[S1:0][package]xorg-x11-libICE-7.2-50.i586
+>!> 3827: U_Th_[S2:0][package]xorg-x11-libICE-7.2-57.i586
+>!> 3828: U__s_[S2:0][package]xorg-x11-libICE-devel-7.2-57.i586
+>!> 3829: I__s_[S1:0][package]xorg-x11-libSM-7.2-48.i586
+>!> 3830: U_Th_[S2:0][package]xorg-x11-libSM-7.2-54.i586
+>!> 3831: U__s_[S2:0][package]xorg-x11-libSM-devel-7.2-54.i586
+>!> 3832: I__s_[S1:0][package]xorg-x11-libX11-7.2-63.i586
+>!> 3833: U_Th_[S2:0][package]xorg-x11-libX11-7.2-70.i586
+>!> 3834: I__s_[S1:0][package]xorg-x11-libX11-ccache-7.2-68.i586
+>!> 3835: U_Th_[S2:0][package]xorg-x11-libX11-ccache-7.2-79.i586
+>!> 3836: U__s_[S2:0][package]xorg-x11-libX11-devel-7.2-70.i586
+>!> 3837: I__s_[S1:0][package]xorg-x11-libXau-7.2-44.i586
+>!> 3838: U_Th_[S2:0][package]xorg-x11-libXau-7.2-50.i586
+>!> 3839: U__s_[S2:0][package]xorg-x11-libXau-devel-7.2-50.i586
+>!> 3840: I__s_[S1:0][package]xorg-x11-libXdmcp-7.2-43.i586
+>!> 3841: U_Th_[S2:0][package]xorg-x11-libXdmcp-7.2-49.i586
+>!> 3842: U__s_[S2:0][package]xorg-x11-libXdmcp-devel-7.2-49.i586
+>!> 3843: I__s_[S1:0][package]xorg-x11-libXext-7.2-52.i586
+>!> 3844: U_Th_[S2:0][package]xorg-x11-libXext-7.2-59.i586
+>!> 3845: U__s_[S2:0][package]xorg-x11-libXext-devel-7.2-59.i586
+>!> 3846: I__s_[S1:0][package]xorg-x11-libXfixes-7.2-52.i586
+>!> 3847: U_Th_[S2:0][package]xorg-x11-libXfixes-7.2-59.i586
+>!> 3848: U__s_[S2:0][package]xorg-x11-libXfixes-devel-7.2-59.i586
+>!> 3849: I__s_[S1:0][package]xorg-x11-libXmu-7.2-52.i586
+>!> 3850: U_Th_[S2:0][package]xorg-x11-libXmu-7.2-59.i586
+>!> 3851: U__s_[S2:0][package]xorg-x11-libXmu-devel-7.2-59.i586
+>!> 3852: I__s_[S1:0][package]xorg-x11-libXp-7.2-47.i586
+>!> 3853: U_Th_[S2:0][package]xorg-x11-libXp-7.2-54.i586
+>!> 3854: U__s_[S2:0][package]xorg-x11-libXp-devel-7.2-54.i586
+>!> 3855: I__s_[S1:0][package]xorg-x11-libXpm-7.2-51.i586
+>!> 3856: U_Th_[S2:0][package]xorg-x11-libXpm-7.2-59.i586
+>!> 3857: U__s_[S2:0][package]xorg-x11-libXpm-devel-7.2-59.i586
+>!> 3858: I__s_[S1:0][package]xorg-x11-libXprintUtil-7.2-47.i586
+>!> 3859: U_Th_[S2:0][package]xorg-x11-libXprintUtil-7.2-54.i586
+>!> 3860: U__s_[S2:0][package]xorg-x11-libXprintUtil-devel-7.2-54.i586
+>!> 3861: I__s_[S1:0][package]xorg-x11-libXrender-7.2-51.i586
+>!> 3862: U_Th_[S2:0][package]xorg-x11-libXrender-7.2-59.i586
+>!> 3863: U__s_[S2:0][package]xorg-x11-libXrender-devel-7.2-59.i586
+>!> 3864: I__s_[S1:0][package]xorg-x11-libXt-7.2-53.i586
+>!> 3865: U_Th_[S2:0][package]xorg-x11-libXt-7.2-60.i586
+>!> 3866: U__s_[S2:0][package]xorg-x11-libXt-devel-7.2-60.i586
+>!> 3867: I__s_[S1:0][package]xorg-x11-libXv-7.2-48.i586
+>!> 3868: U_Th_[S2:0][package]xorg-x11-libXv-7.2-55.i586
+>!> 3869: U__s_[S2:0][package]xorg-x11-libXv-devel-7.2-55.i586
+>!> 3870: I__s_[S1:0][package]xorg-x11-libfontenc-7.2-49.i586
+>!> 3871: U_Th_[S2:0][package]xorg-x11-libfontenc-7.2-55.i586
+>!> 3872: U__s_[S2:0][package]xorg-x11-libfontenc-devel-7.2-55.i586
+>!> 3873: I__s_[S1:0][package]xorg-x11-libs-7.2-84.i586
+>!> 3874: U_Th_[S2:0][package]xorg-x11-libs-7.2-96.i586
+>!> 3875: I__s_[S1:0][package]xorg-x11-libxcb-7.2-39.i586
+>!> 3876: U_Th_[S2:0][package]xorg-x11-libxcb-7.2-46.i586
+>!> 3877: U__s_[S2:0][package]xorg-x11-libxcb-devel-7.2-46.i586
+>!> 3878: I__s_[S1:0][package]xorg-x11-libxkbfile-7.2-51.i586
+>!> 3879: U_Th_[S2:0][package]xorg-x11-libxkbfile-7.2-58.i586
+>!> 3880: U__s_[S2:0][package]xorg-x11-libxkbfile-devel-7.2-58.i586
+>!> 3881: U__s_[S2:0][package]xorg-x11-proto-devel-7.2-62.i586
+>!> 3882: I__s_[S1:0][package]xorg-x11-server-7.2-115.i586
+>!> 3883: U_Th_[S2:0][package]xorg-x11-server-7.2-130.i586
+>!> 3884: U__s_[S2:0][package]xorg-x11-server-extra-7.2-130.i586
+>!> 3885: U__s_[S2:0][package]xorg-x11-server-sdk-7.2-130.i586
+>!> 3886: U__s_[S2:0][package]xorg-x11-util-devel-7.2-50.i586
+>!> 3887: U__s_[S2:0][package]xorg-x11-xtrans-devel-7.2-52.i586
+>!> 3888: U__s_[S2:0][package]xosd-2.2.12-105.i586
+>!> 3889: U__s_[S2:0][package]xosview-1.8.3-89.i586
+>!> 3890: U__s_[S2:0][package]xournal-0.3.3-64.i586
+>!> 3891: U__s_[S2:0][package]xpdf-3.02-12.i586
+>!> 3892: I__s_[S1:0][package]xpdf-tools-3.01-103.i586
+>!> 3893: U_Th_[S2:0][package]xpdf-tools-3.02-12.i586
+>!> 3894: U__s_[S2:0][package]xpenguins-2.2-719.i586
+>!> 3895: U__s_[S2:0][package]xpp-1.5-121.i586
+>!> 3896: U__s_[S2:0][package]xrestop-0.4-73.i586
+>!> 3897: U__s_[S2:0][package]xsane-0.994-69.i586
+>!> 3898: U__s_[S2:0][package]xscreensaver-5.03-14.i586
+>!> 3899: U__s_[S2:0][package]xsidplay-1.6.5.2-106.i586
+>!> 3900: U__s_[S2:0][package]xskat-4.0-102.i586
+>!> 3901: U__s_[S2:0][package]xslide-0.2.2-97.noarch
+>!> 3902: U__s_[S2:0][package]xsnow-1.42-344.i586
+>!> 3903: U__s_[S2:0][package]xsp-1.2.5-12.noarch
+>!> 3904: U_Th_[S2:0][package]xstroke-0.6-103.i586
+>!> 3905: I__s_[S1:0][package]xstroke-0.6-93.i586
+>!> 3906: I__s_[S1:0][package]xterm-228-6.i586
+>!> 3907: U_Th_[S2:0][package]xterm-229-9.i586
+>!> 3908: U__s_[S2:0][package]xtermset-0.5.2-191.i586
+>!> 3909: U__s_[S2:0][package]xv-3.10a-1163.i586
+>!> 3910: I__s_[S1:0][package]xvkbd-2.8-67.i586
+>!> 3911: U_Th_[S2:0][package]xvkbd-2.8-74.i586
+>!> 3912: U__s_[S2:0][package]xyaku-1.4.0-92.i586
+>!> 3913: U__s_[S2:0][package]xzgv-0.8-220.i586
+>!> 3914: U__s_[S2:0][package]yafc-1.1.1-81.i586
+>!> 3915: U__s_[S2:0][package]yafray-0.0.8-98.i586
+>!> 3916: I__s_[S1:0][package]yast2-2.15.45-3.i586
+>!> 3917: U_Th_[S2:0][package]yast2-2.15.54-2.i586
+>!> 3918: I__s_[S1:0][package]yast2-add-on-2.15.11-2.noarch
+>!> 3919: U_Th_[S2:0][package]yast2-add-on-2.15.14-4.noarch
+>!> 3920: U__s_[S2:0][package]yast2-add-on-creator-2.15.20-8.noarch
+>!> 3921: I__s_[S1:0][package]yast2-apparmor-2.0.2-15.noarch
+>!> 3922: U_Th_[S2:0][package]yast2-apparmor-2.1-10.noarch
+>!> 3923: U__s_[S2:0][package]yast2-autofs-2.15.2-52.noarch
+>!> 3924: I__s_[S1:0][package]yast2-backup-2.15.4-15.noarch
+>!> 3925: U_Th_[S2:0][package]yast2-backup-2.15.4-32.noarch
+>!> 3926: I__s_[S1:0][package]yast2-bluetooth-2.15.2-30.noarch
+>!> 3927: U_Th_[S2:0][package]yast2-bluetooth-2.15.4-2.noarch
+>!> 3928: I__s_[S1:0][package]yast2-bootloader-2.15.14-9.i586
+>!> 3929: U_Th_[S2:0][package]yast2-bootloader-2.15.19-3.i586
+>!> 3930: U__s_[S2:0][package]yast2-ca-management-2.15.2-13.noarch
+>!> 3931: I__s_[S1:0][package]yast2-control-center-2.15.1-3.i586
+>!> 3932: U_Th_[S2:0][package]yast2-control-center-2.15.4-3.i586
+>!> 3933: U__s_[S2:0][package]yast2-control-center-gnome-2.13.2-75.i586
+>!> 3934: I__s_[S1:0][package]yast2-control-center-qt-2.15.1-3.i586
+>!> 3935: U_Th_[S2:0][package]yast2-control-center-qt-2.15.4-3.i586
+>!> 3936: U_Th_[S2:0][package]yast2-core-2.15.10-2.i586
+>!> 3937: I__s_[S1:0][package]yast2-core-2.15.8-2.i586
+>!> 3938: U__s_[S2:0][package]yast2-core-devel-2.15.10-2.i586
+>!> 3939: I__s_[S1:0][package]yast2-country-2.15.16-2.i586
+>!> 3940: U_Th_[S2:0][package]yast2-country-2.15.18-12.i586
+>!> 3941: U__s_[S2:0][package]yast2-devel-doc-2.15.54-2.i586
+>!> 3942: U__s_[S2:0][package]yast2-devtools-2.15.8-3.noarch
+>!> 3943: U__s_[S2:0][package]yast2-dhcp-server-2.15.4-31.noarch
+>!> 3944: U__s_[S2:0][package]yast2-dns-server-2.15.3-64.noarch
+>!> 3945: U__s_[S2:0][package]yast2-drbd-2.13.1-35.noarch
+>!> 3946: U__s_[S2:0][package]yast2-fingerprint-reader-2.15.2-12.i586
+>!> 3947: U_Th_[S2:0][package]yast2-firewall-2.15.7-23.noarch
+>!> 3948: I__s_[S1:0][package]yast2-firewall-2.15.7-8.noarch
+>!> 3949: U__s_[S2:0][package]yast2-firstboot-2.15.1-76.noarch
+>!> 3950: U__s_[S2:0][package]yast2-ftp-server-2.15.9-7.noarch
+>!> 3951: U__s_[S2:0][package]yast2-gtk-2.15.9-16.i586
+>!> 3952: U_Th_[S2:0][package]yast2-hardware-detection-2.15.8-22.i586
+>!> 3953: I__s_[S1:0][package]yast2-hardware-detection-2.15.8-9.i586
+>!> 3954: U__s_[S2:0][package]yast2-http-server-2.15.7-10.noarch
+>!> 3955: U_Th_[S2:0][package]yast2-inetd-2.15.1-24.noarch
+>!> 3956: I__s_[S1:0][package]yast2-inetd-2.15.1-7.noarch
+>!> 3957: I__s_[S1:0][package]yast2-installation-2.15.40-2.noarch
+>!> 3958: U_Th_[S2:0][package]yast2-installation-2.15.46-2.noarch
+>!> 3959: U__s_[S2:0][package]yast2-installation-devel-doc-2.15.46-2.noarch
+>!> 3960: U__s_[S2:0][package]yast2-instserver-2.15.4-27.noarch
+>!> 3961: I__s_[S1:0][package]yast2-irda-2.15.1-64.noarch
+>!> 3962: U_Th_[S2:0][package]yast2-irda-2.15.1-79.noarch
+>!> 3963: U_Th_[S2:0][package]yast2-iscsi-client-2.15.2-24.noarch
+>!> 3964: I__s_[S1:0][package]yast2-iscsi-client-2.15.2-9.noarch
+>!> 3965: U__s_[S2:0][package]yast2-iscsi-server-2.14.3-73.noarch
+>!> 3966: U__s_[S2:0][package]yast2-kdump-2.15.7-3.i586
+>!> 3967: U_Th_[S2:0][package]yast2-kerberos-client-2.15.7-17.noarch
+>!> 3968: I__s_[S1:0][package]yast2-kerberos-client-2.15.7-2.noarch
+>!> 3969: I__s_[S1:0][package]yast2-ldap-2.15.1-53.i586
+>!> 3970: U_Th_[S2:0][package]yast2-ldap-2.15.1-68.i586
+>!> 3971: U_Th_[S2:0][package]yast2-ldap-client-2.15.12-20.noarch
+>!> 3972: I__s_[S1:0][package]yast2-ldap-client-2.15.12-3.noarch
+>!> 3973: U__s_[S2:0][package]yast2-ldap-server-2.15.5-61.noarch
+>!> 3974: U_Th_[S2:0][package]yast2-mail-2.15.20-18.noarch
+>!> 3975: I__s_[S1:0][package]yast2-mail-2.15.9-38.noarch
+>!> 3976: U__s_[S2:0][package]yast2-mail-plugins-2.15.20-18.noarch
+>!> 3977: I__s_[S1:0][package]yast2-metapackage-handler-0.5.2-2.noarch
+>!> 3978: U_Th_[S2:0][package]yast2-metapackage-handler-0.7.0-3.noarch
+>!> 3979: I__s_[S1:0][package]yast2-mouse-2.15.1-51.i586
+>!> 3980: U_Th_[S2:0][package]yast2-mouse-2.15.1-66.i586
+>!> 3981: U__s_[S2:0][package]yast2-multipath-2.13.0-70.noarch
+>!> 3982: I__s_[S1:0][package]yast2-ncurses-2.15.23-4.i586
+>!> 3983: U_Th_[S2:0][package]yast2-ncurses-2.15.26-7.i586
+>!> 3984: I__s_[S1:0][package]yast2-network-2.15.57-2.i586
+>!> 3985: U_Th_[S2:0][package]yast2-network-2.15.72-2.i586
+>!> 3986: U__s_[S2:0][package]yast2-network-devel-doc-2.15.72-2.i586
+>!> 3987: I__s_[S1:0][package]yast2-nfs-client-2.14.0-71.noarch
+>!> 3988: U_Th_[S2:0][package]yast2-nfs-client-2.15.0-10.noarch
+>!> 3989: U__s_[S2:0][package]yast2-nfs-server-2.15.4-10.noarch
+>!> 3990: I__s_[S1:0][package]yast2-nis-client-2.15.2-49.i586
+>!> 3991: U_Th_[S2:0][package]yast2-nis-client-2.15.3-6.i586
+>!> 3992: U__s_[S2:0][package]yast2-nis-server-2.15.1-26.noarch
+>!> 3993: U__s_[S2:0][package]yast2-nis-server-devel-doc-2.15.1-26.noarch
+>!> 3994: I__s_[S1:0][package]yast2-ntp-client-2.15.6-2.noarch
+>!> 3995: U_Th_[S2:0][package]yast2-ntp-client-2.15.8-2.noarch
+>!> 3996: U_Th_[S2:0][package]yast2-online-update-2.15.20-20.noarch
+>!> 3997: I__s_[S1:0][package]yast2-online-update-2.15.20-3.noarch
+>!> 3998: U_Th_[S2:0][package]yast2-online-update-frontend-2.15.20-20.noarch
+>!> 3999: I__s_[S1:0][package]yast2-online-update-frontend-2.15.20-3.noarch
+>!> 4000: I__s_[S1:0][package]yast2-packager-2.15.54-2.i586
+>!> 4001: U_Th_[S2:0][package]yast2-packager-2.15.74-2.i586
+>!> 4002: U_Th_[S2:0][package]yast2-pam-2.14.0-113.noarch
+>!> 4003: I__s_[S1:0][package]yast2-pam-2.14.0-98.noarch
+>!> 4004: I__s_[S1:0][package]yast2-perl-bindings-2.15.2-4.i586
+>!> 4005: U_Th_[S2:0][package]yast2-perl-bindings-2.15.3-12.i586
+>!> 4006: U__s_[S2:0][package]yast2-phone-services-2.15.0-59.noarch
+>!> 4007: I__s_[S1:0][package]yast2-pkg-bindings-2.15.42-4.i586
+>!> 4008: U_Th_[S2:0][package]yast2-pkg-bindings-2.15.49-2.i586
+>!> 4009: U__s_[S2:0][package]yast2-pkg-bindings-devel-doc-2.15.49-2.noarch
+>!> 4010: I__s_[S1:0][package]yast2-printer-2.15.4-2.i586
+>!> 4011: U_Th_[S2:0][package]yast2-printer-2.15.5-2.i586
+>!> 4012: U__s_[S2:0][package]yast2-printer-devel-doc-2.15.5-2.i586
+>!> 4013: U__s_[S2:0][package]yast2-product-creator-2.15.6-7.noarch
+>!> 4014: I__s_[S1:0][package]yast2-profile-manager-2.15.0-18.i586
+>!> 4015: U_Th_[S2:0][package]yast2-profile-manager-2.15.0-35.i586
+>!> 4016: U__s_[S2:0][package]yast2-python-bindings-2.15.2-12.i586
+>!> 4017: I__s_[S1:0][package]yast2-qt-2.15.11-4.i586
+>!> 4018: U_Th_[S2:0][package]yast2-qt-2.15.16-2.i586
+>!> 4019: I__s_[S1:0][package]yast2-registration-2.15.0-3.noarch
+>!> 4020: U_Th_[S2:0][package]yast2-registration-2.15.2-3.noarch
+>!> 4021: I__s_[S1:0][package]yast2-repair-2.15.7-24.noarch
+>!> 4022: U_Th_[S2:0][package]yast2-repair-2.15.7-41.noarch
+>!> 4023: I__s_[S1:0][package]yast2-restore-2.15.2-7.noarch
+>!> 4024: U_Th_[S2:0][package]yast2-restore-2.15.4-4.noarch
+>!> 4025: U__s_[S2:0][package]yast2-ruby-bindings-0.1.0-16.i586
+>!> 4026: I__s_[S1:0][package]yast2-runlevel-2.15.2-13.noarch
+>!> 4027: U_Th_[S2:0][package]yast2-runlevel-2.15.3-4.noarch
+>!> 4028: U_Th_[S2:0][package]yast2-samba-client-2.15.11-18.noarch
+>!> 4029: I__s_[S1:0][package]yast2-samba-client-2.15.11-3.noarch
+>!> 4030: I__s_[S1:0][package]yast2-samba-server-2.15.7-23.noarch
+>!> 4031: U_Th_[S2:0][package]yast2-samba-server-2.15.7-40.noarch
+>!> 4032: I__s_[S1:0][package]yast2-scanner-2.15.5-12.noarch
+>!> 4033: U_Th_[S2:0][package]yast2-scanner-2.15.5-27.noarch
+>!> 4034: U_Th_[S2:0][package]yast2-schema-2.15.0-102.noarch
+>!> 4035: I__s_[S1:0][package]yast2-schema-2.15.0-75.noarch
+>!> 4036: I__s_[S1:0][package]yast2-security-2.15.0-59.noarch
+>!> 4037: U_Th_[S2:0][package]yast2-security-2.15.1-8.noarch
+>!> 4038: I__s_[S1:0][package]yast2-slp-2.14.1-73.i586
+>!> 4039: U_Th_[S2:0][package]yast2-slp-2.15.0-16.i586
+>!> 4040: U__s_[S2:0][package]yast2-slp-server-2.15.0-28.noarch
+>!> 4041: U_Th_[S2:0][package]yast2-sound-2.15.11-3.i586
+>!> 4042: I__s_[S1:0][package]yast2-sound-2.15.9-3.i586
+>!> 4043: I__s_[S1:0][package]yast2-storage-2.15.20-2.i586
+>!> 4044: U_Th_[S2:0][package]yast2-storage-2.15.24-2.i586
+>!> 4045: U__s_[S2:0][package]yast2-storage-devel-2.15.24-2.i586
+>!> 4046: U__s_[S2:0][package]yast2-storage-evms-2.15.24-2.i586
+>!> 4047: I__s_[S1:0][package]yast2-storage-lib-2.15.20-2.i586
+>!> 4048: U_Th_[S2:0][package]yast2-storage-lib-2.15.24-2.i586
+>!> 4049: I__s_[S1:0][package]yast2-sudo-2.15.3-52.noarch
+>!> 4050: U_Th_[S2:0][package]yast2-sudo-2.15.3-69.noarch
+>!> 4051: I__s_[S1:0][package]yast2-support-2.15.2-42.noarch
+>!> 4052: U_Th_[S2:0][package]yast2-support-2.15.2-57.noarch
+>!> 4053: I__s_[S1:0][package]yast2-sysconfig-2.15.3-28.noarch
+>!> 4054: U_Th_[S2:0][package]yast2-sysconfig-2.15.3-43.noarch
+>!> 4055: U__s_[S2:0][package]yast2-testsuite-2.15.1-12.noarch
+>!> 4056: U__s_[S2:0][package]yast2-tftp-server-2.14.0-90.noarch
+>!> 4057: U_Th_[S2:0][package]yast2-theme-openSUSE-2.15.13-2.noarch
+>!> 4058: I__s_[S1:0][package]yast2-theme-openSUSE-2.15.6-3.noarch
+>!> 4059: U__s_[S2:0][package]yast2-trans-af-2.15.3-7.noarch
+>!> 4060: U__s_[S2:0][package]yast2-trans-ar-2.15.3-7.noarch
+>!> 4061: U__s_[S2:0][package]yast2-trans-bg-2.15.4-4.noarch
+>!> 4062: U__s_[S2:0][package]yast2-trans-bn-2.15.5-7.noarch
+>!> 4063: U__s_[S2:0][package]yast2-trans-bs-2.15.1-16.noarch
+>!> 4064: U__s_[S2:0][package]yast2-trans-ca-2.15.2-7.noarch
+>!> 4065: U__s_[S2:0][package]yast2-trans-cs-2.15.11-2.noarch
+>!> 4066: U__s_[S2:0][package]yast2-trans-cy-2.15.1-16.noarch
+>!> 4067: U__s_[S2:0][package]yast2-trans-da-2.15.10-2.noarch
+>!> 4068: U__s_[S2:0][package]yast2-trans-de-2.15.16-4.noarch
+>!> 4069: U__s_[S2:0][package]yast2-trans-el-2.15.10-4.noarch
+>!> 4070: U__s_[S2:0][package]yast2-trans-en_GB-2.15.5-4.noarch
+>!> 4071: I__s_[S1:0][package]yast2-trans-en_US-2.15.1-8.noarch
+>!> 4072: U_Th_[S2:0][package]yast2-trans-en_US-2.15.4-4.noarch
+>!> 4073: U__s_[S2:0][package]yast2-trans-es-2.15.4-4.noarch
+>!> 4074: U__s_[S2:0][package]yast2-trans-et-2.15.10-4.noarch
+>!> 4075: U__s_[S2:0][package]yast2-trans-fi-2.15.15-4.noarch
+>!> 4076: U__s_[S2:0][package]yast2-trans-fr-2.15.8-2.noarch
+>!> 4077: U__s_[S2:0][package]yast2-trans-gl-2.15.1-16.noarch
+>!> 4078: U__s_[S2:0][package]yast2-trans-gu-2.13.5-7.noarch
+>!> 4079: U__s_[S2:0][package]yast2-trans-he-2.15.1-16.noarch
+>!> 4080: U__s_[S2:0][package]yast2-trans-hi-2.15.4-4.noarch
+>!> 4081: U__s_[S2:0][package]yast2-trans-hr-2.15.12-4.noarch
+>!> 4082: U__s_[S2:0][package]yast2-trans-hu-2.15.12-4.noarch
+>!> 4083: U__s_[S2:0][package]yast2-trans-it-2.15.9-4.noarch
+>!> 4084: U__s_[S2:0][package]yast2-trans-ja-2.15.6-4.noarch
+>!> 4085: U__s_[S2:0][package]yast2-trans-km-2.15.17-2.noarch
+>!> 4086: U__s_[S2:0][package]yast2-trans-ko-2.15.2-16.noarch
+>!> 4087: U__s_[S2:0][package]yast2-trans-lt-2.15.9-4.noarch
+>!> 4088: U__s_[S2:0][package]yast2-trans-mk-2.15.1-16.noarch
+>!> 4089: U__s_[S2:0][package]yast2-trans-mr-2.15.3-7.noarch
+>!> 4090: U__s_[S2:0][package]yast2-trans-nb-2.15.9-4.noarch
+>!> 4091: U__s_[S2:0][package]yast2-trans-nl-2.15.7-4.noarch
+>!> 4092: U__s_[S2:0][package]yast2-trans-pa-2.15.11-4.noarch
+>!> 4093: U__s_[S2:0][package]yast2-trans-pl-2.15.9-4.noarch
+>!> 4094: U__s_[S2:0][package]yast2-trans-pt-2.15.16-4.noarch
+>!> 4095: U__s_[S2:0][package]yast2-trans-pt_BR-2.15.8-2.noarch
+>!> 4096: U__s_[S2:0][package]yast2-trans-ro-2.15.13-2.noarch
+>!> 4097: U__s_[S2:0][package]yast2-trans-ru-2.15.20-4.noarch
+>!> 4098: U__s_[S2:0][package]yast2-trans-sk-2.15.6-2.noarch
+>!> 4099: U__s_[S2:0][package]yast2-trans-sl-2.15.2-7.noarch
+>!> 4100: U__s_[S2:0][package]yast2-trans-sr-2.15.1-16.noarch
+>!> 4101: I__s_[S1:0][package]yast2-trans-stats-2.15.0-12.noarch
+>!> 4102: U_Th_[S2:0][package]yast2-trans-stats-2.15.0-22.noarch
+>!> 4103: U__s_[S2:0][package]yast2-trans-sv-2.15.9-4.noarch
+>!> 4104: U__s_[S2:0][package]yast2-trans-ta-2.15.3-7.noarch
+>!> 4105: U__s_[S2:0][package]yast2-trans-tr-2.15.1-16.noarch
+>!> 4106: U__s_[S2:0][package]yast2-trans-uk-2.15.13-2.noarch
+>!> 4107: U__s_[S2:0][package]yast2-trans-vi-2.15.1-16.noarch
+>!> 4108: U__s_[S2:0][package]yast2-trans-wa-2.15.16-4.noarch
+>!> 4109: U__s_[S2:0][package]yast2-trans-xh-2.13.7-7.noarch
+>!> 4110: U__s_[S2:0][package]yast2-trans-zh_CN-2.15.9-4.noarch
+>!> 4111: U__s_[S2:0][package]yast2-trans-zh_TW-2.15.11-2.noarch
+>!> 4112: U__s_[S2:0][package]yast2-trans-zu-2.13.8-7.noarch
+>!> 4113: I__s_[S1:0][package]yast2-transfer-2.14.0-77.i586
+>!> 4114: U_Th_[S2:0][package]yast2-transfer-2.14.0-92.i586
+>!> 4115: I__s_[S1:0][package]yast2-tune-2.15.6-36.i586
+>!> 4116: U_Th_[S2:0][package]yast2-tune-2.15.7-2.i586
+>!> 4117: I__s_[S1:0][package]yast2-tv-2.15.6-21.noarch
+>!> 4118: U_Th_[S2:0][package]yast2-tv-2.15.7-8.noarch
+>!> 4119: I__s_[S1:0][package]yast2-update-2.15.19-3.i586
+>!> 4120: U_Th_[S2:0][package]yast2-update-2.15.23-4.i586
+>!> 4121: I__s_[S1:0][package]yast2-users-2.15.34-3.i586
+>!> 4122: U_Th_[S2:0][package]yast2-users-2.15.36-13.i586
+>!> 4123: U__s_[S2:0][package]yast2-vm-2.16.1-35.i586
+>!> 4124: I__s_[S1:0][package]yast2-x11-2.15.10-30.noarch
+>!> 4125: U_Th_[S2:0][package]yast2-x11-2.15.11-5.noarch
+>!> 4126: I__s_[S1:0][package]yast2-xml-2.15.0-36.i586
+>!> 4127: U_Th_[S2:0][package]yast2-xml-2.15.0-47.i586
+>!> 4128: U_Th_[S2:0][package]yauap-0.2.1-13.i586
+>!> 4129: I__s_[S1:0][package]yauap-0.2.1-3.i586
+>!> 4130: U__s_[S2:0][package]yelp-2.19.90-3.i586
+>!> 4131: I__s_[S1:0][package]yp-tools-2.9-67.i586
+>!> 4132: U_Th_[S2:0][package]yp-tools-2.9-73.i586
+>!> 4133: I__s_[S1:0][package]ypbind-1.20.5-38.i586
+>!> 4134: U_Th_[S2:0][package]ypbind-1.20.5-46.i586
+>!> 4135: U__s_[S2:0][package]ypserv-2.19-75.i586
+>!> 4136: U__s_[S2:0][package]yudit-2.7.8-90.i586
+>!> 4137: U__s_[S2:0][package]yum-3.2.4-4.i586
+>!> 4138: U__s_[S2:0][package]yum-metadata-parser-1.1.2-3.i586
+>!> 4139: U__s_[S2:0][package]yum-utils-1.1.6-10.noarch
+>!> 4140: U__s_[S2:0][package]yumex-1.9.11-9.i586
+>!> 4141: U__s_[S2:0][package]zd1211-firmware-1.3-32.noarch
+>!> 4142: U__s_[S2:0][package]zenity-2.19.2-3.i586
+>!> 4143: U__s_[S2:0][package]zip-2.32-8.i586
+>!> 4144: U__s_[S2:0][package]ziptool-1.4.0-180.i586
+>!> 4145: I__s_[S1:0][package]zisofs-tools-1.0.6-66.i586
+>!> 4146: U_Th_[S2:0][package]zisofs-tools-1.0.6-72.i586
+>!> 4147: I__s_[S1:0][package]zlib-1.2.3-66.i586
+>!> 4148: U_Th_[S2:0][package]zlib-1.2.3-72.i586
+>!> 4149: U__s_[S2:0][package]zlib-devel-1.2.3-72.i586
+>!> 4150: U__s_[S2:0][package]zoo-2.10-935.i586
+>!> 4151: U__s_[S2:0][package]zsh-4.3.4-25.i586
+>!> 4152: I__s_[S1:0][package]zvbi-0.2.16-81.i586
+>!> 4153: U_Th_[S2:0][package]zvbi-0.2.16-89.i586
+>!> 4154: I__s_[S1:0][package]zypper-0.8.10-2.i586
+>!> 4155: U_Th_[S2:0][package]zypper-0.8.19-2.i586
+>!> No problems so far
+>!> Solution #1:
+>!> install ConsoleKit-0.2.1-48.i586[1]
+>!> install OpenOffice_org-base-2.3.0.1-2.i586[1]
+>!> install OpenOffice_org-filters-2.3.0.1-2.i586[1]
+>!> install OpenOffice_org-hyphen-20070719-11.noarch[1]
+>!> install OpenOffice_org-mailmerge-2.3.0.1-2.i586[1]
+>!> install OpenOffice_org-math-2.3.0.1-2.i586[1]
+>!> install OpenOffice_org-pyuno-2.3.0.1-2.i586[1]
+>!> install OpenOffice_org-templates-en-2.0.4-48.noarch[1]
+>!> install OpenOffice_org-templates-labels-a4-1.0-2.noarch[1]
+>!> install OpenOffice_org-templates-labels-letter-1.0-2.noarch[1]
+>!> install OpenOffice_org-templates-presentation-layouts-2.0.4-50.noarch[1]
+>!> install OpenOffice_org-thesaurus-en-20060111-11.noarch[1]
+>!> install a2ps-4.13-1175.i586[1]
+>!> install alsa-plugins-1.0.14-33.i586[1]
+>!> install apparmor-admin_en-10.3-7.noarch[1]
+>!> install apparmor-docs-2.1-10.noarch[1]
+>!> install audit-1.5.5-10.i586[1]
+>!> install beagle-0.2.18-7.i586[1]
+>!> install beagle-firefox-0.2.18-7.i586[1]
+>!> install binutils-2.17.50.20070726-10.i586[1]
+>!> install blktrace-0.99.3-3.i586[1]
+>!> install bundle-lang-common-en-10.3-21.noarch[1]
+>!> install classpath-webplugin-0.95-62.i586[1]
+>!> install cryptsetup-1.0.5-26.i586[1]
+>!> install cups-1.2.12-13.i586[1]
+>!> install dcraw-1.390-8.i586[1]
+>!> install digikamimageplugins-superimpose-0.9.2-37.i586[1]
+>!> install dmraid-1.0.0.rc14-17.i586[1]
+>!> install enscript-1.6.4-80.i586[1]
+>!> install foomatic-filters-3.0.2-120.i586[1]
+>!> install freeglut-060903-73.i586[1]
+>!> install ft2demos-2.3.5-16.i586[1]
+>!> install gle-3.1.0-14.i586[1]
+>!> install glib-sharp2-2.10.2-17.i586[1]
+>!> install gmime-2.2.10-19.i586[1]
+>!> install gmime-sharp-2.2.10-19.i586[1]
+>!> install groff-1.18.1.1-96.i586[1]
+>!> install gsf-sharp-0.8.1-72.i586[1]
+>!> install gtk-sharp2-2.10.2-17.i586[1]
+>!> install ispell-3.3.02-20.i586[1]
+>!> install ispell-american-3.3.02-20.i586[1]
+>!> install java-1_5_0-sun-1.5.0_update12-20.i586[1]
+>!> install java-1_5_0-sun-plugin-1.5.0_update12-20.i586[1]
+>!> install kdeaddons3-kicker-3.5.7-6.i586[1]
+>!> install kdeartwork3-xscreensaver-3.5.7-47.i586[1]
+>!> install kdebase3-beagle-3.5.7-67.i586[1]
+>!> install kdegames4-carddecks-other-3.93.0-2.noarch[1]
+>!> install kdelibs3-doc-3.5.7-58.i586[1]
+>!> install kerry-0.2.2-77.i586[1]
+>!> install kio_beagle-0.3.1-106.i586[1]
+>!> install koffice-1.6.3-38.i586[1]
+>!> install koffice-illustration-1.6.3-38.i586[1]
+>!> install kpartx-0.4.7-75.i586[1]
+>!> install kscpm-0.5.3-124.i586[1]
+>!> install language:en-.noarch
+>!> install language:en_US-.noarch
+>!> install libGraphicsMagick1-1.1.8-12.i586[1]
+>!> install libMagick10-6.3.5.3-20.i586[1]
+>!> install libWand10-6.3.5.3-20.i586[1]
+>!> install libbeagle-0.2.18-8.i586[1]
+>!> install libfuse2-2.7.0-19.i586[1]
+>!> install libgdiplus-1.2.5-11.i586[1]
+>!> install libgmime-2_0-2-2.2.10-19.i586[1]
+>!> install libnetpbm10-10.26.44-7.i586[1]
+>!> install libopensync-0.22-44.i586[1]
+>!> install libtheora0-0.99.0.7-44.i586[1]
+>!> install libthinkfinger-0.3-2.i586[1]
+>!> install libvisual-plugins-0.4.0-103.i586[1]
+>!> install lvm2-2.02.25-25.i586[1]
+>!> install man-2.4.3-81.i586[1]
+>!> install mono-core-1.2.5-11.i586[1]
+>!> install mono-data-1.2.5-11.i586[1]
+>!> install mono-data-sqlite-1.2.5-11.i586[1]
+>!> install mono-web-1.2.5-11.i586[1]
+>!> install mono-winforms-1.2.5-11.i586[1]
+>!> install mozilla-xulrunner181-1.8.1.4-19.i586[1]
+>!> install nspluginwrapper-0.9.91.4-49.i586[1]
+>!> install ntfs-3g-1.826-3.i586[1]
+>!> install opensuse-codecs-installer-10.3.0-8.noarch[1]
+>!> install oxygen-icon-theme-3.93.0-3.noarch[1]
+>!> install oxygen-icon-theme-scalable-3.93.0-3.noarch[1]
+>!> install pattern:apparmor_opt-10.3-133.i586[1]
+>!> install pattern:kde_imaging_opt-10.3-133.i586[1]
+>!> install pattern:kde_laptop-10.3-133.i586[1]
+>!> install pattern:kde_office_opt-10.3-133.i586[1]
+>!> install pattern:kde_utilities_opt-10.3-133.i586[1]
+>!> install pattern:non_oss_java-10.3-133.i586[1]
+>!> install perl-Archive-Tar-1.32-15.i586[1]
+>!> install perl-Digest-HMAC-1.01-563.i586[1]
+>!> install perl-IO-Socket-SSL-1.07-18.i586[1]
+>!> install perl-IO-Zlib-1.06-10.i586[1]
+>!> install perl-Net-DNS-0.60-13.i586[1]
+>!> install perl-Net-IP-1.23-70.i586[1]
+>!> install perl-Net_SSLeay-1.30-71.i586[1]
+>!> install perl-TermReadKey-2.30-69.i586[1]
+>!> install perl-libapparmor-2.2-10.i586[1]
+>!> install perl-spamassassin-3.2.3-7.i586[1]
+>!> install python-2.5.1-32.i586[1]
+>!> install qtcurve-kde-0.52.3-21.i586[1]
+>!> install readline-doc-5.2-15.i586[1]
+>!> install setserial-2.17-651.i586[1]
+>!> install sgml-skel-0.6-342.noarch[1]
+>!> install spamassassin-3.2.3-7.i586[1]
+>!> install strace-4.5.16-8.i586[1]
+>!> install ulimit-1.1-205.noarch[1]
+>!> install vim-data-7.1-37.i586[1]
+>!> install wdiff-0.5.2-731.i586[1]
+>!> install words-6-78.noarch[1]
+>!> install wv-1.2.2-67.i586[1]
+>!> install x11-tools-0.1-97.i586[1]
+>!> install xfsprogs-2.8.21-17.i586[1]
+>!> install xscreensaver-5.03-14.i586[1]
+>!> install yast2-fingerprint-reader-2.15.2-12.i586[1]
+>!> remove glib2-lang-2.14.0-1.i586
+>!> remove kdelibs4-icons-3.92.0-9.noarch
+>!> remove libnetpbm-1.0.0-709.i586
+>!> remove libtheora-0.99.0.7-40.i586
+>!> upgrade 915resolution-0.5.3-21.i586 => 915resolution-0.5.3-28.i586[1]
+>!> upgrade CheckHardware-0.1-1071.i586 => CheckHardware-0.1-1080.i586[1]
+>!> upgrade DirectFB-1.0.0-47.i586 => DirectFB-1.0.0-57.i586[1]
+>!> upgrade LibVNCServer-0.9.1-11.i586 => LibVNCServer-0.9.1-20.i586[1]
+>!> upgrade Mesa-7.0.1-2.i586 => Mesa-7.0.1-12.i586[1]
+>!> upgrade MozillaFirefox-2.0.0.5-9.i586 => MozillaFirefox-2.0.0.6-9.i586[1]
+>!> upgrade NetworkManager-0.6.5-4.i586 => NetworkManager-0.6.5-22.i586[1]
+>!> upgrade NetworkManager-kde-0.2r674918-21.i586 => NetworkManager-kde-0.2r674918-40.i586[1]
+>!> upgrade OpenEXR-1.4.0a-22.i586 => OpenEXR-1.4.0a-30.i586[1]
+>!> upgrade OpenOffice_org-2.2.99.224-4.i586 => OpenOffice_org-2.3.0.1-2.i586[1]
+>!> upgrade OpenOffice_org-Quickstarter-1.0-572.i586 => OpenOffice_org-Quickstarter-1.0-582.i586[1]
+>!> upgrade OpenOffice_org-calc-2.2.99.224-4.i586 => OpenOffice_org-calc-2.3.0.1-2.i586[1]
+>!> upgrade OpenOffice_org-draw-2.2.99.224-4.i586 => OpenOffice_org-draw-2.3.0.1-2.i586[1]
+>!> upgrade OpenOffice_org-icon-themes-2.2.99.224-3.noarch => OpenOffice_org-icon-themes-2.3.0.1-2.noarch[1]
+>!> upgrade OpenOffice_org-impress-2.2.99.224-4.i586 => OpenOffice_org-impress-2.3.0.1-2.i586[1]
+>!> upgrade OpenOffice_org-kde-2.2.99.224-4.i586 => OpenOffice_org-kde-2.3.0.1-2.i586[1]
+>!> upgrade OpenOffice_org-writer-2.2.99.224-4.i586 => OpenOffice_org-writer-2.3.0.1-2.i586[1]
+>!> upgrade PolicyKit-0.2_git20060822-83.i586 => PolicyKit-0.4-15.i586[1]
+>!> upgrade SDL-1.2.12-7.i586 => SDL-1.2.12-16.i586[1]
+>!> upgrade SDL_mixer-1.2.8-7.i586 => SDL_mixer-1.2.8-16.i586[1]
+>!> upgrade SuSEfirewall2-3.6_SVNr182-2.noarch => SuSEfirewall2-3.6_SVNr183-7.noarch[1]
+>!> upgrade aaa_base-10.3-65.i586 => aaa_base-10.3-78.i586[1]
+>!> upgrade aaa_skel-2007.3.7-27.i586 => aaa_skel-2007.3.7-33.i586[1]
+>!> upgrade aalib-1.4.0-372.i586 => aalib-1.4.0-379.i586[1]
+>!> upgrade acl-2.2.34-66.i586 => acl-2.2.34-72.i586[1]
+>!> upgrade acpid-1.0.6-11.i586 => acpid-1.0.6-18.i586[1]
+>!> upgrade alsa-1.0.14-20.i586 => alsa-1.0.14-27.i586[1]
+>!> upgrade alsa-oss-1.0.14-14.i586 => alsa-oss-1.0.14-20.i586[1]
+>!> upgrade alsa-utils-1.0.14-15.i586 => alsa-utils-1.0.14-22.i586[1]
+>!> upgrade amarok-1.4.6-17.i586 => amarok-1.4.7-22.i586[1]
+>!> upgrade amarok-libvisual-1.4.6-17.i586 => amarok-libvisual-1.4.7-22.i586[1]
+>!> upgrade amarok-xine-1.4.6-17.i586 => amarok-xine-1.4.7-22.i586[1]
+>!> upgrade amarok-yauap-1.4.6-17.i586 => amarok-yauap-1.4.7-22.i586[1]
+>!> upgrade apparmor-parser-2.0.2-41.i586 => apparmor-parser-2.1-10.i586[1]
+>!> upgrade apparmor-profiles-2.0.2-38.noarch => apparmor-profiles-2.1-9.noarch[1]
+>!> upgrade apparmor-utils-2.0.2-28.noarch => apparmor-utils-2.1-6.noarch[1]
+>!> upgrade arts-1.5.7-23.i586 => arts-1.5.7-32.i586[1]
+>!> upgrade aspell-0.60.5-33.i586 => aspell-0.60.5-42.i586[1]
+>!> upgrade aspell-en-6.0-85.i586 => aspell-en-6.0-93.i586[1]
+>!> upgrade atk-1.19.6-3.i586 => atk-1.19.6-14.i586[1]
+>!> upgrade attr-2.4.28-72.i586 => attr-2.4.28-78.i586[1]
+>!> upgrade audiofile-0.2.6-68.i586 => audiofile-0.2.6-74.i586[1]
+>!> upgrade audit-libs-1.5.5-4.i586 => audit-libs-1.5.5-10.i586[1]
+>!> upgrade autofs-5.0.2-12.i586 => autofs-5.0.2-20.i586[1]
+>!> upgrade autoyast2-2.15.13-12.noarch => autoyast2-2.15.16-2.noarch[1]
+>!> upgrade autoyast2-installation-2.15.13-12.noarch => autoyast2-installation-2.15.16-2.noarch[1]
+>!> upgrade avahi-0.6.20-21.i586 => avahi-0.6.20-31.i586[1]
+>!> upgrade avahi-compat-mDNSResponder-0.6.20-21.i586 => avahi-compat-mDNSResponder-0.6.20-31.i586[1]
+>!> upgrade avahi-glib-0.6.20-21.i586 => avahi-glib-0.6.20-31.i586[1]
+>!> upgrade bash-3.2-46.i586 => bash-3.2-56.i586[1]
+>!> upgrade bash-doc-3.2-5.i586 => bash-doc-3.2-15.i586[1]
+>!> upgrade bind-libs-9.4.1-19.i586 => bind-libs-9.4.1.P1-8.i586[1]
+>!> upgrade bind-utils-9.4.1-19.i586 => bind-utils-9.4.1.P1-8.i586[1]
+>!> upgrade blocxx-1.0.0-70.i586 => blocxx-1.0.0-76.i586[1]
+>!> upgrade bluez-libs-3.13-4.i586 => bluez-libs-3.18-2.i586[1]
+>!> upgrade bluez-utils-3.13-9.i586 => bluez-utils-3.18-2.i586[1]
+>!> upgrade boost-1.34.1-3.i586 => boost-1.33.1-102.i586[1]
+>!> upgrade bootsplash-3.3-72.i586 => bootsplash-3.3-78.i586[1]
+>!> upgrade bootsplash-theme-SuSE-3.1-154.i586 => bootsplash-theme-SuSE-3.1-166.i586[1]
+>!> upgrade bundle-lang-kde-en-10.3-42.noarch => bundle-lang-kde-en-10.3-78.noarch[1]
+>!> upgrade bzip2-1.0.4-33.i586 => bzip2-1.0.4-39.i586[1]
+>!> upgrade cairo-1.4.10-11.i586 => cairo-1.4.10-19.i586[1]
+>!> upgrade cdparanoia-IIIalpha9.8-616.i586 => cdparanoia-IIIalpha9.8-623.i586[1]
+>!> upgrade cdrdao-1.2.2-94.i586 => cdrdao-1.2.2-107.i586[1]
+>!> upgrade cdrkit-cdrtools-compat-1.1.6-10.i586 => cdrkit-cdrtools-compat-1.1.6-18.i586[1]
+>!> upgrade check-0.9.5-25.i586 => check-0.9.5-31.i586[1]
+>!> upgrade classpath-0.95-45.i586 => classpath-0.95-62.i586[1]
+>!> upgrade clucene-core-0.9.16-28.i586 => clucene-core-0.9.16-34.i586[1]
+>!> upgrade compiz-0.5.2-4.i586 => compiz-0.5.4-11.i586[1]
+>!> upgrade compiz-kde-0.5.2-4.i586 => compiz-kde-0.5.4-11.i586[1]
+>!> upgrade coreutils-6.9-34.i586 => coreutils-6.9-40.i586[1]
+>!> upgrade cpio-2.9-5.i586 => cpio-2.9-14.i586[1]
+>!> upgrade cpp-4.2-15.i586 => cpp-4.2-21.i586[1]
+>!> upgrade cpp42-4.2.1_20070724-4.i586 => cpp42-4.2.1_20070724-12.i586[1]
+>!> upgrade cracklib-2.8.10-26.i586 => cracklib-2.8.10-34.i586[1]
+>!> upgrade cracklib-dict-small-2.8.10-26.i586 => cracklib-dict-small-2.8.10-34.i586[1]
+>!> upgrade cron-4.1-113.i586 => cron-4.1-119.i586[1]
+>!> upgrade cups-client-1.2.12-5.i586 => cups-client-1.2.12-13.i586[1]
+>!> upgrade cups-libs-1.2.12-5.i586 => cups-libs-1.2.12-13.i586[1]
+>!> upgrade curl-7.16.4-2.i586 => curl-7.16.4-10.i586[1]
+>!> upgrade curl-ca-bundle-7.16.4-2.i586 => curl-ca-bundle-7.16.4-10.i586[1]
+>!> upgrade cyrus-sasl-2.1.22-69.i586 => cyrus-sasl-2.1.22-76.i586[1]
+>!> upgrade cyrus-sasl-crammd5-2.1.22-69.i586 => cyrus-sasl-crammd5-2.1.22-76.i586[1]
+>!> upgrade cyrus-sasl-digestmd5-2.1.22-69.i586 => cyrus-sasl-digestmd5-2.1.22-76.i586[1]
+>!> upgrade cyrus-sasl-plain-2.1.22-69.i586 => cyrus-sasl-plain-2.1.22-76.i586[1]
+>!> upgrade cyrus-sasl-saslauthd-2.1.22-71.i586 => cyrus-sasl-saslauthd-2.1.22-78.i586[1]
+>!> upgrade db-utils-4.5.20-20.i586 => db-utils-4.5.20-26.i586[1]
+>!> upgrade dbus-1-1.0.2-49.i586 => dbus-1-1.0.2-56.i586[1]
+>!> upgrade dbus-1-glib-0.74-11.i586 => dbus-1-glib-0.74-19.i586[1]
+>!> upgrade dbus-1-qt3-0.62-93.i586 => dbus-1-qt3-0.62-102.i586[1]
+>!> upgrade dbus-1-x11-1.0.2-53.i586 => dbus-1-x11-1.0.2-61.i586[1]
+>!> upgrade dejavu-2.18-8.noarch => dejavu-2.19-8.noarch[1]
+>!> upgrade desktop-data-SuSE-10.3-61.noarch => desktop-data-SuSE-10.3-77.noarch[1]
+>!> upgrade desktop-file-utils-0.13-18.i586 => desktop-file-utils-0.13-29.i586[1]
+>!> upgrade device-mapper-1.02.19-19.i586 => device-mapper-1.02.19-25.i586[1]
+>!> upgrade dhcdbd-1.14-53.i586 => dhcdbd-1.14-61.i586[1]
+>!> upgrade dhcp-3.0.6-9.i586 => dhcp-3.0.6-17.i586[1]
+>!> upgrade dhcp-client-3.0.6-9.i586 => dhcp-client-3.0.6-17.i586[1]
+>!> upgrade dhcpcd-1.3.22pl4-278.i586 => dhcpcd-1.3.22pl4-284.i586[1]
+>!> upgrade dialog-1.0-54.i586 => dialog-1.0-60.i586[1]
+>!> upgrade diffutils-2.8.7-71.i586 => diffutils-2.8.7-77.i586[1]
+>!> upgrade digikam-0.9.2-19.i586 => digikam-0.9.2-37.i586[1]
+>!> upgrade digikamimageplugins-0.9.2-19.i586 => digikamimageplugins-0.9.2-37.i586[1]
+>!> upgrade dirmngr-1.0.0-3.i586 => dirmngr-1.0.0-11.i586[1]
+>!> upgrade dockutils-0.2-12.i586 => dockutils-0.2-18.i586[1]
+>!> upgrade dosfstools-2.11-70.i586 => dosfstools-2.11-77.i586[1]
+>!> upgrade dvd+rw-tools-7.0-40.i586 => dvd+rw-tools-7.0-46.i586[1]
+>!> upgrade e2fsprogs-1.40.2-9.i586 => e2fsprogs-1.40.2-15.i586[1]
+>!> upgrade eject-2.1.0-62.i586 => eject-2.1.0-68.i586[1]
+>!> upgrade esound-0.2.38-8.i586 => esound-0.2.38-14.i586[1]
+>!> upgrade ethtool-6-4.i586 => ethtool-6-10.i586[1]
+>!> upgrade expat-2.0.1-15.i586 => expat-2.0.1-21.i586[1]
+>!> upgrade fam-2.7.0-61.i586 => fam-2.7.0-67.i586[1]
+>!> upgrade fftw3-3.1.2-53.i586 => fftw3-3.1.2-59.i586[1]
+>!> upgrade file-4.20-32.i586 => file-4.21-4.i586[1]
+>!> upgrade fileshareset-2.0-329.i586 => fileshareset-2.0-352.i586[1]
+>!> upgrade filesystem-10.3-40.i586 => filesystem-10.3-47.i586[1]
+>!> upgrade fillup-1.42-170.i586 => fillup-1.42-176.i586[1]
+>!> upgrade findutils-4.2.31-15.i586 => findutils-4.2.31-21.i586[1]
+>!> upgrade flash-player-9.0.48.0-8.i586 => flash-player-9.0.48.0-13.i586[1]
+>!> upgrade fontconfig-2.4.2-34.i586 => fontconfig-2.4.2-40.i586[1]
+>!> upgrade fonts-config-20061025-45.noarch => fonts-config-20061025-51.noarch[1]
+>!> upgrade freetype2-2.3.5-8.i586 => freetype2-2.3.5-15.i586[1]
+>!> upgrade fribidi-0.10.4-565.i586 => fribidi-0.10.4-574.i586[1]
+>!> upgrade fuse-2.7.0-9.i586 => fuse-2.7.0-19.i586[1]
+>!> upgrade fvwm2-2.5.21-50.i586 => fvwm2-2.5.21-62.i586[1]
+>!> upgrade gail-1.19.6-5.i586 => gail-1.19.6-16.i586[1]
+>!> upgrade gawk-3.1.5g-16.i586 => gawk-3.1.5g-22.i586[1]
+>!> upgrade gcc-gij-4.2-15.i586 => gcc-gij-4.2-21.i586[1]
+>!> upgrade gcc42-gij-4.2.1_20070724-6.i586 => gcc42-gij-4.2.1_20070724-17.i586[1]
+>!> upgrade gconf2-2.19.1-10.i586 => gconf2-2.19.1-21.i586[1]
+>!> upgrade gdb-6.6.50.20070726-7.i586 => gdb-6.6.50.20070726-16.i586[1]
+>!> upgrade gdbm-1.8.3-293.i586 => gdbm-1.8.3-299.i586[1]
+>!> upgrade genisoimage-1.1.6-10.i586 => genisoimage-1.1.6-18.i586[1]
+>!> upgrade gettext-0.16-35.i586 => gettext-0.16-43.i586[1]
+>!> upgrade ghostscript-fonts-std-8.15.3-82.i586 => ghostscript-fonts-std-8.15.3-90.i586[1]
+>!> upgrade ghostscript-library-8.15.3-82.i586 => ghostscript-library-8.15.3-90.i586[1]
+>!> upgrade ghostscript-x11-8.15.3-82.i586 => ghostscript-x11-8.15.3-90.i586[1]
+>!> upgrade giflib-4.1.4-73.i586 => giflib-4.1.4-80.i586[1]
+>!> upgrade gimp-2.2.17-8.i586 => gimp-2.2.17-25.i586[1]
+>!> upgrade glib2-2.14.0-1.i586 => glib2-2.14.0-3.i586[1]
+>!> upgrade glibc-2.6-16.i686 => glibc-2.6.1-12.i686[1]
+>!> upgrade glibc-i18ndata-2.6-16.i586 => glibc-i18ndata-2.6.1-12.i586[1]
+>!> upgrade glibc-locale-2.6-16.i586 => glibc-locale-2.6.1-12.i586[1]
+>!> upgrade glitz-0.5.6-72.i586 => glitz-0.5.6-80.i586[1]
+>!> upgrade gmp-4.2.1-49.i586 => gmp-4.2.1-55.i586[1]
+>!> upgrade gnome-icon-theme-2.18.0-30.noarch => gnome-icon-theme-2.19.91-4.noarch[1]
+>!> upgrade gnome-keyring-2.19.6.1-3.i586 => gnome-keyring-2.19.91-5.i586[1]
+>!> upgrade gnome-vfs2-2.19.3-3.i586 => gnome-vfs2-2.19.91-3.i586[1]
+>!> upgrade gnutls-1.6.1-26.i586 => gnutls-1.6.1-33.i586[1]
+>!> upgrade gpart-0.1h-547.i586 => gpart-0.1h-553.i586[1]
+>!> upgrade gpg2-2.0.4-30.i586 => gpg2-2.0.4-38.i586[1]
+>!> upgrade gpgme-1.1.5-11.i586 => gpgme-1.1.5-21.i586[1]
+>!> upgrade gpm-1.20.1-378.i586 => gpm-1.20.1-385.i586[1]
+>!> upgrade grep-2.5.2-19.i586 => grep-2.5.2-25.i586[1]
+>!> upgrade grub-0.97-72.i586 => grub-0.97-79.i586[1]
+>!> upgrade gstreamer010-0.10.13-16.i586 => gstreamer010-0.10.13-27.i586[1]
+>!> upgrade gstreamer010-plugins-base-0.10.13-15.i586 => gstreamer010-plugins-base-0.10.13-27.i586[1]
+>!> upgrade gstreamer010-plugins-good-0.10.6-16.i586 => gstreamer010-plugins-good-0.10.6-29.i586[1]
+>!> upgrade gtk2-2.11.6-7.i586 => gtk2-2.11.6-20.i586[1]
+>!> upgrade gwenview-1.4.1-69.i586 => gwenview-1.4.1-81.i586[1]
+>!> upgrade gzip-1.3.12-25.i586 => gzip-1.3.12-31.i586[1]
+>!> upgrade hal-0.5.8_git200704021230-51.i586 => hal-0.5.9_git20070831-2.i586[1]
+>!> upgrade hal-resmgr-0.1_SVNr141-11.i586 => hal-resmgr-0.1_SVNr141-21.i586[1]
+>!> upgrade hdparm-7.6-9.i586 => hdparm-7.7-7.i586[1]
+>!> upgrade hicolor-icon-theme-0.10-28.noarch => hicolor-icon-theme-0.10-34.noarch[1]
+>!> upgrade hotkey-setup-0.1-59.i586 => hotkey-setup-0.1-67.i586[1]
+>!> upgrade hplip-hpijs-2.7.7-3.i586 => hplip-hpijs-2.7.7-22.i586[1]
+>!> upgrade hwinfo-13.41-3.i586 => hwinfo-13.49-2.i586[1]
+>!> upgrade icedax-1.1.6-10.i586 => icedax-1.1.6-18.i586[1]
+>!> upgrade id3lib-3.8.3-157.i586 => id3lib-3.8.3-163.i586[1]
+>!> upgrade ifnteuro-1.2.1-285.noarch => ifnteuro-1.2.1-296.noarch[1]
+>!> upgrade ifplugd-0.28-92.i586 => ifplugd-0.28-100.i586[1]
+>!> upgrade imlib2-1.3.0-52.i586 => imlib2-1.3.0-60.i586[1]
+>!> upgrade imlib2-loaders-1.3.0-52.i586 => imlib2-loaders-1.3.0-60.i586[1]
+>!> upgrade info-4.9-6.i586 => info-4.9-12.i586[1]
+>!> upgrade info2html-2.0-71.noarch => info2html-2.0-79.noarch[1]
+>!> upgrade insserv-1.09.0-36.i586 => insserv-1.09.0-43.i586[1]
+>!> upgrade inst-source-utils-2007.8.7-1.noarch => inst-source-utils-2007.9.2-1.noarch[1]
+>!> upgrade iproute2-2.6.22-11.i586 => iproute2-2.6.22-22.i586[1]
+>!> upgrade iptables-1.3.8-7.i586 => iptables-1.3.8-17.i586[1]
+>!> upgrade iputils-ss021109-224.i586 => iputils-ss021109-230.i586[1]
+>!> upgrade irda-0.9.18-80.i586 => irda-0.9.18-89.i586[1]
+>!> upgrade irqbalance-0.55-28.i586 => irqbalance-0.55-36.i586[1]
+>!> upgrade jarnal-9.01-33.noarch => jarnal-9.01-42.noarch[1]
+>!> upgrade java-1_4_2-gcj-compat-1.4.2.0-140.i586 => java-1_4_2-gcj-compat-1.4.2.0-166.i586[1]
+>!> upgrade jpackage-utils-1.7.0-67.i586 => jpackage-utils-1.7.0-74.i586[1]
+>!> upgrade jpeg-6b-803.i586 => jpeg-6b-809.i586[1]
+>!> upgrade k3b-1.0.3-9.i586 => k3b-1.0.3-20.i586[1]
+>!> upgrade kaffeine-0.8.5-7.i586 => kaffeine-0.8.5-22.i586[1]
+>!> upgrade kbd-1.12-126.i586 => kbd-1.12-135.i586[1]
+>!> upgrade kcm_gtk-0.7cvs20060209-86.i586 => kcm_gtk-0.7svn20070827-5.i586[1]
+>!> upgrade kde4-filesystem-3.92.0-2.noarch => kde4-filesystem-3.93.0-2.noarch[1]
+>!> upgrade kde4-kdialog-3.92.0-9.i586 => kde4-kdialog-3.93.0-3.i586[1]
+>!> upgrade kde4-kmahjongg-3.92.0-6.i586 => kde4-kmahjongg-3.93.0-4.i586[1]
+>!> upgrade kde4-kmines-3.92.0-6.i586 => kde4-kmines-3.93.0-4.i586[1]
+>!> upgrade kde4-kpat-3.92.0-6.i586 => kde4-kpat-3.93.0-4.i586[1]
+>!> upgrade kde4-krdc-3.92.0-8.i586 => kde4-krdc-3.93.0-4.i586[1]
+>!> upgrade kde4-kreversi-3.92.0-6.i586 => kde4-kreversi-3.93.0-4.i586[1]
+>!> upgrade kde4-krfb-3.92.0-8.i586 => kde4-krfb-3.93.0-4.i586[1]
+>!> upgrade kde4-ksudoku-3.92.0-6.i586 => kde4-ksudoku-3.93.0-4.i586[1]
+>!> upgrade kdeartwork3-kscreensaver-3.5.7-32.i586 => kdeartwork3-kscreensaver-3.5.7-47.i586[1]
+>!> upgrade kdebase3-3.5.7-44.i586 => kdebase3-3.5.7-67.i586[1]
+>!> upgrade kdebase3-SuSE-10.3-103.i586 => kdebase3-SuSE-10.3-128.i586[1]
+>!> upgrade kdebase3-kdm-3.5.7-44.i586 => kdebase3-kdm-3.5.7-67.i586[1]
+>!> upgrade kdebase3-ksysguardd-3.5.7-44.i586 => kdebase3-ksysguardd-3.5.7-67.i586[1]
+>!> upgrade kdebase3-nsplugin-3.5.7-44.i586 => kdebase3-nsplugin-3.5.7-67.i586[1]
+>!> upgrade kdebase3-samba-3.5.7-44.i586 => kdebase3-samba-3.5.7-67.i586[1]
+>!> upgrade kdebase3-session-3.5.7-44.i586 => kdebase3-session-3.5.7-67.i586[1]
+>!> upgrade kdebase4-runtime-3.92.0-9.i586 => kdebase4-runtime-3.93.0-3.i586[1]
+>!> upgrade kdebluetooth-1.0_beta5-8.i586 => kdebluetooth-1.0_beta7-2.i586[1]
+>!> upgrade kdegames4-3.92.0-6.i586 => kdegames4-3.93.0-4.i586[1]
+>!> upgrade kdegames4-carddecks-default-3.92.0-2.noarch => kdegames4-carddecks-default-3.93.0-2.noarch[1]
+>!> upgrade kdegraphics3-3.5.7-31.i586 => kdegraphics3-3.5.7-46.i586[1]
+>!> upgrade kdegraphics3-kamera-3.5.7-31.i586 => kdegraphics3-kamera-3.5.7-46.i586[1]
+>!> upgrade kdegraphics3-pdf-3.5.7-31.i586 => kdegraphics3-pdf-3.5.7-46.i586[1]
+>!> upgrade kdegraphics3-postscript-3.5.7-31.i586 => kdegraphics3-postscript-3.5.7-46.i586[1]
+>!> upgrade kdegraphics3-scan-3.5.7-31.i586 => kdegraphics3-scan-3.5.7-46.i586[1]
+>!> upgrade kdelibs3-3.5.7-43.i586 => kdelibs3-3.5.7-58.i586[1]
+>!> upgrade kdelibs3-default-style-3.5.7-43.i586 => kdelibs3-default-style-3.5.7-58.i586[1]
+>!> upgrade kdelibs4-3.92.0-8.i586 => kdelibs4-3.93.0-3.i586[1]
+>!> upgrade kdelibs4-core-3.92.0-8.i586 => kdelibs4-core-3.93.0-3.i586[1]
+>!> upgrade kdemultimedia3-3.5.7-35.i586 => kdemultimedia3-3.5.7-48.i586[1]
+>!> upgrade kdemultimedia3-CD-3.5.7-35.i586 => kdemultimedia3-CD-3.5.7-48.i586[1]
+>!> upgrade kdemultimedia3-mixer-3.5.7-35.i586 => kdemultimedia3-mixer-3.5.7-48.i586[1]
+>!> upgrade kdenetwork3-3.5.7-39.i586 => kdenetwork3-3.5.7-54.i586[1]
+>!> upgrade kdenetwork3-InstantMessenger-3.5.7-39.i586 => kdenetwork3-InstantMessenger-3.5.7-54.i586[1]
+>!> upgrade kdenetwork3-news-3.5.7-39.i586 => kdenetwork3-news-3.5.7-54.i586[1]
+>!> upgrade kdepim3-3.5.7.enterprise.0.20070731.694771-2.i586 => kdepim3-3.5.7.enterprise.0.20070831.706868-6.i586[1]
+>!> upgrade kdepim3-kpilot-3.5.7.enterprise.0.20070731.694771-2.i586 => kdepim3-kpilot-3.5.7.enterprise.0.20070831.706868-6.i586[1]
+>!> upgrade kdepim3-notes-3.5.7.enterprise.0.20070731.694771-2.i586 => kdepim3-notes-3.5.7.enterprise.0.20070831.706868-6.i586[1]
+>!> upgrade kdepimlibs4-3.92.0-6.i586 => kdepimlibs4-3.93.0-3.i586[1]
+>!> upgrade kdetv-0.8.9-74.i586 => kdetv-0.8.9-84.i586[1]
+>!> upgrade kdeutils3-3.5.7-32.i586 => kdeutils3-3.5.7-47.i586[1]
+>!> upgrade kernel-default-2.6.22.1-16.i586 => kernel-default-2.6.22.5-10.i586[1]
+>!> upgrade keyutils-libs-1.2-33.i586 => keyutils-libs-1.2-39.i586[1]
+>!> upgrade kio_ipodslave-0.8.pre1-91.i586 => kio_ipodslave-0.8.pre1-102.i586[1]
+>!> upgrade kio_iso-1.80.0-9.i586 => kio_iso-1.80.0-26.i586[1]
+>!> upgrade kio_slp-0.4.1-103.i586 => kio_slp-0.4.1-113.i586[1]
+>!> upgrade kio_sysinfo-10.3-103.i586 => kio_sysinfo-10.3-128.i586[1]
+>!> upgrade kipi-plugins-0.1.4-9.i586 => kipi-plugins-0.1.4-25.i586[1]
+>!> upgrade kitchensync-0.01svn691344-2.i586 => kitchensync-3.5.7.enterprise.0.20070831.706868-6.i586[1]
+>!> upgrade klogd-1.4.1-622.i586 => klogd-1.4.1-629.i586[1]
+>!> upgrade konversation-1.0.1-91.i586 => konversation-1.0.1-101.i586[1]
+>!> upgrade kpowersave-0.7.2_SVN20070724-10.i586 => kpowersave-0.7.2_SVN20070830-3.i586[1]
+>!> upgrade krb5-1.6.2-8.i586 => krb5-1.6.2-15.i586[1]
+>!> upgrade krecord-1.16-117.i586 => krecord-1.16-127.i586[1]
+>!> upgrade ktorrent-2.2.1-9.i586 => ktorrent-2.2.1-22.i586[1]
+>!> upgrade kwin-decor-suse2-0.4.1-2.i586 => kwin-decor-suse2-0.4.1-19.i586[1]
+>!> upgrade lbreakout-2.5.2-97.i586 => lbreakout-2.5.2-106.i586[1]
+>!> upgrade ldapcpplib-0.0.4-81.i586 => ldapcpplib-0.0.4-88.i586[1]
+>!> upgrade less-406-4.i586 => less-406-11.i586[1]
+>!> upgrade libFLAC++6-1.2.0-4.i586 => libFLAC++6-1.2.0-10.i586[1]
+>!> upgrade libFLAC8-1.2.0-4.i586 => libFLAC8-1.2.0-10.i586[1]
+>!> upgrade libacl-2.2.34-66.i586 => libacl-2.2.34-72.i586[1]
+>!> upgrade libakode-2.0.2-41.i586 => libakode-2.0.2-51.i586[1]
+>!> upgrade libao-0.8.8-3.i586 => libao-0.8.8-12.i586[1]
+>!> upgrade libapparmor1-2.2-2.i586 => libapparmor1-2.2-10.i586[1]
+>!> upgrade libart_lgpl-2.3.19-26.i586 => libart_lgpl-2.3.19-32.i586[1]
+>!> upgrade libasound2-1.0.14-20.i586 => libasound2-1.0.14-27.i586[1]
+>!> upgrade libattr-2.4.28-72.i586 => libattr-2.4.28-78.i586[1]
+>!> upgrade libblkid1-1.40.2-9.i586 => libblkid1-1.40.2-15.i586[1]
+>!> upgrade libbonobo-2.19.6-3.i586 => libbonobo-2.19.6-13.i586[1]
+>!> upgrade libbonoboui-2.19.6-4.i586 => libbonoboui-2.19.6-17.i586[1]
+>!> upgrade libbz2-1-1.0.4-33.i586 => libbz2-1-1.0.4-39.i586[1]
+>!> upgrade libcap-1.10-34.i586 => libcap-1.10-40.i586[1]
+>!> upgrade libcdio7-0.78.2-3.i586 => libcdio7-0.78.2-4.i586[1]
+>!> upgrade libcom_err2-1.40.2-9.i586 => libcom_err2-1.40.2-15.i586[1]
+>!> upgrade libcroco-0.6.1-56.i586 => libcroco-0.6.1-64.i586[1]
+>!> upgrade libcurl4-7.16.4-2.i586 => libcurl4-7.16.4-10.i586[1]
+>!> upgrade libdaemon-0.12-8.i586 => libdaemon-0.12-14.i586[1]
+>!> upgrade libdb-4_5-4.5.20-20.i586 => libdb-4_5-4.5.20-26.i586[1]
+>!> upgrade libdrm-2.3.0-34.i586 => libdrm-2.3.0-40.i586[1]
+>!> upgrade libdvdread3-0.9.7-3.i586 => libdvdread3-0.9.7-4.i586[1]
+>!> upgrade libevent-1.3b-27.i586 => libevent-1.3b-33.i586[1]
+>!> upgrade libexif-0.6.16-10.i586 => libexif-0.6.16-18.i586[1]
+>!> upgrade libexiv2-0.14-35.i586 => libexiv2-0.15-2.i586[1]
+>!> upgrade libexpat1-2.0.1-15.i586 => libexpat1-2.0.1-21.i586[1]
+>!> upgrade libext2fs2-1.40.2-9.i586 => libext2fs2-1.40.2-15.i586[1]
+>!> upgrade libgcc42-4.2.1_20070724-4.i586 => libgcc42-4.2.1_20070724-12.i586[1]
+>!> upgrade libgcj42-4.2.1_20070724-6.i586 => libgcj42-4.2.1_20070724-17.i586[1]
+>!> upgrade libgcrypt-1.2.4-29.i586 => libgcrypt-1.2.4-35.i586[1]
+>!> upgrade libgimpprint-4.2.7-159.i586 => libgimpprint-4.2.7-168.i586[1]
+>!> upgrade libglade2-2.6.2-3.i586 => libglade2-2.6.2-12.i586[1]
+>!> upgrade libgnome-2.19.1-3.i586 => libgnome-2.19.1-17.i586[1]
+>!> upgrade libgnomecanvas-2.19.1-3.i586 => libgnomecanvas-2.19.2-4.i586[1]
+>!> upgrade libgnomecups-0.2.2-104.i586 => libgnomecups-0.2.2-115.i586[1]
+>!> upgrade libgnomeprint-2.18.0-34.i586 => libgnomeprint-2.18.1-3.i586[1]
+>!> upgrade libgnomeprintui-2.18.0-40.i586 => libgnomeprintui-2.18.0-52.i586[1]
+>!> upgrade libgnomesu-1.0.0-130.i586 => libgnomesu-1.0.0-144.i586[1]
+>!> upgrade libgnomeui-2.19.1-3.i586 => libgnomeui-2.19.1-17.i586[1]
+>!> upgrade libgpg-error-1.4-50.i586 => libgpg-error-1.4-56.i586[1]
+>!> upgrade libgpgme11-1.1.5-11.i586 => libgpgme11-1.1.5-21.i586[1]
+>!> upgrade libgphoto2-2.4.0-3.i586 => libgphoto2-2.4.0-16.i586[1]
+>!> upgrade libgpod2-0.5.2-13.i586 => libgpod2-0.5.2-23.i586[1]
+>!> upgrade libgsf-1.14.5-3.i586 => libgsf-1.14.5-15.i586[1]
+>!> upgrade libgssapi-0.11-21.i586 => libgssapi-0.11-27.i586[1]
+>!> upgrade libgtkhtml-2.11.0-94.i586 => libgtkhtml-2.11.0-104.i586[1]
+>!> upgrade libicu-3.6-4.i586 => libicu-3.6-10.i586[1]
+>!> upgrade libidl-0.8.8-29.i586 => libidl-0.8.8-37.i586[1]
+>!> upgrade libidn-1.0-2.i586 => libidn-1.0-8.i586[1]
+>!> upgrade libieee1284-0.2.10-90.i586 => libieee1284-0.2.10-99.i586[1]
+>!> upgrade libjack-0.103.0-43.i586 => libjack-0.103.0-50.i586[1]
+>!> upgrade libjasper-1.900.1-30.i586 => libjasper-1.900.1-38.i586[1]
+>!> upgrade libjpeg-6.2.0-803.i586 => libjpeg-6.2.0-809.i586[1]
+>!> upgrade libkdcraw1-0.1.1-2.i586 => libkdcraw1-0.1.1-12.i586[1]
+>!> upgrade libkde4-3.92.0-8.i586 => libkde4-3.93.0-3.i586[1]
+>!> upgrade libkdecore4-3.92.0-8.i586 => libkdecore4-3.93.0-3.i586[1]
+>!> upgrade libkdegames4-3.92.0-6.i586 => libkdegames4-3.93.0-4.i586[1]
+>!> upgrade libkdepimlibs4-3.92.0-6.i586 => libkdepimlibs4-3.93.0-3.i586[1]
+>!> upgrade libkexiv2-0.1.5-14.i586 => libkexiv2-0.1.5-26.i586[1]
+>!> upgrade libkipi-0.1.5-61.i586 => libkipi-0.1.5-74.i586[1]
+>!> upgrade libksba-1.0.2-2.i586 => libksba-1.0.2-8.i586[1]
+>!> upgrade liblazy-0.1.1-40.i586 => liblazy-0.2-8.i586[1]
+>!> upgrade liblcms-1.16-30.i586 => liblcms-1.16-36.i586[1]
+>!> upgrade libltdl-3-1.5.24-8.i586 => libltdl-3-1.5.24-14.i586[1]
+>!> upgrade libmal-0.31-260.i586 => libmal-0.31-270.i586[1]
+>!> upgrade libmikmod-3.1.11a-24.i586 => libmikmod-3.1.11a-31.i586[1]
+>!> upgrade libmng-1.0.10-5.i586 => libmng-1.0.10-11.i586[1]
+>!> upgrade libmpcdec5-1.2.6-3.i586 => libmpcdec5-1.2.6-5.i586[1]
+>!> upgrade libmtp-0.2.0-2.i586 => libmtp-0.2.1-7.i586[1]
+>!> upgrade libnjb-2.2.5-85.i586 => libnjb-2.2.5-95.i586[1]
+>!> upgrade libnl-1.0-68.i586 => libnl-1.0-78.i586[1]
+>!> upgrade libnscd-2.0.2-34.i586 => libnscd-2.0.2-40.i586[1]
+>!> upgrade libofa-0.9.3-48.i586 => libofa-0.9.3-55.i586[1]
+>!> upgrade libogg-1.1.3-65.i586 => libogg-1.1.3-71.i586[1]
+>!> upgrade liboil-0.3.9-55.i586 => liboil-0.3.9-63.i586[1]
+>!> upgrade libopencdk-0.5.11-31.i586 => libopencdk-0.5.11-37.i586[1]
+>!> upgrade libopenct1-0.6.12-6.i586 => libopenct1-0.6.13-4.i586[1]
+>!> upgrade libopensc2-0.11.3-5.i586 => libopensc2-0.11.3-13.i586[1]
+>!> upgrade libopenssl0_9_8-0.9.8e-33.i586 => libopenssl0_9_8-0.9.8e-40.i586[1]
+>!> upgrade libpcap-0.9.7-4.i586 => libpcap-0.9.7-10.i586[1]
+>!> upgrade libpisock9-0.12.2-10.i586 => libpisock9-0.12.2-20.i586[1]
+>!> upgrade libpng-1.2.18-6.i586 => libpng-1.2.18-12.i586[1]
+>!> upgrade libqt4-4.3.0-25.i586 => libqt4-4.3.1-13.i586[1]
+>!> upgrade libqt4-dbus-1-4.3.0-25.i586 => libqt4-dbus-1-4.3.1-13.i586[1]
+>!> upgrade libqt4-qt3support-4.3.0-25.i586 => libqt4-qt3support-4.3.1-13.i586[1]
+>!> upgrade libqt4-sql-4.3.0-25.i586 => libqt4-sql-4.3.1-13.i586[1]
+>!> upgrade libqt4-x11-4.3.0-25.i586 => libqt4-x11-4.3.1-13.i586[1]
+>!> upgrade libqtpod-0.3-69.i586 => libqtpod-0.3-78.i586[1]
+>!> upgrade libreadline5-5.2-5.i586 => libreadline5-5.2-15.i586[1]
+>!> upgrade librpcsecgss-0.14-60.i586 => librpcsecgss-0.14-66.i586[1]
+>!> upgrade librsvg-2.18.0-3.i586 => librsvg-2.18.1-2.i586[1]
+>!> upgrade libsamplerate-0.1.2-67.i586 => libsamplerate-0.1.2-73.i586[1]
+>!> upgrade libsmbclient-3.0.25b-13.i586 => libsmbclient-3.0.25c-3.i586[1]
+>!> upgrade libsndfile-1.0.17-68.i586 => libsndfile-1.0.17-75.i586[1]
+>!> upgrade libsnmp15-5.4.1-2.i586 => libsnmp15-5.4.1-11.i586[1]
+>!> upgrade libsoprano3-0.9.0-20.i586 => libsoprano3-0.9.0-31.i586[1]
+>!> upgrade libspeex-1.1.99.2-16.i586 => libspeex-1.1.99.2-23.i586[1]
+>!> upgrade libstdc++42-4.2.1_20070724-4.i586 => libstdc++42-4.2.1_20070724-12.i586[1]
+>!> upgrade libstroke-0.5.1-88.i586 => libstroke-0.5.1-99.i586[1]
+>!> upgrade libtiff3-3.8.2-59.i586 => libtiff3-3.8.2-65.i586[1]
+>!> upgrade libtunepimp-0.5.3-6.i586 => libtunepimp-0.5.3-14.i586[1]
+>!> upgrade libtunepimp5-0.5.3-6.i586 => libtunepimp5-0.5.3-14.i586[1]
+>!> upgrade libusb-0.1.12-63.i586 => libusb-0.1.12-69.i586[1]
+>!> upgrade libuuid1-1.40.2-9.i586 => libuuid1-1.40.2-15.i586[1]
+>!> upgrade libvisual-0.4.0-71.i586 => libvisual-0.4.0-79.i586[1]
+>!> upgrade libvolume_id-114-2.i586 => libvolume_id-114-10.i586[1]
+>!> upgrade libvorbis-1.2.0-2.i586 => libvorbis-1.2.0-8.i586[1]
+>!> upgrade libwavpack1-4.41.0-4.i586 => libwavpack1-4.41.0-11.i586[1]
+>!> upgrade libwmf-0.2.8.4-75.i586 => libwmf-0.2.8.4-84.i586[1]
+>!> upgrade libx86-0.99-27.i586 => libx86-0.99-33.i586[1]
+>!> upgrade libxcrypt-2.4-62.i586 => libxcrypt-2.4-68.i586[1]
+>!> upgrade libxml2-2.6.29-8.i586 => libxml2-2.6.29-17.i586[1]
+>!> upgrade libxslt-1.1.20-29.i586 => libxslt-1.1.20-37.i586[1]
+>!> upgrade liby2util-2.14.0-52.i586 => liby2util-2.14.0-60.i586[1]
+>!> upgrade libzio-0.4-34.i586 => libzio-0.4-40.i586[1]
+>!> upgrade libzypp-3.14.0-4.i586 => libzypp-3.22.1-3.i586[1]
+>!> upgrade licenses-20070130-34.noarch => licenses-20070810-9.noarch[1]
+>!> upgrade lilo-22.7-101.i586 => lilo-22.7-111.i586[1]
+>!> upgrade limal-1.3.0-9.i586 => limal-1.3.1-6.i586[1]
+>!> upgrade limal-perl-1.3.0-9.i586 => limal-perl-1.3.1-6.i586[1]
+>!> upgrade linux-atm-lib-2.5.0-64.i586 => linux-atm-lib-2.5.0-70.i586[1]
+>!> upgrade logrotate-3.7.4-53.i586 => logrotate-3.7.5-6.i586[1]
+>!> upgrade lzo-2.02-65.i586 => lzo-2.02-71.i586[1]
+>!> upgrade mailx-12.2-31.i586 => mailx-12.2-39.i586[1]
+>!> upgrade master-boot-code-1.14-15.i586 => master-boot-code-1.14-21.i586[1]
+>!> upgrade mdadm-2.6.2-7.i586 => mdadm-2.6.2-13.i586[1]
+>!> upgrade meanwhile-1.0.2-22.i586 => meanwhile-1.0.2-30.i586[1]
+>!> upgrade microcode_ctl-1.17-22.i586 => microcode_ctl-1.17-29.i586[1]
+>!> upgrade mingetty-1.0.7s-16.i586 => mingetty-1.0.7s-22.i586[1]
+>!> upgrade mkinitrd-2.1-17.i586 => mkinitrd-2.1-28.i586[1]
+>!> upgrade mktemp-1.5-795.i586 => mktemp-1.5-801.i586[1]
+>!> upgrade module-init-tools-3.2.99.pre11-11.i586 => module-init-tools-3.2.99.pre11-19.i586[1]
+>!> upgrade mozilla-nspr-4.6.7-11.i586 => mozilla-nspr-4.6.7-17.i586[1]
+>!> upgrade mozilla-nss-3.11.7-3.i586 => mozilla-nss-3.11.7-9.i586[1]
+>!> upgrade myspell-american-20060207-3.noarch => myspell-american-20060207-10.noarch[1]
+>!> upgrade ncurses-5.6-31.i586 => ncurses-5.6-37.i586[1]
+>!> upgrade neon-0.26.4-6.i586 => neon-0.26.4-13.i586[1]
+>!> upgrade net-tools-1.60-641.i586 => net-tools-1.60-647.i586[1]
+>!> upgrade netcat-1.10-934.i586 => netcat-1.10-940.i586[1]
+>!> upgrade netcfg-10.3-30.noarch => netcfg-10.3-36.noarch[1]
+>!> upgrade netpbm-10.26.22-66.i586 => netpbm-10.26.44-7.i586[1]
+>!> upgrade nfsidmap-0.20-7.i586 => nfsidmap-0.20-14.i586[1]
+>!> upgrade nscd-2.6-16.i586 => nscd-2.6.1-12.i586[1]
+>!> upgrade nss-mdns-0.9-30.i586 => nss-mdns-0.9-36.i586[1]
+>!> upgrade ntfsprogs-1.13.1-39.i586 => ntfsprogs-1.13.1-46.i586[1]
+>!> upgrade numlockx-1.1-68.i586 => numlockx-1.1-75.i586[1]
+>!> upgrade obexftp-0.21-81.i586 => obexftp-0.21-92.i586[1]
+>!> upgrade ocrad-0.17-3.i586 => ocrad-0.17-9.i586[1]
+>!> upgrade openSUSE-release-10.3-51.i586 => openSUSE-release-10.3-65.i586[1]
+>!> upgrade openct-0.6.12-6.i586 => openct-0.6.13-4.i586[1]
+>!> upgrade openldap2-client-2.3.37-5.i586 => openldap2-client-2.3.37-13.i586[1]
+>!> upgrade openobex-1.3-63.i586 => openobex-1.3-74.i586[1]
+>!> upgrade opensc-0.11.3-5.i586 => opensc-0.11.3-13.i586[1]
+>!> upgrade openslp-1.2.0-83.i586 => openslp-1.2.0-90.i586[1]
+>!> upgrade openssh-4.6p1-38.i586 => openssh-4.6p1-49.i586[1]
+>!> upgrade openssh-askpass-4.6p1-38.i586 => openssh-askpass-4.6p1-49.i586[1]
+>!> upgrade openssl-0.9.8e-33.i586 => openssl-0.9.8e-40.i586[1]
+>!> upgrade openssl-certs-0.9.8e-33.i586 => openssl-certs-0.9.8e-40.i586[1]
+>!> upgrade opensuse-manual_en-10.3-9.noarch => opensuse-manual_en-10.3-23.noarch[1]
+>!> upgrade opensuse-updater-kde-0.5-10.i586 => opensuse-updater-kde-0.6-8.i586[1]
+>!> upgrade orbit2-2.14.8-2.i586 => orbit2-2.14.8-10.i586[1]
+>!> upgrade pam-0.99.8.1-6.i586 => pam-0.99.8.1-12.i586[1]
+>!> upgrade pam-config-0.21-4.i586 => pam-config-0.23-6.i586[1]
+>!> upgrade pam-modules-10.3-36.i586 => pam-modules-10.3-44.i586[1]
+>!> upgrade pango-1.17.5-3.i586 => pango-1.18.1-2.i586[1]
+>!> upgrade parted-1.8.7-26.i586 => parted-1.8.7-34.i586[1]
+>!> upgrade patch-2.5.9-210.i586 => patch-2.5.9-216.i586[1]
+>!> upgrade pattern:apparmor-10.3-100.i586 => pattern:apparmor-10.3-133.i586[1]
+>!> upgrade pattern:base-10.3-100.i586 => pattern:base-10.3-133.i586[1]
+>!> upgrade pattern:enhanced_base-10.3-100.i586 => pattern:enhanced_base-10.3-133.i586[1]
+>!> upgrade pattern:fonts-10.3-100.i586 => pattern:fonts-10.3-133.i586[1]
+>!> upgrade pattern:games-10.3-100.i586 => pattern:games-10.3-133.i586[1]
+>!> upgrade pattern:imaging-10.3-100.i586 => pattern:imaging-10.3-133.i586[1]
+>!> upgrade pattern:kde-10.3-100.i586 => pattern:kde-10.3-133.i586[1]
+>!> upgrade pattern:kde_basis-10.3-100.i586 => pattern:kde_basis-10.3-133.i586[1]
+>!> upgrade pattern:kde_games-10.3-100.i586 => pattern:kde_games-10.3-133.i586[1]
+>!> upgrade pattern:kde_imaging-10.3-100.i586 => pattern:kde_imaging-10.3-133.i586[1]
+>!> upgrade pattern:kde_internet-10.3-100.i586 => pattern:kde_internet-10.3-133.i586[1]
+>!> upgrade pattern:kde_multimedia-10.3-100.i586 => pattern:kde_multimedia-10.3-133.i586[1]
+>!> upgrade pattern:kde_office-10.3-100.i586 => pattern:kde_office-10.3-133.i586[1]
+>!> upgrade pattern:kde_utilities-10.3-100.i586 => pattern:kde_utilities-10.3-133.i586[1]
+>!> upgrade pattern:kde_xgl-10.3-100.i586 => pattern:kde_xgl-10.3-133.i586[1]
+>!> upgrade pattern:laptop-10.3-100.i586 => pattern:laptop-10.3-133.i586[1]
+>!> upgrade pattern:multimedia-10.3-100.i586 => pattern:multimedia-10.3-133.i586[1]
+>!> upgrade pattern:office-10.3-100.i586 => pattern:office-10.3-133.i586[1]
+>!> upgrade pattern:sw_management-10.3-100.i586 => pattern:sw_management-10.3-133.i586[1]
+>!> upgrade pattern:sw_management_kde-10.3-100.i586 => pattern:sw_management_kde-10.3-133.i586[1]
+>!> upgrade pattern:x11-10.3-100.i586 => pattern:x11-10.3-133.i586[1]
+>!> upgrade pattern:xgl-10.3-100.i586 => pattern:xgl-10.3-133.i586[1]
+>!> upgrade pattern:yast2_basis-10.3-100.i586 => pattern:yast2_basis-10.3-133.i586[1]
+>!> upgrade pattern:yast2_install_wf-10.3-100.i586 => pattern:yast2_install_wf-10.3-133.i586[1]
+>!> upgrade pciutils-2.2.6-8.i586 => pciutils-2.2.6-14.i586[1]
+>!> upgrade pciutils-ids-2007.8.4-1.noarch => pciutils-ids-2007.9.1-1.noarch[1]
+>!> upgrade pcmciautils-014-32.i586 => pcmciautils-014-38.i586[1]
+>!> upgrade pcre-7.2-4.i586 => pcre-7.2-11.i586[1]
+>!> upgrade pcsc-lite-1.4.3-5.i586 => pcsc-lite-1.4.3-12.i586[1]
+>!> upgrade perl-5.8.8-67.i586 => perl-5.8.8-73.i586[1]
+>!> upgrade perl-Bootloader-0.4.18-2.i586 => perl-Bootloader-0.4.23-8.i586[1]
+>!> upgrade perl-Compress-Raw-Zlib-2.005-8.i586 => perl-Compress-Raw-Zlib-2.005-14.i586[1]
+>!> upgrade perl-Compress-Zlib-2.005-4.i586 => perl-Compress-Zlib-2.005-10.i586[1]
+>!> upgrade perl-Config-Crontab-1.21-2.i586 => perl-Config-Crontab-1.21-8.i586[1]
+>!> upgrade perl-Crypt-SSLeay-0.56-5.i586 => perl-Crypt-SSLeay-0.56-12.i586[1]
+>!> upgrade perl-Crypt-SmbHash-0.12-63.i586 => perl-Crypt-SmbHash-0.12-69.i586[1]
+>!> upgrade perl-DBD-SQLite-1.13-63.i586 => perl-DBD-SQLite-1.13-70.i586[1]
+>!> upgrade perl-DBI-1.58-8.i586 => perl-DBI-1.58-14.i586[1]
+>!> upgrade perl-Digest-MD4-1.5-62.i586 => perl-Digest-MD4-1.5-68.i586[1]
+>!> upgrade perl-Digest-SHA1-2.11-52.i586 => perl-Digest-SHA1-2.11-58.i586[1]
+>!> upgrade perl-File-Tail-0.99.3-62.i586 => perl-File-Tail-0.99.3-68.i586[1]
+>!> upgrade perl-HTML-Parser-3.56-30.i586 => perl-HTML-Parser-3.56-36.i586[1]
+>!> upgrade perl-HTML-Tagset-3.10-62.i586 => perl-HTML-Tagset-3.10-68.i586[1]
+>!> upgrade perl-IO-Compress-Base-2.005-8.i586 => perl-IO-Compress-Base-2.005-14.i586[1]
+>!> upgrade perl-IO-Compress-Zlib-2.005-7.i586 => perl-IO-Compress-Zlib-2.005-13.i586[1]
+>!> upgrade perl-Net-Daemon-0.43-6.i586 => perl-Net-Daemon-0.43-12.i586[1]
+>!> upgrade perl-Parse-RecDescent-1.80-309.i586 => perl-Parse-RecDescent-1.80-315.i586[1]
+>!> upgrade perl-PlRPC-0.2019-9.i586 => perl-PlRPC-0.2019-15.i586[1]
+>!> upgrade perl-RPC-XML-0.59-55.i586 => perl-RPC-XML-0.59-62.i586[1]
+>!> upgrade perl-TimeDate-1.16-186.i586 => perl-TimeDate-1.16-192.i586[1]
+>!> upgrade perl-URI-1.35-65.i586 => perl-URI-1.35-71.i586[1]
+>!> upgrade perl-X500-DN-0.29-6.i586 => perl-X500-DN-0.29-12.i586[1]
+>!> upgrade perl-XML-Bare-0.11-6.i586 => perl-XML-Bare-0.11-12.i586[1]
+>!> upgrade perl-XML-Parser-2.34-98.i586 => perl-XML-Parser-2.34-104.i586[1]
+>!> upgrade perl-XML-Writer-0.603-8.i586 => perl-XML-Writer-0.603-14.i586[1]
+>!> upgrade perl-XML-XPath-1.13-3.i586 => perl-XML-XPath-1.13-9.i586[1]
+>!> upgrade perl-base-5.8.8-67.i586 => perl-base-5.8.8-73.i586[1]
+>!> upgrade perl-gettext-1.05-64.i586 => perl-gettext-1.05-70.i586[1]
+>!> upgrade perl-libwww-perl-5.806-4.i586 => perl-libwww-perl-5.806-10.i586[1]
+>!> upgrade permissions-2007.6.12-10.i586 => permissions-2007.8.10-8.i586[1]
+>!> upgrade pinentry-0.7.2-102.i586 => pinentry-0.7.2-111.i586[1]
+>!> upgrade pkg-config-0.21-29.i586 => pkg-config-0.21-35.i586[1]
+>!> upgrade pm-utils-0.99.3.20070618-5.i586 => pm-utils-0.99.3.20070618-13.i586[1]
+>!> upgrade pmtools-20061026-35.i586 => pmtools-20061026-41.i586[1]
+>!> upgrade poppler-0.5.4-83.i586 => poppler-0.5.4-92.i586[1]
+>!> upgrade poppler-qt-0.5.4-83.i586 => poppler-qt-0.5.4-92.i586[1]
+>!> upgrade popt-1.7-355.i586 => popt-1.7-364.i586[1]
+>!> upgrade portaudio-19-163.i586 => portaudio-19-170.i586[1]
+>!> upgrade portmap-6.0+git20070513-16.i586 => portmap-6.0+git20070513-22.i586[1]
+>!> upgrade postfix-2.4.5-2.i586 => postfix-2.4.5-12.i586[1]
+>!> upgrade powersave-0.15.13-38.i586 => powersave-0.15.17-2.i586[1]
+>!> upgrade powersave-libs-0.15.13-38.i586 => powersave-libs-0.15.17-2.i586[1]
+>!> upgrade ppp-2.4.4-60.i586 => ppp-2.4.4-67.i586[1]
+>!> upgrade pptp-1.7.1-42.i586 => pptp-1.7.1-48.i586[1]
+>!> upgrade preload-0.2-87.i586 => preload-0.2-101.i586[1]
+>!> upgrade procps-3.2.7-58.i586 => procps-3.2.7-64.i586[1]
+>!> upgrade psmisc-22.5-21.i586 => psmisc-22.5-27.i586[1]
+>!> upgrade pth-2.0.7-34.i586 => pth-2.0.7-40.i586[1]
+>!> upgrade pwdutils-3.1.4-12.i586 => pwdutils-3.1.4-20.i586[1]
+>!> upgrade qca-1.0-101.i586 => qca-1.0-110.i586[1]
+>!> upgrade qt3-3.3.8-56.i586 => qt3-3.3.8-67.i586[1]
+>!> upgrade qtcurve-gtk2-0.52.3-11.i586 => qtcurve-gtk2-0.52.3-21.i586[1]
+>!> upgrade recode-3.6-554.i586 => recode-3.6-560.i586[1]
+>!> upgrade reiserfs-3.6.19-79.i586 => reiserfs-3.6.19-87.i586[1]
+>!> upgrade release-notes-10.3.3-3.noarch => release-notes-10.3.8-2.noarch[1]
+>!> upgrade resmgr-1.1.0_SVNr143-2.i586 => resmgr-1.1.0_SVNr143-8.i586[1]
+>!> upgrade rpm-4.4.2-127.i586 => rpm-4.4.2-136.i586[1]
+>!> upgrade rrdtool-1.2.23-34.i586 => rrdtool-1.2.23-41.i586[1]
+>!> upgrade ruby-1.8.6.p36-2.i586 => ruby-1.8.6.p36-13.i586[1]
+>!> upgrade sane-backends-1.0.18-56.i586 => sane-backends-1.0.18-71.i586[1]
+>!> upgrade sax2-8.1-197.i586 => sax2-8.1-235.i586[1]
+>!> upgrade sax2-gui-8.1-197.i586 => sax2-gui-8.1-235.i586[1]
+>!> upgrade sax2-ident-8.1-197.i586 => sax2-ident-8.1-235.i586[1]
+>!> upgrade sax2-libsax-8.1-197.i586 => sax2-libsax-8.1-235.i586[1]
+>!> upgrade sax2-libsax-perl-8.1-197.i586 => sax2-libsax-perl-8.1-235.i586[1]
+>!> upgrade sax2-tools-8.1-197.i586 => sax2-tools-8.1-235.i586[1]
+>!> upgrade scpm-1.1.6pre1-23.i586 => scpm-1.1.6pre2-6.i586[1]
+>!> upgrade scsi-1.7_2.37_1.25_0.19_1.02_0.93-6.i586 => scsi-1.7_2.37_1.25_0.19_1.02_0.93-13.i586[1]
+>!> upgrade sed-4.1.5-55.i586 => sed-4.1.5-61.i586[1]
+>!> upgrade sensors-2.10.4-3.i586 => sensors-2.10.4-15.i586[1]
+>!> upgrade shared-mime-info-0.22-2.i586 => shared-mime-info-0.22-10.i586[1]
+>!> upgrade siga-10.101-64.noarch => siga-10.101-70.noarch[1]
+>!> upgrade slang-2.1.1-7.i586 => slang-2.1.1-13.i586[1]
+>!> upgrade smartlink-softmodem-2.9.10-126.i586 => smartlink-softmodem-2.9.10-138.i586[1]
+>!> upgrade snmp-mibs-5.4.1-2.i586 => snmp-mibs-5.4.1-11.i586[1]
+>!> upgrade splashy-0.3.3-16.i586 => splashy-0.3.3-32.i586[1]
+>!> upgrade sqlite-3.4.1-2.i586 => sqlite-3.4.1-10.i586[1]
+>!> upgrade sqlite2-2.8.17-77.i586 => sqlite2-2.8.17-84.i586[1]
+>!> upgrade startup-notification-0.9-2.i586 => startup-notification-0.9-9.i586[1]
+>!> upgrade strigi-0.5.4.svn696918-2.i586 => strigi-0.5.5-11.i586[1]
+>!> upgrade sudo-1.6.9p2-3.i586 => sudo-1.6.9p2-16.i586[1]
+>!> upgrade sumf-0.2.4pre1-126.i586 => sumf-0.2.4pre2-13.i586[1]
+>!> upgrade suse-build-key-1.0-752.noarch => suse-build-key-1.0-762.noarch[1]
+>!> upgrade suseRegister-1.2-62.noarch => suseRegister-1.2-73.noarch[1]
+>!> upgrade susehelp-2007.05.30-20.noarch => susehelp-2007.08.22-6.noarch[1]
+>!> upgrade susehelp_en-2007.05.30-20.noarch => susehelp_en-2007.08.22-6.noarch[1]
+>!> upgrade suspend-0.50.20070731-5.i586 => suspend-0.69.9-2.i586[1]
+>!> upgrade sysconfig-0.70.0-3.i586 => sysconfig-0.70.0-10.i586[1]
+>!> upgrade sysfsutils-2.1.0-52.i586 => sysfsutils-2.1.0-58.i586[1]
+>!> upgrade syslog-ng-1.6.12-24.i586 => syslog-ng-1.6.12-30.i586[1]
+>!> upgrade sysvinit-2.86-93.i586 => sysvinit-2.86-99.i586[1]
+>!> upgrade taglib-1.4-97.i586 => taglib-1.4-106.i586[1]
+>!> upgrade tar-1.17-8.i586 => tar-1.17-18.i586[1]
+>!> upgrade tcpd-7.6-782.i586 => tcpd-7.6-788.i586[1]
+>!> upgrade tightvnc-1.3.9-2.i586 => tightvnc-1.3.9-9.i586[1]
+>!> upgrade timezone-2.6-16.i586 => timezone-2007g-4.i586[1]
+>!> upgrade udev-114-2.i586 => udev-114-10.i586[1]
+>!> upgrade ufraw-0.12-2.i586 => ufraw-0.12-19.i586[1]
+>!> upgrade ufraw-gimp-0.12-2.i586 => ufraw-gimp-0.12-19.i586[1]
+>!> upgrade unzip-5.52-68.i586 => unzip-5.52-74.i586[1]
+>!> upgrade update-alternatives-1.8.3-66.noarch => update-alternatives-1.8.3-72.noarch[1]
+>!> upgrade utempter-0.5.5-67.i586 => utempter-0.5.5-73.i586[1]
+>!> upgrade util-linux-2.12r+2.13rc2+git20070725-5.i586 => util-linux-2.12r+2.13rc2+git20070725-18.i586[1]
+>!> upgrade v4l-conf-3.95-82.i586 => v4l-conf-3.95-90.i586[1]
+>!> upgrade vim-7.1-24.i586 => vim-7.1-37.i586[1]
+>!> upgrade vim-base-7.1-24.i586 => vim-base-7.1-37.i586[1]
+>!> upgrade vorbis-tools-1.1.1-93.i586 => vorbis-tools-1.1.1-102.i586[1]
+>!> upgrade w3m-0.5.2-15.i586 => w3m-0.5.2-25.i586[1]
+>!> upgrade wget-1.10.2-67.i586 => wget-1.10.2-74.i586[1]
+>!> upgrade wireless-tools-29pre22-2.i586 => wireless-tools-29pre22-10.i586[1]
+>!> upgrade wodim-1.1.6-10.i586 => wodim-1.1.6-18.i586[1]
+>!> upgrade wpa_supplicant-0.5.8-8.i586 => wpa_supplicant-0.5.8-21.i586[1]
+>!> upgrade wvdial-1.56-10.i586 => wvdial-1.56-18.i586[1]
+>!> upgrade wvstreams-4.2.2-48.i586 => wvstreams-4.2.2-56.i586[1]
+>!> upgrade x11-input-synaptics-0.14.6-82.i586 => x11-input-synaptics-0.14.6-94.i586[1]
+>!> upgrade x11-input-wacom-0.7.8-16.i586 => x11-input-wacom-0.7.8-28.i586[1]
+>!> upgrade x11-input-wacom-tools-0.7.8-16.i586 => x11-input-wacom-tools-0.7.8-28.i586[1]
+>!> upgrade xalan-j2-2.7.0-72.noarch => xalan-j2-2.7.0-95.noarch[1]
+>!> upgrade xaw3d-1.5E-308.i586 => xaw3d-1.5E-315.i586[1]
+>!> upgrade xdg-menu-0.2-119.i586 => xdg-menu-0.2-125.i586[1]
+>!> upgrade xdg-utils-1.0.1-63.noarch => xdg-utils-1.0.1-75.noarch[1]
+>!> upgrade xerces-j2-2.8.1-72.noarch => xerces-j2-2.8.1-79.noarch[1]
+>!> upgrade xerces-j2-xml-apis-2.8.1-72.noarch => xerces-j2-xml-apis-2.8.1-79.noarch[1]
+>!> upgrade xgl-git_070104-54.i586 => xgl-git_070104-68.i586[1]
+>!> upgrade xgl-hardware-list-060526-69.noarch => xgl-hardware-list-060526-75.noarch[1]
+>!> upgrade xine-lib-1.1.7-16.i586 => xine-lib-1.1.8-4.i586[1]
+>!> upgrade xinetd-2.3.14-66.i586 => xinetd-2.3.14-74.i586[1]
+>!> upgrade xkeyboard-config-1.0-10.noarch => xkeyboard-config-1.0-22.noarch[1]
+>!> upgrade xli-20061110-27.i586 => xli-20061110-34.i586[1]
+>!> upgrade xntp-4.2.4p3-9.i586 => xntp-4.2.4p3-18.i586[1]
+>!> upgrade xorg-x11-7.2-107.i586 => xorg-x11-7.2-126.i586[1]
+>!> upgrade xorg-x11-Xvnc-7.1-77.i586 => xorg-x11-Xvnc-7.1-85.i586[1]
+>!> upgrade xorg-x11-driver-input-7.2-86.i586 => xorg-x11-driver-input-7.2-98.i586[1]
+>!> upgrade xorg-x11-driver-video-7.2-145.i586 => xorg-x11-driver-video-7.2-171.i586[1]
+>!> upgrade xorg-x11-fonts-core-7.2-67.noarch => xorg-x11-fonts-core-7.2-78.noarch[1]
+>!> upgrade xorg-x11-libICE-7.2-50.i586 => xorg-x11-libICE-7.2-57.i586[1]
+>!> upgrade xorg-x11-libSM-7.2-48.i586 => xorg-x11-libSM-7.2-54.i586[1]
+>!> upgrade xorg-x11-libX11-7.2-63.i586 => xorg-x11-libX11-7.2-70.i586[1]
+>!> upgrade xorg-x11-libX11-ccache-7.2-68.i586 => xorg-x11-libX11-ccache-7.2-79.i586[1]
+>!> upgrade xorg-x11-libXau-7.2-44.i586 => xorg-x11-libXau-7.2-50.i586[1]
+>!> upgrade xorg-x11-libXdmcp-7.2-43.i586 => xorg-x11-libXdmcp-7.2-49.i586[1]
+>!> upgrade xorg-x11-libXext-7.2-52.i586 => xorg-x11-libXext-7.2-59.i586[1]
+>!> upgrade xorg-x11-libXfixes-7.2-52.i586 => xorg-x11-libXfixes-7.2-59.i586[1]
+>!> upgrade xorg-x11-libXmu-7.2-52.i586 => xorg-x11-libXmu-7.2-59.i586[1]
+>!> upgrade xorg-x11-libXp-7.2-47.i586 => xorg-x11-libXp-7.2-54.i586[1]
+>!> upgrade xorg-x11-libXpm-7.2-51.i586 => xorg-x11-libXpm-7.2-59.i586[1]
+>!> upgrade xorg-x11-libXprintUtil-7.2-47.i586 => xorg-x11-libXprintUtil-7.2-54.i586[1]
+>!> upgrade xorg-x11-libXrender-7.2-51.i586 => xorg-x11-libXrender-7.2-59.i586[1]
+>!> upgrade xorg-x11-libXt-7.2-53.i586 => xorg-x11-libXt-7.2-60.i586[1]
+>!> upgrade xorg-x11-libXv-7.2-48.i586 => xorg-x11-libXv-7.2-55.i586[1]
+>!> upgrade xorg-x11-libfontenc-7.2-49.i586 => xorg-x11-libfontenc-7.2-55.i586[1]
+>!> upgrade xorg-x11-libs-7.2-84.i586 => xorg-x11-libs-7.2-96.i586[1]
+>!> upgrade xorg-x11-libxcb-7.2-39.i586 => xorg-x11-libxcb-7.2-46.i586[1]
+>!> upgrade xorg-x11-libxkbfile-7.2-51.i586 => xorg-x11-libxkbfile-7.2-58.i586[1]
+>!> upgrade xorg-x11-server-7.2-115.i586 => xorg-x11-server-7.2-130.i586[1]
+>!> upgrade xpdf-tools-3.01-103.i586 => xpdf-tools-3.02-12.i586[1]
+>!> upgrade xstroke-0.6-93.i586 => xstroke-0.6-103.i586[1]
+>!> upgrade xterm-228-6.i586 => xterm-229-9.i586[1]
+>!> upgrade xvkbd-2.8-67.i586 => xvkbd-2.8-74.i586[1]
+>!> upgrade yast2-2.15.45-3.i586 => yast2-2.15.54-2.i586[1]
+>!> upgrade yast2-add-on-2.15.11-2.noarch => yast2-add-on-2.15.14-4.noarch[1]
+>!> upgrade yast2-apparmor-2.0.2-15.noarch => yast2-apparmor-2.1-10.noarch[1]
+>!> upgrade yast2-backup-2.15.4-15.noarch => yast2-backup-2.15.4-32.noarch[1]
+>!> upgrade yast2-bluetooth-2.15.2-30.noarch => yast2-bluetooth-2.15.4-2.noarch[1]
+>!> upgrade yast2-bootloader-2.15.14-9.i586 => yast2-bootloader-2.15.19-3.i586[1]
+>!> upgrade yast2-control-center-2.15.1-3.i586 => yast2-control-center-2.15.4-3.i586[1]
+>!> upgrade yast2-control-center-qt-2.15.1-3.i586 => yast2-control-center-qt-2.15.4-3.i586[1]
+>!> upgrade yast2-core-2.15.8-2.i586 => yast2-core-2.15.10-2.i586[1]
+>!> upgrade yast2-country-2.15.16-2.i586 => yast2-country-2.15.18-12.i586[1]
+>!> upgrade yast2-firewall-2.15.7-8.noarch => yast2-firewall-2.15.7-23.noarch[1]
+>!> upgrade yast2-hardware-detection-2.15.8-9.i586 => yast2-hardware-detection-2.15.8-22.i586[1]
+>!> upgrade yast2-inetd-2.15.1-7.noarch => yast2-inetd-2.15.1-24.noarch[1]
+>!> upgrade yast2-installation-2.15.40-2.noarch => yast2-installation-2.15.46-2.noarch[1]
+>!> upgrade yast2-irda-2.15.1-64.noarch => yast2-irda-2.15.1-79.noarch[1]
+>!> upgrade yast2-iscsi-client-2.15.2-9.noarch => yast2-iscsi-client-2.15.2-24.noarch[1]
+>!> upgrade yast2-kerberos-client-2.15.7-2.noarch => yast2-kerberos-client-2.15.7-17.noarch[1]
+>!> upgrade yast2-ldap-2.15.1-53.i586 => yast2-ldap-2.15.1-68.i586[1]
+>!> upgrade yast2-ldap-client-2.15.12-3.noarch => yast2-ldap-client-2.15.12-20.noarch[1]
+>!> upgrade yast2-mail-2.15.9-38.noarch => yast2-mail-2.15.20-18.noarch[1]
+>!> upgrade yast2-metapackage-handler-0.5.2-2.noarch => yast2-metapackage-handler-0.7.0-3.noarch[1]
+>!> upgrade yast2-mouse-2.15.1-51.i586 => yast2-mouse-2.15.1-66.i586[1]
+>!> upgrade yast2-ncurses-2.15.23-4.i586 => yast2-ncurses-2.15.26-7.i586[1]
+>!> upgrade yast2-network-2.15.57-2.i586 => yast2-network-2.15.72-2.i586[1]
+>!> upgrade yast2-nfs-client-2.14.0-71.noarch => yast2-nfs-client-2.15.0-10.noarch[1]
+>!> upgrade yast2-nis-client-2.15.2-49.i586 => yast2-nis-client-2.15.3-6.i586[1]
+>!> upgrade yast2-ntp-client-2.15.6-2.noarch => yast2-ntp-client-2.15.8-2.noarch[1]
+>!> upgrade yast2-online-update-2.15.20-3.noarch => yast2-online-update-2.15.20-20.noarch[1]
+>!> upgrade yast2-online-update-frontend-2.15.20-3.noarch => yast2-online-update-frontend-2.15.20-20.noarch[1]
+>!> upgrade yast2-packager-2.15.54-2.i586 => yast2-packager-2.15.74-2.i586[1]
+>!> upgrade yast2-pam-2.14.0-98.noarch => yast2-pam-2.14.0-113.noarch[1]
+>!> upgrade yast2-perl-bindings-2.15.2-4.i586 => yast2-perl-bindings-2.15.3-12.i586[1]
+>!> upgrade yast2-pkg-bindings-2.15.42-4.i586 => yast2-pkg-bindings-2.15.49-2.i586[1]
+>!> upgrade yast2-printer-2.15.4-2.i586 => yast2-printer-2.15.5-2.i586[1]
+>!> upgrade yast2-profile-manager-2.15.0-18.i586 => yast2-profile-manager-2.15.0-35.i586[1]
+>!> upgrade yast2-qt-2.15.11-4.i586 => yast2-qt-2.15.16-2.i586[1]
+>!> upgrade yast2-registration-2.15.0-3.noarch => yast2-registration-2.15.2-3.noarch[1]
+>!> upgrade yast2-repair-2.15.7-24.noarch => yast2-repair-2.15.7-41.noarch[1]
+>!> upgrade yast2-restore-2.15.2-7.noarch => yast2-restore-2.15.4-4.noarch[1]
+>!> upgrade yast2-runlevel-2.15.2-13.noarch => yast2-runlevel-2.15.3-4.noarch[1]
+>!> upgrade yast2-samba-client-2.15.11-3.noarch => yast2-samba-client-2.15.11-18.noarch[1]
+>!> upgrade yast2-samba-server-2.15.7-23.noarch => yast2-samba-server-2.15.7-40.noarch[1]
+>!> upgrade yast2-scanner-2.15.5-12.noarch => yast2-scanner-2.15.5-27.noarch[1]
+>!> upgrade yast2-schema-2.15.0-75.noarch => yast2-schema-2.15.0-102.noarch[1]
+>!> upgrade yast2-security-2.15.0-59.noarch => yast2-security-2.15.1-8.noarch[1]
+>!> upgrade yast2-slp-2.14.1-73.i586 => yast2-slp-2.15.0-16.i586[1]
+>!> upgrade yast2-sound-2.15.9-3.i586 => yast2-sound-2.15.11-3.i586[1]
+>!> upgrade yast2-storage-2.15.20-2.i586 => yast2-storage-2.15.24-2.i586[1]
+>!> upgrade yast2-storage-lib-2.15.20-2.i586 => yast2-storage-lib-2.15.24-2.i586[1]
+>!> upgrade yast2-sudo-2.15.3-52.noarch => yast2-sudo-2.15.3-69.noarch[1]
+>!> upgrade yast2-support-2.15.2-42.noarch => yast2-support-2.15.2-57.noarch[1]
+>!> upgrade yast2-sysconfig-2.15.3-28.noarch => yast2-sysconfig-2.15.3-43.noarch[1]
+>!> upgrade yast2-theme-openSUSE-2.15.6-3.noarch => yast2-theme-openSUSE-2.15.13-2.noarch[1]
+>!> upgrade yast2-trans-en_US-2.15.1-8.noarch => yast2-trans-en_US-2.15.4-4.noarch[1]
+>!> upgrade yast2-trans-stats-2.15.0-12.noarch => yast2-trans-stats-2.15.0-22.noarch[1]
+>!> upgrade yast2-transfer-2.14.0-77.i586 => yast2-transfer-2.14.0-92.i586[1]
+>!> upgrade yast2-tune-2.15.6-36.i586 => yast2-tune-2.15.7-2.i586[1]
+>!> upgrade yast2-tv-2.15.6-21.noarch => yast2-tv-2.15.7-8.noarch[1]
+>!> upgrade yast2-update-2.15.19-3.i586 => yast2-update-2.15.23-4.i586[1]
+>!> upgrade yast2-users-2.15.34-3.i586 => yast2-users-2.15.36-13.i586[1]
+>!> upgrade yast2-x11-2.15.10-30.noarch => yast2-x11-2.15.11-5.noarch[1]
+>!> upgrade yast2-xml-2.15.0-36.i586 => yast2-xml-2.15.0-47.i586[1]
+>!> upgrade yauap-0.2.1-3.i586 => yauap-0.2.1-13.i586[1]
+>!> upgrade yp-tools-2.9-67.i586 => yp-tools-2.9-73.i586[1]
+>!> upgrade ypbind-1.20.5-38.i586 => ypbind-1.20.5-46.i586[1]
+>!> upgrade zisofs-tools-1.0.6-66.i586 => zisofs-tools-1.0.6-72.i586[1]
+>!> upgrade zlib-1.2.3-66.i586 => zlib-1.2.3-72.i586[1]
+>!> upgrade zvbi-0.2.16-81.i586 => zvbi-0.2.16-89.i586[1]
+>!> upgrade zypper-0.8.10-2.i586 => zypper-0.8.19-2.i586[1]
+>!> |unflag cracklib-dict-full-2.8.10-28.i586[1]
+>!> |unflag pattern:sw_management_gnome-10.3-133.i586[1]
+>!> |unflag sendmail-8.14.1-46.i586[1]
+>!> installs=113, upgrades=677, uninstalls=4
Added: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.xml
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.xml (added)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308098-test.xml Tue Sep 11 17:20:38 2007
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!-- testcase generated by YaST bug 308098-->
+<test>
+<setup arch="i686">
+ <system file="bug308098-system.xml.gz"/>
+ <channel file="bug308098-1-package.xml.gz" name="1" />
+ <locale name="en_US" />
+ <locale name="en" />
+</setup>
+<trial>
+<showpool all="yes"/>
+<establish/>
+<showpool all="true" prefix=">!> ESTABLISHED:"/>
+<distupgrade delete_unmaintained="false"/>
+<reportproblems/>
+</trial>
+</test>
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7189 - /trunk/zypper/src/zypper-source-callbacks.h
by jkupec@svn.opensuse.org 11 Sep '07
by jkupec@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: jkupec
Date: Tue Sep 11 16:49:35 2007
New Revision: 7189
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7189&view=rev
Log:
- remove the limit_to_verbosity nonsense
Modified:
trunk/zypper/src/zypper-source-callbacks.h
Modified: trunk/zypper/src/zypper-source-callbacks.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-source-callbac…
==============================================================================
--- trunk/zypper/src/zypper-source-callbacks.h (original)
+++ trunk/zypper/src/zypper-source-callbacks.h Tue Sep 11 16:49:35 2007
@@ -217,11 +217,6 @@
{
void tick( const zypp::ProgressData &data )
{
- // verbosity filter
- // don't display anything, if verbosity is not >= than limit_to_verbosity
- if (gSettings.verbosity < gData.limit_to_verbosity)
- return;
-
if ( data.reportAlive() )
display_tick (zypp::str::numstring(data.numericId()), cout, data.name() );
else
@@ -230,17 +225,11 @@
virtual void start( const zypp::ProgressData &data )
{
- if (gSettings.verbosity < gData.limit_to_verbosity)
- return;
-
tick(data);
}
virtual bool progress( const zypp::ProgressData &data )
{
- if (gSettings.verbosity < gData.limit_to_verbosity)
- return true;
-
tick(data);
return true;
}
@@ -254,9 +243,6 @@
virtual void finish( const zypp::ProgressData &data )
{
- if (gSettings.verbosity < gData.limit_to_verbosity)
- return;
-
display_done(zypp::str::numstring(data.numericId()), cout, data.name() );
}
};
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7188 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes
by dmacvicar@svn.opensuse.org 11 Sep '07
by dmacvicar@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: dmacvicar
Date: Tue Sep 11 16:13:32 2007
New Revision: 7188
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7188&view=rev
Log:
changes
Modified:
trunk/libzypp/VERSION.cmake
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7188&r…
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Tue Sep 11 16:13:32 2007
@@ -47,4 +47,4 @@
SET(LIBZYPP_MAJOR "3")
SET(LIBZYPP_MINOR "22")
SET(LIBZYPP_COMPATMINOR "21")
-SET(LIBZYPP_PATCH "7")
+SET(LIBZYPP_PATCH "8")
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Tue Sep 11 16:13:32 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Sep 11 16:11:20 CEST 2007 - dmacvicar(a)suse.de
+
+- restore deltas and patch rpms from the cache (#309124)
+- 3.22.8
+
+-------------------------------------------------------------------
Tue Sep 11 14:54:44 CEST 2007 - ma(a)suse.de
- Don't fail if a product is deleted multiple times (e.g. due to
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7187 - in /trunk/libzypp: tests/cache/ zypp/cache/ zypp/cache/schema/ zypp/repo/ zypp/repo/cached/
by dmacvicar@svn.opensuse.org 11 Sep '07
by dmacvicar@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: dmacvicar
Date: Tue Sep 11 16:13:31 2007
New Revision: 7187
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7187&view=rev
Log:
- restore deltas and patches from the cache (#309124)
Modified:
trunk/libzypp/tests/cache/CacheStore_test.cc
trunk/libzypp/zypp/cache/CacheInitializer.h
trunk/libzypp/zypp/cache/CacheStore.cc
trunk/libzypp/zypp/cache/schema/schema.sql
trunk/libzypp/zypp/repo/RepositoryImpl.cc
trunk/libzypp/zypp/repo/RepositoryImpl.h
trunk/libzypp/zypp/repo/cached/RepoImpl.cc
Modified: trunk/libzypp/tests/cache/CacheStore_test.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheStore_t…
==============================================================================
--- trunk/libzypp/tests/cache/CacheStore_test.cc (original)
+++ trunk/libzypp/tests/cache/CacheStore_test.cc Tue Sep 11 16:13:31 2007
@@ -444,6 +444,32 @@
cache_write_shared_attributes(repodir);
}
+/**
+ * \short Test that a yum repo wrtes and reads back patch and delta rpm information
+ */
+void cache_delta_rpm_test(const string &dir)
+{
+ Pathname repodir = Pathname(dir) + "/repo/yum/data/10.2-updates-subset";
+ filesystem::TmpDir tmpdir;
+ string alias = "novell.com";
+ write_yum_repo( alias, repodir, tmpdir );
+
+ data::RecordId repository_id;
+ {
+ cache::CacheStore store(tmpdir.path());
+ repository_id = store.lookupOrAppendRepository(alias);
+ }
+
+ cached::RepoImpl *repositoryImpl = new cached::RepoImpl( cached::RepoOptions( RepoInfo(),
+ tmpdir.path(),
+ repository_id ));
+ // 22 packages and 6 patches
+ BOOST_CHECK_EQUAL( repositoryImpl->resolvables().size(), 42 );
+ // 19 patch rpms
+ BOOST_CHECK_EQUAL( repositoryImpl->patchRpms().size(), 19 );
+ //check_tables_clean(tmpdir);
+}
+
test_suite*
init_unit_test_suite( int argc, char *argv[] )
{
@@ -484,6 +510,10 @@
(std::string const*)params, params+1));
test->add(BOOST_PARAM_TEST_CASE(&cache_write_shared_attributes_test,
(std::string const*)params, params+1));
+
+ // test for delta and patch rpms
+ test->add(BOOST_PARAM_TEST_CASE(&cache_delta_rpm_test,
+ (std::string const*)params, params+1));
return test;
}
Modified: trunk/libzypp/zypp/cache/CacheInitializer.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheInitiali…
==============================================================================
--- trunk/libzypp/zypp/cache/CacheInitializer.h (original)
+++ trunk/libzypp/zypp/cache/CacheInitializer.h Tue Sep 11 16:13:31 2007
@@ -19,7 +19,7 @@
#include "zypp/Pathname.h"
#include "zypp/cache/sqlite3x/sqlite3x.hpp"
-#define ZYPP_CACHE_SCHEMA_VERSION 1004
+#define ZYPP_CACHE_SCHEMA_VERSION 1005
///////////////////////////////////////////////////////////////////
namespace zypp
Modified: trunk/libzypp/zypp/cache/CacheStore.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc…
==============================================================================
--- trunk/libzypp/zypp/cache/CacheStore.cc (original)
+++ trunk/libzypp/zypp/cache/CacheStore.cc Tue Sep 11 16:13:31 2007
@@ -122,13 +122,13 @@
count_shared_cmd.reset( new sqlite3_command( con, "select count(id) from resolvables where shared_id=:rid;" ));
insert_patchrpm_cmd.reset( new sqlite3_command (con,
- "insert into patch_packages (repository_id, media_nr, location, checksum, download_size, build_time) "
- "values (:repository_id, :media_nr, :location, :checksum, :download_size, :build_time);" ));
+ "insert into patch_packages (repository_id, media_nr, location, checksum, checksum_type, download_size, build_time) "
+ "values (:repository_id, :media_nr, :location, :checksum, :checksum_type, :download_size, :build_time);" ));
insert_deltarpm_cmd.reset( new sqlite3_command (con,
- "insert into delta_packages (repository_id, media_nr, location, checksum, download_size, build_time, "
+ "insert into delta_packages (repository_id, media_nr, location, checksum, checksum_type, download_size, build_time, "
"baseversion_version, baseversion_release, baseversion_epoch, baseversion_checksum, "
"baseversion_build_time, baseversion_sequence_info) "
- "values (:repository_id, :media_nr, :location, :checksum, :download_size, :build_time, "
+ "values (:repository_id, :media_nr, :location, :checksum, :checksum_type, :download_size, :build_time, "
":baseversion_version, :baseversion_release, :baseversion_epoch, :baseversion_checksum, "
":baseversion_build_time, :baseversion_sequence_info);" ));
append_patch_baseversion_cmd.reset( new sqlite3_command (con,
@@ -747,6 +747,7 @@
_pimpl->insert_patchrpm_cmd->bind(":repository_id", repository_id);
_pimpl->insert_patchrpm_cmd->bind(":location", prpm->location.filename().asString());
_pimpl->insert_patchrpm_cmd->bind(":checksum", prpm->location.checksum().checksum());
+ _pimpl->insert_patchrpm_cmd->bind(":checksum_type", prpm->location.checksum().type());
//! \todo checksum type
_pimpl->insert_patchrpm_cmd->bind(":download_size", static_cast<ByteCount::SizeType>(prpm->location.downloadSize()));
_pimpl->insert_patchrpm_cmd->bind(":build_time", prpm->buildTime.asSeconds());
@@ -777,6 +778,8 @@
_pimpl->insert_deltarpm_cmd->bind(":repository_id", repository_id);
_pimpl->insert_deltarpm_cmd->bind(":location", drpm->location.filename().asString());
_pimpl->insert_deltarpm_cmd->bind(":checksum", drpm->location.checksum().checksum());
+ _pimpl->insert_deltarpm_cmd->bind(":checksum", drpm->location.checksum().checksum());
+ _pimpl->insert_deltarpm_cmd->bind(":checksum_type", drpm->location.checksum().type());
//! \todo checksum type
_pimpl->insert_deltarpm_cmd->bind(":download_size", static_cast<ByteCount::SizeType>(drpm->location.downloadSize()));
_pimpl->insert_deltarpm_cmd->bind(":build_time", drpm->buildTime.asSeconds());
Modified: trunk/libzypp/zypp/cache/schema/schema.sql
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/schema/schema…
==============================================================================
--- trunk/libzypp/zypp/cache/schema/schema.sql (original)
+++ trunk/libzypp/zypp/cache/schema/schema.sql Tue Sep 11 16:13:31 2007
@@ -169,12 +169,14 @@
, media_nr INTEGER
, location TEXT
, checksum TEXT
+ , checksum_type TEXT
, download_size INTEGER
, build_time INTEGER
, baseversion_version TEXT
, baseversion_release TEXT
, baseversion_epoch INTEGER
, baseversion_checksum TEXT
+ , baseversion_checksum_type TEXT
, baseversion_build_time INTEGER
, baseversion_sequence_info TEXT
, repository_id INTEGER REFERENCES repositories(id)
@@ -186,6 +188,7 @@
, media_nr INTEGER
, location TEXT
, checksum TEXT
+ , checksum_type TEXT
, download_size INTEGER
, build_time INTEGER
, repository_id INTEGER REFERENCES repositories(id)
Modified: trunk/libzypp/zypp/repo/RepositoryImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepositoryImpl…
==============================================================================
--- trunk/libzypp/zypp/repo/RepositoryImpl.cc (original)
+++ trunk/libzypp/zypp/repo/RepositoryImpl.cc Tue Sep 11 16:13:31 2007
@@ -11,6 +11,7 @@
RepositoryImpl::RepositoryImpl( const RepoInfo &info )
: _restore_lazy_initialized(false),
+ _deltas_lazy_initialized(false),
_info(info)
{
@@ -54,13 +55,23 @@
const std::list<packagedelta::PatchRpm> &
RepositoryImpl::patchRpms() const
{
+ if ( ! _deltas_lazy_initialized )
+ {
+ const_cast<RepositoryImpl*>(this)->createPatchAndDeltas();
+ const_cast<RepositoryImpl*>(this)->_deltas_lazy_initialized = true;
+ }
return _patchRpms;
}
const std::list<packagedelta::DeltaRpm> &
RepositoryImpl::deltaRpms() const
{
- return _deltaRpms;
+ if ( ! _deltas_lazy_initialized )
+ {
+ const_cast<RepositoryImpl*>(this)->createPatchAndDeltas();
+ const_cast<RepositoryImpl*>(this)->_deltas_lazy_initialized = true;
+ }
+ return _deltaRpms;
}
} } // ns
Modified: trunk/libzypp/zypp/repo/RepositoryImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepositoryImpl…
==============================================================================
--- trunk/libzypp/zypp/repo/RepositoryImpl.h (original)
+++ trunk/libzypp/zypp/repo/RepositoryImpl.h Tue Sep 11 16:13:31 2007
@@ -77,6 +77,8 @@
std::list<packagedelta::DeltaRpm> _deltaRpms;
private:
bool _restore_lazy_initialized;
+ bool _deltas_lazy_initialized;
+
RepoInfo _info;
};
}
Modified: trunk/libzypp/zypp/repo/cached/RepoImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/RepoImp…
==============================================================================
--- trunk/libzypp/zypp/repo/cached/RepoImpl.cc (original)
+++ trunk/libzypp/zypp/repo/cached/RepoImpl.cc Tue Sep 11 16:13:31 2007
@@ -174,19 +174,6 @@
//extract_packages_from_directory( _store, thePath, selfRepositoryRef(), true );
}
-static CheckSum encoded_string_to_checksum( const std::string &encoded )
-{
- vector<string> words;
- if ( str::split( encoded, std::back_inserter(words), ":" ) != 2 )
- {
- return CheckSum();
- }
- else
- {
- return CheckSum( words[0], words[1] );
- }
-}
-
void RepoImpl::createPatchAndDeltas()
{
ProgressData ticks;
@@ -201,8 +188,8 @@
con.executenonquery("BEGIN;");
string pp_query =
- // 0 1 2 3 4 5
- "SELECT id, media_nr, location, checksum, download_size, build_time "
+ // 0 1 2 3 4 5
+ "SELECT id, media_nr, location, checksum, checksum_type, download_size, build_time "
"FROM patch_packages WHERE repository_id=:repository_id;";
string pp_bv_query =
@@ -210,92 +197,101 @@
"FROM patch_packages_baseversions WHERE patch_package_id = :patch_package_id";
string delta_query =
- // 0 1 2 3 4 5 6 7 8 9 10
- "SELECT id, media_nr, location, checksum, download_size, build_time, baseversion_version, baseversion_release, baseversion_epoch, baseversion_checksum, baseversion_build_time "
+ // 0 1 2 3 4 5 6 7 8 9 10 11
+ "SELECT id, media_nr, location, checksum, checksum_type, download_size, build_time, baseversion_version, baseversion_release, baseversion_epoch, baseversion_checksum, baseversion_checksum_type, baseversion_build_time "
// 11
", baseversion_sequence_info "
"FROM delta_packages WHERE repository_id=:repository_id;";
-
- // bind the master repo id to the query
- sqlite3_command deltas_cmd( con, delta_query);
- deltas_cmd.bind(":repository_id", _options.repository_id);
- sqlite3_reader reader = deltas_cmd.executereader();
- while ( reader.read() )
+
{
- zypp::OnMediaLocation on_media( reader.getstring(2), reader.getint(1) );
-
- string checksum_string(reader.getstring(3));
- CheckSum checksum = encoded_string_to_checksum(checksum_string);
- if ( checksum.empty() )
- {
- ERR << "Wrong checksum for delta, skipping..." << endl;
- continue;
- }
- on_media.setChecksum(checksum);
- on_media.setDownloadSize(reader.getint(4));
-
- packagedelta::DeltaRpm::BaseVersion baseversion;
- baseversion.setEdition( Edition(reader.getstring(6), reader.getstring(7), reader.getstring(8) ) );
-
- checksum_string = reader.getstring(9);
- checksum = encoded_string_to_checksum(checksum_string);
- if ( checksum.empty() )
+ // bind the master repo id to the query
+ sqlite3_command deltas_cmd( con, delta_query);
+ deltas_cmd.bind(":repository_id", _options.repository_id);
+ sqlite3_reader reader = deltas_cmd.executereader();
+ while ( reader.read() )
{
- ERR << "Wrong checksum for delta, skipping..." << endl;
- continue;
+ zypp::OnMediaLocation on_media( reader.getstring(2), reader.getint(1) );
+
+ string checksum_string(reader.getstring(3));
+ CheckSum checksum(reader.getstring(4), reader.getstring(3));
+ if ( checksum.empty() )
+ {
+ ERR << "Wrong checksum for delta, skipping..." << endl;
+ continue;
+ }
+ on_media.setChecksum(checksum);
+ on_media.setDownloadSize(reader.getint(5));
+
+ packagedelta::DeltaRpm::BaseVersion baseversion;
+ baseversion.setEdition( Edition(reader.getstring(7), reader.getstring(8), reader.getstring(9) ) );
+
+ checksum = CheckSum(reader.getstring(11), reader.getstring(10));
+ if ( checksum.empty() )
+ {
+ ERR << "Wrong checksum for delta, skipping..." << endl;
+ continue;
+ }
+ baseversion.setChecksum(checksum);
+ baseversion.setBuildtime(reader.getint(12));
+ baseversion.setSequenceinfo(reader.getstring(13));
+
+ zypp::packagedelta::DeltaRpm delta;
+ delta.setLocation( on_media );
+ delta.setBaseversion( baseversion );
+ delta.setBuildtime(reader.getint(6));
+
+ _deltaRpms.push_back(delta);
}
- baseversion.setChecksum(checksum);
- baseversion.setBuildtime(reader.getint(10));
- baseversion.setSequenceinfo(reader.getstring(11));
-
- zypp::packagedelta::DeltaRpm delta;
- delta.setLocation( on_media );
- delta.setBaseversion( baseversion );
- delta.setBuildtime(reader.getint(5));
-
- _deltaRpms.push_back(delta);
+ reader.close();
}
-
- // patch rpms
- // bind the master package id to the query
- // bind the master repo id to the query
- sqlite3_command pp_cmd( con, pp_query);
- sqlite3_command pp_bv_cmd( con, pp_bv_query);
- pp_cmd.bind(":repository_id", _options.repository_id);
- reader = pp_cmd.executereader();
-
- while ( reader.read() )
{
- long long patch_package_id = reader.getint64(0);
-
- zypp::OnMediaLocation on_media( reader.getstring(2), reader.getint(1) );
-
- string checksum_string(reader.getstring(3));
- CheckSum checksum = encoded_string_to_checksum(checksum_string);
- if ( checksum.empty() )
+ // patch rpms
+ // bind the master package id to the query
+ // bind the master repo id to the query
+ sqlite3_command pp_cmd( con, pp_query);
+ sqlite3_command pp_bv_cmd( con, pp_bv_query);
+ pp_cmd.bind(":repository_id", _options.repository_id);
+ sqlite3_reader reader = pp_cmd.executereader();
+
+ while ( reader.read() )
{
- ERR << "Wrong checksum for delta, skipping..." << endl;
- continue;
+ //MIL << "Addining patch rpm " << endl;
+ long long patch_package_id = reader.getint64(0);
+
+ zypp::OnMediaLocation on_media( reader.getstring(2), reader.getint(1) );
+
+ CheckSum checksum(reader.getstring(4), reader.getstring(3));
+ if ( checksum.empty() )
+ {
+ ERR << "Wrong checksum for delta, skipping..." << endl;
+ continue;
+ }
+ on_media.setChecksum(checksum);
+ on_media.setDownloadSize(reader.getint(5));
+
+ zypp::packagedelta::PatchRpm patch;
+ patch.setLocation( on_media );
+ patch.setBuildtime(reader.getint(6));
+
+ pp_bv_cmd.bind( ":patch_package_id", patch_package_id );
+
+ sqlite3_reader bv_reader = pp_bv_cmd.executereader();
+ while (bv_reader.read())
+ {
+ //MIL << " * Adding baseversion " << endl;
+ packagedelta::PatchRpm::BaseVersion baseversion = packagedelta::PatchRpm::BaseVersion( bv_reader.getstring(0) , bv_reader.getstring(1), bv_reader.getint(2) );
+ patch.addBaseversion(baseversion);
+ }
+
+ bv_reader.close();
+
+ _patchRpms.push_back(patch);
}
- on_media.setChecksum(checksum);
- on_media.setDownloadSize(reader.getint(4));
-
- zypp::packagedelta::PatchRpm patch;
- patch.setLocation( on_media );
- patch.setBuildtime(reader.getint(5));
-
- pp_bv_cmd.bind( ":patch_package_id", patch_package_id );
-
- sqlite3_reader bv_reader = pp_bv_cmd.executereader();
- while (bv_reader.read())
- {
- packagedelta::PatchRpm::BaseVersion baseversion = packagedelta::PatchRpm::BaseVersion( bv_reader.getstring(0) , bv_reader.getstring(1), bv_reader.getint(2) );
- patch.addBaseversion(baseversion);
- }
-
- _patchRpms.push_back(patch);
+ reader.close();
+ MIL << _patchRpms.size() << " patch rpms read." << endl;
}
- con.resetprogresshandler();
+ //con.resetprogresshandler();
+ con.close();
}
catch(exception &ex) {
cerr << "Exception Occured: " << ex.what() << endl;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7186 - /trunk/updater-kde/updater/MainWindow.cpp
by tgoettlicher@svn.opensuse.org 11 Sep '07
by tgoettlicher@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: tgoettlicher
Date: Tue Sep 11 15:28:58 2007
New Revision: 7186
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7186&view=rev
Log:
fixed to disable checking button while checking for updates
Modified:
trunk/updater-kde/updater/MainWindow.cpp
Modified: trunk/updater-kde/updater/MainWindow.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.c…
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Tue Sep 11 15:28:58 2007
@@ -405,6 +405,9 @@
applet->setState(state);
}
+ _check_updates_action->setEnabled(true);
+ _edit_sources_action->setEnabled(true);
+
if ( state == APPLET_CHECKING || state == APPLET_INSTALLING || state == APPLET_NO_NETWORK )
_check_updates_action->setEnabled(false);
else
@@ -412,8 +415,6 @@
- _check_updates_action->setEnabled(true);
- _edit_sources_action->setEnabled(true);
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7185 - in /trunk/libzypp: devel/devel.ma/Parse.cc package/libzypp.changes zypp/DiskUsageCounter.cc zypp/target/rpm/RpmPackageImpl.cc zypp/target/rpm/RpmPackageImpl.h
by mlandres@svn.opensuse.org 11 Sep '07
by mlandres@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: mlandres
Date: Tue Sep 11 15:01:52 2007
New Revision: 7185
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7185&view=rev
Log:
changes
Modified:
trunk/libzypp/devel/devel.ma/Parse.cc
trunk/libzypp/package/libzypp.changes
trunk/libzypp/zypp/DiskUsageCounter.cc
trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc
trunk/libzypp/zypp/target/rpm/RpmPackageImpl.h
Modified: trunk/libzypp/devel/devel.ma/Parse.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?…
==============================================================================
--- trunk/libzypp/devel/devel.ma/Parse.cc (original)
+++ trunk/libzypp/devel/devel.ma/Parse.cc Tue Sep 11 15:01:52 2007
@@ -35,11 +35,12 @@
#include "zypp/RepoInfo.h"
#include "zypp/ui/PatchContents.h"
+#include "zypp/ResPoolProxy.h"
using namespace std;
using namespace zypp;
using namespace zypp::functor;
-
+using namespace zypp::ui;
using zypp::parser::TagParser;
///////////////////////////////////////////////////////////////////
@@ -48,14 +49,44 @@
///////////////////////////////////////////////////////////////////
+template<class _Res>
+Selectable::Ptr getSel( const std::string & name_r )
+{
+ ResPoolProxy uipool( getZYpp()->poolProxy() );
+ for_(it, uipool.byKindBegin<_Res>(), uipool.byKindEnd<_Res>() )
+ {
+ if ( (*it)->name() == name_r )
+ return (*it);
+ }
+ return 0;
+}
+
+void dbgDu( Selectable::Ptr sel )
+{
+ if ( sel->installedPoolItem() )
+ {
+ DBG << "i: " << sel->installedPoolItem() << endl
+ << sel->installedPoolItem()->diskusage() << endl;
+ }
+ if ( sel->candidatePoolItem() )
+ {
+ DBG << "c: " << sel->candidatePoolItem() << endl
+ << sel->candidatePoolItem()->diskusage() << endl;
+ }
+ INT << sel << endl
+ << getZYpp()->diskUsage() << endl;
+}
+
+///////////////////////////////////////////////////////////////////
+
struct Xprint
{
bool operator()( const PoolItem & obj_r )
{
- //handle( asKind<Package>( obj_r ) );
- //handle( asKind<Patch>( obj_r ) );
- handle( asKind<Pattern>( obj_r ) );
- handle( asKind<Product>( obj_r ) );
+ handle( asKind<Package>( obj_r ) );
+// handle( asKind<Patch>( obj_r ) );
+// handle( asKind<Pattern>( obj_r ) );
+// handle( asKind<Product>( obj_r ) );
return true;
}
@@ -64,6 +95,7 @@
if ( !p )
return;
+ WAR << p->size() << endl;
MIL << p->diskusage() << endl;
}
@@ -425,6 +457,25 @@
std::for_each( pool.begin(), pool.end(), Xprint() );
+ DiskUsageCounter::MountPointSet fakePart;
+ fakePart.insert( DiskUsageCounter::MountPoint( "/", 1024, 10240, 5120, 0LL, false ) );
+ getZYpp()->setPartitions( fakePart );
+
+ USR << getZYpp()->getPartitions() << endl;
+ INT << getZYpp()->diskUsage() << endl;
+
+ Selectable::Ptr sel( getSel<Package>( "rpm" ) );
+ dbgDu( sel );
+
+ MIL << sel->set_status( ui::S_Del ) << endl;
+ dbgDu( sel );
+
+ MIL << sel->set_status( ui::S_Update ) << endl;
+ dbgDu( sel );
+
+ MIL << sel->set_status( ui::S_KeepInstalled ) << endl;
+ dbgDu( sel );
+
///////////////////////////////////////////////////////////////////
INT << "===[END]============================================" << endl << endl;
zypp::base::LogControl::instance().logNothing();
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Tue Sep 11 15:01:52 2007
@@ -4,6 +4,7 @@
- Don't fail if a product is deleted multiple times (e.g. due to
obsoletes and an explicit deleted request). (#308746)
- version 3.22.7
+- revision 7184
-------------------------------------------------------------------
Tue Sep 11 13:52:47 CEST 2007 - jkupec(a)suse.cz
Modified: trunk/libzypp/zypp/DiskUsageCounter.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/DiskUsageCounter.cc…
==============================================================================
--- trunk/libzypp/zypp/DiskUsageCounter.cc (original)
+++ trunk/libzypp/zypp/DiskUsageCounter.cc Tue Sep 11 15:01:52 2007
@@ -305,7 +305,11 @@
std::ostream & operator<<( std::ostream & str, const DiskUsageCounter::MountPoint & obj )
{
- str << "dir:[" << obj.dir << "] [ bs: " << obj.block_size << " ts: " << obj.total_size << "]" << std::endl;
+ str << "dir:[" << obj.dir << "] [ bs: " << obj.block_size
+ << " ts: " << obj.total_size
+ << " us: " << obj.used_size
+ << " +-: " << obj.pkg_size
+ << "]" << std::endl;
return str;
}
Modified: trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmPacka…
==============================================================================
--- trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc (original)
+++ trunk/libzypp/zypp/target/rpm/RpmPackageImpl.cc Tue Sep 11 15:01:52 2007
@@ -56,6 +56,7 @@
// we know we are reading english.
_description.setText(data->tag_description(), Locale("en"));
data->tag_du(_disk_usage);
+ SEC << _disk_usage << endl;
_location.setDownloadSize(data->tag_archivesize());
}
@@ -199,7 +200,7 @@
}
/** */
-const DiskUsage & RPMPackageImpl::diskUsage() const
+const DiskUsage & RPMPackageImpl::diskusage() const
{
return _disk_usage;
}
Modified: trunk/libzypp/zypp/target/rpm/RpmPackageImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/rpm/RpmPacka…
==============================================================================
--- trunk/libzypp/zypp/target/rpm/RpmPackageImpl.h (original)
+++ trunk/libzypp/zypp/target/rpm/RpmPackageImpl.h Tue Sep 11 15:01:52 2007
@@ -85,7 +85,7 @@
/** */
virtual std::string type() const;
/** */
- virtual const DiskUsage & diskUsage() const;
+ virtual const DiskUsage & diskusage() const;
/** */
virtual Repository repository() const;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7184 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes zypp/target/store/XMLFilesBackend.cc
by mlandres@svn.opensuse.org 11 Sep '07
by mlandres@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: mlandres
Date: Tue Sep 11 15:01:30 2007
New Revision: 7184
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7184&view=rev
Log:
- Don't fail if a product is deleted multiple times (e.g. due to
obsoletes and an explicit deleted request). (#308746)
Modified:
trunk/libzypp/VERSION.cmake
trunk/libzypp/package/libzypp.changes
trunk/libzypp/zypp/target/store/XMLFilesBackend.cc
Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7184&r…
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Tue Sep 11 15:01:30 2007
@@ -47,4 +47,4 @@
SET(LIBZYPP_MAJOR "3")
SET(LIBZYPP_MINOR "22")
SET(LIBZYPP_COMPATMINOR "21")
-SET(LIBZYPP_PATCH "6")
+SET(LIBZYPP_PATCH "7")
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Tue Sep 11 15:01:30 2007
@@ -1,19 +1,26 @@
-------------------------------------------------------------------
+Tue Sep 11 14:54:44 CEST 2007 - ma(a)suse.de
+
+- Don't fail if a product is deleted multiple times (e.g. due to
+ obsoletes and an explicit deleted request). (#308746)
+- version 3.22.7
+
+-------------------------------------------------------------------
Tue Sep 11 13:52:47 CEST 2007 - jkupec(a)suse.cz
-- SYSCONFDIR variable added for modifying /etc
+- SYSCONFDIR variable added for modifying /etc
-------------------------------------------------------------------
Tue Sep 11 12:18:11 CEST 2007 - schubi(a)suse.de
- uninstallable resolvable -->suggested solution: delete; Bug 308164
-- r 7177
+- r 7177
-------------------------------------------------------------------
Mon Sep 10 16:19:05 CEST 2007 - schubi(a)suse.de
- new translations added
-- r 7166
+- r 7166
- version 3.22.6
-------------------------------------------------------------------
@@ -25,7 +32,7 @@
Mon Sep 10 14:17:29 CEST 2007 - schubi(a)suse.de
- Splitting packages: Take the package with the best
- architecture,edition ONLY; Bug 308591
+ architecture,edition ONLY; Bug 308591
- r 7160
-------------------------------------------------------------------
Modified: trunk/libzypp/zypp/target/store/XMLFilesBackend.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/store/XMLFil…
==============================================================================
--- trunk/libzypp/zypp/target/store/XMLFilesBackend.cc (original)
+++ trunk/libzypp/zypp/target/store/XMLFilesBackend.cc Tue Sep 11 15:01:30 2007
@@ -47,9 +47,6 @@
#include <zypp/ZYpp.h>
#include <zypp/PathInfo.h>
-#include "boost/filesystem/operations.hpp" // includes boost/filesystem/path.hpp
-#include "boost/filesystem/fstream.hpp" // ditto
-
#include "XMLFilesBackend.h"
#include "serialize.h"
@@ -59,7 +56,6 @@
using std::endl;
using std::string;
using std::list;
-using namespace boost::filesystem;
using namespace zypp;
using namespace zypp::filesystem;
@@ -258,7 +254,7 @@
for ( it_kinds = d->kinds.begin() ; it_kinds != d->kinds.end(); ++it_kinds )
{
Resolvable::Kind kind = (*it_kinds);
- bool isthere = exists(dirForResolvableKind(kind));
+ bool isthere = PathInfo( dirForResolvableKind(kind) ).isExist();
ok = ok && isthere;
}
@@ -266,12 +262,12 @@
for ( it_kinds = d->kinds_flags.begin() ; it_kinds != d->kinds_flags.end(); ++it_kinds )
{
Resolvable::Kind kind = (*it_kinds);
- bool isthere = exists(dirForResolvableKindFlags(kind));
+ bool isthere = PathInfo( dirForResolvableKindFlags(kind) ).isExist();
ok = ok && isthere;
}
// named flags
- bool nmthere = exists(dirForNamedFlags());
+ bool nmthere = PathInfo( dirForNamedFlags() ).isExist();
ok = ok && nmthere;
return ok;
@@ -328,25 +324,19 @@
std::string
XMLFilesBackend::dirForResolvableKind( Resolvable::Kind kind ) const
{
- std::string dir;
- dir += Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname(resolvableKindToString(kind, true)) ).asString();
- return dir;
+ return Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname(resolvableKindToString(kind, true)) ).asString();
}
std::string
XMLFilesBackend::dirForResolvableKindFlags( Resolvable::Kind kind ) const
{
- std::string dir;
- dir += Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname("flags") + Pathname(resolvableKindToString(kind, true)) ).asString();
- return dir;
+ return Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname("flags") + Pathname(resolvableKindToString(kind, true)) ).asString();
}
std::string
XMLFilesBackend::dirForNamedFlags() const
{
- std::string dir;
- dir += Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname("named-flags")).asString();
- return dir;
+ return Pathname( d->root + Pathname(ZYPP_DB_DIR) + Pathname("named-flags")).asString();
}
std::string
@@ -385,7 +375,7 @@
std::string
XMLFilesBackend::fullPathForResolvable( ResObject::constPtr resolvable ) const
{
- return path( path(dirForResolvable(resolvable)) / path(fileNameForResolvable(resolvable))).string();
+ return( Pathname( dirForResolvable(resolvable) ) / fileNameForResolvable(resolvable) ).asString();
}
std::string
@@ -393,14 +383,14 @@
{
std::stringstream key_stream(key);
std::string key_encoded = Digest::digest("MD5", key_stream);
- return path( path(dirForNamedFlags()) / path(key_encoded)).string();
+ return( Pathname( dirForNamedFlags() ) / key_encoded ).asString();
}
std::string
XMLFilesBackend::fullPathForResolvableFlags( ResObject::constPtr resolvable ) const
{
// flags are in a hidden file with the same name
- return path( path(dirForResolvableFlags(resolvable)) / path(fileNameForResolvable(resolvable))).string();
+ return( Pathname( dirForResolvableFlags(resolvable) ) / fileNameForResolvable(resolvable) ).asString();
}
void
@@ -520,7 +510,7 @@
{
std::set<std::string> _flags;
// do we have previous saved flags?
- if (!exists(path(filename)))
+ if ( ! PathInfo( filename ).isExist() )
return _flags;
std::ifstream file(filename.c_str());
@@ -593,8 +583,8 @@
{
try
{
- int ret = filesystem::unlink(Pathname(filename));
- if ( ret != 0 )
+ int ret = filesystem::unlink( filename );
+ if ( ret != 0 && ret != ENOENT )
{
ERR << "Error removing resolvable file " << filename << std::endl;
ZYPP_THROW(Exception("Error deleting " + filename.asString()));
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7183 - /trunk/updater-kde/package/opensuse-updater-kde.spec
by tgoettlicher@svn.opensuse.org 11 Sep '07
by tgoettlicher@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: tgoettlicher
Date: Tue Sep 11 14:46:05 2007
New Revision: 7183
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7183&view=rev
Log:
spec
Modified:
trunk/updater-kde/package/opensuse-updater-kde.spec
Modified: trunk/updater-kde/package/opensuse-updater-kde.spec
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.spec (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.spec Tue Sep 11 14:46:05 2007
@@ -90,6 +90,9 @@
%changelog -n opensuse-updater-kde
-------------------------------------------------------------------
+* Mon Sep 10 2007 - tgoettlicher(a)suse.de
+- fixed declining license does not abort (#308985)
+- updated translations
* Fri Sep 7 2007 - tgoettlicher(a)suse.de
- fixed opensuse-updater should also offer Recommend updates by default (#308550)
- fixed duplicated text in error message (#308125)
@@ -158,3 +161,7 @@
+
+
+
+
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
11 Sep '07
Author: jkupec
Date: Tue Sep 11 13:53:32 2007
New Revision: 7182
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7182&view=rev
Log:
.changes
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Tue Sep 11 13:53:32 2007
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Sep 11 13:52:47 CEST 2007 - jkupec(a)suse.cz
+
+- SYSCONFDIR variable added for modifying /etc
+
+-------------------------------------------------------------------
Tue Sep 11 12:18:11 CEST 2007 - schubi(a)suse.de
- uninstallable resolvable -->suggested solution: delete; Bug 308164
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
11 Sep '07
Author: jkupec
Date: Tue Sep 11 13:52:41 2007
New Revision: 7181
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7181&view=rev
Log:
- SYSCONFDIR variable added for /etc
Modified:
trunk/libzypp/CMakeLists.txt
Modified: trunk/libzypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=7181&…
==============================================================================
--- trunk/libzypp/CMakeLists.txt (original)
+++ trunk/libzypp/CMakeLists.txt Tue Sep 11 13:52:41 2007
@@ -10,6 +10,14 @@
SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
ENDIF ( DEFINED LIB )
MESSAGE(STATUS "Libraries will be installed in ${LIB_INSTALL_DIR}" )
+
+# system configuration dir (etc)
+
+IF( NOT DEFINED SYSCONFDIR )
+ SET( SYSCONFDIR /etc )
+ENDIF( NOT DEFINED SYSCONFDIR )
+MESSAGE(STATUS "Config files will be installed in ${SYSCONFDIR}" )
+
####################################################################
# CONFIGURATION #
####################################################################
@@ -206,8 +214,8 @@
MESSAGE(STATUS "FindZypp.cmake will be installed in ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules")
INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules )
-MESSAGE(STATUS "zypp.conf will be installed in /etc/zypp")
-INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp.conf DESTINATION /etc/zypp )
+MESSAGE(STATUS "zypp.conf will be installed in ${SYSCONFDIR}/zypp")
+INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp.conf DESTINATION ${SYSCONFDIR}/zypp )
####################################################################
# SUBDIRECTORIES #
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7180 - in /trunk/libzypp/zypp: PathInfo.cc PathInfo.h
by mlandres@svn.opensuse.org 11 Sep '07
by mlandres@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: mlandres
Date: Tue Sep 11 13:40:18 2007
New Revision: 7180
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7180&view=rev
Log:
Log filesystem operations as milestone
Modified:
trunk/libzypp/zypp/PathInfo.cc
trunk/libzypp/zypp/PathInfo.h
Modified: trunk/libzypp/zypp/PathInfo.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PathInfo.cc?rev=718…
==============================================================================
--- trunk/libzypp/zypp/PathInfo.cc (original)
+++ trunk/libzypp/zypp/PathInfo.cc Tue Sep 11 13:40:18 2007
@@ -29,7 +29,7 @@
#include "zypp/PathInfo.h"
#include "zypp/Digest.h"
-
+using std::endl;
using std::string;
///////////////////////////////////////////////////////////////////
@@ -292,10 +292,9 @@
*/
inline int _Log_Result( const int res, const char * rclass = "errno" )
{
+ MIL << endl;
if ( res )
- WAR << " FAILED: " << rclass << " " << res << std::endl;
- else
- DBG << std::endl;
+ WAR << " FAILED: " << rclass << " " << res << endl;
return res;
}
@@ -306,7 +305,7 @@
//
int mkdir( const Pathname & path, unsigned mode )
{
- DBG << "mkdir " << path << ' ' << str::octstring( mode );
+ MIL << "mkdir " << path << ' ' << str::octstring( mode );
if ( ::mkdir( path.asString().c_str(), mode ) == -1 ) {
return _Log_Result( errno );
}
@@ -334,20 +333,26 @@
else
lastpos=1;
- // DBG << "about to create " << spath << endl;
+ // MIL << "about to create " << spath << endl;
while((pos = spath.find('/',lastpos)) != string::npos )
{
string dir = spath.substr(0,pos);
ret = ::mkdir(dir.c_str(), mode);
if(ret == -1)
+ {
+ // ignore errors about already existing directorys
+ if(errno == EEXIST)
+ ret=0;
+ else
{
- // ignore errors about already existing directorys
- if(errno == EEXIST)
- ret=0;
- else
- ret=errno;
+ ret=errno;
+ WAR << " FAILED: mkdir " << path << ' ' << str::octstring( mode ) << " errno " << ret << endl;
}
- // DBG << "creating directory " << dir << (ret?" failed":" succeeded") << endl;
+ }
+ else
+ {
+ MIL << "mkdir " << path << ' ' << str::octstring( mode );
+ }
lastpos = pos+1;
}
return ret;
@@ -360,7 +365,7 @@
//
int rmdir( const Pathname & path )
{
- DBG << "rmdir " << path;
+ MIL << "rmdir " << path;
if ( ::rmdir( path.asString().c_str() ) == -1 ) {
return _Log_Result( errno );
}
@@ -374,7 +379,7 @@
//
int recursive_rmdir( const Pathname & path )
{
- DBG << "recursive_rmdir " << path << ' ';
+ MIL << "recursive_rmdir " << path << ' ';
PathInfo p( path );
if ( !p.isExist() ) {
@@ -392,7 +397,7 @@
}
catch ( boost::filesystem::filesystem_error & excpt )
{
- WAR << " FAILED: " << excpt.what() << std::endl;
+ WAR << " FAILED: " << excpt.what() << endl;
return -1;
}
@@ -406,7 +411,7 @@
//
int clean_dir( const Pathname & path )
{
- DBG << "clean_dir " << path << ' ';
+ MIL << "clean_dir " << path << ' ';
PathInfo p( path );
if ( !p.isExist() ) {
@@ -420,7 +425,7 @@
string cmd( str::form( "cd '%s' && rm -rf --preserve-root -- *", path.asString().c_str() ) );
ExternalProgram prog( cmd, ExternalProgram::Stderr_To_Stdout );
for ( string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) {
- DBG << " " << output;
+ MIL << " " << output;
}
int ret = prog.close();
return _Log_Result( ret, "returned" );
@@ -433,7 +438,7 @@
//
int copy_dir( const Pathname & srcpath, const Pathname & destpath )
{
- DBG << "copy_dir " << srcpath << " -> " << destpath << ' ';
+ MIL << "copy_dir " << srcpath << " -> " << destpath << ' ';
PathInfo sp( srcpath );
if ( !sp.isDir() ) {
@@ -461,7 +466,7 @@
};
ExternalProgram prog( argv, ExternalProgram::Stderr_To_Stdout );
for ( string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) {
- DBG << " " << output;
+ MIL << " " << output;
}
int ret = prog.close();
return _Log_Result( ret, "returned" );
@@ -474,7 +479,7 @@
//
int copy_dir_content(const Pathname & srcpath, const Pathname & destpath)
{
- DBG << "copy_dir " << srcpath << " -> " << destpath << ' ';
+ MIL << "copy_dir " << srcpath << " -> " << destpath << ' ';
PathInfo sp( srcpath );
if ( !sp.isDir() ) {
@@ -502,7 +507,7 @@
};
ExternalProgram prog( argv, ExternalProgram::Stderr_To_Stdout );
for ( string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) {
- DBG << " " << output;
+ MIL << " " << output;
}
int ret = prog.close();
return _Log_Result( ret, "returned" );
@@ -518,7 +523,7 @@
{
retlist.clear();
- DBG << "readdir " << path << ' ';
+ MIL << "readdir " << path << ' ';
DIR * dir = ::opendir( path.asString().c_str() );
if ( ! dir ) {
@@ -624,7 +629,7 @@
//
int unlink( const Pathname & path )
{
- DBG << "unlink " << path;
+ MIL << "unlink " << path;
if ( ::unlink( path.asString().c_str() ) == -1 ) {
return _Log_Result( errno );
}
@@ -638,7 +643,7 @@
//
int rename( const Pathname & oldpath, const Pathname & newpath )
{
- DBG << "rename " << oldpath << " -> " << newpath;
+ MIL << "rename " << oldpath << " -> " << newpath;
if ( ::rename( oldpath.asString().c_str(), newpath.asString().c_str() ) == -1 ) {
return _Log_Result( errno );
}
@@ -652,7 +657,7 @@
//
int copy( const Pathname & file, const Pathname & dest )
{
- DBG << "copy " << file << " -> " << dest << ' ';
+ MIL << "copy " << file << " -> " << dest << ' ';
PathInfo sp( file );
if ( !sp.isFile() ) {
@@ -673,7 +678,7 @@
};
ExternalProgram prog( argv, ExternalProgram::Stderr_To_Stdout );
for ( string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) {
- DBG << " " << output;
+ MIL << " " << output;
}
int ret = prog.close();
return _Log_Result( ret, "returned" );
@@ -686,7 +691,7 @@
//
int symlink( const Pathname & oldpath, const Pathname & newpath )
{
- DBG << "symlink " << newpath << " -> " << oldpath;
+ MIL << "symlink " << newpath << " -> " << oldpath;
if ( ::symlink( oldpath.asString().c_str(), newpath.asString().c_str() ) == -1 ) {
return _Log_Result( errno );
}
@@ -700,7 +705,7 @@
//
int hardlink( const Pathname & oldpath, const Pathname & newpath )
{
- DBG << "hardlink " << newpath << " -> " << oldpath;
+ MIL << "hardlink " << newpath << " -> " << oldpath;
if ( ::link( oldpath.asString().c_str(), newpath.asString().c_str() ) == -1 ) {
return _Log_Result( errno );
}
@@ -714,7 +719,7 @@
//
int copy_file2dir( const Pathname & file, const Pathname & dest )
{
- DBG << "copy_file2dir " << file << " -> " << dest << ' ';
+ MIL << "copy_file2dir " << file << " -> " << dest << ' ';
PathInfo sp( file );
if ( !sp.isFile() ) {
@@ -735,7 +740,7 @@
};
ExternalProgram prog( argv, ExternalProgram::Stderr_To_Stdout );
for ( string output( prog.receiveLine() ); output.length(); output = prog.receiveLine() ) {
- DBG << " " << output;
+ MIL << " " << output;
}
int ret = prog.close();
return _Log_Result( ret, "returned" );
@@ -816,7 +821,7 @@
//
int chmod( const Pathname & path, mode_t mode )
{
- DBG << "chmod " << path << ' ' << str::octstring( mode );
+ MIL << "chmod " << path << ' ' << str::octstring( mode );
if ( ::chmod( path.asString().c_str(), mode ) == -1 ) {
return _Log_Result( errno );
}
@@ -886,7 +891,7 @@
//
int touch (const Pathname & path)
{
- DBG << "touch " << path << std::endl;
+ MIL << "touch " << path;
struct ::utimbuf times;
times.actime = ::time( 0 );
times.modtime = ::time( 0 );
Modified: trunk/libzypp/zypp/PathInfo.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PathInfo.h?rev=7180…
==============================================================================
--- trunk/libzypp/zypp/PathInfo.h (original)
+++ trunk/libzypp/zypp/PathInfo.h Tue Sep 11 13:40:18 2007
@@ -521,6 +521,14 @@
/** \name File related functions. */
//@{
/**
+ * Change file's modification and access times.
+ *
+ * \return 0 on success, errno on failure
+ * \see man utime
+ */
+ int touch (const Pathname & path);
+
+ /**
* Like '::unlink'. Delete a file (symbolic link, socket, fifo or device).
*
* @return 0 on success, errno on failure
@@ -659,14 +667,6 @@
{ return mode_r & ~getUmask(); }
//@}
- /**
- * Change file's modification and access times.
- *
- * \return 0 on success, errno on failure
- * \see man utime
- */
- int touch (const Pathname & path);
-
/////////////////////////////////////////////////////////////////
} // namespace filesystem
///////////////////////////////////////////////////////////////////
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
11 Sep '07
Author: jkupec
Date: Tue Sep 11 13:03:36 2007
New Revision: 7179
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7179&view=rev
Log:
- don't display the number of problems if only one found (#304283)
Modified:
trunk/zypper/src/zypper-misc.cc
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=71…
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Tue Sep 11 13:03:36 2007
@@ -488,13 +488,17 @@
e = rproblems.end (),
i;
ProblemSolutionList todo;
- if (!rproblems.empty()) {
+
+ // display the number of problems
+ if (rproblems.size() > 1) {
stm << format (_("%s Problems:")) % rproblems.size() << endl;
}
- else {
+ else if (rproblems.empty()) {
+ // should not happen! If solve() failed at least one problem must be set!
stm << _("Specified capability not found") << endl;
return false;
}
+
// for many problems, list them shortly first
if (rproblems.size() > 1)
{
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
11 Sep '07
Author: schubi2
Date: Tue Sep 11 12:18:31 2007
New Revision: 7178
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7178&view=rev
Log:
uninstallable resolvable -->suggested solution: delete; Bug 308164
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Tue Sep 11 12:18:31 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Sep 11 12:18:11 CEST 2007 - schubi(a)suse.de
+
+- uninstallable resolvable -->suggested solution: delete; Bug 308164
+- r 7177
+
+-------------------------------------------------------------------
Mon Sep 10 16:19:05 CEST 2007 - schubi(a)suse.de
- new translations added
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7177 - /trunk/libzypp/zypp/solver/detail/Resolver_problems.cc
by schubi2@svn.opensuse.org 11 Sep '07
by schubi2@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: schubi2
Date: Tue Sep 11 12:17:51 2007
New Revision: 7177
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7177&view=rev
Log:
uninstallable resolvable -->suggested solution: delete; Bug 308164
Modified:
trunk/libzypp/zypp/solver/detail/Resolver_problems.cc
Modified: trunk/libzypp/zypp/solver/detail/Resolver_problems.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/Resolver_problems.cc (original)
+++ trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Tue Sep 11 12:17:51 2007
@@ -546,7 +546,7 @@
details = str::form (_("%s is not installed and has been marked as uninstallable"), who.c_str()) + "\n";
details += logAdditionalInfo(collector.additionalInfo, item);
ResolverProblem_Ptr problem = new ResolverProblem (what, details);
- problem->addSolution (new ProblemSolutionInstall (problem, item)); // Install resolvable again
+ problem->addSolution (new ProblemSolutionUninstall (problem, item)); // Uninstall resolvable
problems.push_back (problem);
problem_created = true;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7176 - /trunk/libzypp/tests/zypp/PathInfo.cc
by dmacvicar@svn.opensuse.org 11 Sep '07
by dmacvicar@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: dmacvicar
Date: Tue Sep 11 11:49:39 2007
New Revision: 7176
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7176&view=rev
Log:
- test case fot isExist()
Modified:
trunk/libzypp/tests/zypp/PathInfo.cc
Modified: trunk/libzypp/tests/zypp/PathInfo.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/PathInfo.cc?r…
==============================================================================
--- trunk/libzypp/tests/zypp/PathInfo.cc (original)
+++ trunk/libzypp/tests/zypp/PathInfo.cc Tue Sep 11 11:49:39 2007
@@ -52,9 +52,28 @@
BOOST_REQUIRE( is_checksum( file.path(), file_md5 ) );
}
+void pathinfo_is_exist_test()
+{
+ TmpDir dir;
+ Pathname subdir("text with spaces");
+ // create a fake file
+ BOOST_CHECK_EQUAL( filesystem::mkdir(dir.path() + subdir), 0 );
+
+ Pathname filepath = (dir.path() + subdir+ "filename");
+ ofstream str(filepath.asString().c_str(),ofstream::out);
+ str << "foo bar" << endl;
+ str.flush();
+ str.close();
+
+ BOOST_CHECK( PathInfo(filepath).isExist() );
+}
+
void pathinfo_misc_test()
{
TmpDir dir;
+
+
+
PathInfo info(dir.path());
BOOST_CHECK(info.isDir());
}
@@ -65,6 +84,7 @@
test_suite* test= BOOST_TEST_SUITE( "PathInfoTest" );
test->add( BOOST_TEST_CASE( &pathinfo_checksum_test ), 0 /* expected zero error */ );
test->add( BOOST_TEST_CASE( &pathinfo_misc_test ), 0 /* expected zero error */ );
+ test->add( BOOST_TEST_CASE( &pathinfo_is_exist_test ), 0 /* expected zero error */ );
return test;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
11 Sep '07
Author: jkupec
Date: Tue Sep 11 11:01:21 2007
New Revision: 7175
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7175&view=rev
Log:
.changes
Modified:
trunk/zypper/package/zypper.changes
Modified: trunk/zypper/package/zypper.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re…
==============================================================================
--- trunk/zypper/package/zypper.changes (original)
+++ trunk/zypper/package/zypper.changes Tue Sep 11 11:01:21 2007
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Sep 11 10:58:16 CEST 2007 - jkupec(a)suse.cz
+
+- translations update
+- man page update
+- r7174
+
+-------------------------------------------------------------------
Mon Sep 10 15:39:11 CEST 2007 - jkupec(a)suse.cz
- report too many arguments (#307639)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7174 - in /trunk/zypper/po: cs.po da.po en_GB.po fi.po hu.po it.po km.po nb.po nl.po pa.po pl.po pt.po ru.po uk.po zh_TW.po
by jkupec@svn.opensuse.org 11 Sep '07
by jkupec@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: jkupec
Date: Tue Sep 11 10:57:42 2007
New Revision: 7174
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7174&view=rev
Log:
- translations update
Modified:
trunk/zypper/po/cs.po
trunk/zypper/po/da.po
trunk/zypper/po/en_GB.po
trunk/zypper/po/fi.po
trunk/zypper/po/hu.po
trunk/zypper/po/it.po
trunk/zypper/po/km.po
trunk/zypper/po/nb.po
trunk/zypper/po/nl.po
trunk/zypper/po/pa.po
trunk/zypper/po/pl.po
trunk/zypper/po/pt.po
trunk/zypper/po/ru.po
trunk/zypper/po/uk.po
trunk/zypper/po/zh_TW.po
Modified: trunk/zypper/po/cs.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/cs.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/cs.po (original)
+++ trunk/zypper/po/cs.po Tue Sep 11 10:57:42 2007
@@ -1,4 +1,3 @@
-# translation of zypper.po to Czech
# translation of zypper.po to
# @TITLE@
# Copyright (C) 2006, SUSE Linux GmbH, Nuremberg
@@ -11,10 +10,10 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
-"PO-Revision-Date: 2007-08-22 16:38+0200\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"PO-Revision-Date: 2007-09-06 18:49+0200\n"
"Last-Translator: Jakub Hegenbart <jhegenbart(a)suse.cz>\n"
-"Language-Team: Czech <cs(a)li.org>\n"
+"Language-Team: <cs(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -58,36 +57,48 @@
#: ../src/zypper-keyring-callbacks.h:110
#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "VarovánÃ: Ignoruje se nezdaÅené ovÄÅenà podpisu pro %s s veÅejným klÃÄem ID %s, %s, s otiskem %s! DůkladnÄ provÄÅte, zda pÅÃÄinou nejsou úmyslné zmÄny v souboru!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "VarovánÃ: Ignoruje se nezdaÅené ovÄÅenà podpisu pro %s s veÅejným klÃÄem ID %s, %s, s otiskem %s!"
-#: ../src/zypper-keyring-callbacks.h:119
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "DůkladnÄ provÄÅte, zda pÅÃÄinou nejsou úmyslné zmÄny v souboru!"
+
+#: ../src/zypper-keyring-callbacks.h:120
#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "OvÄÅenà podpisu pro %s s veÅejným klÃÄem ID %s, %s, s otiskem %s se nezdaÅilo. VarovánÃ: PÅÃÄinou mohou být úmyslné zmÄny v souboru! PokraÄovánÃm podstupujete riziko. Chcete pÅesto pokraÄovat?"
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "OvÄÅenà podpisu souboru %s veÅejným klÃÄem s ID %s, %s a s otiskem %s se nezdaÅilo."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr "VarovánÃ: PÅÃÄinou může být úmyslná zmÄna v souboru!"
+
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
+msgstr "PokraÄovánÃm podstupujete riziko. Chcete opravdu pokraÄovat?"
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "Žádný pÅehled pro soubor %s."
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "PokraÄovat?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "Neznámý pÅehled %s pro soubor %s."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "Ignoruje se nezdaÅené ovÄÅenà pÅehledu pro soubor %s (oÄekáváno %s, nalezeno %s)."
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "OvÄÅenà pÅehledu pro soubor %s se nezdaÅilo. OÄekáváno %s, nalezeno %s."
@@ -123,11 +134,11 @@
msgstr "NepodaÅilo se pÅidat '%s' do seznamu balÃÄků k instalaci."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Nenalezeno"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "Problém: "
@@ -138,146 +149,146 @@
msgstr " ÅeÅ¡enà %d: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "ÄÃslo, (o)pakovat nebo (z)ruÅ¡it> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "o"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "z"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "Aplikuje se ÅeÅ¡enà %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s problémy:"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "Požadovaná schopnost nebyla nalezena"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "Nic k provedenÃ."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "Velková stahovaná velikost: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Po operaci bude dodateÄnÄ využito %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Po operaci bude uvolnÄno %s."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "ZamÄené položky: %s"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "ZjiÅ¡Å¥uje se stav agregacÃ"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "ProbÃhá ÅeÅ¡enà závislostÃ..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "Vyžadované opravy: %d (bezpeÄnostnà opravy: %d)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Nainstalováno"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Odinstalováno"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Již nepoužitelné"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Nepoužitelné"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Použito"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Nenà tÅeba"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Poškozeno"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Je potÅeba"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "chyba"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Katalog: "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "RepozitáÅ: "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Jméno"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "Verze"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "Kategorie"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Stav"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "Nebyly nalezeny žádné vyžadované opravy."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -285,38 +296,46 @@
"VAROVÃNÃ: Tyto pouze opravy majà vliv na samotný aktualizátor.\n"
"K dispozici jsou také jiné aktualizace.\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "Nebyly nalezeny žádné aktualizace."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Skupina"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "VAROVÃNÃ: %s je interaktivnÃ, pÅeskakuje se."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "potvrzuje se"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+msgid "Problem downloading the package file from the repository:"
+msgstr "Problém pÅi stahovánà souboru balÃÄku z repozitáÅe:"
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "NápovÄdu naleznete v uvedené chybové zprávÄ."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -332,402 +351,435 @@
" - použÃt jiné instalaÄnà médium (napÅÃklad pokud je poÅ¡kozeno)\n"
" - použÃt jiný repozitáÅ"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "VAROVÃNÃ: Jedna z nainstalovaných oprav vyžaduje restartovánà poÄÃtaÄe. Restartujte poÄÃtaÄ co nejdÅÃve."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "VAROVÃNÃ: Jedna z nainstalovaných oprav vyžaduje restartovánà poÄÃtaÄe. Restartujte poÄÃtaÄ co nejdÅÃve."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "VAROVÃNÃ: Jedna z nainstalovaných oprav se týká samotného správce balÃÄků. Ten proto musà být pÅed spuÅ¡tÄnÃm dalÅ¡Ãch operacà restartován."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Automatický souhlas s licencà %s %s."
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "Licence %s %s:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Chcete-li nainstalovat tento balÃÄek, musÃte souhlasit s výše uvedenými licenÄnÃmi podmÃnkami. PokraÄovat?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Instalace se pÅeruÅ¡uje, protože je tÅeba potvrdit licence."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Restartujte operaci v interaktivnÃm režimu a potvrÄte souhlas s požadovanými licencemi nebo použijte volbu --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Instalace se pÅeruÅ¡uje, protože uživatel nesouhlasil s licencà %s %s."
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "Instaluje se zdrojový balÃk %s-%s"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Zdrojový balÃk %s-%s byl nainstalován úspÄÅ¡nÄ."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problém pÅi instalaci zdrojového balÃku %s-%s:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "Zdrojový balÃk '%s' nebyl nalezen."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "Kontroluje se, zda je tÅeba obnovit metadata pro %s"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "Obnovuje se '%s'"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(vynuceno)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "RepozitáŠ'%s' je aktuálnÃ."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "Vynucuje se obnovenà nezpracovaných metadat"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "Problém pÅi stahovánà souborů z '%s'."
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "NápovÄdu naleznete v uvedené chybové zprávÄ."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "Pro '%s' nejsou definovány žádné adresy URL."
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "PÅidejte jednu nebo vÃce základnÃch adres URL (baseurl=URL) do %s pro repozitáŠ'%s'."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "Pro tento repozitáŠnenà definovaný žádný alias."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "RepozitáŠ'%s' je neplatný."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "Zkontrolujte, zda adresy URL definované pro tento repozitáŠukazujà na platný repozitáÅ."
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "PÅi stahovánà metadat pro '%s' doÅ¡lo k chybÄ:"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "Vynucuje se vytvoÅenà vyrovnávacà pamÄti repozitáÅe"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "Chyba pÅi analýze metadat pro '%s':"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "PÅÃÄinou mohou být neplatná metadata v repozitáÅi nebo chyba v analyzátoru metadat. Ve druhém pÅÃpadÄ a v pÅÃpadÄ pochybnostà odeÅ¡lete zprávu o chybÄ podle pokynů na stránce http://en.opensuse.org/Zypper#Troubleshooting."
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "Metadata repozitáÅe '%s' nebyla nalezena v mÃstnà vyrovnávacà pamÄti."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "Chyba pÅi vytváÅenà databáze vyrovnávacà pamÄti:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "RepozitáŠ'%s' nebyl nalezen."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "Chyba pÅi Ätenà souboru popisu repozitáÅe '%s'."
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "PÅÃÄina: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "RepozitáŠ'%s' bude kvůli uvedené chybÄ vypnut."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "RepozitáŠ'%s' nenà aktuálnÃ. Můžete ho aktualizovat spuÅ¡tÄnÃm pÅÃkazu 'zypper refresh' jako uživatel root."
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "povoleno"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "Obnovit"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "Typ"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "AktivnÃ"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "Zakázáno"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "povoleno"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "Obnovit"
+
+# printers.ycp.noloc:1270
+# printers.ycp.noloc:1270
+# printers.ycp.noloc:1270
+# printers.ycp.noloc:1270
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "Alias"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Ano"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "Ne"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "Nejsou definovány žádné repozitáÅe. PÅidejte jeden nebo vÃce repozitáÅů pÅÃkazem 'zypper addrepo'."
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "Chyba pÅi Ätenà repozitáÅů:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "Soubor %s nelze otevÅÃt pro zápis. PravdÄpodobnÄ nemáte oprávnÄnà k zápisu."
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "RepozitáÅe byly úspÄÅ¡nÄ vyexportovány do %s."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "PÅeskakuji zakázaný repozitáŠ'%s'"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "PÅeskakuji repozitáŠ'%s' z důvodu uvedené chyby."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "RepozitáŠ'%s' nebyl podle ÄÃsla nebo aliasu nalezen."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "Seznam definovaných repozitáÅů zÃskejte pomocà pÅÃkazu 'zypper repos'."
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "Zadané repozitáÅe nejsou povoleny nebo definovány."
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "Nejsou definovány žádné povolené repozitáÅe."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "K pÅidánà nebo k povolenà repozitáÅů použijte pÅÃkaz 'zypper addrepo' nebo 'zypper modifyrepo'."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "RepozitáÅe nelze z důvodu chyby obnovit."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "NÄkteré repozitáÅe nebyly z důvodu chyby obnoveny."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "Zadané repozitáÅe byly obnoveny."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "VÅ¡echny repozitáÅe byly obnoveny."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "Toto médium je výmÄnné a pouze pro Ätenà (CD/DVD), vypÃná se automatické obnovenÃ."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "RepozitáŠs názvem '%s' již existuje. Zvolte jiný alias."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "Na zadaném umÃstÄnà nelze najÃt platný repozitáÅ:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "Typ repozitáÅe se nepodaÅilo urÄit. Zkontrolujte, zda definované adresy URL (uvedené nÞe) ukazujà na platný repozitáÅ:"
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "Problém pÅi pÅenosu dat repozitáÅe ze zadané adresy URL:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "Zkontrolujte, zda je zadaná adresa URL pÅÃstupná."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "Neznámý problém pÅi pÅidávánà repozitáÅe:"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "RepozitáŠ'%s' byl úspÄÅ¡nÄ pÅidán"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "Automatické obnovenÃ"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "NaÄÃtánà dat z média '%s'."
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "Problém pÅi naÄÃtánà dat z média '%s'."
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "OvÄÅte, zda je instalaÄnà médium platné a Äitelné."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+msgid "Problem accessing the file at the specified URL"
+msgstr "Problém pÅi pÅÃstupu k souboru na zadané adrese URL"
+
+#: ../src/zypper-sources.cc:796
+msgid "Please check if the URL is valid and accessible."
+msgstr "Zkontrolujte, zda je zadaná adresa URL platná a pÅÃstupná."
+
+#: ../src/zypper-sources.cc:803
+msgid "Problem parsing the file at the specified URL"
+msgstr "Problém pÅi analýze souboru na zadané adrese URL"
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr "Jedná se opravdu o soubor .repo? Podrobnosti naleznete na stránce http://en.opensuse.org/Standards/RepoInfo."
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr "Problém pÅi pokusu o naÄtenà souboru na zadané adrese URL"
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "RepozitáŠ%s byl odstranÄn."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "RepozitáŠ%s byl pÅejmenován na %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "RepozitáŠ%s nebyl nalezen."
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "Chyba pÅi zmÄnÄ repozitáÅe:"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "RepozitáŠ%s bude ponechán nezmÄnÄný."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s použito spoleÄnÄ s %s. Tyto možnosti se navzájem vyluÄujÃ. Vlastnost bude ponechána nezmÄnÄna."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "RepozitáŠ%s byl úspÄÅ¡nÄ zmÄnÄn."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "NaÄÃtánà dat repozitáÅe '%s'..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "RepozitáŠ'%s' nenà uložen ve vyrovnávacà pamÄti. Ukládá se..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "Problém pÅi naÄÃtánà dat z '%s'"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "Závislosti z '%s' nebyly naÄteny, protože doÅ¡lo k chybÄ."
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(Nalezeno závislostÃ: %d)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "Zadejte pÅÃkaz 'zypper refresh', pÅed tÃm můžete i odstranit soubor /var/cache/zypp/zypp.db."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "NaÄÃtá se databáze RPM..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(Závislosti: %s)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -763,41 +815,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "Neplatná odpovÄÄ. Vyberte pÃsmeno p, o nebo i."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "a"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "A"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
-
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "ano"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "ne"
+
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "OdpovÄÄ '%s' nenà platná, zadejte '%s' nebo '%s':"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr "Neplatná odpovÄÄ '%s'. Pokud jsou jiné volby odmÃtány, odpovÄzte 'y' mÃsto '%s' nebo 'n' mÃsto '%s'."
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -900,64 +933,38 @@
msgid "Requires:"
msgstr "Vyžaduje:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "Nejsou nakonfigurovány žádné repozitáÅe. PÅed použitÃm hledánà pÅidejte pÅÃkazem 'zypper addrepo' alespoÅ jeden repozitáÅ."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "ProbÃhá ukládánà nainstalovaných závislostÃ, které odpovÃdajà zadanému kritériu, do cache..."
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr "z ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "uloženo do cache."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr "nenà platný regulárnà výraz: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "Jedná se o chybu, uložte, prosÃm, v aplikaci zypper zprávu o chybÄ do souboru."
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "Zadaná adresa URL je neplatná."
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" Možnosti:\n"
-"\t--help, -h\t\tNápovÄda\n"
-"\t--version, -V\t\tVytiskne ÄÃslo verze\n"
-"\t--quiet, -q\t\tPotlaÄà obvyklý výstup, vypisovány budou jen chybové zprávy.\n"
-"\t--verbose, -v\t\tZvýšà úroveÅ podrobnostÃ\n"
-"\t--terse, -t\t\tStruÄný výstup pro strojové zpracovánÃ\n"
-"\t--table-style, -s\tStyl tabulky (celé ÄÃslo)\n"
-"\t--rug-compatible, -r\tZapne kompatibilitu s programem rug\n"
-"\t--non-interactive\tNezobrazovat žádné otázky, použÃt automaticky výchozà odpovÄdi.\n"
-"\t--no-gpg-checks\t\tSelhánà kontrol programem GPG buou ignorována a program bude pokraÄovat.\n"
-"\t--root, -R <dir>\tOperace v jiném koÅenovém adresáÅi\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -978,7 +985,7 @@
"\tsource-install, si\tInstall a source package\n"
msgstr ""
" PÅÃkazy:\n"
-"\thelp\t\t\tNápovÄda\n"
+"\thelp, ?\t\t\tNápovÄda\n"
"\tshell, sh\t\tPÅijÃmá vÃce pÅÃkazů najednou.\n"
"\tinstall, in\t\tNainstaluje balÃÄky nebo závislosti.\n"
"\tremove, rm\t\tOdstranà balÃÄky nebo závislosti.\n"
@@ -993,33 +1000,59 @@
"\tpatches, pch\t\tZobrazà opravy.\n"
"\tlist-updates, lu\tZobrazà aktualizace.\n"
"\txml-updates, xu\t\tZobrazà aktualizace a opravy ve formátu XML.\n"
-"\tupdate, up\t\tAktualizuje závislosti na novÄjÅ¡Ã verze.\n"
+"\tupdate, up\t\tAktualizuje nainstalované závislosti na novÄjÅ¡Ã verze.\n"
"\tinfo, if\t\tZobrazà úplné informace o balÃÄcÃch.\n"
"\tpatch-info\t\tZobrazà úplné informace o opravách.\n"
"\tsource-install, si\tNainstaluje zdrojový balÃÄek.\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" Možnosti:\n"
+"\t--help, -h\t\tNápovÄda\n"
+"\t--version, -V\t\tVytiskne ÄÃslo verze\n"
+"\t--quiet, -q\t\tPotlaÄà obvyklý výstup, vypisovány budou jen chybové zprávy.\n"
+"\t--verbose, -v\t\tZvýšà úroveÅ podrobnostÃ\n"
+"\t--terse, -t\t\tStruÄný výstup pro strojové zpracovánÃ\n"
+"\t--table-style, -s\tStyl tabulky (celé ÄÃslo)\n"
+"\t--rug-compatible, -r\tZapne kompatibilitu s programem rug\n"
+"\t--non-interactive\tNezobrazovat žádné otázky, použÃt automaticky výchozà odpovÄdi.\n"
+"\t--no-gpg-checks\t\tSelhánà kontrol programem GPG buou ignorována a program bude pokraÄovat.\n"
+"\t--root, -R <dir>\tOperace v jiném koÅenovém adresáÅi\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "ÃroveÅ podrobnostÃ: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "PÅechod do neinteraktivnÃho režimu."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "PÅechod do režimu no-gpg-checks."
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "Neplatná tabulka stylu"
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "NápovÄdu zÃskáte parametrem -h."
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1045,7 +1078,7 @@
" Podrobnosti viz 'man zypper'.\n"
" --debug-solver VytvoÅà test ÅeÅ¡itele závislostà pro úÄely ladÄnÃ.\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1067,7 +1100,7 @@
"-n, --name VybÃrá závislosti podle jednoduchého názvu, nikoli podle schopnostÃ.\n"
" --debug-solver VytvoÅà test ÅeÅ¡itele závislostà pro úÄely ladÄnÃ.\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1081,7 +1114,7 @@
"\n"
"Tento pÅÃkaz nemá možnosti.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1104,7 +1137,7 @@
"-d, --disabled PÅidá repozitáŠjako zakázaný.\n"
"-n, --no-refresh PÅidá repozitáŠs vypnutým automatickým obnovovánÃm metadat.\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1120,7 +1153,7 @@
" Možnosti pÅÃkazu:\n"
"-e, --export <SOUBOR.repo> Exportuje vÅ¡echny definované repozitáÅe do jediného mÃstnÃho souboru .repo.\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1138,7 +1171,7 @@
" --loose-auth\tIgnoruje data ovÄÅenà uživatele v adrese URL\n"
" --loose-query\tIgnoruje ÅetÄzec dotazu v adrese URL\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1152,7 +1185,7 @@
"\n"
"Tento pÅÃkaz nemá žádné možnosti.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1174,7 +1207,7 @@
"-a, --enable-autorefresh Povolà automatické obnovovánà repozitáÅe.\n"
" --disable-autorefresh Zakáže automatické obnovovánà repozitáÅe.\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1198,7 +1231,7 @@
"-B, --build-only Pouze sestavà databázi, nestáhne nezpracovaná metadata.\n"
"-D, --download-only Pouze stáhne nezpracovaná metadata, nesestavà databázi.\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1218,7 +1251,7 @@
"-r, --repo <alias> VypÃÅ¡e pouze aktualizace z repozitáÅe zadaného aliasem.\n"
" --best-effort Provede obnovenà metodou nejvÄtÅ¡Ãho úsilÃ. PÅijatelné jsou i aktualizace na úroveÅ nižšÃ, než je poslednà verze.\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1248,7 +1281,7 @@
" --best-effort Provede obnovenà metodou nejvÄtÅ¡Ãho úsilÃ. PÅijatelné jsou i aktualizace na úroveÅ nižšÃ, než je poslednà verze.\n"
" --debug-solver VytvoÅà test ÅeÅ¡itele závislostà pro úÄely ladÄnÃ.\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1292,7 +1325,7 @@
" \n"
"V hledaných ÅetÄzcÃch lze také použÃvat zástupné znaky * a ?.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1310,7 +1343,7 @@
"\n"
"-r, --repo <alias> Opravy zkontroluje pouze v repozitáÅi urÄeném aliasem.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1328,7 +1361,7 @@
"\n"
"-r, --repo <alias> Zkontroluje opravy pouze v repozitáÅi zadaném aliasem.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1346,7 +1379,7 @@
"\n"
"-r, --repo <alias> Pracuje pouze s repozitáÅem zadaným aliasem.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1360,7 +1393,7 @@
"\n"
"Toto je alias pÅÃkazu 'zypper info -t patch' pro kompatiblitu s programem rug.\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1374,7 +1407,7 @@
"\n"
"Tento pÅÃkaz nemá žádné možnosti.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1390,24 +1423,24 @@
" Možnosti pÅÃkazu:\n"
"-r, --repo <alias> Pracuje pouze s aktualizacemi z repozitáÅe zadaného aliasem.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "Parametry programu mimo možnosti:"
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "RepozitáÅe jsou zakázány, bude použita pouze databáze nainstalovaných balÃÄků."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "Ignorujà se nainstalované závislosti..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "Transakce systému ZYpp již probÃhá. To znamená, že knihovnu libzypp ke správÄ balÃÄků již použÃvá jiný program. VÅ¡echny takové aplikace musejà být pÅed použitÃm tohoto pÅÃkazu ukonÄeny."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1417,105 +1450,105 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "Ke zmÄnÄ systémových repozitáÅů je tÅeba mÃt oprávnÄnà uživatele root."
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "PÅÃliÅ¡ málo argumentů. Je vyžadována pÅinejmenÅ¡Ãm adresa URL a alias."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "Zadaný typ nenà platný typ repozitáÅe:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Seznam známých typů repozitáÅů zÃskáte pÅÃkazem 'zypper -h' nebo v manuálové stránce programu zypper."
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "Chybà vyžadovaný argument."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "RepozitáŠnebyl pod aliasem nalezen. Pokus o odstranÄnà repozitáÅe podle URL..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "RepozitáŠnebyl pod zadaným aliasem nebo adresou URL nalezen."
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "Alias je vyžadovaný argument."
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "K aktualizaci systémových repozitáÅů je tÅeba mÃt oprávnÄnà uživatele root."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "K instalovánà a odinstalovánà balÃků je tÅeba mÃt oprávnÄnà uživatele root."
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Neznámý typ závislosti: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "VarovánÃ: Nenà definován žádný repozitáÅ. Pracuje se pouze s nainstalovanými závislostmi. Nebude možné provádÄt instalaci."
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "Generuje se test pro ÅeÅ¡itel závislostÃ..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "Test pro ÅeÅ¡itel událostà byl vygenerován úspÄÅ¡nÄ."
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "PÅi vytváÅenà testu pro ÅeÅ¡itel závislostà doÅ¡lo k chybÄ."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "Název zdrojového balÃÄku je vyžadovaný argument."
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "Neznámý typ závislosti"
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "Nebyly nalezeny žádné závislosti."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "SpuÅ¡tÄn jako 'rug', aktualizaci nelze provést metodou nejlepÅ¡Ãho úsilÃ."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "K aktualizaci balÃků je tÅeba mÃt oprávnÄnà uživatele root."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "NeoÄekávaná výjimka."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "Interpret pÅÃkazů programu zypper je již spuÅ¡tÄn."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "ProsÃm, podejte hlášenà o této chybÄ."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "Instrukce jsou k dispozici na adrese http://en.opensuse.org/Zypper#Troubleshooting."
@@ -1525,20 +1558,24 @@
msgstr "Neznámý pÅÃkaz '%s'"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "Chyba I/O"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "Neplatný objekt"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "Chyba"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Vložte médium [%s] # %d a zadejte 'y' pro pokraÄovánÃ, nebo operaci zruÅ¡te zadánÃm 'n'."
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "Stahuje se: "
@@ -1617,11 +1654,11 @@
msgid "Installation of %s failed:"
msgstr "Instalace %s selhala:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "Katalog"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "RepozitáÅ"
Modified: trunk/zypper/po/da.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/da.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/da.po (original)
+++ trunk/zypper/po/da.po Tue Sep 11 10:57:42 2007
@@ -1,4 +1,4 @@
-# translation of zypper.po to
+# # translation of zypper.po to
# @TITLE@
# Copyright (C) 2006, SUSE Linux GmbH, Nuremberg
#
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
-"PO-Revision-Date: 2007-08-17 20:11+0200\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"PO-Revision-Date: 2007-09-07 14:15+0200\n"
"Last-Translator: Martin Schlander <suse(a)linuxin.dk>\n"
"Language-Team: <opensuse-translation(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
@@ -57,37 +57,50 @@
#: ../src/zypper-keyring-callbacks.h:110
#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "Advarsel: Ignorerer mislykket signatur-verifikation for %s med offentlig nøgle-id,%s,%s,fingeraftryk %s! Dobbelttjek at dette ikke er forårsaget af nogen ondsindede ændringer i filen!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "Advarsel: Ignorerer mislykket signatur-verifikation for %s med offentlig nøgle-id,%s,%s,fingeraftryk %s!"
-#: ../src/zypper-keyring-callbacks.h:119
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "Kontrollér at dette ikke forårsages af nogle ondsindede ændringer i filen!"
+
+# %s is either BOOTP or DHCP
+#: ../src/zypper-keyring-callbacks.h:120
#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "Signatur-verifikation mislykkedes for %s med offentlig nøgle-id %s,%s fingeraftryk %s. Advarsel: Ã
rsagen til dette kunne være ondsindede ændringer i filen! Det er risikabelt at fortsætte! Vil du fortsætte alligevel?"
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Signatur-verifikation mislykkedes for %s med offentlig nøgle %s, %s, fingeraftryk %s."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr "Advarsel: Dette kan forårsages af en ondsindet ændring i filen!"
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Det er risikabelt at fortsætte! Fortsæt alligevel?"
+
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "Ingen oversigt for fil %s."
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "Fortsæt?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "Ukendt oversigt %s for filen %s."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "Ignorerer mislykket oversigts-verifikation for %s (forventede %s, fandt %s)."
# %s is either BOOTP or DHCP
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Oversigts-verifikation mislykkedes for %s. Forventede %s, fandt %s."
@@ -123,11 +136,11 @@
msgstr "Det mislykkedes at tilføje '%s' til listen over pakker der skal slettes."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Ikke fundet"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "Problem: "
@@ -138,148 +151,148 @@
msgstr " Løsning %d: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "tal, (f)orsøg igen eller (a)nullér> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "f"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "a"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "Udfører løsning %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s problemer:"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "Angivet kapabilitet ikke fundet"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "Intet at gøre."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "Samlet downloadstørrelse: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Efter transaktionen vil yderligere %s blive brugt."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Efter transaktionen vil %s være frigjort."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "%s elementer er låst"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "Fastslår status af sammenfatninger"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "Løser afhængigheder..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d rettelser nødvendige (%d sikkerhedsrettelser)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Installeret"
#
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Afinstalleret"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Ikke længere anvendelig"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Ikke anvendelig"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Anvendt"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Ikke nødvendig"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Brudt"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Nødvendig"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "fejl"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Katalog: "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Softwarekilde: "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Navn"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "Version"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "Kategori"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Status"
#
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "Ingen nødvendige rettelser fundet."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -288,38 +301,46 @@
"Der er andre tilgængelige også.\n"
#
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "Ingen opdateringer fundet."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Bundt"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arkitektur"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "ADVARSEL: %s er interaktiv, undladt."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "udfører"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+msgid "Problem downloading the package file from the repository:"
+msgstr "Problem med download af pakke-filen fra softwarekilden:"
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "Se venligst fejlmeddelelsen ovenfor for at få et vink."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -335,404 +356,433 @@
"- brug et andet installationsmedie ( f.eks. hvis det er beskadiget)\n"
"- brug en anden softwarekilde"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "En af de installerede rettelser kræver genstart af din maskine. Gør det venligst så snart som muligt."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "ADVARSEL: En af de installerede rettelser kræver genstart af din maskine. Gør det venligst så snart som muligt."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "ADVARSEL: En af de installerede rettelser påvirker selve pakkehåndteringen, derfor kræves den genstartet før udførsel af yderligere transaktioner."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Automatisk accept af %s %s licensaftale."
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "%s %s licensaftale:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "For at installere denne pakke, mÃ¥ du acceptere betingelserne for ovenstÃ¥ende licensaftale. Ãnsker du at fortsætte?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Afbryder installationen fordi der kræves licensbekræftelse."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Genstart venligst transaktionen i interaktiv tilstand og bekræft at du er indforstået med påkrævede licensaftale(r), eller anvend valgmuligheden --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Afbryder installationen fordi bruger ikke er indforstået med %s %s licensaftale."
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "Installerer kildepakke %s-%s"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Installation af kildepakke %s-%s gennemført."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problem med installation af kildepakke %s-%s:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "Kildepakken '%s' blev ikke fundet."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "Tjekker om metadata for %s skal genopfriskes"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "Genopfrisker '%s'"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(tvunget)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "Softwarekilden '%s' er fuldt opdateret."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "Gennemtvinger rå genopfriskning af metadata"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "Problem med download af filer fra '%s'."
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "Se venligst fejlmeddelelsen ovenfor for at få et vink."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "Ingen URLs defineret for '%s'."
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "Tilføj venligst en eller flere basis URL-indgange (baseurl=URL) til %s for softwarekilden '%s'."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "Intet alias defineret for denne softwarekilde."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "Softwarekilden '%s' er ugyldig."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "Tjek venligst om URLerne defineret for denne softwarekilde peger på en gyldig softwarekilde."
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "Problem med download af metadata for '%s'."
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "Gennemtvinger opbygning af softwarekilde-cache"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "Fejl under fortolkning af metada for '%s':"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "Dette kan forårsages af ugyldig metadata på softwarekilden eller en fejl i metadata-fortolkeren. I tilfælde af det sidste, eller i tvivlstilfælde så opret venligst en fejlrapport ved at følge instruktionerne på http://en.opensuse.org/Zypper#Troubleshooting"
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "Softwarekilde- metadata for '%s' blev ikke fundet i lokal cache."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "Fejl under opbygning af cache-databasen:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "Softwarekilden '%s' blev ikke fundet."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "Fejl under læsning af beskrivelsesfil for softwarekilde '%s':"
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "Ã
rsag: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "Deaktiverer softwarekilden '%s', på grund af ovennævnte fejl."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "Softwarekilde '%s' er uddateret. Du kan køre 'zypper refresh' som root for at opdatere det."
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "Aktiveret"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "Genopfrisk"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "Type"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "Aktiv"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "Deaktiveret"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "Aktiveret"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "Genopfrisk"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "Alias"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Ja"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "Nej"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "Ingen softwarekilder defineret. Brug 'zypper addrepo' kommandoen for at tilføje en eller flere softwarekilder."
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "Fejl under læsning af softwarekilder:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "Kan ikke åbne %s til skrivning. Måske har du ikke skrivetilladelse?"
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "Eksport af softwarekilder til %s gennemført."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "Springer deaktiveret softwarekilde over '%s'"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "Springer softwarekilden '%s' over, på grund af ovennævnte fejl."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "Softwarekilde '%s' blev ikke fundet ved dens alias eller URL."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "Brug 'zypper repos' for at få en liste over definerede softwarekilder."
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "De specificerede softwarekilder ikke aktiveret eller definerede."
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "Der er ikke defineret nogen aktiverede softwarekilder."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "Brug 'zypper addrepo'-kommandoen for at tilføje eller aktivere softwarekilder."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "Kunne ikke genopfriske softwarekilder på grund af fejl."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "Nogle af softwarekilderne blev ikke genopfrisket på grund af en fejl."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "De specificerede softwarekilder er blevet genopfrisket."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "Alle softwarekilder er blevet genopfrisket."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "Dette er et flytbart skrivebeskyttet medie (CD/DVD), deaktiverer automatisk genopfriskning."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "Softwarekilden med navnet '%s' eksisterer allerede. Brug venligst et andet alias."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "Kan ikke finde en gyldig softwarekilde på given placering:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "Kunne ikke fastslå typen af softwarekilde. Tjek venligst om de definerede URLer (se nedenfor) peger på en gyldig softwarekilde:"
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "Problem med at overføre softwarekilde-data fra den specificerede URL."
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "Tjek venligst at den specificerede URL er tilgængelig."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "Ukendt problem under tilføjelse af softwarekilde:"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "Tilføjelse af softwarekilden '%s' gennemført"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "Automatisk genopfrisk"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "Læser data fra mediet '%s'"
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "Problem med indlæsning af data fra mediet '%s'"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "Tjek venligst om dit installationsmedie er gydligt og læsbart."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+msgid "Problem accessing the file at the specified URL"
+msgstr "Problem med at tilgå filen på den specificerede URL"
+
+#: ../src/zypper-sources.cc:796
+msgid "Please check if the URL is valid and accessible."
+msgstr "Tjek venligst at URL er gyldig og tilgængelig."
+
+#: ../src/zypper-sources.cc:803
+msgid "Problem parsing the file at the specified URL"
+msgstr "Problem med fortolkning af filen på den specificerede URL"
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr "Er det en .repo-fil? Se http://en.opensuse.org/Standards/RepoInfo for detaljer."
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr "Problem opstod under forsøg på at læse filen på den specificerede URL"
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "Softwarekilden %s er blevet fjernet."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "softwarekilden %s er omdøbt til %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "Softwarekilden %s blev ikke fundet."
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "Fejl ved ændring af softwarekilde:"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "Lader softwarekilden %s være uændret."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s brugt sammen med %s, som modstrider hinanden. Denne egenskab vil forblive uændret."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "Ãndring af softwarekilden %s gennemført."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "Henter '%s'-data for softwarekilde..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "Softwarekilden '%s' er ikke cachet. Cacher..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "Problem med indlæsning af data fra '%s'"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "Resolvables fra '%s' er ikke indlæst på grund af fejl."
#
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(%d resolvables fundet)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "Forsøg 'zypper refresh', eller fjern måske endda /var/cache/zypp/zypp.db før du gør det."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "Læser RPM-databasen..."
#
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s resolvables)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -768,41 +818,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "Ugyldigt svar. Vælg bogstaver a, f, eller i."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "y"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "Y"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "Ja"
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "nej"
+
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "Ugyldigt svar '%s', indtast '%s' eller '%s':"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr "Ugyldigt svar '%s'. Tast 'y' for '%s' eller 'n' for '%s' hvis intet andet virker for dig"
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -907,64 +938,38 @@
msgid "Requires:"
msgstr "Kræver:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "Ingen softwarekilder konfigureret. Tilføj venligst mindst en softwarekilde ved at bruge 'zypper addrepo'-kommandoen før brug af søg."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "Præ-cacher installerede resolvables som matcher givet søgekriterie... "
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr " uddateret ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "cachet."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr "er ikke et gyldig regulært udtryk: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "Dette er en fejl. Udfyld venligst en fejlrapport mod zypper."
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "Den givne URL er ugyldig."
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" Valgmuligheder:\n"
-"\t--help, -h\t\tHjælp\n"
-"\t--version, -V\t\tSkriv versionsnummer.\n"
-"\t--quiet, -q\t\tUndertryk normalt output, skriv kun fejlmeddelelser.\n"
-"\t--verbose, -v\t\tForøg informationsniveau.\n"
-"\t--terse, -t\t\tKortfattet output til maskine-fortolkning.\n"
-"\t--table-style, -s\tTabelstil (heltal).\n"
-"\t--rug-compatible, -r\tSlå rug-kompatibilitet til\n"
-"\t--non-interactive\tSpørg ikke om noget, brug standardsvar automatisk.\n"
-"\t--no-gpg-checks\t\tIgnorer fejl i GPG-tjek og fortsæt.\n"
-"\t--root, -R <dir>\tArbejd på en anden root mappe.\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -1000,33 +1005,59 @@
"\tpatches, pch\t\tListe over rettelser\n"
"\tlist-updates, lu\tListe over opdateringer\n"
"\txml-updates, xu\t\tListe over opdateringer og rettelser i XML-format\n"
-"\tupdate, up\t\tOpdatér installerede resolvables med nyeste version.\n"
+"\tupdate, up\t\tOpdatér installerede resolvables med nyere versioner.\n"
"\tinfo, if\t\tVis fuld information om pakker\n"
"\tpatch-info\t\tVis fuld information om rettelser\n"
"\tsource-install, si\tInstallér en kildepakke\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" Valgmuligheder:\n"
+"\t--help, -h\t\tHjælp\n"
+"\t--version, -V\t\tSkriv versionsnummer.\n"
+"\t--quiet, -q\t\tUndertryk normalt output, skriv kun fejlmeddelelser.\n"
+"\t--verbose, -v\t\tForøg informationsniveau.\n"
+"\t--terse, -t\t\tKortfattet output til maskine-fortolkning.\n"
+"\t--table-style, -s\tTabelstil (heltal).\n"
+"\t--rug-compatible, -r\tSlå rug-kompatibilitet til\n"
+"\t--non-interactive\tSpørg ikke om noget, brug standardsvar automatisk.\n"
+"\t--no-gpg-checks\t\tIgnorer fejl i GPG-tjek og fortsæt.\n"
+"\t--root, -R <dir>\tArbejd på en anden root mappe.\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "Uddybende: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "GÃ¥r i ikke-interaktiv tilstand."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "GÃ¥r i ingen GPG-tjek-tilstand."
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "Ugyldig tabelstil "
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "Prøv -h for at få hjælp."
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1052,7 +1083,7 @@
" Se 'man zypper' for flere detaljer.\n"
" --debug-solver Opret solver-test-case til fejlsøgning\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1074,7 +1105,7 @@
"-n, --name Vælg resolvables ved simpelt navn, ikke ved kapabilitet\n"
" --debug-solver Opret solver-test-case til fejlsøgning\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1088,7 +1119,7 @@
"\n"
"Denne kommando har ingen yderligere valgmuligheder.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1110,7 +1141,7 @@
"-d, --disabled Tilføj softwarekilde som deaktiveret\n"
"-n, --no-refresh Tilføj softwarekilde med automatisk genopfrisk deaktiveret\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1126,7 +1157,7 @@
" Kommando-valgmuligheder:\n"
"-e, --export <FILE.repo> Eksportér alle definerede softwarekilder som en enkelt lokal .repo-fil\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1144,7 +1175,7 @@
" --loose-auth\tIgnorér bruger-godkendelsesdata i URL\n"
" --loose-query\tIgnorér forespørgsels-streng i URL\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1158,7 +1189,7 @@
"\n"
"Denne kommando har ingen yderligere valgmuligheder.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1179,7 +1210,7 @@
"-a, --enable-autorefresh Aktivér automatisk genopfriskning af softwarekilden\n"
" --disable-autorefresh Deaktivér automatisk genopfriskning af softwarekilden\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1203,7 +1234,7 @@
"-B, --build-only Byg kun databasen, download ikke metadata.\n"
"-D, --download-only Download kun rå metadata, byg ikke databasen\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1223,7 +1254,7 @@
"-r, --repo <alias> List kun opdateringer fra softwarekilden specificeret ved alias.\n"
" --best-effort Brug en 'så godt som muligt'-tilgang til opdatering, opdatering til mindre end seneste nye version er også acceptabelt.\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1253,7 +1284,7 @@
" --best-effort Brug en 'så godt som muligt'-tilgang til opdatering, opdatering til mindre end seneste nye version er også acceptabelt.\n"
" --debug-solver Opret solver-test-case til fejlsøgning\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1297,7 +1328,7 @@
" \n"
"Jokertegnene * og ? kan også bruges i søgestrenge.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1315,7 +1346,7 @@
"\n"
"-r, --repo <alias> Tjek kun efter rettelser på softwarekilde specificeret ved alias.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1333,7 +1364,7 @@
"\n"
"-r, --repo <alias> Tjek kun efter rettelser på softwarekilde specificeret ved alias.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1351,7 +1382,7 @@
"\n"
"-r, --repo <alias> Arbejd kun med softwarekilde specificeret ved alias.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1365,7 +1396,7 @@
"\n"
"Dette er et alias til rug-kompatibilitet for 'zypper info -t patch'\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1379,7 +1410,7 @@
"\n"
"Denne kommando har ingen yderligere valgmuligheder.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1395,24 +1426,24 @@
" Kommando-valgmuligheder:\n"
"-r, --repo <alias> Arbejd kun med opdateringer fra softwarekilde defineret ved alias.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "Programargumenter uden valgmulighed: "
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "Softwarekilder deaktiveret, bruger kun database af installerede pakker."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "Ignorerer installerede resolvables..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "En ZYpp transaktion er allerede i gang. Dette betyder der er et andet program der bruger libzypp-biblioteket til pakkehåndtering. Alle sådanne programmer skal lukkes før brug af denne kommando."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1445,106 +1476,106 @@
" #@@@@@@@@# \n"
" +@@@@#` "
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "Der kræves root-rettigheder for at ændre systemets softwarekilder."
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "For få argumenter. Der kræves mindst URL og alias."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "Den specificerede type er ikke en gyldig type af softwarekilde:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Se 'zypper -h addrepo' eller man zypper for at få en liste over kendte typer af softwarekilder."
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "Krævet argument mangler."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Softwarekilde er ikke fundet ved alias, prøver at slette ved brug af URL..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "Softwarekilde ikke fundet ved givet alias eller URL."
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "Alias er et krævet argument."
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "Der kræves root-rettigheder for at genopfriske systemets softwarekilder."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Der kræves root-rettigheder for at installere eller afinstallere pakker."
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Ukendt resolvable-type: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Advarsel: Ingen softwarekilder defineret. Der anvendes kun installerede resolvables. Det er ikke muligt at installere noget."
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "Genererer solver-test-case..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "Generering af solver-test-case gennemført."
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "Fejl under oprettelse af solver-test-case."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "Kildepakkens navn er et påkrævet argument."
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "Ukendt resolvable-type"
#
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "Ingen resolvables fundet."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Kører som 'rug'. Kan ikke bruge 'så godt som muligt'-tilgang til opdatering."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "Der kræves root-rettigheder for at opdatere pakker."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "Uventet undtagelse."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "Du kører allerede zyppers skal."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "Udfyld en fejlrapport om dette."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "Du kan få vejledning på http://en.opensuse.org/Zypper#Troubleshooting"
@@ -1554,20 +1585,24 @@
msgstr "Ukendt kommando '%s'"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "I/O-fejl"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "Ugyldigt objekt"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "Fejl"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Indsæt venligst mediet [%s] # %d og tast 'j' for at fortsætte eller 'n' for at afbryde operationen."
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "Downloader: "
@@ -1647,11 +1682,11 @@
msgid "Installation of %s failed:"
msgstr "Installation af %s fejlede:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "Katalog"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "Softwarekilde"
Modified: trunk/zypper/po/en_GB.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/en_GB.po?rev=7174&r1=7…
==============================================================================
--- trunk/zypper/po/en_GB.po (original)
+++ trunk/zypper/po/en_GB.po Tue Sep 11 10:57:42 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
"PO-Revision-Date: 2007-08-19 16:18+0100\n"
"Last-Translator: Benjamin Weber <b.weber(a)warwick.ac.uk>\n"
"Language-Team: <en(a)li.org>\n"
@@ -55,37 +55,49 @@
msgstr "Do you want to trust key id %s, %s, fingerprint %s"
#: ../src/zypper-keyring-callbacks.h:110
-#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
+#, fuzzy, c-format
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
msgstr "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-#: ../src/zypper-keyring-callbacks.h:119
-#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:120
+#, fuzzy, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Digest verification failed for %s. Expected %s, found %s."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr ""
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "No digest for file %s."
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "Continue?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "Unknown digest %s for file %s."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "Ignoring failed digest verification for %s (expected %s, found %s)."
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Digest verification failed for %s. Expected %s, found %s."
@@ -121,11 +133,11 @@
msgstr "Failed to add '%s' to the list of packages to be removed."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Not found"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "Problem: "
@@ -136,146 +148,146 @@
msgstr " Solution %d: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "number, (r)etry or (c)ancel> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "Applying solution %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s Problems:"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "Specified capability not found"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "Nothing to do."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "Overall download size: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "After the operation, additional %s will be used."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "After the operation, %s will be freed."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "%s items locked"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "Establishing status of aggregates"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "Resolving dependencies..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d patches needed (%d security patches)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Installed"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Uninstalled"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "No Longer Applicable"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Not Applicable"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Applied"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Not Needed"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Broken"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Needed"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "error"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Catalogue: "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Repository: "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Name"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "Version"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "Category"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Status"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "No needed patches found."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -283,38 +295,47 @@
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "No updates found."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Bundle"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "WARNING: %s is interactive, skipped."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "committing"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+#, fuzzy
+msgid "Problem downloading the package file from the repository:"
+msgstr "Problem downloading files from '%s'."
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "Please, see the above error message to for a hint."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -330,402 +351,434 @@
"- use another installation medium (if e.g. damaged)\n"
"- use another repository"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Automatically agreeing with %s %s licence."
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "%s %s licence:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "In order to install this package, you must agree to terms of the above licence. Continue?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Aborting installation due to the need for licence(s) confirmation."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Please, restart the operation in interactive mode and confirm your agreement with required licence(s), or use the --auto-agree-with-licenses option."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Aborting installation due to user disagreement with %s %s licence."
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "Installing source package %s-%s"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Source package %s-%s successfully installed."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problem installing source package %s-%s:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "Source package '%s' not found."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "Checking whether to refresh metadata for %s"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "Refreshing '%s'"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(forced)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "Repository '%s' is up to date."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "Forcing raw metadata refresh"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "Problem downloading files from '%s'."
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "Please, see the above error message to for a hint."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "No URLs defined for '%s'."
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "No alias defined this repository."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "Repository '%s' is invalid."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "Please, check if the URLs defined for this repository are pointing to a valid repository."
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "Error downloading metadata for '%s':"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "Forcing building of repository cache"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "Error parsing metadata for '%s':"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by following instructions at http://en.opensuse.org/Zypper#Troubleshooting"
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "Repository metadata for '%s' not found in local cache."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "Error building the cache database:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "Repository '%s' not found."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "Error reading repository description file for '%s'."
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "Reason: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "Disabling repository '%s' because of the above error."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "Enabled"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "Refresh"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "Type"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "Active"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "Disabled"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "Enabled"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "Refresh"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr ""
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Yes"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "No"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "Error reading repositories:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "Can't open %s for writing. Maybe you don't have write permissions?"
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "Repositories have been successfully exported to %s."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "Skipping disabled repository '%s'"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "Skipping repository '%s' because of the above error."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "Repository '%s' not found by its alias or number."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "Use 'zypper repos' to get the list of defined repositories."
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "Specified repositories are not enabled or defined."
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "There are no enabled repositories defined."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "Could not refresh the repositories because of errors."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "Some of the repositories have not been refreshed because of an error."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "Specified repositories have been refreshed."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "All repositories have been refreshed."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "This is a changeable read-only media (CD/DVD), disabling autorefresh."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "Repository named '%s' already exists. Please, use another alias."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "Can't find a valid repository at given location:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "Problem transferring repository data from specified URL:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "Please, check whether the specified URL is accessible."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "Unknown problem when adding repository:"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "Repository '%s' successfully added"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "Autorefresh"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "Reading data from '%s' media"
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "Problem reading data from '%s' media"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "Please, check if your installation media is valid and readable."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+#, fuzzy
+msgid "Problem accessing the file at the specified URL"
+msgstr "Problem transferring repository data from specified URL:"
+
+#: ../src/zypper-sources.cc:796
+#, fuzzy
+msgid "Please check if the URL is valid and accessible."
+msgstr "Please, check whether the specified URL is accessible."
+
+#: ../src/zypper-sources.cc:803
+#, fuzzy
+msgid "Problem parsing the file at the specified URL"
+msgstr "Problem transferring repository data from specified URL:"
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr ""
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr ""
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "Repository %s has been removed."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "Repository %s renamed to %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "Repository %s not found."
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "Error while modifying the repository:"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "Leaving repository %s unchanged."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s used together with %s, which contradict each other. This property will be left unchanged."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "Repository %s has been successfully modified."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "Retrieving repository '%s' data..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "Repository '%s' not cached. Caching..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "Problem loading data from '%s'"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "Resolvables from '%s' not loaded because of error."
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(%d resolvables found)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "Reading RPM database..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s resolvables)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -761,41 +814,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "Invalid answer. Choose letter a, r, or i."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "y"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "Y"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
-
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "yes"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "no"
+
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "Invalid answer '%s', enter '%s' or '%s':"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr ""
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -898,64 +932,39 @@
msgid "Requires:"
msgstr "Requires:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "Pre-caching installed resolvables matching given search criteria... "
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr " out of ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "cached."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr " is not a valid regular expression: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "This is a bug, please file a bug report against zypper."
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "Given URL is invalid."
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
+#, fuzzy
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -996,28 +1005,54 @@
"\tpatch-info\t\tShow full information for patches\n"
"\tsource-install, si\tInstall a source package\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "Verbosity: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "Entering non-interactive mode."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "Entering no-gpg-checks mode."
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "Invalid table style "
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "Try -h for help."
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1043,7 +1078,7 @@
" See 'man zypper' for more details.\n"
" --debug-solver Create solver test case for debugging\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1065,7 +1100,7 @@
"-n, --name Select resolvables by plain name, not by capability\n"
" --debug-solver Create solver test case for debugging\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1079,7 +1114,7 @@
"\n"
"This command has no additional options.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1101,7 +1136,7 @@
"-d, --disabled Add the repository as disabled\n"
"-n, --no-refresh Add the repository with auto-refresh disabled\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1117,7 +1152,7 @@
" Command options:\n"
"-e, --export <FILE.repo> Export all defined repositories as a single local .repo file\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1135,7 +1170,7 @@
" --loose-auth\tIgnore user authentication data in the URL\n"
" --loose-query\tIgnore query string in the URL\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1149,7 +1184,7 @@
"\n"
"This command has no additional options.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1171,7 +1206,7 @@
"-a, --enable-autorefresh Enable auto-refresh of the repository\n"
" --disable-autorefresh Disable auto-refresh of the repository\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1195,7 +1230,7 @@
"-B, --build-only Only build the database, don't download metadata.\n"
"-D, --download-only Only download raw metadata, don't build the database\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1215,7 +1250,7 @@
"-r, --repo <alias> List only updates from the repository specified by the alias.\n"
" --best-effort Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable.\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1245,7 +1280,7 @@
" --best-effort Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable\n"
" --debug-solver Create solver test case for debugging\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1289,7 +1324,7 @@
"\n"
"* and ? wildcards can also be used within search strings.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1307,7 +1342,7 @@
"\n"
"-r, --repo <alias> Check for patches only in the repository specified by the alias.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1325,7 +1360,7 @@
"\n"
"-r, --repo <alias> Check for patches only in the repository specified by the alias.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1343,7 +1378,7 @@
"\n"
"-r, --repo <alias> Work only with the repository specified by the alias.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1357,7 +1392,7 @@
"\n"
"This is a rug compatibility alias for 'zypper info -t patch'\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1371,7 +1406,7 @@
"\n"
"This command has no additional options.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1387,24 +1422,24 @@
" Command options:\n"
"-r, --repo <alias> Work only with updates from repository specified by alias.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "Non-option programme arguments: "
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "Repositories disabled, using the database of installed packages only."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "Ignoring installed resolvables..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1414,105 +1449,105 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "Root privileges are required for modifying system repositories."
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "Too few arguments. At least URL and alias are required."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "Specified type is not a valid repository type:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "Required argument missing."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Repository not found by alias, trying delete by URL..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "Repository not found by given alias or URL."
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "Alias is a required argument."
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "Root privileges are required for refreshing system repositories."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Root privileges are required for installing or uninstalling packages."
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Unknown resolvable type: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "Generating solver test case..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "Solver test case generated successfully."
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "Error creating the solver test case."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "Source package name is a required argument."
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "Unknown resolvable type "
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "No resolvables found."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Running as 'rug', can't do 'best-effort' approach to update."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "Root privileges are required for updating packages."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "Unexpected exception."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "You already are running zypper's shell."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "Please file a bug report about this."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
@@ -1521,20 +1556,24 @@
msgid "Unknown command '%s'"
msgstr "Unknown command '%s'"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "I/O error"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "Invalid object"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "Error"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "Downloading: "
@@ -1613,11 +1652,28 @@
msgid "Installation of %s failed:"
msgstr "Installation of %s failed:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "Catalogue"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "Repository"
+#~ msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+#~ msgstr "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "Y"
+#~ msgstr "Y"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "N"
+#~ msgstr "N"
+
+#~ msgid "Invalid answer '%s', enter '%s' or '%s':"
+#~ msgstr "Invalid answer '%s', enter '%s' or '%s':"
Modified: trunk/zypper/po/fi.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/fi.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/fi.po (original)
+++ trunk/zypper/po/fi.po Tue Sep 11 10:57:42 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
"PO-Revision-Date: 2007-08-25 15:22+0300\n"
"Last-Translator: Jyri Palokangas <jmp(a)opensuse.fi>\n"
"Language-Team: Suomi <fi(a)li.org>\n"
@@ -56,37 +56,49 @@
msgstr "Luotetaanko avaimeen %s, %s, tunnus %s"
#: ../src/zypper-keyring-callbacks.h:110
-#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
+#, fuzzy, c-format
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
msgstr "Varoitus: %s ei läpäissyt aitoustarkistusta julkisella avaimella %s, %s, tunniste %s! Tämä ei johdu pahanlaatuisista muutoksista tiedostossa!"
-#: ../src/zypper-keyring-callbacks.h:119
-#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "%s ei läpäissyt aitoustarkistusta julkisella avaimella %s, %s, tunniste %s. Varoitus: Tämä saattaa johtua pahanlaatuisista muutoksista tiedostossa ja jatkaminen saattaa johtaa ongelmiin! Jatketaanko silti?"
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:120
+#, fuzzy, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "%s koostetarkistus epäonnistui. Odotettiin %s, saatiin %s."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr ""
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "Ei koostetta tiedostolle %s."
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "Jatketaanko?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "Tuntematon kooste %s tiedostolle %s."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "Jätettiin huomioimatta epäonnistunut %s koostetarkistus (odotettiin %s, saatiin %s)."
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "%s koostetarkistus epäonnistui. Odotettiin %s, saatiin %s."
@@ -122,11 +134,11 @@
msgstr "Kohteen '%s' merkitseminen poistettavaksi epäonnistui."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Ei löytynyt"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "Ongelma: "
@@ -137,146 +149,146 @@
msgstr " Ratkaisu %d: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "numero, y(r)itä uudelleen tai k(e)skeytä> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "e"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "Ratkaistaan %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s ongelmat:"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "Annettua määritystä ei löydetty"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "Ei mitään tehtävää."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "Ladattava määrä yhteensä: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Operaation jälkeen tilaa on %s vähemmän."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Operaation jälkeen tilaa on %s enemmän."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "%s kohdetta lukittu"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "Muodostetaan yhdistettyjen kohteiden tiloja"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "Ratkaistaan riippuvuuksia..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d paikkausta (%d tietoturvapaikkausta)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Asennettu"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Poistettiin"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Ei enää käyttökelpoinen"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Ei käyttökelpoinen"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Käytettiin"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Ei tarvita"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Rikki"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Tarvitaan"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "virhe"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Luettelo: "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Asennuslähde: "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Nimi"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "Versio"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "Luokka"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Tila"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "Ei löydetty paikattavaa."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -284,38 +296,47 @@
"VAROITUS: Nämä ovat ainoastaan itse päivitystoimintoon vaikuttavia päivityksiä.\n"
"Myös muita päivityksiä on saatavilla.\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "Ei päivitettävää."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "T"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Nippu"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arkkitehtuuri"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "VAROITUS: %s on vuorovaikutteinen, ohitetaan."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "suoritetaan"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+#, fuzzy
+msgid "Problem downloading the package file from the repository:"
+msgstr "Ongelma ladattaessa tietoja kohteesta '%s'."
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "Tarkista ylläoleva virheviesti."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -331,403 +352,435 @@
"- käytä jotakin toista tietovälinettä (nykyinen voi olla esim. vaurioitunut)\n"
"- käytä jotakin toista asennuslähdettä"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Jokin asennetuista päivityksistä edellyttää tietokoneen uudelleenkäynnistämistä. Käynnistä tietokone uudelleen mahdollisimman pian."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "VAROITUS: Jokin asennetuista päivityksistä edellyttää tietokoneen uudelleenkäynnistämistä. Käynnistä tietokone uudelleen mahdollisimman pian."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "VAROITUS: Jokin asennetuista korjauksista vaikuttaa itse paketinhallintasovellukseen. Tästä syystä paketinhallintasovellus on käynnistettävä uudelleen ennen seuraavien toimintojen tekemistä."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "%s %s lisenssi hyväksyttiin automaattisesti."
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "%s %s käyttöoikeussopimus:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Tämän paketin asentaminen edellyttää, että hyväksyt yllä olevan käyttöoikeussopimuksen ehdot. Haluatko jatkaa?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Keskeytetään asennus, koska jokin paketti vaatii käyttöoikeussopimuksen vahvistamista."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Käynnistä toiminto vuorovaikutteisessa tilassa ja vahvista tarvittavien käyttöoikeussopimusten hyväksyminen, tai käytä --auto-agree-with-licences -valintaa."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Keskeytetään asennus, koska käyttäjä ei hyväksynyt %s %s käyttöoikeussopimusta."
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "Asennetaan lähdekoodipaketti %s-%s"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Lähdekoodipaketti %s-%s asennettiin onnistuneesti."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Virhe asennettaessa lähdekoodipakettia %s-%s:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "Lähdekoodipakettia '%s' ei löydetty."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "Tarkistetaan tarvitseeko %s metatietoja päivittää."
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "Päivitetään '%s'"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(pakotettu)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "Asennuslähde '%s' on ajantasalla."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "Pakotetaan metatietojen päivitys"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "Ongelma ladattaessa tietoja kohteesta '%s'."
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "Tarkista ylläoleva virheviesti."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "'%s':lle ei ole määritelty URL-osoitteita"
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "Aseta vähintään yksi URL (baseurl=URL) tiedostoon %s asennuslähteelle '%s'."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "Tälle alias-nimelle ei ole määritelty asennuslähteitä."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "Asennuslähde '%s' on virheellinen."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "Tarkista että asennuslähteen URL-osoitteen osoittavat kelvolliseen asennuslähteeseen."
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "Ongelma ladattaessa metatietoja '%s'."
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "Pakotetaan asennuslähteen välimuistin rakentaminen"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "Virhe asennuslähteen '%s' metatietojen koostamisessa:"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "Tämä voi johtua virheellisistä metatiedoista asennuslähteessä tai metatietojen koostajan ohjelmointivirheestä. Jos epäilet jälkimmäistä, niin lähetä virheraportti näiden ohjeiden mukaisesti: http://en.opensuse.org/Zypper#Troubleshooting"
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "Asennuslähteen '%s' metatietoja ei löytynyt paikallisesta välimuistista."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "Virhe välimuistitietokannan rakennuksessa:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "Ei löydetty asennuslähdettä '%s'."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "Virhe luettaessa asennuslähteen kuvaustiedostoa kohteesta '%s'."
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "Syy: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "Poistettiin asennuslähde '%s' käytöstä ylläolevien virheiden vuoksi."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "Asennuslähde '%s' ei ole ajantasalla. Suorita 'zypper refresh' pääkäyttäjänä päivittääksesi sen."
-# kpowersave.cpp: tooltip
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "Käytössä"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "Päivitä"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "Tyyppi"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "Käytössä"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "Poistettu käytöstä"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+# kpowersave.cpp: tooltip
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "Käytössä"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "Päivitä"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "Alias"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Kyllä"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "Ei"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "Asennuslähteitä ei ole määritelty. Käytä 'zypper addrepo' -komentoa lisätäksesi yhden tai useamman asennuslähteen."
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "Virhe luettaessa asennuslähdettä:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "Tiedostoon %s ei voitu kirjoittaa. Tarkista, että sinulla on kirjoitusoikeudet."
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "Asennuslähteet on onnistuneesti viety %s."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "Ohitettiin käytöstäpoistettu asennuslähde '%s'"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "Ohitettiin asennuslähde '%s' ylläolevien virheiden vuoksi."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "Asennuslähdettä '%s' ei löydy alias-nimen tai numeron perusteella."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "Käytä 'zypper repos' saadaksesi listan määritellyistä asennuslähteistä"
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "Annetut asennuslähteet eivät ole käytössä tai niitä ei ole määritelty"
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "Yhtään käytössäolevaa asennuslähdettä ei ole määritelty."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "Käytä 'zypper addrepo' -komentoa lisätäksesi uuden asennuslähteen tai 'zypper modifyrepo' -komentoa ottaaksesi jonkin käytöstä poistettu käyttöön."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "Asennuslähdettä ei voitu päivittää virheiden vuoksi."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "Jotain asennuslähteistä ei ole päivitetty virheiden vuoksi."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "Määritellyt asennuslähteet on päivitetty."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "Kaikki järjestelmän asennuslähteet päivitettiin."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "Tämä on vaihdettava, ei kirjoitettavissa oleva asennusmedia (CD/DVD). Poistetaan automaattinen päivitys."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "Asennuslähde '%s' on jo määritelty. Valitse toinen alias-nimi."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "Ei löydetty asennuslähteitä annetusta sijainnista:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "Asennuslähteen tyyppiä ei voitu päätellä automaattisesti. Tarkista seuraavat olevat URL-osoitteet: "
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "Ongelma siirrettäessä asennuslähteen tietoja määritellystä URL-osoitteesta:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "Tarkista, että määritelty URL on saatavissa."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "Tunnistamaton ongelma lisättäessä asennuslähdettä:."
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "Asennuslähde '%s' lisättiin onnistuneesti"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "Automaattinen päivitys"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "Luetaan tietoja medialta '%s'"
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "Ongelma ladattaessa tietoja '%s'"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "Tarkista, että asennusmedia on oikeellinen ja luettavissa."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+#, fuzzy
+msgid "Problem accessing the file at the specified URL"
+msgstr "Ongelma siirrettäessä asennuslähteen tietoja määritellystä URL-osoitteesta."
+
+#: ../src/zypper-sources.cc:796
+#, fuzzy
+msgid "Please check if the URL is valid and accessible."
+msgstr "Tarkista, että määritelty URL on saatavissa."
+
+#: ../src/zypper-sources.cc:803
+#, fuzzy
+msgid "Problem parsing the file at the specified URL"
+msgstr "Ongelma siirrettäessä asennuslähteen tietoja määritellystä URL-osoitteesta."
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr ""
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr ""
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "Asennuslähde %s poistettiin."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "Asennuslähde %s nimettiin %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "Asennuslähdettä %s ei löydy."
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "Virhe muunnettaessa asennuslähdettä:"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "Asennuslähdettä %s ei muutettu."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "Käytettäessä %s yhdessä %s kumoavat toisensa. Tämä ominaisuus jätetään jätetään muuttamatta."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "Asennuslähdettä %s muunnettiin onnistuneesti."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "Luetaan asennuslähteen '%s' tietoja..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "Asennuslähdettä '%s' ei löydy välimuistista. Noudetaan..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "Ongelma ladattaessa tietoja '%s'"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "Virheen vuoksi '%s' ei ladattu osia."
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(löydettiin %d osaa)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "Kokeile 'zypper refresh' tai poista jopa /var/cache/zypp/zypp.db ennen asennuslähteen päivitystä."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "Luetaan RPM-tietokantaa..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s osaa)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -763,41 +816,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "Virheellinen vastaus. Valitse jokin seuraavista kirjaimista: a, r, i."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "k"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "K"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "e"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "E"
-
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "kyllä"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "ei"
+
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "Virheellinen vastaus '%s'. Valitse '%s' tai '%s':"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr ""
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -900,64 +934,39 @@
msgid "Requires:"
msgstr "Vaatii:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "Asennuslähteitä ei ole määritelty. Lisää vähintään yksi asennuslähde 'zypper addrepo' -komennolla ennen hakua."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "Tallennettaan välimuistiin asennettuja osia, jotka vastaavat hakuehtoja..."
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr "/"
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "tallennettu välimuistiin."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr " ei ole kelvollinen säännöllinen lause: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "Tämä on ohjelmavirhe. Tee ilmoitus zypper-ohjelmavirheestä."
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "Verkko-osoite ei kelpaa."
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" Valinnat:\n"
-"\t--help, -h\t\tOhje\n"
-"\t--version, -V\t\tNäyttää version\n"
-"\t--quiet, -q\t\tTulostaa ainoastaan virheet.\n"
-"\t--verbose, -v\t\tKasvattaa näytettävän tiedon määrää\n"
-"\t--terse, -t\t\tMinimoi näytettävän tiedon määrän\n"
-"\t--table-style, -s\tTaulukon tyyppi (kokonaisluku)\n"
-"\t--rug-compatible, -r\tOttaa rug-yhteensopivuustilan käyttöön.\n"
-"\t--non-interactive\tÃlä kysy mitään, käytä oletus vastausta automaattisesti. (kehityksen alla)\n"
-"\t--no-gpg-checks\t\tJätä GPG-tarkistuksen virheet huomioimatta ja jatka.\n"
-"\t--root, -R <dir>\tToimi eri juuri-hakemiston alla\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
+#, fuzzy
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -997,28 +1006,54 @@
" \tpatch-info\t\tNäytä korjausten täydet tiedot\n"
" \tsource-install, si\tAsenna lähdekoodipaketti\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" Valinnat:\n"
+"\t--help, -h\t\tOhje\n"
+"\t--version, -V\t\tNäyttää version\n"
+"\t--quiet, -q\t\tTulostaa ainoastaan virheet.\n"
+"\t--verbose, -v\t\tKasvattaa näytettävän tiedon määrää\n"
+"\t--terse, -t\t\tMinimoi näytettävän tiedon määrän\n"
+"\t--table-style, -s\tTaulukon tyyppi (kokonaisluku)\n"
+"\t--rug-compatible, -r\tOttaa rug-yhteensopivuustilan käyttöön.\n"
+"\t--non-interactive\tÃlä kysy mitään, käytä oletus vastausta automaattisesti. (kehityksen alla)\n"
+"\t--no-gpg-checks\t\tJätä GPG-tarkistuksen virheet huomioimatta ja jatka.\n"
+"\t--root, -R <dir>\tToimi eri juuri-hakemiston alla\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "Sanallisuus: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "Siirrytään ei-vuorovaikutteinen -tilaan."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "Siirrytään ei tarkisteta GPG-avaimia -tilaan."
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "Virheellinen taulukon tyyli "
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "Saat ohjeita valitsimella -h."
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1044,7 +1079,7 @@
" Katso lisätietoja zypper-komennon manuaalista (man zypper).\n"
" --debug-solver Luo ratkaisintesti (debug)\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1066,7 +1101,7 @@
"-n, --name Poista paketit ainoastaan nimen perusteella\n"
" --debug-solver Luo ratkaisintesti (debug)\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1080,7 +1115,7 @@
"\n"
"Tällä komennolla ei ole valitsimia.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1101,7 +1136,7 @@
"-d, --disabled Lisää asennuslähde poistettuna käytöstä\n"
"-n, --no-refresh Ãlä päivitä metatietoja automaattisesti\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1117,7 +1152,7 @@
" Valinnat:\n"
"-e, --export <TIEDOSTO.repo> Vie järjestelmän kaikki asennuslähteet yksittäiseen .repo-tiedostoon\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1134,7 +1169,7 @@
"--loose-auth Jätä URL-osoitteen käyttäjän tunnistautumistiedot huomioimatta.\n"
"--loose-query Jätä URL-osoitteen kyselyjono huomioimatta.\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1148,7 +1183,7 @@
"\n"
"Tällä komennolla ei ole valitsimia.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1168,7 +1203,7 @@
"-a, --enable-autorefresh Asettaa automaattisen päivityksen päälle\n"
" --disable-autorefresh Poistaa automaattisen päivityksen käytöstä\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1192,7 +1227,7 @@
"-B, --build-only Rakenna ainoastaan tietokanta uudelleen. Ãlä nouda metatietoja uudelleen\n"
"-D, --download-only Nouda ainoastaan metatiedot uudelleen, älä uudelleenrakenna tietokantaa\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1212,7 +1247,7 @@
"-r, --repo <alias> Näytä ainoastaan määritellyn asennuslähteen päivitykset.\n"
" --best-effort Mahdollistaa myös pakettien päivittämisen vanhempaan versioon.\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1242,7 +1277,7 @@
" --best-effort Mahdollistaa myös pakettien päivittämisen vanhempaan versioon.\n"
" --debug-solver Luo ratkaisintesti (debug)\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1286,7 +1321,7 @@
"\n"
"Voit käyttää jokerimerkkejä (* ja ?) hakulauseessa.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1304,7 +1339,7 @@
"\n"
"-r, --repo <alias> Tarkista ainoastaan tietyn asennuslähteen paikkaukset.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1322,7 +1357,7 @@
"\n"
"-r, --repo <alias> Tarkista ainoastaan tietyn asennuslähteen paikkaukset.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1338,7 +1373,7 @@
"\n"
"-r, --repo <alias> Käytä ainoastaan määriteltyä asennuslähdettä.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1352,7 +1387,7 @@
"\n"
"Tämä on ainoastaan rug-yhteensopivuuden takia ja sama kuin: 'zypper info -t patch'\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1366,7 +1401,7 @@
"\n"
"Tällä komennolla ei ole valitsimia.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1382,24 +1417,24 @@
" Valinnat:\n"
"-r, --repo <alias> Käytä ainoastaan määriteltyä asennuslähdettä.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "Ei-valinnaiset ohjelman valinnat "
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "Asennuslähteet poistettu käytöstä. Käytetään asennettujen pakettien tietokantaa."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "Ohitetaan asennettuja osia..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "ZYpp tapahtuma on jo käynnissä. Tämä tarkoittaa, että jokin toinen käynnissäoleva ohjelma käyttää libzypp-kirjastoa pakettienhallintaan. Muut libzypp-kirjastoa käyttävät ohjelmat on suljettava ennen tämän komennon käyttöä."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1409,105 +1444,105 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "Järjestelmän asennuslähteiden muokkaaminen vaatii pääkäyttäjän oikeudet."
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "Liian vähän valintoja. Määrittele vähintään URL-osoite ja alias."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "Virheellinen asennuslähteen tyyppi:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Tarkista 'zypper -h addrepo' tai 'man zypper' saadaksesi listan tunnetuista asennuslähteen tyypeistä"
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "Tarvittava valinta puuttuu."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Aliaksella määriteltyä asennuslähdettä ei löydy. Kokeile poistaa URL-osoitteen perusteella."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "Määriteltyä asennuslähdettä ei löydy."
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "Alias on pakollinen valinta."
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "Järjestelmän asennuslähteiden päivittämiseen vaaditaan pääkäyttäjän oikeudet."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Pakettien asentamiseen tai poistamiseen vaaditaan pääkäyttäjän oikeudet."
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Tuntematon tyyppi: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Varoitus: Asennuslähteitä ei ole määritelty. Käytetään ainoastaan asennettuja osia. Mitään ei voida asentaa."
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "Luodaan asennuslähteen ratkaisintestiä..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "Ratkaisintesti luotiin onnistuneesti."
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "Virhe ratkaisintestin luonnissa."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "Lähdekoodipaketin nimi on pakollinen valinta"
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "Tuntematon tyyppi "
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "Ei löytynyt."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "'best-effort'-ratkaisumalli ei ole käytettävissä rug-yhteensopivuustilassa."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "Pakettien päivittämiseen vaaditaan pääkäyttäjän oikeudet."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "Odottamaton poikkeus."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "Olet jo zypperin komentokehoitteessa."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "Tee virheilmoitus tästä viasta."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "Ohjeita on sivulla http://en.opensuse.org/Zypper#Troubleshooting."
@@ -1517,20 +1552,24 @@
msgstr "Tuntematon komento '%s'"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "I/O-virhe"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "Epäkelpo objekti."
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "Virhe"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Aseta media [%s] # %d ja kirjoita 'k' jatkaaksesi tai 'e' peruuttaaksesi toiminnon."
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "Ladataan: "
@@ -1609,11 +1648,28 @@
msgid "Installation of %s failed:"
msgstr "%s asennus epäonnistui:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "Luettelo"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "Asennuslähde"
+#~ msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+#~ msgstr "%s ei läpäissyt aitoustarkistusta julkisella avaimella %s, %s, tunniste %s. Varoitus: Tämä saattaa johtua pahanlaatuisista muutoksista tiedostossa ja jatkaminen saattaa johtaa ongelmiin! Jatketaanko silti?"
+
+#~ msgid "y"
+#~ msgstr "k"
+
+#~ msgid "Y"
+#~ msgstr "K"
+
+#~ msgid "n"
+#~ msgstr "e"
+
+#~ msgid "N"
+#~ msgstr "E"
+
+#~ msgid "Invalid answer '%s', enter '%s' or '%s':"
+#~ msgstr "Virheellinen vastaus '%s'. Valitse '%s' tai '%s':"
Modified: trunk/zypper/po/hu.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/hu.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/hu.po (original)
+++ trunk/zypper/po/hu.po Tue Sep 11 10:57:42 2007
@@ -11,15 +11,15 @@
msgstr ""
"Project-Id-Version: zypper.hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
-"PO-Revision-Date: 2007-08-19 22:38+0200\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"PO-Revision-Date: 2007-09-07 09:18+0200\n"
"Last-Translator: Kalman Kemenczy <kkemenczy(a)novell.com>\n"
"Language-Team: <hu(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../src/zypper-keyring-callbacks.h:40
#, c-format
@@ -59,36 +59,48 @@
#: ../src/zypper-keyring-callbacks.h:110
#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "Figyelem! A(z) %s meghiúsult aláÃrás-ellenÅrzése (nyilvános kulcsazonosÃtó: %s, %s; ujjlenyomat: %s) figyelmen kÃvül marad. EllenÅrizze, hogy ezt nem a fájl ártó szándékú módosÃtása okozta!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "Figyelem! A(z) %s aláÃrás-ellenÅrzése (nyilvános kulcsazonosÃtó: %s, %s; ujjlenyomat: %s) figyelmen kÃvül hagyva!"
-#: ../src/zypper-keyring-callbacks.h:119
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "EllenÅrizze, hogy ez nem okoz-e nem kÃvánt módosÃtást a fájlban!"
+
+#: ../src/zypper-keyring-callbacks.h:120
#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "A(z) %s aláÃrás-ellenÅrzése meghiúsult (nyilvános kulcsazonosÃtó: %s, %s; ujjlenyomat: %s). Figyelem: ezt a fájl ártó szándékú módosÃtása is okozhatta! A folytatás kockázatos. Mindenképp folytatja?"
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "A aláÃrásellenÅrzés meghiúsult ehhez: %s. A felhasznált publikus kulcs: %s, %s, ujjlenyomat: %s."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr "Figyele,: ez nem kÃvánt változásokat okozhat a fájlban!"
+
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Kockázatos folytatni! Biztosan folytatja?"
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "Nincs kivonat a(z) %s fájlhoz."
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "Folytatja?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "Ismeretlen %s kivonat a(z) %s fájlhoz."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "%s meghiúsult (várt: %s, megtalálható: %s) kivonatellenÅrzésének figyelmen kÃvül hagyása."
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "A kivonatellenÅrzés meghiúsult ehhez: %s. A várt %s helyett a kapott érték: %s."
@@ -124,11 +136,11 @@
msgstr "\"%s\" hozzáadása az eltávolÃtandó alkalmazások listájához meghiúsult."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Nem található"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "Problém: "
@@ -140,148 +152,148 @@
msgstr " %d. megoldás: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "darab, új(r)a vagy (m)égsem> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "m"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "Megoldás végrehajtása %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s Problémák:"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "A megadott képesség nem található"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "Nincs teendÅ."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "Letöltés mérete: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "A művelet után további %s kerül felhasználásra."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "A művelet után további %s szabadul fel."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "%s elem zárolt"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "Gyűjtemények állapotának kialakÃtása"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "FüggÅségek feloldása..."
# modules/inst_config_x11.ycp:216
# /usr/lib/YaST2/clients/inst_config_x11.ycp:865
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d frissÃtés szükséges (%d biztonsági frissÃtés)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "TelepÃtve"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "EltávolÃtva"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "A továbbiakban nem érvényes"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Nem alkalmazható"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Alkalmazva"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Nem szükséges"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Hibás"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Szükséges"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "hiba"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Katalógus: "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "TelepÃtési forrás: "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Név"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "Verzió"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "Kategória"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Ãllapot"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "Nem találhatók frissÃtések."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -289,38 +301,46 @@
"FIGYELMEZTETÃS: Ezek a frissÃtések csak a frissÃtÅt érintik.\n"
"Ezen kÃvül mások is elérhetÅk.\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "Nem találhatók frissÃtések."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Köteg"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Architektúra"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "FIGYELMEZTETÃS: %s interaktÃv, kihagyva."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "véglegesÃtés"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+msgid "Problem downloading the package file from the repository:"
+msgstr "Hiba történt az adatok letöltésekor a következÅ telepÃtési forrásról:"
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "Tekintse meg a fent található hibaüzenetet."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -336,402 +356,431 @@
" - használjon másik telepÃtÅ adathordozót (ha az sérült)\n"
" - használjon másik telepÃtési forrást"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "A telepÃtett frissÃtések egyike a számÃtógép újraindÃtását igényli. Ezt amint lehet, tegye meg."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "FIGYELMEZTETÃS: A telepÃtett frissÃtések egyike a számÃtógép újraindÃtását igényli. Ezt amint lehet, tegye meg."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "FIGYELMEZTETÃS: A telepÃtett frissÃtések egyike magát a csomagkezelÅt érinti, Ãgy az az új műveletek végrehajtása elÅtt újraindÃtást igényel."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "A(z) %s %s licencének automatikus elfogadása."
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "%s %s licenc:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "A csomag telepÃtése érdekében el kell fogadnia a fenti licenc feltételeit. Folytatja?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "A telepÃtés megszakÃtva a licencek elfogadásának szükségessége miatt."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "IndÃtsa újra a folyamatot interaktÃv módban és fogadja el a szükséges licenceket, vagy használja az '--auto-agree-with-licenses' kapcsolót."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "TelepÃtés megszakÃtva a felhasználó a %s %s licencekkel való egyet nem értése miatt."
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "A(z) %s-%s forráscsomag telepÃtése"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "A(z) %s-%s forráscsomag telepÃtése sikeresen befejezÅdött."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Hiba történt a(z) %s-%s forráscsomag telepÃtése közben:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "A(z) %s forráscsomag nem található."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "A(z) %s frissÃtett metaadatainak keresése"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "'%s' frissÃtése"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(kikényszerÃtett)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "A(z) %s telepÃtési forrás naprakész."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "Metaadatok frissÃtésének kikényszerÃtése"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "Hiba történt az adatok letöltésekor a következÅ helyrÅl: '%s'."
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "Tekintse meg a fent található hibaüzenetet."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "Nincs megadva URL a következÅhöz: '%s'."
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "Adjon meg egy vagy több URL-t (baseurl=URL) a(z) %s útvonalhoz a következÅ telepÃtési forráshoz: '%s'."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "Ehhez a telepÃtési forráshoz nincs álnév megadva."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "A(z) %s telepÃtési forrás nem érvényes."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "EllenÅrizze, hogy a telepÃtési forráshoz megadott URL megfelelÅ helyre mutat."
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "Hiba történt a(z) '%s' metaadatának letöltése közben:"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "TelepÃtési forrás gyorsÃtótárának felépÃtésének kikényszerÃtése"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "Hiba történt a(z) '%s' metaadadatainak foldolgozása közben:"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "Ennek oka lehet telepÃtési forrásban lévÅ hibás metaadat vagy más hiba a metaadat-feldolgozó kódban. Amennyiben úgy gondolja jelentse be a hibát a http://hu.opensuse.org/Zypper oldalon leÃrtaknak megfelelÅen"
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "A(z) %s telepÃtési forrás metaadata nem található a helyi gyorsÃtótárban."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "Hiba történt a gyorsÃtótár adatbázisának felépÃtése közben:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "A(z) %s telepÃtési forrás nem található."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "Hiba történt a(z) '%s' telepÃtési forrás leÃrófájljának beolvasása közben."
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "Ok: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "A jelzett hiba miatt a(z) %s telepÃtési forrás letiltásra kerül."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "A(z) '%s' telepÃtési forrás nem naprakész, frissÃtéséhez rendszergazdaként futtathatja a 'zypper refresh' parancsot."
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "Bekapcsolva"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "FrissÃtés"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "TÃpus"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "AktÃv"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "Tiltva"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "Bekapcsolva"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "FrissÃtés"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "Ãlnév"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Igen"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "Nem"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "Nincs megadva telepÃtési forrás. Használja a 'zypper addrepo' parancsot egy vagy több telepÃtési forrás hozzáadásához."
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "Hiba a telepÃtési forrás olvasásakor:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "A(z) %s nem nyitható meg Ãrásra. EllenÅrizze, hogy van-e Ãrásjoga."
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "A(z) %s telepÃtési forrás exportálása sikeres."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "A letiltott '%s' telepÃtési forrás kihagyása"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "A jelzett hiba miatt a(z) %s telepÃtési forrás kihagyása."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "A(z) '%s' telepÃtési forrás nem található az álneve vagy száma alapján."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "A beállÃtott telepÃtési források listájához használja a 'zypper repos' parancsot."
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "A megadott telepÃtési forrás nincs engedélyezve vagy beállÃtva."
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "Nincs engedélyezett telepÃtési forrás beállÃtva."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "TelepÃtési forrás hozzáadásához vagy engedélyezéséhez használja a 'zypper addrepo' vagy 'zypper modifyrepo' parancsot."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "A jelzett hiba miatt a telepÃtési forrás frissÃtése sikertelen."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "Hiba miatt néhány telepÃtési forrás nem került frissÃtésre."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "A megadott telepÃtési források frissÃtése megtörtént."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "Az összes telepÃtési forrás frissÃtése megtörtént."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "Ez egy csak olvasható, cserélhetÅ adathordozó (CD/DVD), ezért az automatikus frissÃtés letiltásra kerül."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "Ilyen nevű ('%s') telepÃtési forrás már létezik. Adjon egy másik álnevet."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "A megadott helyen nem található érvényes telepÃtési forrás:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "A telepÃtési forrás tÃpusa nem derÃthetÅ ki. EllenÅrizze, hogy az URL valóban egy érvényes telepÃtési forrásra mutat:"
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "A telepÃtési forrás adatainak lekérdezése a megadott URL-rÅl sikertelen:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "EllenÅrizze, hogy a megadott URL valóban elérhetÅ."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "Ismeretlen hiba történt a telepÃtés forrás hozzáadásakor:"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "A(z) '%s' telepÃtési forrás hozzáadása sikeres"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "Automatikus frissÃtés"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "Az adatok betöltése a következŠa(z) '%s' adathordozóról"
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "Az adatok betöltése a(z) '%s' adathordozóról sikertelen"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "EllenÅrizze, hogy a telepÃtési adathordozó valóban révényes és olvasható."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+msgid "Problem accessing the file at the specified URL"
+msgstr "A fájl adatainak lekérdezése a megadott URL-rÅl sikertelen"
+
+#: ../src/zypper-sources.cc:796
+msgid "Please check if the URL is valid and accessible."
+msgstr "EllenÅrizze, hogy a megadott URL érvényes és valóban elérhetÅ."
+
+#: ../src/zypper-sources.cc:803
+msgid "Problem parsing the file at the specified URL"
+msgstr "A fájl feldolgozása a megadott URL-rÅl sikertelen"
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr "Ez egy .repo fájl? A szabványos .repo fájl leÃrása a http://en.opensuse.org/Standards/RepoInfo oldalon található."
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr "Hiba történt a megadott URL-en található fájl beolvasása közben"
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "A(z) %s telepÃtési forrás eltávolÃtása megtörtént."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "A(z) %s telepÃtési forrás átnevezése megtörtént. Az új neve %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "A(z) %s telepÃtési forrás nem található."
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "Hiba a telepÃtési forrás módosÃtása közben:"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "A(z) %s telepÃtési forrás változatlan maradt."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s és %s ellentmondanak egymásnak. Ez a tulajdonság változatlan marad."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "A(z) %s telepÃtési forrás módosÃtása sikeres."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "A(z) %s telepÃtési forrás adatainak beolvasása..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "A(z) '%s' telepÃtési forrás nincs a gyorsÃtótárban. Beolvasás folyamatban..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "Az adatok betöltése sikertelen a következÅ helyrÅl: '%s'"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "Hiba történt, Ãgy \"%s\" feloldhatói nem tölthetÅk be."
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(%d feloldandó található)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "ElÅtte használja a 'zypper refresh', vagy törölje a /var/cache/zypp/zypp.db fájlt."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "RPM adatbázis beolvasása..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s feloldandó)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -767,41 +816,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "Ãrvénytelen válasz. Válassza ki az a, r vagy i betűk egyikét."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "i"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "I"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
-
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "igen"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "nem"
+
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "Ãrvénytelen válasz. Válassza ki az '%s', '%s' vagy '%s' betűk egyikét:"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr "Hibás válasz: '%s'. Válassza az 'y'-t az '%s'-hez vagy az 'n'-t a '%s'-hez."
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -905,64 +935,38 @@
msgid "Requires:"
msgstr "Igényli:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "Nincsenek telepÃtési források beállÃtva. A keresés elÅtt vegyen fel legalább egy telepÃtési forrást a \"zypper addrepo\" parancs segÃtségével."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "Az adott keresési feltételnek megfelelÅ telepÃtett feloldhatók elÅ-gyorsÃtótárazása... "
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr " / ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "gyorsÃtótárazva."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr " nem érvényes reguláris kifejezés: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "Ez hiba, küldjön errÅl egy hibajelentést a zypper fejlesztÅinek."
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "A megadott URL érvénytelen."
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" Kapcsolók:\n"
-"\t--help, -h\t\tSúgó\n"
-"\t--version, -V\t\tVerziószám kiÃrása.\n"
-"\t--quiet, -q\t\tNormál kimenet elnyomása, csak a hibaüzenetek kiÃrása.\n"
-"\t--verbose, -v\t\tKimenet részletezettségének növelése.\n"
-"\t--terse, -t\t\tTömör kimenet gépi feldolgozásra.\n"
-"\t--table-style, -s\tTáblastÃlus (integer).\n"
-"\t--rug-compatible, -r\tRug-kompatibilitás engedélyezése.\n"
-"\t--non-interactive\tNe kérdezzen semmit, az alapértelmezett válaszokat használja automatikusan.\n"
-"\t--no-gpg-checks\t\tA GPG ellenÅrzési hibák figyelmen kÃvül hagyása és folytatás.\n"
-"\t--root, -R <dir>\tMűködés másik root könyvtárban.\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -994,6 +998,8 @@
"\trenamerepo, nr\t\tMegadott forrás átnevezése\n"
"\tmodifyrepo, mr\t\tMegadott forrás módosÃtása\n"
"\tpatch-check, pchk\tJavÃtások keresése\n"
+"\trefresh, ref\t\tTelepÃtési forrás frissÃtése\n"
+"\tpatch-check, pchk\tFrissÃtések ellenÅrzése\n"
"\tpatches, pch\t\tJavÃtások felsorolása\n"
"\tlist-updates, lu\tFrissÃtések felsorolása\n"
"\txml-updates, xu\t\tFrissÃtések és javÃtások felsorolása xml formátumban\n"
@@ -1002,28 +1008,54 @@
"\tpatch-info\t\tJavÃtások teljes információinak megjelenÃtése\n"
"\tsource-install, si\tForráscsomag telepÃtése\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" Kapcsolók:\n"
+"\t--help, -h\t\tSúgó\n"
+"\t--version, -V\t\tVerziószám kiÃrása.\n"
+"\t--quiet, -q\t\tNormál kimenet elnyomása, csak a hibaüzenetek kiÃrása.\n"
+"\t--verbose, -v\t\tKimenet részletezettségének növelése.\n"
+"\t--terse, -t\t\tTömör kimenet gépi feldolgozásra.\n"
+"\t--table-style, -s\tTáblastÃlus (integer).\n"
+"\t--rug-compatible, -r\tRug-kompatibilitás engedélyezése.\n"
+"\t--non-interactive\tNe kérdezzen semmit, az alapértelmezett válaszokat használja automatikusan.\n"
+"\t--no-gpg-checks\t\tA GPG ellenÅrzési hibák figyelmen kÃvül hagyása és folytatás.\n"
+"\t--root, -R <dir>\tMűködés másik root könyvtárban.\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "Részletesség: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "Belépés a nem interaktÃv módba."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "Belépés a gpg ellenÅrzések kihagyása módba."
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "Ãrvénytelen táblázatstÃlus "
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "A súgóhoz használja a -h kapcsolót."
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1049,7 +1081,7 @@
" További információért nézze meg a 'man zypper' parancs kimenetét.\n"
" --debug-solver Hibakereséshez feloldási teszteset létrehozása.\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1071,7 +1103,7 @@
"-n, --name Feloldandó kiválasztása név és nem képesség szerint.\n"
" --debug-solver Hibakereséshez feloldási teszteset létrehozása.\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1085,7 +1117,7 @@
"\n"
"Ennek a parancsnak nincsenek további kapcsolói.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1107,7 +1139,7 @@
"-d, --disabled A szolgáltatás felvétele letiltottként\n"
"-n, --no-refresh Ne frissÃtse automatikusan a metaadatokat\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1123,7 +1155,7 @@
" Parancs kapcsolói:\n"
"-e, --export <FÃJL.repo> Minden megadott telepÃtési forrás kiexportálása egyetlen .repo fájlba\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1141,7 +1173,7 @@
" --loose-auth\tAz URL cÃmen található felhasználóhitelesÃtési adatok figyelmen kÃvül hagyása\n"
" --loose-query\tAz URL cÃmen található lekérdezés figyelmen kÃvül hagyása\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1155,7 +1187,7 @@
"\n"
"Ennek a parancsnak nincsenek további kapcsolói.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1177,7 +1209,7 @@
"-a, --enable-autorefresh A telepÃtési forrás automatikus frissÃtésének engedélyezése\n"
" --disable-autorefresh A telepÃtési forrás automatikus frissÃtésének letiltása\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1201,7 +1233,7 @@
"-B, --build-only Az adatbázis újraépÃtése a metaadat újboli letöltése nélkül.\n"
"-D, --download-only A metaadat letöltése az adatbázis újraépÃtése nélkül.\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1221,7 +1253,7 @@
"-r, --repo <álnév> Csak az álnévvel megadott telepÃtési forrás frissÃtéseinek listázása..\n"
" --best-effort A 'best effort' felhasználása a frissÃtéshez, amely elfogadja a legfrissebb verziónál régebbiek telepÃtését is.\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1251,7 +1283,7 @@
" --best-effort A 'best effort' felhasználása a frissÃtéshez, amely elfogadja a legfrissebb verziónál régebbiek telepÃtését is.\n"
" --debug-solver Hibakereséshez feloldási teszteset létrehozása.\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1294,7 +1326,7 @@
"\n"
"A * és ? helyettesÃtÅ karakterek is használhatók a keresÅkifejezésekben.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1312,7 +1344,7 @@
"\n"
"-r, --repo [álnév] Csak a megadott álnév telepÃtési forrásainak frissÃtéseit adja vissza.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1330,7 +1362,7 @@
"\n"
"-r, --repo <álnév> Csak a megadott álnév telepÃtési forrásainak frissÃtéseit adja vissza.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1348,7 +1380,7 @@
"\n"
"-r, --repo [álnév] Csak a megadott álnév telepÃtési forrásainak frissÃtéseit adja vissza.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1362,7 +1394,7 @@
"\n"
"Ez egy rug kompatibilitási álnév a 'zypper info -t patch' parancshoz\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1376,7 +1408,7 @@
"\n"
"Ehhez a parancshoz nincs más kapcsoló.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1392,24 +1424,24 @@
" Parancs kapcsolói::\n"
"-r, --repo <álnév> Csak a megadott álnév telepÃtési forrásainak frissÃtéseit adja vissza.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "Nem kapcsoló jellegű paraméterek: "
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "TelepÃtési forrás letiltva, csak a telepÃtett csomagok adatbázisát használja."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "TelepÃtett feloldhatók figyelmen kÃvül hagyása..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "Egy ZYpp tranzakció már folyamatban van. Ez azt jelenti, hogy egy másik futó alkalmazás már használja a libzypp csomagkezelÅ programkönyvtárat. A parancs használata elÅtt minden ilyen alkalmazást be kell zárni."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1419,105 +1451,105 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "A rendszer forrásainak módosÃtásához root jogosultság szükséges."
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "Kevés paraméter. Az URL és az álnév megadása szükséges."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "A megadott tÃpus nem érvényes telepÃtési forrástÃpus:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Az ismert telepÃtési forrás tÃpusainak listázásához használja a 'zypper -h addrepo' vagy a man zypper parancsot."
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "Szükséges paraméter hiányzik."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "A megadott álnév alapján nem található telepÃtési forrás, kÃsérlet a törlésre az URL alapján..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "A megadott álnéven vagy URL-en nem található telepÃtési forrás."
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "Az álnév megadása szükséges."
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "A rendszer telepÃtÅ forrásainak frissÃtéséhez root jogosultság szükséges."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "A csomagok telepÃtéséhez és eltávolÃtásához root jogosultság szükséges."
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Ismeretlen feloldható tÃpus: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Figyelem: Nincsenek források. Csak a telepÃtett feloldhatókkal lehet dolgozni. Semmi sem telepÃthetÅ."
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "Feloldási tesztesét létrehozása..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "A feloldási teszteset sikeresen létrejött."
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "A feloldási teszteset létrehozása sikertelen."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "A forráscsomag nevének megadása szükséges."
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "Ismeretlen feloldható tÃpus: "
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "Nem található feloldandó."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "A 'rug' futtatásával nem alkalmazható a 'best-effort'."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "A csomagok frissÃtéséhez root jogosultság szükséges."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "Váratlan kivétel."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "A zypper shell már fut."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "Küldjön errÅl egy hibajelentést."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "UtasÃtásokért tekintse meg a http://en.opensuse.org/Zypper#Troubleshooting oldalt."
@@ -1527,20 +1559,24 @@
msgstr "Ismeretlen parancs: '%s'"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "I/O hiba"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "Ãrvénytelen objektum"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "Hiba"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Tegye be a(z) [%s] # %d adathordozót és nyomja meg a folytatáshoz az 'i', a megszakÃtáshoz az 'n' billentyűt."
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "Letöltés: "
@@ -1620,11 +1656,11 @@
msgid "Installation of %s failed:"
msgstr "%s telepÃtése meghiúsult:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "Katalógus"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "TelepÃtési forrás"
Modified: trunk/zypper/po/it.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/it.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/it.po (original)
+++ trunk/zypper/po/it.po Tue Sep 11 10:57:42 2007
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
-"PO-Revision-Date: 2007-08-19 20:01+0100\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"PO-Revision-Date: 2007-09-06 19:40+0100\n"
"Last-Translator: Alberto Passalacqua <alberto.passalacqua(a)tin.it>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
"MIME-Version: 1.0\n"
@@ -56,15 +56,27 @@
#: ../src/zypper-keyring-callbacks.h:110
#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "Attenzione: Si sta ignorando il fallimento della verifica della firma per %s con ID della chiave pubblica %s, %s, impronta digitale %s! Verificare che ciò non sia causato da qualche alterazione pericolosa nel file!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "Attenzione: Si sta ignorando il fallimento della verifica della firma per %s con ID della chiave pubblica %s, %s, impronta digitale %s! "
-#: ../src/zypper-keyring-callbacks.h:119
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "Verificare che ciò non sia causato da qualche modifica dannosa del file!"
+
+#: ../src/zypper-keyring-callbacks.h:120
#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "Verifica della firma fallita per %s con ID della chiave pubblica %s, %s, impronta digitale %s. Attenzione: questo potrebbe essere causato da una modifica pericolosa del file. Procedere è rischioso! Continuare comunque?"
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Verifica del sommario fallita per %s con ID della chiave pubblica %s, %s, impronta digitale %s."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr "Attenzione: Questo potrebbe essere causato da una modifica dannosa nel file!"
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Procedere è rischioso! Procedere ugualmente?"
+
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "Nessun file di sommario per %s."
@@ -72,24 +84,24 @@
# internal key used: Ok
# internal key used: Ok
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133
-#: ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160
-#: ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136
+#: ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163
+#: ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "Continuare?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "Sommario sconosciuto %s per il file %s."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "Ignora verifica del sommario fallita per %s (Era atteso %s, è stato trovato %s)."
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Verifica del sommario fallita per %s. Era atteso %s, è stato trovato %s."
@@ -126,12 +138,11 @@
#. TranslatorExplanation These are reasons for various failures.
#: ../src/zypper-misc.cc:355
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Non trovato"
#: ../src/zypper-misc.cc:421
-#: ../src/zypper-misc.cc:493
msgid "Problem: "
msgstr "Problema:"
@@ -142,166 +153,167 @@
msgstr "Soluzione %d:"
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "numero, (r)iprova o (c)ancella>"
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "Applicazione della soluzione %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s Problemi:"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "La capacità specificata non è stata trovata"
-#: ../src/zypper-misc.cc:620
-#: ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621
+#: ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "Nessuna operazione da eseguire."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "Dimensione complessiva del download: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Dopo l'operazione, sarà utilizzato %s addizionale."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Dopo l'operazione saranno liberati %s."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "elementi %s bloccati"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "Definizione dello stato dei componenti aggregati"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "Risoluzione delle dipendenze in corsoâ¦"
# TLABEL modules/inst_config_x11.ycp:578
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d patch richieste (%d patch di sicurezza)"
-#: ../src/zypper-misc.cc:838
+#: ../src/zypper-misc.cc:840
#: ../src/zypper-info.cc:148
msgid "Installed"
msgstr "installato"
-#: ../src/zypper-misc.cc:838
+#: ../src/zypper-misc.cc:840
#: ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "disinstallato"
-#: ../src/zypper-misc.cc:840
+#: ../src/zypper-misc.cc:842
#: ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Non più applicabile"
-#: ../src/zypper-misc.cc:840
+#: ../src/zypper-misc.cc:842
#: ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Non applicabile"
-#: ../src/zypper-misc.cc:842
+#: ../src/zypper-misc.cc:844
#: ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Applicato"
-#: ../src/zypper-misc.cc:842
+#: ../src/zypper-misc.cc:844
#: ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Non necessario"
-#: ../src/zypper-misc.cc:844
+#: ../src/zypper-misc.cc:846
#: ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Danneggiato"
-#: ../src/zypper-misc.cc:844
+#: ../src/zypper-misc.cc:846
#: ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Necessario"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "errore"
-#: ../src/zypper-misc.cc:875
-#: ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144
+#: ../src/zypper-misc.cc:877
+#: ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146
#: ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Catalogo:"
-#: ../src/zypper-misc.cc:875
-#: ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144
+#: ../src/zypper-misc.cc:877
+#: ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146
#: ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Sorgente di installazione:"
-#: ../src/zypper-misc.cc:876
-#: ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150
-#: ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878
+#: ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152
+#: ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:299
msgid "Name"
msgstr "Nome"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876
-#: ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878
+#: ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154
+#: ../src/zypper-search.h:299
msgid "Version"
msgstr "Versione"
-#: ../src/zypper-misc.cc:876
-#: ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878
+#: ../src/zypper-misc.cc:998
msgid "Category"
msgstr "Categoria"
-#: ../src/zypper-misc.cc:876
-#: ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878
+#: ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Stato"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "Nessuna patch necessaria trovata."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -309,42 +321,52 @@
"AVVISO: questi aggiornamenti riguardano solo il programma di aggiornamento.\n"
"Sono tuttavia disponibili anche altri aggiornamenti.\n"
-#: ../src/zypper-misc.cc:1040
-#: ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042
+#: ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "Nessun aggiornamento trovato."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142
-#: ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144
+#: ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147
-#: ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149
+#: ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Pacchetto"
-#: ../src/zypper-misc.cc:1152
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154
+#: ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch."
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "AVVISO: %s è interattivo e verrà ignorato."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "commit"
+# TLABEL modules/inst_config_x11.ycp:578
+#: ../src/zypper-misc.cc:1390
+msgid "Problem downloading the package file from the repository:"
+msgstr "Si è verificato un problema scaricando il file del pacchetto dalla sorgente di installazione:"
+
#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "Per favore, vedere il messaggio di errore precedente per un suggerimento."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -360,421 +382,450 @@
" â utilizzare un altro supporto di installazione (se ad es. quello in uso è danneggiato)\n"
" â utilizzare unâaltra sorgente di installazione"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Una delle patch installate richiede di riavviare il computer. Riavviarlo il più presto possibile."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "ATTENZIONE: Una delle patch installate richiede di riavviare il computer. Riavviarlo il più presto possibile."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "ATTENZIONE: una delle patch installate riguarda il gestore pacchetti. Pertanto, è necessario riavviarlo prima di eseguire le operazioni successive."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Accetta automaticamente la licenza di %s %s."
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "%s %s licenza:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Per installare questo pacchetto, è necessario accettare i termini del contratto di licenza. Continuare?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Installazione interrotta a causa della necessità di conferma di una o più licenze."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Per favore, riavviare l'operazione in modalità interattiva e conferma l'accettazione delle licenze richieste, oppure usa l'opzione --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Interruzione dellâinstallazione a causa di un disaccordo dellâutente con la licenza %s %s."
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "Installazione dei pacchetti sorgente %s-%s"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Il pacchetto sorgente %s-%s è stato installato con successo."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Si è verificato un problema durante l'installazione del pacchetto sorgente %s-%s:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "Pacchetto sorgente '%s' non trovato."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "Verifico se è necessario aggiornare i metadati per %s"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "Aggiornamento di '%s'"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(forzato)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "La sorgente di installazione '%s' è aggiornata."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "Aggiornamento forzato dei metadati"
# TLABEL modules/inst_config_x11.ycp:578
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "Si è verificato un problema scaricando i dati da '%s'."
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "Per favore, vedere il messaggio di errore precedente per un suggerimento."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "Nessun URL definito per '%s'."
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "Per favore, aggiungere una o più voci di URL di base (baseurl=URL) a %s per la sorgente di installazione '%s'."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "Nessun alias definito per questa sorgente di installazione."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "La sorgente di installazione '%s' non è valida."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "Per favore, verificare se gli URL definiti per questa sorgente di installazione puntano ad una sorgente di installazione valida."
# TLABEL modules/inst_config_x11.ycp:578
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "Si è verificato un errore scaricando i metadati per '%s'"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "Costruzione forzata della cache della sorgente di installazione"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "Errore nell'analisi dei metadati per '%s':"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "Questo può essere causato da metadati non validi nella sorgente di installazione, o da un errore nel parser dei metadati. In quest'ultimo caso, o se non si è certi, riportare un bug seguendo le istruzioni riportate in http://en.opensuse.org/Zypper#Troubleshooting"
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "Metadati della sorgente di installazione per '%s' non trovati nella cache locale."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "Errore durante la costruzione della cache del database:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "La sorgente di installazione '%s' non è stata trovata."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "Si è verificato un errore durante la lettura del file di descrizione della sorgente di installazione '%s':"
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "Ragione:"
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "Esclusione della sorgente di installazione '%s' a causa dell'errore precedente."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "La sorgente di installazione '%s' non è aggiornata. E' possibile eseguire 'zypper refresh' da root per aggiornarlo."
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309
-#: ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "abilitato"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "Attualizza"
-
-#: ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "Tipo"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "Attiva"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "Disabilitato"
-#: ../src/zypper-sources.cc:331
-#: ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681
-#: ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357
+#: ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "abilitato"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "Attualizza"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "Alias"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373
+#: ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730
+#: ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160
#: ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Sì"
-#: ../src/zypper-sources.cc:331
-#: ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373
+#: ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730
+#: ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160
#: ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "No"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "Nessuna sorgente di installazione è stata definita. Usare 'zypper addrepo' per aggiungere una o più sorgenti di installazione"
-#: ../src/zypper-sources.cc:383
-#: ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424
+#: ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "Errore durante la lettura delle sorgenti di installazione:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "Impossibile aprire %s in scrittura. E' possibile che non abbiate i permessi necessari."
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "Le sorgenti di installazione sono state esportate con successo in %s."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "Esclusione delle sorgenti di installazione disabilitate '%s'"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "Esclusione della sorgente di installazione '%s' a causa dell'errore precedente."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "Sorgente di installazione '%s' non trovata tramite l'alias o il numero."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "Usare 'zypper repos' per ottenere una lista delle sorgenti di installazione."
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "Le sorgenti di installazione specificate non sono abilitato o non sono definite."
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "Non esistono sorgenti di installazione abilitate definite."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "Usare 'zypper addrepo' o 'zypper modifyrepo' per aggiungere o abilitare le sorgenti di installazione."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "Impossibile aggiornare le sorgenti di installazione a causa di un errore."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "Alcune sorgenti di installazione non sono state aggiornate a causa di un errore."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "Le sorgenti di installazione specificate sono state aggiornate."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "Tutte le sorgenti di installazione sono state aggiornate."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "Questo è un supporto a sola lettura (CD/DVD), aggiornamento disabilitato."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "Esiste già una sorgente di installazione di nome '%s'. Per favore, usare un'altro alias."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "Impossibile trovare una sorgente di installazione valida nella posizione specificate:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "Impossibile determinare il tipo della sorgente di installazione. Per favore, verificare che l'URL definita (vedi sotto) punti ad una sorgente di installazione valida:"
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "Si è verificato un problema trasferendo i dati della sorgente di installazione dall'URL specificato:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "Per favore, verificare che l'URL specificato sia accessibile."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "Si è verificato un problema sconosciuto durante l'aggiunta della sorgente di installazione:"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "La sorgente di installazione '%s' è stata aggiunta con successo"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "Aggiorna automaticamente"
# TLABEL modules/inst_config_x11.ycp:578
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "Lettura dei dati dal supporto '%s'"
# TLABEL modules/inst_config_x11.ycp:578
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "Si è verificato un problema leggendo i dati dal supporto '%s'"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "Per favore, verificare che il vostro supporto di installazione sia valido e leggibile."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+msgid "Problem accessing the file at the specified URL"
+msgstr "Si è verificato un problema accedendo al file all'URL specificato"
+
+#: ../src/zypper-sources.cc:796
+msgid "Please check if the URL is valid and accessible."
+msgstr "Per favore, verificare che l'URL specificato sia valido e accessibile."
+
+#: ../src/zypper-sources.cc:803
+msgid "Problem parsing the file at the specified URL"
+msgstr "Si è verificato un problema durante l'esame del file all'URL specificato"
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr "E' un file .repo? Vedere http://en.opensuse.org/Standards/RepoInfo per ulteriori informazioni."
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr "Si è verificato in problema mentre si tentava di leggere il file all'URL specificato"
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "La sorgente di installazione '%s' è stata rimossa."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "Repository %s rinominato come %s"
-#: ../src/zypper-sources.cc:849
-#: ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927
+#: ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "La sorgente di installazione '%s' non è stata trovata."
-#: ../src/zypper-sources.cc:854
-#: ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932
+#: ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "errore durante la modifica della sorgente di installazione:"
-#: ../src/zypper-sources.cc:856
-#: ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934
+#: ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "La sorgente di installazione %s non sarà modificato."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s usato assieme a %s è contraddittorio. Questa proprietà sarà lasciata immutata."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "La sorgente di installazione %s è stata modificata correttamente."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "Recupero dei dati della sorgente di installazione %s..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "Il repository '%s' non ha la cache. Creazione cache..."
# TLABEL modules/inst_config_x11.ycp:578
-#: ../src/zypper-sources.cc:983
-#: ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061
+#: ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "Si è verificato un problema leggendo i dati da '%s'"
-#: ../src/zypper-sources.cc:984
-#: ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062
+#: ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "Risolubili da '%s' non caricati a causa di un errore."
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(%d risolubili trovati)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "Provare con 'zypper refresh', o rimuovere /var/cache/zypp/zypp.db prima di fare ciò."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "Lettura del database RPM..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s resolubili)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -810,45 +861,24 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "Risposta non valida. Scegliere una lettera tra a, r, oppure i."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148
-#: ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "y"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152
-#: ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "S"
+#: ../src/zypper-callbacks.cc:130
+#: ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "sì"
+
+#: ../src/zypper-callbacks.cc:130
+#: ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "no"
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156
-#: ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160
-#: ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
-
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "Risposta '%s' non valida, inserire '%s' oppure '%s':"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr "Risposta non valida '%s'. Inserire 'y' per '%s' o 'n' per '%s' se null'altro funziona"
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -959,65 +989,39 @@
msgid "Requires:"
msgstr "Richiede:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "Nessuna sorgente di installazione configurata. Per favore aggiungere almeno una sorgente di installazione usando 'zypper addrepo' prima di usare la ricerca."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "Memorizzazione preliminare nella cache in corso dei risolvibili installati corrispondente ai criteri di ricerca specificatiâ¦"
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr "obsoleto ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "memorizzato nella cache."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr "non è unâespressione regolare valida: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "Questo è un bug. Compilare un rapporto relativo ai bug in zypper."
-#: ../src/zypper.cc:73
-#: ../src/zypper.cc:887
+#: ../src/zypper.cc:76
+#: ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "L'URL fornito non è valido."
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" Opzioni:\n"
-"\t--help, -h\t\tAiuto.\n"
-"\t--version, -V\t\tRestituisce il numero della versione.\n"
-"\t--quiet, -q\t\tElimina l'output convenzionale e stampa solo i messaggi di errore.\n"
-"\t--verbose, -v\t\tAumenta il livello di dettaglio dell'output.\n"
-"\t--terse, -t\t\tVisualizzazione concisa per l'utilizzo da parte della macchina (opposto a verbose).\n"
-"\t--table-style, -s\tStile tabella (interi).\n"
-"\t--rug-compatible, -r\tAttiva la compatibilità con rug.\n"
-"\t--non-interactive\tNon pone domande. Utilizza sempre le risposte predefinite.\n"
-"\t--no-gpg-checks\t\tIngnora fallimenti GPG e continua.\n"
-"\t--root, -R <dir>\tLavora su una diversa directory radice.\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -1058,28 +1062,54 @@
"\tpatch-info\t\tMostra informazioni complete sulle patch\n"
"\tsource-install, si\tInstalla un pacchetto sorgente\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" Opzioni:\n"
+"\t--help, -h\t\tAiuto.\n"
+"\t--version, -V\t\tRestituisce il numero della versione.\n"
+"\t--quiet, -q\t\tElimina l'output convenzionale e stampa solo i messaggi di errore.\n"
+"\t--verbose, -v\t\tAumenta il livello di dettaglio dell'output.\n"
+"\t--terse, -t\t\tVisualizzazione concisa per l'utilizzo da parte della macchina (opposto a verbose).\n"
+"\t--table-style, -s\tStile tabella (interi).\n"
+"\t--rug-compatible, -r\tAttiva la compatibilità con rug.\n"
+"\t--non-interactive\tNon pone domande. Utilizza sempre le risposte predefinite.\n"
+"\t--no-gpg-checks\t\tIngnora fallimenti GPG e continua.\n"
+"\t--root, -R <dir>\tLavora su una diversa directory radice.\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "Livello di dettaglio: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "Attivazione modalità non interattiva."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "Attivazione modalita senza verifica GPG."
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "Stile tabella non valido"
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "Provare a immettere -h per la guida"
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1105,7 +1135,7 @@
" Vedere 'man zypper' per ulteriori dettagli.\n"
" --debug-solver Crea un caso di prova per il risolutore\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1127,7 +1157,7 @@
"-n, --name Seleziona i risolubili per nome, non per capacità .\n"
" --debug-solver Crea caso di prova per il debug del risolutore\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1141,7 +1171,7 @@
"\n"
"Questo comando non offre opzioni aggiuntive.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1163,7 +1193,7 @@
"-d, --disabled Aggiunge la sorgente di installazione come disabilitato\n"
"-n, --no-refresh Aggiunge la sorgente di installazione con l'aggiornamento automatico disabilitato \n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1179,7 +1209,7 @@
" Opzioni del comando:\n"
"-e, --export <FILE.repo> Esporta le sorgenti di installazione definite in un singolo file .repo locale\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1196,7 +1226,7 @@
" --loose-auth\tIgnora dati di autenticazione dell'utente nell'URL\n"
" --loose-query\tIgnora stringhe di query nell'URL\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1210,7 +1240,7 @@
"\n"
"Questo comando non ha opzioni aggiuntive.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1232,7 +1262,7 @@
"-a, --enable-autorefresh Abilita aggiornamento automatico della sorgente di installazione\n"
" --disable-autorefresh Disabilita aggiornamento automatico della sorgente di installazione\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1256,7 +1286,7 @@
"-B, --build-only Costruisce il database senza scaricare i metadati\n"
"-D, --download-only Scarica solo i metadati senza costruire il database\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1276,7 +1306,7 @@
"-r, --repo <alias> Elenca solo gli aggiornamento dal repository specificato con l'alias.\n"
" --best-effort Usa l'approccio 'best effort' per aggiornare. Gli aggiornamenti a versioni meno recenti sono anche accettabili.\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1306,7 +1336,7 @@
" --best-effort Usa l'approccio 'best effort' per aggiornare. Aggiornamenti con una versione inferiore sono anche accettabili.\n"
" --debug-solver Crea un caso di prova per il debug del risolutore.\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1350,7 +1380,7 @@
" \n"
" Nelle stringhe di ricerca è possibile utilizzare i caratteri jolly * e ?.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1368,7 +1398,7 @@
"\n"
"-r, --repo <alias> Verifica gli aggiornamenti solo nelle sorgenti di installazione specificate dall'alias.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1386,7 +1416,7 @@
"\n"
"-r, --repo <alias> Verifica gli aggiornamenti solo nelle sorgenti di installazione specificate dall'alias.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1402,7 +1432,7 @@
"\n"
"-r, --repo <alias> Lavora solo con le sorgenti di installazione specificate dall'alias.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1416,7 +1446,7 @@
"\n"
"Questo è un alias di 'zipper info -t patch' per la compatibilità con rug.\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1430,7 +1460,7 @@
"\n"
"Questo comando non ha opzioni aggiuntive.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1446,24 +1476,24 @@
" Opzioni del comando:\n"
"-r, --repo <alias> Lavora solo con gli aggiornamenti dalle sorgenti di installazione specificate dall'alias.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "Argomenti del programma senza opzioni:"
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "Sorgente di installazione disabilitata, sarà utilizzato solo il database dei pacchetti installati."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "Tralasciamento dei risolvibili installati in corso..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "Una transazione Zypp è già in corso. Ciò significa che c'è un'altra applicazione in esecuzione che sta usando la libreria libzypp per la gestione dei pacchetti. Tutte queste applicazioni devono essere chiuse prima di usare questo comando."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1496,114 +1526,114 @@
" #@@@@@@@@# \n"
" +@@@@#` "
-#: ../src/zypper.cc:783
-#: ../src/zypper.cc:861
-#: ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795
+#: ../src/zypper.cc:873
+#: ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "Per modificare le sorgenti di installazione del sistema sono necessari i privilegi di utente root."
-#: ../src/zypper.cc:810
-#: ../src/zypper.cc:938
+#: ../src/zypper.cc:822
+#: ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "Troppi pochi argomento. E' necessario inserire almeno l'URL e l'alias."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "Il tipo specificato non è un tipo valido di sorgente di installazione:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Vedere 'zypper -h addrepo' o 'man zypper' per ottenere una lista dei tipi conosciuti di sorgente di installazione."
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "Mancano degli argomenti richiesti."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Sorgente di installazione non trovata tramite l'alias, tentativo di rimozione in corso tramite URL..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "Sorgente di installazione non trovata tramite l'alias o l'URL."
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "L'alias è un argomento richiesto."
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "Per aggiornare le sorgenti di installazione del sistema sono necessari i privilegi dell'utente root."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Per visualizzare le origini del sistema sono necessari i privilegi dell'utente root."
-#: ../src/zypper.cc:1051
-#: ../src/zypper.cc:1259
-#: ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063
+#: ../src/zypper.cc:1282
+#: ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Tipo di risolubile sconosciuto: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Attenzione: Nessuna sorgente di installazione definita. Si opererà solo con i risolubili installati. Nulla potrà essere installato."
-#: ../src/zypper.cc:1089
-#: ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101
+#: ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "Generazione del caso di prova del risolutore..."
-#: ../src/zypper.cc:1091
-#: ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103
+#: ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "Generazione del caso di prova del risolutore avvenuta con successo."
-#: ../src/zypper.cc:1094
-#: ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106
+#: ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "Errore durante la creazione del caso di prova per il risolutore."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "Il nome del pacchetto sorgente è richiesto come parametro."
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "Tipo di risolvibile sconosciuto"
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "Nessun risolubile trovato."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269
-#: ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292
+#: ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Esecuzione in emulazione 'rug', impossibile utilizzare il metodo 'best-effort' per l'aggiornamento."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "Per aggiornare i pacchetti sono necessari i privilegi dell'utente root."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "Eccezione imprevista."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "Zypper è già in esecuzione in una shell."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "Inoltrare una segnalazione su questo bug."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "Per ulteriori istruzioni, vedere http://en.opensuse.org/Zypper#Troubleshooting."
@@ -1613,21 +1643,25 @@
msgstr "Comando sconosciuto '%s'"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "Errore I/O"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "Oggetto non valido"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "Errore"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Per favore, inserire il supporto [%s] # %d e premere 's' per continuare o 'n' per annullare l'operazione."
-#: ../src/zypper-media-callbacks.h:63
-#: ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76
+#: ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "Download:"
@@ -1711,14 +1745,26 @@
msgid "Installation of %s failed:"
msgstr "Installazione di %s fallita:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "Catalogo"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "Sorgente di installazione"
+#~ msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+#~ msgstr "Verifica della firma fallita per %s con ID della chiave pubblica %s, %s, impronta digitale %s. Attenzione: questo potrebbe essere causato da una modifica pericolosa del file. Procedere è rischioso! Continuare comunque?"
+#~ msgid "y"
+#~ msgstr "y"
+#~ msgid "Y"
+#~ msgstr "S"
+#~ msgid "n"
+#~ msgstr "n"
+#~ msgid "N"
+#~ msgstr "N"
+#~ msgid "Invalid answer '%s', enter '%s' or '%s':"
+#~ msgstr "Risposta '%s' non valida, inserire '%s' oppure '%s':"
#~ msgid "Summary:"
#~ msgstr "Riepilogo:"
@@ -1953,8 +1999,6 @@
#, fuzzy
#~ msgid "Cleaning cache..."
#~ msgstr "Inizializzazione cache..."
-#~ msgid "Continuing anyway"
-#~ msgstr "Lâesecuzione continuerà ugualmente"
#~ msgid "removing source "
#~ msgstr "rimozione dellâorigine"
#~ msgid "URL is invalid: "
Modified: trunk/zypper/po/km.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/km.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/km.po (original)
+++ trunk/zypper/po/km.po Tue Sep 11 10:57:42 2007
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: zypper.km\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
-"PO-Revision-Date: 2007-08-21 10:52+0700\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"PO-Revision-Date: 2007-09-07 08:58+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n"
"Language-Team: Khmer <support(a)khmeros.info>\n"
"MIME-Version: 1.0\n"
@@ -56,36 +56,48 @@
#: ../src/zypper-keyring-callbacks.h:110
#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "áá¶áâááááá¶á á áá·áâá¢á¾áá¾âáá¶áâááááááááá¶ááâá ááááááá¶âáááâáá¶áâááá¶áááâááááá¶áá %s áá¶âáá½áâáá¹áâáááááááá¶ááâááâáá¶áá¶ááá %s, %s áááá¶ááááá¶ááá %s ! áá·áá·áááâááááááââ áá¶âáá·áâáááá¼áâáá¶âáâááááá¶áâáááâáá¶âááááá¶áááááá¼áâáá·áâáááá¹ááááá¼áâáá
âáááá»áâá¯ááá¶áâáá !"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "áá¶áâááááá¶á á áá·áâá¢á¾áá¾âáá¶áâááááááááá¶ááâá ááááááá¶âáááâáá¶áâááá¶áááâááááá¶áá %s áá¶âáá½áâáá¹áâáááááááá¶ááâááâáá¶áá¶ááá %s, %s áááá¶áâáááá¶áâáá %s !"
-#: ../src/zypper-keyring-callbacks.h:119
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "áá¶áâáá·áá·áááâáááááá áá¶âáá·áâááááá¶áâáááá¸âáá¶áâáááá¶áááááá¼áâáááâáááááâáá
âáááá»áâá¯ááá¶á !"
+
+#: ../src/zypper-keyring-callbacks.h:120
#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "áá¶áâááááááááá¶ááâáá¶áâááá¶áááâááááá¶áá %s áá¶âáá½ááááâááááá¶ááâááâáá¶áá¶ááá %s, %s, áááá¶áâáááá¶ááá %s á áá¶áâááááá¶á á áá¶âá¢á¶á
âááááá¶áâááâáá¸âáá¶áâáááá¶áááááá¼áâáá·áâááá¢âáá
âáááá»áâá¯ááá¶á ! á¢ááá
á¹áâááááâáá ?"
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "áá¶áâááááááááá¶ááâáá¶áâáááá¹ááááá¼áââá ááááááá¶ââáá¶áâááá¶áááâááááá¶áá %s áá¶âáá½áâáááâááááá¶ááâááâáá¶áá¶ááá %s, %s, áááá¶áâáááá¶ááá %s á"
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr "áá¶áâááááá¶á á áá¶âá¢á¶á
âááááá¶áâááâáá¸âáá¶áâáááá¶áááááá¼áâáááâáááááâáá
âáááá»áâá¯ááá¶á !"
+
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
+msgstr "ááááâáááâááááááááá¶áá ! áá¾âá¢ááá
á¹áâááááâá¬áá ?"
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "áááá¶áâá¢áááááâááááááâááááá¶ááâá¯ááá¶á %s á"
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "áááá ?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "áá·áâáááá¶ááâá¢áááááâááááááâ %s ááááá¶ááâá¯ááá¶á %s á"
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "áá·áâá¢á¾áá¾âáá¶áâááááááááá¶ááâá¢áááááâááááááâááááá¶áá %s (áááá¹áâáá»á %s ááâáá¾á %s) á"
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "áá¶áâááááááááá¶ááâáá¶áâáááá¹ááááá¼áââá¢áááááâááááááâáá¶áâááá¶áááâááááá¶áá %s á %s áááâáááá¹áâáá»á ááâáá¾á %s á"
@@ -121,11 +133,11 @@
msgstr "áá¶áâááá¶áááâáááá»áâáá¶âááááááá '%s' áá
âáá¶ááâááááá¸âááááâáááá
ááâáááâáááá¼áâááâá
áá á"
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "ááâáá·ááá¾á"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "áááá á¶Â á "
@@ -136,146 +148,146 @@
msgstr " ááááááááá¶á %d á "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "ááá áááá¶áá¶(á)âááááááá á¬âááá(á)áá> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "á"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "á"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "áááá»áâá¢áá»ááááâááááááááá¶á %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s áááá á¶Â á"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "ááâáá·áááâáá¶áâáááááá¶âáááâáá¶áâááááá¶áá"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "áááá¶áâá¢ááá¸âáááá¼áâáááá¾Â á"
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "ááá áâáá¶áááâááá»á á %s á"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "ááááá¶ááâáá¸âááááá·ááááá·áá¶á %s ááááááâáá¹áâáááá¼áâáá¶áâáááá¾Â á"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "ááááá¶ááâáá¸âááááá·ááááá·áá¶á %s áá¹áâááááá á"
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "áá¶áá» %s áá¶áááá"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "ááááá¾áâáááá¶ááá¶áâááâáá¶áâáááá»á"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "áááá»áâááááááá¶áâáá¶áâá¢á¶ááááá..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "áááá¼áâáá¶áâáááá %d (%d ááááâáá»ááááá·áá¶á)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "áá¶áâááá¡á¾á"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "áá¶áâáá»á"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "áá·áá¢áá»ááááâáá¶áâáááâáá"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "áá·áâá¢áá»ááááâáá¶á"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "áá¶áâá¢áá»áááá"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "áá·áâáááá¼ááá¶á"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "áá¼á
"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "áááá¼ááá¶á"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "ááá á»á"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "áá¶áá¶á¡á»á á "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "áááá¶áá á "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "ááááá"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "áááá"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "áááááá"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "áááá¶ááá¶á"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "ááâáá·áâáá¾áâááááâáááâáááá¼ááá¶á á"
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -283,38 +295,46 @@
"ááááá¶á á áá¶áááááâáá¶âáá¶áâáá¶áááááâáááâááááá¶ááâáááâááááâáá·áá¸âáááá¾á²ááâáá¶ááááááâáááá½ááá¶Â á\n"
"áááá¶áâáá¶áâáá¶áááááâááááááááâááááá á\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "ááâáá·áâáá¾áâáá¶áâáá¶ááâáááá á"
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "á"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "áá¶á
á"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "áááá¶áááááááá"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "ááááá¶á á %s ááºâáá¶âá¢ááááááááá áá¶áâáááá á"
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "áá¶ááâáááá¾"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+msgid "Problem downloading the package file from the repository:"
+msgstr "áááá á¶âáááá»áâáá¶áâáá¶áâááâá¯ááá¶áâáááá
ááâáá¸âáááá¶áá á"
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "áá¼áâ áá¾áâáá¶áâááá á»áâáá¶áâáá¾â ááááá¶ááâáá¶âáááá½á á"
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -330,402 +350,431 @@
"- áááá¾âá§áááááâáááá»áâááá¡á¾áâááááá (á§. ááááá·áâáá¾âáá¶âáá¼á
)\n"
"- áááá¾âáááá¶ááâááááá"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "ááááâáá½áâáááá»áâá
ááááâááááâáááâáá¶áâááá¡á¾á âááááá¼áâá²ááâá
á¶áááááá¾áâááá¶ááá¸áâááááâá¢áááâá¡á¾áâáá·á á áá¼áâáááá¾âáá¶âá²ááâáá¶áâáá¶ááâáá¶áâáááá¢á¶á
âáááá¾âáá¶á á"
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "áá¶áááááá¶á á ááááâáá½áâáááá»áâá
ááááâááááâáááâáá¶áâááá¡á¾á ááááá¼áâá²ááâá
á¶áááááá¾áâááá¶ááá¸áâááááâá¢áááâá¡á¾áâáá·á á áá¼áâáááá¾âáá¶âá²ááâáá¶áâáá¶ááâáá¶áâáááâá¢á¶á
âáááá¾âáá
âáá¶á á"
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "áá¶áâááááá¶á á ááááâáá½áâáááá»áâá
ááááâááááâáááâáá¶áâááá¡á¾áâááááá¶ááâáááááá·áá¸âáááááááááâáááá
ááâáááá½áâá¯á áá¼á
ááááâáá¶âááááá¼áâá²ááâá
á¶áááááá¾áâá¡á¾áâáá·á áá»áâáááâáá·áá·áááâááááá·ááááá·âááááááâáá¶âáá½á á"
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "áááâááááâáá¶âá¢á¶áááá¶ááááâ %s %s áááâáááááâáááááááá·Â á"
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "á¢á¶áááá¶áááá %s %s á"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "áá¾áááá¸âááá¡á¾áâáááá
ááâááá á¢áááâáááá¼áâááâáááááááâáá¹áâááááááááâááááâá¢á¶áááá¶ááááâáá¶ááá¾Â á áááá ?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "ááááááâáá¶áâááá¡á¾á áááâáá¶áâááâáááá¼áâáá¶áâáá¶áâá¢áá¢á¶áâá¢á¶áááá¶áááá á"
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "áá¼áââá
á¶áááááá¾áâááááá·ááááá·áá¶áâá¡á¾áââáá·áâáá
âáááá»áâááááâá¢áááááááá á á¾áá¢áá¢á¶áâáá·á
áá
áááááááááâááááâá¢áááâáá¶âáá½áâá¢á¶áááá¶ááááâáááâáááá¼áâáá¶á á¬âáááá¾áááááá¾á --auto-agree-with-licenses á"
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "ááááááâáá¶áâááá¡á¾á áááâáá¶áâááâáá¶áâáá·áâáááááááááâááááâá¢áááâáááá¾âáá¶âáá½áâá¢á¶áááá¶áááá %s %s á"
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "ááá¡á¾áâáááá
ááâááááá %s-%s"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "áá¶áâááá¡á¾áâáááá
ááâááááá %s-%s áááâáááááá á"
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "áááá á¶âáááá»áâáá¶áâááá¡á¾áâáááá
ááâááááá %s-%s á"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "ááâáá·áââáá¾áâáááá
ááâááááá '%s'Â á"
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "áá·áá·áááâáá¾áâáá¶áá¾âáááá¼áâáááá¾âá²ááâáá·ááááááâáááá¶áááááâááááá¶áá %s"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "áááá¾á²áá '%s' ááááá"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(áá¶áâááááá)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "áááá¶áá '%s' áá¶áááááá á"
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "áááááâáááá¾âá²ááâáá·ááááááâáááá¶âáá¾áâááááá"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "áááá á¶âáááá»áâáá¶áâáá¶áááâá¯ááá¶áâáḠ'%s' á"
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "áá¼áâ áá¾áâáá¶áâááá á»áâáá¶áâáá¾â ááááá¶ááâáá¶âáááá½á á"
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "áááá¶á URLs áá¶áâáááááâááááá¶áá '%s' á"
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "áá¼á áááááá URL áá¼ááááá¶áâáá½á á¬âá
ááá¾á áá¶áá» (baseurl=URL) áá
%s ááááá¶ááâáááá¶áá '%s' á"
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "áááá¶áâáááááâááááááááá¶áâáá¶áâáááááâáááá»áâáááá¶ááâááá á"
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "áááá¶áá '%s' áá·áâáááá¹ááááá¼á á"
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "áá¼áâ áá·áá·áááâáá¾áâáá¶áá¾â URLs áá¶áâáááááâááááá¶ááâáááá¶ááâáááâá¬á¢áá á á¾áâá
ááá¢á»áâáá
âáááá¶ááââáááá¹ááááá¼áâá¬âá¢áá á"
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "ááá á»áâáááá»áâáá¶áâáá¶áááâáá·ááááááâáááá¶âááááá¶áá '%s' á"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "áááááâáááá¶ááá¶âáááá¶ááâááááá¶ááâáááá¶áá"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "ááá á»áâáááá»áâáá¶áâáááâáá·ááááááâáááá¶âááááá¶áá '%s' á"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "áá¶âá¢á¶á
âááááá¶áâááâáá¸âáá·ááááááâáááá¶âáá·áâáááá¹ááááá¼áâáá
âáááá»áâáááá¶áá á¬âáááâááá á»áâáá
âáááá»áâá§áááááâáááâáá·ááááááâáááá¶Â á áááá»áâáááá¸ââáá¾áâááááá ááááá·áâáá¾âáá¶áâá
ááááá áá¼áâáááá¾âááá á»áâáááâáá¶ááá¶áááâááá
áááá¸âáááá¶áâáá¼á
âáá¶áâáááááâáá
http://en.opensuse.org/Zypper#Troubleshooting"
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "ááâáá·áâáá¾áâáá·ááááááâáááá¶âáááá¶ááâááááá¶áá '%s' áá
âáááá»áâáááá¶ááâááááá¶ááâáá¼ááááá¶á á"
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "ááá á»áâáááá»áâáá¶áâáááá¶ááá¶âáá¼ááááá¶áâáá·ááááááâáááá¶ááâááááá¶áá á"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "ááâáá·áâáá¾áâáááá¶áá '%s' á"
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "ááá á»áâáááá»áâá¢á¶áâá¯ááá¶áâáá·ááááá¶âáááá¶ááááááá¶áá '%s' á"
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "áá¼áá ááá»Â á "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "áá·áâáááá¶áá '%s' ááááá¶áâááâááá á»áâáá¶áâáá¾Â á"
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "áááá¶áá '%s' áá»áâááááá á á¢áááâá¢á¶á
âááá 'zypper refresh' áá¶â root áá¾áááá¸âáááá¾âá²ááâáá¶âáá¶áááááá á"
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "á¢áá»áááá¶á"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "áááá¾âá²ááâááááá"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "áááááá"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "ááááá"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "áá·á"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "á¢áá»áááá¶á"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "áááá¾âá²ááâááááá"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "áááááâááááááááá¶á"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "áá¶á/á
á¶á"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "áá"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "áááá¶áâáááá¶ááâáá¶áâááááá á áááá¾âáá¶áááâááááᶠ'zypper addrepo' áá¾áááá¸âááááááâáááá¶ááâáá½á á¬âá
ááá¾á á"
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "ááá á»áâááááááâá¢á¶áâáááá¶áá á"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "áá·áâá¢á¶á
âáá¾á %s áá¾áááá¸âááááá á á¢áááâáááá ááâáá¶âáááá¶áâáá·áááá·âááááá ?"
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "áááá¶ááâáááá¼áâáá¶áâáá¶áá
ááâáááâáááááááá
%s á"
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "áááá»áâááááâáááá¶áá '%s' áááâáá¶áâáá·á"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "ááááâáááá¶áá '%s' áááâáá¶áâááâááá á»áâáá¶áâáá¾Â á"
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "ááâáá·ááá¾áâáááá¶áá '%s' áá¶áâáááááâááááááááá¶áâ á¬âááá á"
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "áááá¾ 'zypper repos' áá¾áááá¸âááá½áâááááá¸âáááááááá¶ááâáááâáá¶áâááááá á"
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "áááá¶ááâáááâáá¶áâááááá¶ááâáá·áâá¢á¶á
âáááá¼áâáá¶áâáá¾á ááááá á"
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "áá·áâáá¶áâáááááâáááá¶ááâáááâáá¶áâáá¾áâ á"
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "áááá¾âáá¶áááâááááᶠ'zypper addrepo' ᬠ'zypper modifyrepo' áá¾áááá¸âáááááá á¬âáá¾áâáááá¶áá á"
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "áá·áâá¢á¶á
âáááá¾âá²ááâáááá¶ááâáááááâáááâáá¶áâááâáá¶áâááá á»á á"
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "áááá¶ááâáá½áâá
ááá½áâáá·áâáááá¼áâáá¶áââáááá¾âá²ááâáááááâáá áááâáá¶áâááâáá¶áâááá á»á á"
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "áááá¶ááâáááâáá¶áâááááá¶ááâáááá¼áâáá¶áâáááá¾âá²ááâááááá á"
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "áááá¶ááâáá¶ááâá¢ááâáááá¼áâáá¶áâáááá¾âá²ááâááááá á"
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "áááâáá¶âááááâáááâáá¶áááâá¢á¶áâáááâá¢á¶á
âáááá¶áááááá¼áâáá¶á (ááá¸áá¸/áá¸áá¸áá¸) áá¶âááá·áâáááá¾âá²ááâáááááâáááááâáááááááá·Â á"
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "áá¶áâáááá¶ááâáááâáá¶áâááááá '%s' áá½á
âá á¾á á áá¼áâáááá¾âáááááâááááááááá¶áâáááááâáá½áâááá á"
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "áá·áâá¢á¶á
âááâáááá¶ááâáááâáááá¹ááááá¼áâáá
âáá¸áá¶ááâáááâáá¶áááááá á"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "áá·áâá¢á¶á
âáááááâááááááâáááá¶áá á áá¼áâáá·áá·áááâáá¶âáá¾âáá¶âáá¶áâáááááâá
ááá»á
URLs (áá¾áâáá¶áâááááá) áá
âáááá¶ááâáááâáááá¹ááááá¼á á"
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "áááá á¶âáááá»áâáá¶áâáááááâáá·ááááááâáááá¶ááâáá¸â URL áááâáá¶áâááááá¶áá á"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "áá¼áâáá·áá·áááâáá¶áá¾ URL áááâáá¶áâááááá¶ááâá¢á¶á
âá
á¼áâáááá¾ááá¶áâáá¶áá¬âááâá¢áá á"
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "áá¶áâáááá á¶âáááâáá·áâáááá¶áá áá
âáááâááááááâáááá¶áá á"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "áá¶áâááááááâáááá¶áá '%s' áááâáááááá"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "áááá¾âá²ááâáááááâáááâáááááâáááááááá·"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "á¢á¶áâáá·ááááááâáá¸âáááá '%s'"
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "áááá á¶âáááá»áâáá¶áâá¢á¶áâáá·ááááááâáá¸âáááá '%s'"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "áá¼áâáá·áá·áááâáá¾áâáᶠááááâááá¡á¾áâááááâá¢áááâáááá¹ááááá¼á áá·áâá¢á¶á
âá¢á¶áâáá¶áá¬áá á"
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+msgid "Problem accessing the file at the specified URL"
+msgstr "áááá á¶âáááá»áâáá¶áâá
á¼áâáááá¾ááá¶áâá¯ááá¶áâáá¶áâ URL áááâáá¶áâááááá¶áá"
+
+#: ../src/zypper-sources.cc:796
+msgid "Please check if the URL is valid and accessible."
+msgstr "áá¼áâáá·áá·áááâáá¾áâáá¶áá¾ URL áááá¹ááááá¼á áá·áâá¢á¶á
âá
á¼áâáááá¾ááá¶áâáá¶áâá¬áá á"
+
+#: ../src/zypper-sources.cc:803
+msgid "Problem parsing the file at the specified URL"
+msgstr "áááá á¶âáááá»áâáá¶áâáááâá¯ááá¶áâáá¶á URL áááâáá¶áâááááá¶áá"
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr "áá¾âáá¶âáá¶âá¯ááá¶á .repo ? á
ááááâááá
áááá¸âáááá¢á·á áá¼áâáá¾á http://en.opensuse.org/Standards/RepoInfo á"
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr "áá¶áâáá½áâáááá á¶âááááááâáááá¶áá¶áâá¢á¶áâá¯ááá¶áâáá¶á URL áááâáá¶áâááááá¶áá"
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "áááá¶áá %s áááá¼áâáá¶áâááâá
áá á"
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "áááá¶áá %s áááá¼áâáá¶áâáááá¼áâáááááâáá
áᶠ%s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "ááâáá·áâáá¾áâáááá¶áá %s á"
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "ááá á»áâááááááâááááááâáááá¶áá á"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "áá·áâááááá¶ááâáááá¶áá %s á"
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s áá¶áâáááá¾âáá½áâáááá¶âáá¶âáá½á %s áááááááá¶ááâáááá¶Â á áááááááááááááá·âáááâáá¹áâáá·áâáááá¼áâáá¶áâáááá¶áááááá¼áâáá á"
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "áááá¶áá %s áááá¼áâáá¶áááááááâáááâáááááá á"
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "áááá»áâáá
âááâáá·ááááááâáááá¶áá '%s'..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "áááá¶áá '%s' áá·ááá¶áâáá¶ááâáá¶âáááá¶ááâááááá¶áá á áááá»áâáá¶ááâáá¶âáááá¶ááâááááá¶áá..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "áááá á¶âáááá»áâáá¶âááááá»áâáá·ááááááâáḠ'%s'"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "á¢ááá¸âáááá¢á¶á
âááááááá¶áâáḠ'%s' áá·áâáááá¼áâáá¶áâáááá»áâ áááâáá¶áâááâááá á»á á"
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(ááâáá¾á %d áááâá¢á¶á
âááááááá¶áâáá¶á)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "áááá¶áá¶á 'zypper refresh' á¬âáá /var/cache/zypp/zypp.db á
ááâáá»áâáááâáááá¾âáá¶Â á"
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "áááá»áâá¢á¶áâáá¼ááááá¶áâáá·áááááá RPM..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s á¢á¶á
âááááááá¶áâáá¶á)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -761,41 +810,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "á
áááá¾áâáá·áâáááá¹ááááá¼á á áááá¾áâá¢áááá a, r, ᬠi."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "y"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "Y"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "áá¶á/á
á¶á"
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "áá"
+
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "á
áááá¾áâáá·áâáááá¹ááááá¼á '%s' áááá
á¼á '%s' ᬠ'%s' á"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr "á
áááá¾áâáá·áâáááá¹ááááá¼á '%s' á áááá
á»á 'y' ááááá¶áá '%s' ᬠ'n' ááááá¶áá '%s' ááááá·áâáá¾âáááá¶áâá¢ááá¸âáááááâáááá¾ááá¶áâááááá¶ááâá¢ááá"
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -898,64 +928,38 @@
msgid "Requires:"
msgstr "ááááá¼ááá¶á á"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "áááá¶áâáááá¶ááâáá¶áâáááááâáá
áá¶áááááááá á áá¼áâááááááâáááá¶ááâááá¶áâá áá
áá¶ááâáá½áâ áááâáááá¾áá¶áááâááááᶠ'zypper addrepo' áá»áâáááâáááá¾âáá¶áâááááááá á"
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "áá¶áâáá¶ááâáááá»áâáááá¶ááâááááá¶ááâáá»á áá¶áâááá¡á¾áâáááá
ááâááááááá¶áâáááâáááá¼ááááâáá¹áâáááááá áá·áá·á
ááááâáááááááâáááâáá¶áâááááá... "
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr " á¢áá ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "áá»áâáááá»áâáááá¶ááâááááá¶áá á"
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr " áá·ááááâáá¶âááááááâáááááá¶âáááá¹ááááá¼áâáá á \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "áááâáá¶âááá á»á áá¼áâáááá
áâááá¶ááá¶áááâááá á»áâáááâááááá¶ááâáá¹á zypper á"
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "URL áááâáá¶áâáááááâáá·áâáááá¹ááááá¼á á"
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" ááááá¾á á\n"
-"\t--help, -h\t\táááá½á á\n"
-"\t--version, -V\t\táááá á¶áâáááâáááá á\n"
-"\t--quiet, -q\t\táááá á¶ááâááááááâáááááᶠáááá á¶áâááâáá¶áâááá á»á á\n"
-"\t--verbose, -v\t\tááááá¾ááá¶áâááá·áá¶á á\n"
-"\t--terse, -t\t\tááááááâááááááâááááá¶ááâáá¶âááááá¾âááá¶ááá¸á á\n"
-"\t--table-style, -s\táá
áá¶áááááâáá¶áá¶á (á
ááá½áâááá) á\n"
-"\t--rug-compatible, -r\táá¾áâáá¶áâáááááá¶âáááá½áá á\n"
-"\t--non-interactive\táá»áâáá½áâá¢ááá¸âáá¶ááâá¢áá áááá¾âá
áááá¾áâáááá¶ááá¾áâáááâáááááâáááááááá·Â á\n"
-"\t--no-gpg-checks\t\táá·áâá¢á¾âáá¾ââáá¶áááá¶áááâáááá»áâáá¶áâáá·áá·ááá GPG á á¾áâáááá á\n"
-"\t--root, -R <dir>\tááááá·ááááá·áá¶áâáá
âáá¾âáá root ááááá á\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -976,13 +980,13 @@
"\tsource-install, si\tInstall a source package\n"
msgstr ""
" áá¶áááâááááá¶Â á\n"
-"\thelp\t\t\táááá½á\n"
-"\tshell, sh\t\tááááâááá½áâáá¶áááâááááá¶âá
ááá¾áâáááá»áâáááâááâáá½á\n"
-"\tinstall, in\t\tááá¡á¾áâáááá
áá á¬á¢ááá¸ââá¢á¶á
âááááááá¶áâáá¶á\n"
-"\tremove, rm\t\tááâáááá
áá á¬á¢ááá¸âá¢á¶á
âááááááá¶áâáá¶á\n"
-"\tsearch, se\t\táááááááâáááá¶áâáááá¼ááááâáááá
áá\n"
-"\trepos, lr\t\táá¶áâáááá¶ááâáááâáá¶áâáááááâáá¶ááâá¢áá á\n"
-"\taddrepo, ar\t\tááááááâáááá¶ááâáááá¸\n"
+"\thelp, ?\t\t\táááá½á\n"
+"\tshell, sh\t\tááááâááá½áâáá¶áááâááááá¶âáá
âáááâááâáá½á\n"
+"\tinstall, in\t\tááá¡á¾áâáááá
áá á¬âá¢ááá¸âáááá¢á¶á
âááááááá¶áâáá¶á\n"
+"\tremove, rm\t\tááâáááá
áá á¬âá¢ááá¸âáááá¢á¶á
âááááááá¶áâáá¶áâá
áá\n"
+"\tsearch, se\t\táááááááâáááá
ááâáááâáááá¼ááááâáá¹áâáááá¶á\n"
+"\trepos, lr\t\táá¶áâáááá¶ááâáááâáá¶áâáááááâáá¶ááâá¢áá á\n"
+"\taddrepo, ar\t\tááááááâáááá¶ááâáááá¸âáá½á\n"
"\tremoverepo, rr\t\tááâáááá¶ááâáááâáá¶áâááááá¶ááâá
áá\n"
"\trenamerepo, nr\t\táááá¼áâáááááâáááá¶ááâáááâáá¶áâááááá¶áá\n"
"\tmodifyrepo, mr\t\tááááááâáááá¶ááâáááâáá¶áâááááá¶áá\n"
@@ -991,32 +995,59 @@
"\tpatches, pch\t\táá¶áâáááá\n"
"\tlist-updates, lu\táá¶áâáááá\n"
"\txml-updates, xu\t\táá¶áâáá¶áâáá¶áááááá áá·áâááááâáááá»áâááááááááá¶á xml\n"
-"\tupdate, up\t\táááá¾ââá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶âáâáá¶áááááááá¶âáá½áâáá¹áâááááâáááá¸á á\n"
+"\tupdate, up\t\táááá¾âá²ááâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áâáááâáá¶áâááá¡á¾áâáá¶ááááááâáá¶áá½áâááááâáááá¸Â á\n"
"\tinfo, if\t\táááá á¶áâáááááá¶áâááááááâááááá¶ááâáááá
áá\n"
"\tpatch-info\t\táááá á¶áâáááááá¶áâááááááâááááá¶ááâáááá\n"
+"\tsource-install, si\tááá¡á¾áâáááá
ááâááááá\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" ááááá¾á á\n"
+"\t--help, -h\t\táááá½á á\n"
+"\t--version, -V\t\táááá á¶áâáááâáááá á\n"
+"\t--quiet, -q\t\táááá á¶ááâááááááâáááááᶠáááá á¶áâááâáá¶áâááá á»á á\n"
+"\t--verbose, -v\t\tááááá¾ááá¶áâááá·áá¶á á\n"
+"\t--terse, -t\t\tááááááâááááááâááááá¶ááâáá¶âááááá¾âááá¶ááá¸á á\n"
+"\t--table-style, -s\táá
áá¶áááááâáá¶áá¶á (á
ááá½áâááá) á\n"
+"\t--rug-compatible, -r\táá¾áâáá¶áâáááááá¶âáááá½áá á\n"
+"\t--non-interactive\táá»áâáá½áâá¢ááá¸âáá¶ááâá¢áá áááá¾âá
áááá¾áâáááá¶ááá¾áâáááâáááááâáááááááá·Â á\n"
+"\t--no-gpg-checks\t\táá·áâá¢á¾âáá¾ââáá¶áááá¶áááâáááá»áâáá¶áâáá·áá·ááá GPG á á¾áâáááá á\n"
+"\t--root, -R <dir>\tááááá·ááááá·áá¶áâáá
âáá¾âáá root ááááá á\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "áá¶áâááá·áá¶á á %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "áááá
á¼áâááááââáá·áâá¢ááááááááá á"
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "áááá
á¼áâááááâáá·áá·áááâáááâáááá¶á-gpg- á"
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "áá
áá¶áááááâáá¶áá¶áâáá·ááááá¹ááááá¼á "
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "áá¶ááááá -h ááááá¶ááâáááá½á á"
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1042,7 +1073,7 @@
" á
ááááâáááááá¶ááááá¢á·áâ áá¼áâáá¾á 'man zypper' á\n"
" --debug-solver ááááá¾áâáá¶áâáá¶áááááâáááááá·áá¸âááááááá¶áâááááá¶áááá¶âááááá¶ááâááá á»á\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1064,7 +1095,7 @@
"-n, --name áááá¾áâá¢ááá¸âá¢á¶á
âááááááá¶áâáá¶áâáááâáááááâáááááᶠáá·ááááâáááâááááááá¶áâáá\n"
" --debug-solver ááááá¾áâáá¶áâáá¶áááááâáááááá·áá¸âááááááá¶áâááááá¶ááâáááá¶ááâááá á»á\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1078,7 +1109,7 @@
"\n"
"áá¶áááâááááá¶âáááâáááá¶áâááááá¾áâááááááâáá á\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1100,7 +1131,7 @@
"\t--disabled,-d\t\tááááááâáááá¶ááááááááá¶âáá¶áâáá·áâ\n"
"\t--no-refresh,-n\t\tááááááâáááá¶ááâáá¶âáá½áâáá¹áâáá¶áâáááá¾âá²ááâáááááâáááááâáááááááá·âáááâáááá¾âáá·ááá¶á\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1116,7 +1147,7 @@
" ááááá¾áâáá¶áááâááááá¶Â á\n"
"-e, --export <FILE.repo> áá¶áá
ááâáááá¶ááâáááâáá¶áâáááááâáá¶ááâá¢áááá¶âá¯ááá¶á .repo áá¼ááááá¶áâááâáá½á á\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1133,7 +1164,7 @@
"\t--loose-auth\táá·áâá¢á¾áá¾âáá·ááááááâááááááááá¶ááâáá¶áâáááá¹ááááá¼áâááááâá¢áááâáááá¾âáá
âáááá»á URL\n"
"\t--loose-query\táá·áâá¢á¾áá¾âááááá¢ááááâáááá½áâáá
âáááá»á URL\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1146,7 +1177,7 @@
"áááááâáááááâááááááááá¶áâáááá¸âáá
âáááá¶ááâáááâáá¶áâááááá¶ááâáááâáááááâáááááâáááá¶á á\n"
"áá¶áááâááááá¶âáááâáááá¶áâááááá¾áâááááááâáá á\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1168,7 +1199,7 @@
"-a, --enable-autorefresh áá¾áâáá¶áâáááá¾âá²ááâáááá¶ááâáááááâáááâáááááâáááááááá·\n"
" --disable-autorefresh áá·áâáá¶áâáááá¾âá²ááâáááá¶ááâáááááâáááâáááááâáááááááá·\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1192,7 +1223,7 @@
"-B, --build-only áááá¶ááá¶âááâáá¼ááááá¶áâáá·áááááá áá»áâáá¶áâááâáá·ááááááâáááá¶Â á\n"
"-D, --download-only áá¶áâááâááâáá·ááááááâáááá¶âáá¾á áá»áâáááá¶ááá¶ââáá¼ááááá¶áâáá·áááááá\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1212,7 +1243,7 @@
"-r, --repo <alias> áá¶áâááâáá¶áâáá¶ááááááâáá¸âáááá¶ááâáááâáá¶áâááááá¶ááâáááâáááááâááááááááá¶á á\n"
" --best-effort áááá¶áá¶á 'á¢ááâáá¸âááááááá¶á' áá¾áááá¸âáááá¾âá²ááâáá¶áááááá áááá¾âá²áááá¶ááááááâáá
âááááâáááâáá¶áâáá¶áâááááâá
á»ááááááâáááá»á áá·áâááâáááá»áâááâá¢á¶á
âááá½áâááâáá¶áâááá á\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1242,7 +1273,7 @@
" --best-effort áááá¶áá¶á 'á¢ááâáá¸âááááááá¶á' áá¾áááá¸âáááá¾âá²ááâáá¶áááááá áááá¾âá²ááâáá¶ááááááâáá
âááááâáá¶ááá¶áâááááâáááá
á»áááááááááá»á áá·áâáááááá»á ááºââá¢á¶á
âááá½áâáá¶áâááá\n"
" --debug-solver ááááá¾áâáá¶áâáá¶áááááâáááááá·áá¸âááááááá¶áââááááá¶ááâáááá¶ááâááá á»á\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1286,7 +1317,7 @@
"\n"
"áá½á¢áááá * áá·á ? ááâá¢á¶á
âáááá¼áâáá¶áâáááá¾âáááá»áâááááá¢ááááâááááááá á\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1304,7 +1335,7 @@
"\n"
"-r, --repo <alias> áá·áá·áááâááâááááâáá
âáááá»áâáááá¶ááâáááâáá¶áâááááá¶áááááâáááááâáááááâáááá¶á á\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1322,7 +1353,7 @@
"\n"
"-r, --repo <alias> áá·áá·áááâáá¾áâááááâááâáááá»ááááá¶ááâáááâáá¶áâááááá¶ááâáááâáááááâááááááááá¶á á\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1340,7 +1371,7 @@
"\n"
"-r, --repo <alias> áááá¾ááá¶áâááâáá¶âáá½áâáááá¶ááâáááâáá¶áâááááá¶áááááâáááááâááááááááá¶á á\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1354,7 +1385,7 @@
"\n"
"áááâááºâáá¶â rug ááâáááá¶âáá¶âáá½áâáááááâááááááááá¶áâááááá¶áá 'zypper info -t patch'\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1368,7 +1399,7 @@
"\n"
"áá¶áááâááááá¶âáááâáááá¶áâááááá¾áâááááááâáá á\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1384,24 +1415,24 @@
" ááááá¾áâáá¶áááâááááá¶Â á\n"
"-r, --repo <alias> áááá¾ááá¶áâááâáá¶âáá½áâáá¶áâáá¶ááááááâáá¸âáááá¶áááá¶ááááááâááááááááá¶á á\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "áááá¶áâááááá¾áâá¢á¶áá»áááááâáááááá·áá¸â á "
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "áá¶ááá·ááááá¶áá áááá¾âáá¼ááááá¶áâáá·ááááááâááááâááâáááá
ááâáááâáá¶áâááá¡á¾áâááá»ááááá á"
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "áááá»áâáá·áá¢á¾áá¾âáá¹áâáááá
ááâááááááá¶áâáááâáá¶áâááá¡á¾á..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "áá·á
áá
áá¶á ZYpp áááá»áâáááá¾ááá¶áâáá½á
âá á¾á á áááâáá¶áâáááâáᶠáá¶áâáááááá·áá¸âáá½áâáááááâááá áááá»áâáááá¾ááááá¶ááá libzypp ááááá¶ááâáá¶áâáááâáá¶áâáááááááááâáááá
áá á áááááá·áá¸âááááááâáá¶ááâá¢ááâáááá¼áâááâáá¶áâáá·áâáá»ááááâáááá¾âáá¶áááâááááá¶âááá á"
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1411,105 +1442,105 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "áááá¼áâáá¶áâáá·áááá·áᶠRoot áá¾áááá¸âááááááâáááá¶ááâáááááááá á"
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "á¢á¶áá»áááááâá
ááá¾áâááá á ááá¶áâá áá
áá¶ááâáááá¼áâáá¶á URL áá·áâáááááâáááááâáááá¶áâáá½á á"
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "ááááááâáááâáá¶áâááááá¶ááâáá·áâáááâáá¶âááááááâáááá¶ááâáááá¹ááááá¼áâáá á"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "áá¾á 'zypper -h addrepo' ᬠman zypper áá¾áááá¸âááá½áâááááá¸âááááááâáááá¶ááâáááâáááá¶áá á"
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "áá¶ááâá¢á¶áá»áááááâáááâáááá¼áâáá¶á á"
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "ááâáá·áâáá¾áâáááá¶ááâáá¶áâáááááâááááááááá¶á áááá¶áá¶áâáá»áâáá¶á URL..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "ááâáá·áâáá¾áâáááá¶ááâáá¶áâáááááâááááááááá¶áâ ᬠURL áááâáá¶áâááááá á"
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "áááááâááááááááá¶áâááºâáá¶âá¢á¶áá»áááááâáááâáááá¼áâáá¶á á"
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "áááá¼ááá¶áâáá·áááá·âáᶠRoot áá¾áááá¸âáááá¾âá²ááâáááá¶ááâááááááááâááááá á"
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "áááá¼ááá¶áâáá·áááá·âáᶠRoot áá¾áááá¸âááá¡á¾á á¬âáá»áâáááá
áá á"
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "áá·áâáááá¶ááâááááááâáááâá¢á¶á
âááááááá¶áâáá¶á á %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "áá¶áâááááá¶á á áá·áâáá¶áâáááááâáááá¶áá á ááááá·ááááá·áá¶áâááâáá¶âáá½áâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áâáááâáá¶áâááá¡á¾áâááá»ááááá á áááá¶áâá¢ááá¸âáááá¼áâáá¶áâááá¡á¾áâáá á"
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "áááá»áâááááá¾áâáá¶áâáá¶áááááâáááááá·áá¸âááááááá¶á..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "áá¶áâáá¶áááááâáááááá·áá¸âááááááá¶áâáá¶áâááááá¾áâááááááááá á"
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "ááá á»áâáááá»áâáá¶áâááááá¾áâáá¶áâáá¶áááááâáááááá·áá¸âááááááá¶á á"
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "áááááâáááá
ááâáááááâáááá¼ááá¶áâá¢á¶áá»ááááá á"
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "áá·ááááá¶ááâááááááâáááá
ááâááááááá¶á "
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "ááâáá·áâáá¾áâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶á á"
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "áááâáᶠ'rug' áá·áâá¢á¶á
âáááá¶áá¶áâ 'á¢ááâáá¸âááááááá¶á' áá¾áááá¸áááá¾âá²ááâáá¶áááááá á"
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "áááá¼áâáá¶áâáá·áááá·âáᶠRoot áá¾áááá¸âáááá¾âá²ááâáááá
ááâáá¶áááááá á"
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "áááá¸âáá¾ááááâáááâáá·ááá¶áâáááá¹áâáá»á á"
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "á¢áááâáááá»áâáááâáááâáááá zypper áá½á
âá á¾á á"
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "áá¼áâáááá
áâááá¶ááá¶áááâááá á»áâá¢ááá¸âáá¶Â á"
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "á
ááááâááá
áááá¸âáááá¶á áá¼áâáá¾á http://en.opensuse.org/Zypper#Troubleshooting á"
@@ -1519,20 +1550,24 @@
msgstr "áá·áâáááá¶ááâáá¶áááâááááᶠ'%s'"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "ááá á»á I/O"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "ááááá»âáá·áâáááá¹ááááá¼á"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "ááá á»á"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "áá¼áâáááá
á¼áâáááá [%s] # %d áá·áâáááááá 'y' áá¾áááá¸âáááá 'n' áá¾áááá¸âááááááâááááá·ááááá·áá¶á á"
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "áááá»áâáá¶ááá á "
@@ -1611,11 +1646,11 @@
msgid "Installation of %s failed:"
msgstr "áá¶áâááá¡á¾á %s áá¶áâááá¶ááá á"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "áá¶áá¶á¡á»á"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "áááá¶áá"
Modified: trunk/zypper/po/nb.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/nb.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/nb.po (original)
+++ trunk/zypper/po/nb.po Tue Sep 11 10:57:42 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypper.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
"PO-Revision-Date: 2007-08-17 22:54+0200\n"
"Last-Translator: Rune Nordbøe Skillingstad <rune(a)skillingstad.no>\n"
"Language-Team: Norwegian\n"
@@ -55,37 +55,49 @@
msgstr "Vil du importere nøkkel-ID %s, %s med fingeravtrykk %s"
#: ../src/zypper-keyring-callbacks.h:110
-#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
+#, fuzzy, c-format
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
msgstr "Advarsel: Problemer med å overse signaturkontroll av %s med den offentlige nøkkelen %s, %s med fingeravtrykk %s! Dobbelsjekk at dette ikke er på grunn av ondsinnet endringer i filen!"
-#: ../src/zypper-keyring-callbacks.h:119
-#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "Feil ved signaturkontroll av %s med den offentlige nøkkelen %s, %s og fingeravtrykk %s. Advarsel: det kan være pÃ¥ grunn av ondsinnet endring av innholdet i filen. Ã
fortsette kan være farlig! Vil du likevel fortsette?"
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:120
+#, fuzzy, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Mislykket sammendragskontroll for %s. Forventet %s, fant %s."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr ""
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "Mangler sammendrag for filen %s."
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "Vil du fortsette?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "Ukjent sammendrag %s for filen %s."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "Hopper over sammendragkontroll for %s (forventet %s, fant %s)."
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Mislykket sammendragskontroll for %s. Forventet %s, fant %s."
@@ -121,11 +133,11 @@
msgstr "Kan ikke legge til %s i listen over pakker som skal fjernes."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Ikke funnet"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "Problem: "
@@ -136,146 +148,146 @@
msgstr " Løsning %d: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "nummer, (g)jenta eller (a)vbryt> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "g"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "a"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "Bruker løsning %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s-problemer:"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "Den spesifiserte evnen ble ikke funnet"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "Ingenting å gjøre."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "Total nedlastingsstørrelse: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Operasjonen vil gi et tillegg på %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Operasjonen vil frigjøre %s."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "%s låste enheter"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "Etablerer status for aggregerte"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "Kontrollerer avhengigheter..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "Behøver %d oppdateringer (%d sikkerhetsoppdateringer)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Installert"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Avinstallert"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Kan ikke lenger brukes"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Kan ikke brukes"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Brukt"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Ikke nødvendig"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Skadet"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Nødvendig"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "feil"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Katalog: "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Arkiv: "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Navn"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "Versjon"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "Kategori"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Status"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "Ingen pakkeoppdateringer ble funnet."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -283,38 +295,47 @@
"ADVARSEL: Dette er de eneste oppdateringene som virker inn på oppdateringsprogrammet.\n"
"Andre oppdateringer er også tilgjengelig.\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "Ingen pakkeoppdateringer ble funnet."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Samling"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Ark."
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "ADVARSEL: Hopper over %s, som er interaktiv."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "skriver"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+#, fuzzy
+msgid "Problem downloading the package file from the repository:"
+msgstr "Kunne ikke laste filer fra '%s'."
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "Se overstående feilmelding for et hit."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -330,402 +351,434 @@
" - bruk et annet installasjonsmedium (f.eks. hvis skadet)\n"
" - bruk en annen installasjonskilde"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Ãn av de installerte oppdateringene krever at datamaskinen startes pÃ¥ nytt. Gjør dette sÃ¥ snart som mulig."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "ADVARSEL: Ãn av de installerte oppdateringene krever at datamaskinen startes pÃ¥ nytt. Gjør dette sÃ¥ snart som mulig."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "ADVARSEL: Ãn av de installerte oppdateringene virker inn pÃ¥ pakkebehandleren, og krever derfor omstart før ytterligere operasjoner kan utføres."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Godtar automatisk lisens for %s %s."
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "%s %s lisens: "
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Du må godta lisensvilkårene for å kunne installere denne pakken. Vil du fortsette?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Avbryter installasjonen på grunn av manglende lisensbekreftelse."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Start operasjonen på nytt i interaktiv modus og bekreft at du godtar nødvendig(e) lisens(er) eller benytt \"--auto-agree-with-licenses\"-alternativet."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Avbryter installasjonen på grunn av manglende brukergodkjennelse av %s %s lisensen."
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "Installerer pakke %s-%s"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Kildekodepakken %s-%s ble installert."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problemer med å Installerer kildekodepakken %s-%s:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "Kildekodepakken '%s' ble ikke funnet."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "Undersøker behov for oppdatering av metadata til %s"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "Oppdaterer '%s'"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(tvungen)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "Arkivet '%s' er oppdatert."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "Tvinger rå-metadata-oppdatering"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "Kunne ikke laste filer fra '%s'."
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "Se overstående feilmelding for et hit."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "Ingen nettadresse definert for '%s'."
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "Legg til en eller flere grunnadresser (baseurl=nettadresse) til %s for arkiv '%s'."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "Det finnes ingen kortnavn for dette arkivet."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "Arkivet '%s' er ugyldig."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "Undersøk om de angitte nettadressene til dette arkivet virkelig peker på et gyldig arkiv."
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "Kunne ikke laste ned metata for '%s':"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "Tvungen bygging av arkivmellomlager"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "Feil under lesing av metadata for '%s':"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "Dette kan skyldes ugyldig metadata i arkivet, eller en feil i metadata-tolkeren. Om det siste er tilfelle, eller om du er usikker, fyll inn en feilmelding etter veiledningene du kan finne på http://en.opensuse.org/Zypper#Troubleshooting"
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "Arkivmetadata for %s ble ikke funnet i lokalt mellomlager."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "Feil under bygging av mellomlager-databasen:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "Arkivet %s ble ikke funnet."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "Feil under lesing av arkivbeskrivelsesfil for '%s'."
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "Grunn: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "Deaktiverer arkiv '%s' på grunn av overstående feil."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "Arkivet '%s' er utdatert. Du kan kjøre 'zypper refresh' som rotbrukeren for å oppdatere det."
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "aktivert"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "Oppdater"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "Type"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "Aktiv"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "Deaktivert"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "aktivert"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "Oppdater"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "Alias"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Ja"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "Nei"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "Mangler arkivdefinisjoner. Bruk 'zypper addrepo'-kommandoen for å legge til ett eller flere arkiv."
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "Feil under lesing av arkiv:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "Kan ikke åpne '%s' for skriving: du mangler kanskje skrivetilgang?"
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "Arkivene ble eksportert til %s."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "Hopper over deaktivert arkiv '%s'"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "Hopper over arkiv '%s' på grunn av tidligere feil."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "Kunne ikke finne arkiv '%s' med kortnavn eller nummer."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "Bruk 'zypper repos' for å vise listen over definerte akriv."
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "Angitte arkiv er ikke aktivert eller lagt til."
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "Det er ingen aktiverte arkiv tilgjengelig."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "Bruk 'zypper addrepo'- eller 'zypper modifyrepo'-kommandoene for å legge til eller endre arkiv."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "Kunne ikke oppdatere arkivene på grunn av feil."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "Noen av arkivene ble ikke oppdatert på grunn av feil."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "Angitte arkiv ble oppdatert."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "Alle arkiv er oppdatert."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "Dette er et skiftende skrivebeskyttet medium (CD/DVD), deaktiverer autooppdatering."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "Et arkiv med navnet '%s' eksisterer allerede. Velg et annet kortnavn."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "Fant ikke et gyldig arkiv på angitte lokasjon:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "Kunne ikke finne type arkiv. Undersøk om den angitte nettadressen (se under) peker på et gyldig arkiv."
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "Problemer med overføring av arkivdata fra angitte nettadresse:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "Undersøk om angitte nettadresse er tilgjengelig."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "Problemer med å legge til arkiv:"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "Arkiv '%s' ble lagt til"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "Autooppdater"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "Leser data fra '%s'-mediumet"
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "Kunne ikke lese data fra '%s'-mediumet"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "Undersøk om installasjonsmediumet er gyldig og lesbart."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+#, fuzzy
+msgid "Problem accessing the file at the specified URL"
+msgstr "Problemer med overføring av arkivdata fra angitte nettadresse."
+
+#: ../src/zypper-sources.cc:796
+#, fuzzy
+msgid "Please check if the URL is valid and accessible."
+msgstr "Undersøk om angitte nettadresse er tilgjengelig."
+
+#: ../src/zypper-sources.cc:803
+#, fuzzy
+msgid "Problem parsing the file at the specified URL"
+msgstr "Problemer med overføring av arkivdata fra angitte nettadresse."
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr ""
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr ""
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "Arkiv '%s' ble fjernet."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "Arkiv %s fikk nytt navn %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "Arkivet %s ble ikke funnet."
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "Feil ved endring av arkivet:"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "Lar arkivet %s være uendret."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "Forsøkt på benytte %s sammen med %s er umulig. Egenskapen forblir uendret."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "Arkivet %s ble endret."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "Henter arkiv data for '%s'..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "Arkiv '%s' finnes ikke i mellomlager. Mellomlagrer..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "Kunne ikke leser data fra '%s'"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "På grunn av feil, ble ikke nødvendige pakker fra '%s' lastet."
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(%d nødvendige pakker funnet)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "Forsøk 'zypper refresh', eller til og med slett /var/cache/zypp/zypp-db før du gjør det."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "Leser RPM-databasen..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s nødvendige pakker)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -761,41 +814,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "Ugyldig svar. Bruk bokstavene a, g eller i."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "j"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "J"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
-
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "ja"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "nei"
+
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "Ugyldig svar '%s'. Bruk bokstavene '%s' eller '%s':"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr ""
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -898,64 +932,39 @@
msgid "Requires:"
msgstr "Krever:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "Mangler arkivoppsett. Legg til minst ett arkiv med 'zypper addrepo'-kommandoen før søk kan utføres."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "Forsmellomlagrer installerte nødvendige pakker som samsvarer med søkekriteriene... "
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr "av ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "mellomlagret."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr "er ikke et gyldig regulært uttrykk: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "Dette er en feil, send om mulig inn en zypper-feilrapport."
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "Nettadressen er ugyldig."
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" Alternativ:\n"
-"\t--help, -h\t\tHjelp.\n"
-"\t--version, -V\t\tVis versjonsnummer.\n"
-"\t--quiet, -q\t\tGjem dialog og bare vis feilmeldinger.\n"
-"\t--verbose, -v\t\tÃk informasjonsmengden.\n"
-"\t--terse, -t\t\tEnkel dialog for maskinbearbeiding.\n"
-"\t--table-style, -s\tTabell-stil (heltall).\n"
-"\t--rug-compatible, -r\tSlå på kompatibilitet med rug.\n"
-"\t--non-interactive\tIkke spør om noe, men bruk automatisk standardsvar.\n"
-"\t--no-gpg-checks\t\tHopp over feil fra GPG-kontroll.\n"
-"\t--root, -R <dir>\tBenytt en annen rotkatalog.\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
+#, fuzzy
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -996,28 +1005,54 @@
" \tpatch-info\t\tVis full informasjon for pakkeoppdateringer\n"
"\tsource-install, si\tInstaller en kildekodepakke\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" Alternativ:\n"
+"\t--help, -h\t\tHjelp.\n"
+"\t--version, -V\t\tVis versjonsnummer.\n"
+"\t--quiet, -q\t\tGjem dialog og bare vis feilmeldinger.\n"
+"\t--verbose, -v\t\tÃk informasjonsmengden.\n"
+"\t--terse, -t\t\tEnkel dialog for maskinbearbeiding.\n"
+"\t--table-style, -s\tTabell-stil (heltall).\n"
+"\t--rug-compatible, -r\tSlå på kompatibilitet med rug.\n"
+"\t--non-interactive\tIkke spør om noe, men bruk automatisk standardsvar.\n"
+"\t--no-gpg-checks\t\tHopp over feil fra GPG-kontroll.\n"
+"\t--root, -R <dir>\tBenytt en annen rotkatalog.\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "Detaljnivå: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "Starter automatisk modus."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "Starter \"hopp over GPG-kontroll\"-modus."
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "Ugyldig tabellstil "
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "Skriv -h for hjelp."
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1043,7 +1078,7 @@
" Se 'man zypper' for flere detaljer.\n"
" --debug-solver Opprett løsningstestoppgave for debugging\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1065,7 +1100,7 @@
"-n, --name Velger nødvendige pakker fra navnet og ignorerer evner.\n"
" --debug-solver Opprett løsningstestoppgave for debugging\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1079,7 +1114,7 @@
"\n"
"Denne kommandoen har ingen alternativer.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1101,7 +1136,7 @@
"-d, -disabled Legg til arkivet som deaktivert\n"
"-n, --no-refresh Legg til akrivet med automatisk oppdatering deaktivert\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1117,7 +1152,7 @@
" Kommandoalternativer:\n"
"-e, --export <FIL.repo> Eksporter alle definerte arkiv til en enkelt lokal .repo-fil\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1135,7 +1170,7 @@
"\t--loose-auth\tHopp over brukerautentiseringsdata i nettadressen\n"
"\t--loose-query\tHopp over spørrestreng i nettadressen\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1149,7 +1184,7 @@
"\n"
"Denne kommandoen har ingen alternativer.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1171,7 +1206,7 @@
"-a, --enable-autorefresh Aktiver automatisk oppdatering av arkivet\n"
" --disable-autorefresh Deaktiver automatisk oppdatering av arkivet\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1195,7 +1230,7 @@
"-B, --build-only Bare bygg databasen, ikke last ned metadata.\n"
"-D, --download-only Bare last ned rå-metadata, ikke bygg databasen\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1215,7 +1250,7 @@
"-r, --repo <kortnavn> List bare oppdateringer fra arkiv med angitte kortnavn.\n"
" --best-effort Utfør en \"etter beste evne\"-oppdatering. Oppdateringer til en lavere versjon en siste tilgjengelige er også godtatt.\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1245,7 +1280,7 @@
" --best-effort Utfør en \"etter beste evne\"-oppdatering. Oppdateringer til en lavere versjon en siste tilgjengelige er også godtatt\n"
" --debug-solver Opprett løsningstestoppgave for debugging\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1288,7 +1323,7 @@
" \n"
" Jokertegnene * og ? kan også brukes inne i søkestrenger.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1306,7 +1341,7 @@
"\n"
"-r, --repo <kortnavn> Undersøk bare i arkiv angitt av kortnavn.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1324,7 +1359,7 @@
"\n"
"-r, --repo <kortnavn> Undersøk bare i arkiv angitt med kortnavn.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1342,7 +1377,7 @@
"\n"
"-r, --repo <kortnavn> Jobb bare med akriver angitt av kortnavn.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1356,7 +1391,7 @@
"\n"
" Denne kommandoen er et rug-kompabilitetsalias for 'zypper info -t patch'\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1370,7 +1405,7 @@
"\n"
" Denne kommandoen har ingen alternativer.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1386,24 +1421,24 @@
" Kommandoalternativer:\n"
"-r, --repo <kortnavn> Jobb bare med arkiver angitt av kortnavn.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "Programargumenter som ikke er alternativer: "
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "Arkiv er deaktivert, benytter kun database over installerte pakker."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "Ignorerer installerte nødvendig pakker..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "Det er allerede en ZYpp-transaksjon på gang. Dette betyr at det kjører et annet program som benytter libzypp-biblioteket for pakkebehandling. Alle disse programmene må avsluttes før denne kommandoen kan benyttes."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1437,105 +1472,105 @@
" )4QQQQQQQQP\n"
" )?QQQQ?'"
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "Administratorrettigheter (rottilgang) er påkrevd for endre systemarkivene."
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "For få argument. Både en nettadresse og et kortnavn er obligatorisk."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "Angitte type er ikke en gyldig arkivtype:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Se 'zypper -h addrepo' eller man zypper for å få en liste over kjente arkivtyper."
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "Mangler obligatorisk argument."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Kunne ikke finner arkivet angitt med kortnavn, forsøk å fjern med nettadresse..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "Kunne ikke finne arkiv angitt med kortnavn eller nettadresse."
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "Alias er et obligatorisk argument."
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "Administratorrettigheter (rottilgang) er påkrevd for oppdaterer systemarkivene."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Administratorrettigheter (rottilgang) er påkrevd for å installere eller fjerne pakker."
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Ukjent nødvendig pakketype: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Advarsel: Mangler arkiv. Arbeider bare med installerte nødvendige pakker. Ingenting kan installeres."
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "Oppretter løsningstestoppgave..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "Løsningstestoppgave ble opprettet."
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "Feil ved oppretting av løsningstestoppgave."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "Kildekodepakkens navn er et obligatorisk argument."
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "Ukjent nødvendig pakketype"
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "Ingen nødvendige pakker funnet."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Kjører som 'rug', kan ikke utføre \"etter beste evne\"-oppdatering."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "Administratorrettigheter (rottilgang) er påkrevd for å oppdatere pakker."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "Uventet unntak."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "Du kjører allerede zyppers kommandolinjetolker."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "Send om mulig inn en feilrapport om dette."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "Se http://en.opensuse.org/Zypper#Troubleshooting for instruksjoner."
@@ -1545,20 +1580,24 @@
msgstr "Ukjent kommando '%s'"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "Inn/ut-feil"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "Ugyldig objekt"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "Feil"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Sett inn media [%s] # %d og trykk 'j' for å fortsette eller 'n' for å avbryte kjøringen."
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "Laster ned: "
@@ -1637,11 +1676,28 @@
msgid "Installation of %s failed:"
msgstr "Installasjon av %s mislyktes:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "Katalog"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "Arkiv"
+#~ msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+#~ msgstr "Feil ved signaturkontroll av %s med den offentlige nøkkelen %s, %s og fingeravtrykk %s. Advarsel: det kan være pÃ¥ grunn av ondsinnet endring av innholdet i filen. Ã
fortsette kan være farlig! Vil du likevel fortsette?"
+
+#~ msgid "y"
+#~ msgstr "j"
+
+#~ msgid "Y"
+#~ msgstr "J"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "N"
+#~ msgstr "N"
+
+#~ msgid "Invalid answer '%s', enter '%s' or '%s':"
+#~ msgstr "Ugyldig svar '%s'. Bruk bokstavene '%s' eller '%s':"
Modified: trunk/zypper/po/nl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/nl.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/nl.po (original)
+++ trunk/zypper/po/nl.po Tue Sep 11 10:57:42 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
"PO-Revision-Date: 2007-08-22 22:48+0200\n"
"Last-Translator: Rinse de Vries <rinsedevries(a)kde.nl>\n"
"Language-Team: Nederlands <kde-i18n-nl(a)kde.org>\n"
@@ -55,37 +55,50 @@
msgstr "Wilt u de sleutel-id %s, %s, vingerafdruk %s vertrouwen?"
#: ../src/zypper-keyring-callbacks.h:110
-#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
+#, fuzzy, c-format
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
msgstr "Waarschuwing: mislukte ondertekeningverificatie wordt genegeerd voor %s met publieke sleutel-id %s, %s, vingerafdruk %s!. Controleer goed of dit niet wordt veroorzaakt door kwaadaardige wijzigingen in het bestand!"
-#: ../src/zypper-keyring-callbacks.h:119
-#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "Ondertekenverificatie mislukt voor %s met publieke-sleutel-id %s, %s, vingerafdruk %s. Waarschuwing: dit kan zijn veroorzaakt door een kwaadaardige wijziging in het bestand! Doorgaan is riskant! Wilt u toch doorgaan?"
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:120
+#, fuzzy, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Verificatie van de samenvatting is mislukt voor %s. %s werd verwacht, %s werd gevonden."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr ""
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:125
+#, fuzzy
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Toch doorgaan"
+
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "Geen samenvatting voor bestand %s."
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "Doorgaan?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "Onbekende samenvatting %s voor bestand %s."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "Mislukte verificatie voor samenvatting wordt genegeerd voor %s (%s werd verwacht, %s is gevonden)."
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Verificatie van de samenvatting is mislukt voor %s. %s werd verwacht, %s werd gevonden."
@@ -121,11 +134,11 @@
msgstr "Kon '%s' niet toevoegen aan de lijst met te verwijderen pakketten."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Niet gevonden"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "Probleem: "
@@ -136,148 +149,148 @@
msgstr " Oplossing %d: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "getal, (o)pnieuw of (a)nnuleren > "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "o"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "a"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "Oplossing %s wordt toegepast"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s problemen:"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "Opgegeven capaciteit is niet gevonden"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "Niets te doen."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "Totale downloadgrootte: %s"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Na de operatie zal aanvullend %s worden gebruikt."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Na de operatie zal %s worden vrijgemaakt."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "%s items vergrendeld"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "Status van samenstellingen vaststellen"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "Afhankelijkheden oplossen..."
# /usr/lib/YaST2/clients/inst_config_x11.ycp:947
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d patches nodig (%d veiligheidspatches)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Geïnstalleerd"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Niet geïnstalleerd"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Niet langer van toepassing"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Niet toepasbaar"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Toegepast"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Niet nodig"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Gebroken"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Nodig"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "fout"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Catalogus: "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Installatiebron: "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Naam"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "Versie"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "Categorie"
# /usr/lib/YaST2/clients/lan_inetd_custom.ycp:754
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Status"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "Geen noodzakelijke patches gevonden."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -285,38 +298,47 @@
"WAARSCHUWING: dit zijn alleen de opwaarderingen die betrekking hebben op het opwaardeerprogramma zelf.\n"
"Er zijn ook andere opwaarderingen beschikbaar.\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "Geen opwaarderingen gevonden."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Bundel"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "WAARSCHUWING: %s is interactief, overgeslagen."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "toewijzen"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+#, fuzzy
+msgid "Problem downloading the package file from the repository:"
+msgstr "Probleem bij downloaden van bestanden van '%s'"
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "Zie bovenstaande foutmelding voor een hint."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -332,402 +354,435 @@
" - gebruik een ander installatiemedium (bijvoorbeeld bij beschadiging)\n"
" - gebruik een andere installatiebron"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Een van de geïnstalleerde patches vereist dat u de computer opnieuw opstart. Doe dit zo snel mogelijk."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "WAARSCHUWING: een van de geïnstalleerde patches vereist dat u de computer opnieuw opstart. Doe dit zo snel mogelijk."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "WAARSCHUWING: een van de geïnstalleerde patches is van invloed op het pakketbeheer zelf. Opnieuw starten is daarom vereist voordat de volgende operaties worden uitgevoerd."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Gaat automatisch akkoord met licentie van %s %s."
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "%s %s licentie:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Als u dit pakket wilt installeren dient u akkoord te gaan met de voorwaarden van de bovenstaande licentie. Doorgaan?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Installatie wordt afgebroken omdat de licentie(s) moet(en) worden bevestigd."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Start a.u.b. de bewerking opnieuw in de interactieve modus en ga akkoord met de vereiste licentie(s) of gebruik de optie --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Installatie wordt afgebroken omdat gebruiker niet akkoord gaat met %s %s licentie."
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "Bronpakket %s-%s wordt geïnstalleerd"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Bronpakket %s-%s is geïnstalleerd."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Probleem bij installeren van bronpakket %s-%s:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "Bronpakket '%s' niet gevonden."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "Controleert of vernieuwen van metadata voor %s noodzakelijk is"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "Vernieuwt '%s'"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(geforceerd)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "Installatiebron '%s' is actueel."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "Rauwe metadata-vernieuwing forceren"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "Probleem bij downloaden van bestanden van '%s'"
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "Zie bovenstaande foutmelding voor een hint."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "Geen URL-adressen gedefinieerd voor '%s'."
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "Voeg één of meer basis-URL-adressen (baseurl=URL-adres) toe aan %s voor bron '%s'."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "Geen alias definieert deze bron."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "Installatiebron %s is ongeldig."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "Controleer of de gedefinieerde URL-adressen voor deze bron wijzen naar een geldige installatiebron."
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "Probleem bij downloaden van metadata voor '%s'."
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "Bouwen van broncache forceren"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "Fout bij analyseren van metadata voor '%s'."
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "Dit kan worden veroorzaakt door ongeldige metadata in de bron of door een fout in de metadata-parser. In het laatste geval, rapporteer de fout door de instructies op webpagina http://en.opensuse.org/Zypper#Troubleshooting op te volgen."
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "Bron-metadata voor '%s' niet gevonden in de lokale cache."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "Fout bij bouwen van cache-database:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "Installatiebron '%s' is niet gevonden."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "Fout bij lezen van bestand met beschrijving van installatiebron '%s'."
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "Reden: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "Schakelt installatiebron '%s' uit vanwege bovengenoemde fout."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "Bron '%s' is niet actueel. U kunt als root 'zypper refresh' draaien om deze bij te werken."
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "Ingeschakeld"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "Vernieuwen"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "Type"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "Actief"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "Uitgeschakeld"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "Ingeschakeld"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "Vernieuwen"
+
+# ../../db/printers.ycp.noloc:1270
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "Alias"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Ja"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "Nee"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "Geen installatiebronnen opgegeven. Gebruik het commando 'zypper addrepo' om één of meer bronnen toe te voegen."
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "Fout bij lezen van installatiebronnen:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "Kan %s niet opslaan. Heeft u schrijfrechten voor het bestand?"
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "De bronnen zijn met succes geëxporteerd naar %s."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "Slaat uitgeschakelde installatiebron '%s' over"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "Slaat installatiebron '%s' over vanwege bovengenoemde fout."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "Bron '%s' is niet gevonden aan de hand van opgegeven alias of nummer."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "Gebruik 'zypper repos' voor een lijst met gedefinieerde installatiebronnen."
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "Opgegeven bronnen zijn niet geactiveerd of niet gedefinieerd."
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "Er zijn geen geactiveerde bronnen gedefinieerd."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "Gebruik het commando 'zypper addrepo' of 'zypper modifyrepo' om bronnen toe te voegen of te activeren."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "Kon vanwege fouten de installatiebronnen niet vernieuwen."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "Enkele installatiebronnen zijn vanwege fouten niet vernieuwd."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "De opgegeven installatiebronnen zijn vernieuwd."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "Alle installatiebronnen zijn vernieuwd."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "Dit is een verwisselbaar alleen-lezen medium (cd/dvd). Automatisch vernieuwen wordt daarom uitgeschakeld."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "Er bestaat al een bron met de naam '%s'. Kies a.u.b. een andere alias."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "Kan geen geldige installatiebron vinden op de opgegeven locatie:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "Kon het type installatiebron niet bepalen. Controleer of de gedefinieerde URL-adressen (zie hieronder) naar een geldige bron verwijzen."
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "Probleem bij het overdragen van brongegevens van opgegeven URL-adres:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "Controleer of het opgegeven URL-adres toegankelijk is."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "Onbekend probleem bij toevoegen van installatiebron."
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "Installatiebron '%s' is met succes toegevoegd:"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "Autovernieuwen"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "Leest gegevens van medium '%s"
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "Probleem bij lezen van gegevens van '%s' medium"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "Controleer of uw installatiemedium geldig en leesbaar is."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+#, fuzzy
+msgid "Problem accessing the file at the specified URL"
+msgstr "Probleem bij het overdragen van brongegevens van opgegeven URL-adres."
+
+#: ../src/zypper-sources.cc:796
+#, fuzzy
+msgid "Please check if the URL is valid and accessible."
+msgstr "Controleer of het opgegeven URL-adres toegankelijk is."
+
+#: ../src/zypper-sources.cc:803
+#, fuzzy
+msgid "Problem parsing the file at the specified URL"
+msgstr "Probleem bij het overdragen van brongegevens van opgegeven URL-adres."
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr ""
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr ""
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "Installatiebron %s is verwijderd."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "Installatiebron %s is hernoemd naar %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "Installatiebron %s is niet gevonden."
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "Fout bij het wijzigen van de installatiebron:"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "Installatiebron %s wordt ongewijzigd gelaten."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s is samen met %s gebruikt, terwijl ze elkaar tegenspreken. Deze bron zal niet worden gewijzigd."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "Installatiebron %s is met succes gewijzigd."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "Gegevens van installatiebron '%s' wordt opgehaald..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "Bron '%s' bevindt zich niet in de cache. Deze wordt nu toegevoegd..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "Probleem bij laden van gegevens van '%s'"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "Oplosbare pakketten van '%s' zijn niet geladen vanwege een fout."
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(%d oplosbare pakketten gevonden)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "Probeer 'zypper refresh' of zelfs /var/cache/zypp/zypp.db voordat u het doet."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "RPM-database wordt gelezen..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s oplosbare pakketten)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -763,41 +818,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "Onjuist antwoord. Kies letter a, r of i."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "j"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "J"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "N"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
-
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "ja"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "nee"
+
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "Onjuist antwoord '%s'. Kies '%s' of '%s'."
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr ""
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -902,64 +938,39 @@
msgid "Requires:"
msgstr "Benodigd:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "Er zijn geen bronnen geconfigureerd. Voeg tenminste één bron toe met behulp van het commando 'zypper addrepo' voordat u een zoekopdracht uitvoert."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "Oplosbare pakketten die vóór het opslaan in de cache zijn geïnstalleerd, overeenkomend met opgegeven zoekcriteria..."
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr " van ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "in cache geplaatst."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr " is geen geldige reguliere expressie: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "Dit is een bug, stuur een bugrapport in voor zypper."
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "Opgegeven URL-adres is ongeldig."
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" Opties:\n"
-"\t--help, -h\t\tHelp\n"
-" \t--version, -V\t\ttoon versienummer\n"
-"\t--quiet, -q\t\tonderdruk normale uitvoer, toon alleen foutmeldingen.\n"
-" \t--verbose, -v\t\ttoon meer uitvoer\n"
-" \t--terse, -t\t\tbeknopte uitvoer voor machineverbruik\n"
-" \t--table-style, -s\ttabelstijl (heel getal)\n"
-" \t--rug-compatible, -r\tschakel Rug-compatibiliteit in\n"
-" \t--non-interactive\tvraag niets, gebruik automatisch standaardantwoorden.\n"
-"\t--no-gpg-checks\t\tnegeer fouten bij GPG-controles en ga door.\n"
-"\t--root, -R <dir>\twerk vanuit een andere hoofddirectory.\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
+#, fuzzy
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -1000,28 +1011,54 @@
" \tpatch-info\t\ttoon informatie voor patches\n"
"\tsource-install, si\tinstalleer een bronpakket\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" Opties:\n"
+"\t--help, -h\t\tHelp\n"
+" \t--version, -V\t\ttoon versienummer\n"
+"\t--quiet, -q\t\tonderdruk normale uitvoer, toon alleen foutmeldingen.\n"
+" \t--verbose, -v\t\ttoon meer uitvoer\n"
+" \t--terse, -t\t\tbeknopte uitvoer voor machineverbruik\n"
+" \t--table-style, -s\ttabelstijl (heel getal)\n"
+" \t--rug-compatible, -r\tschakel Rug-compatibiliteit in\n"
+" \t--non-interactive\tvraag niets, gebruik automatisch standaardantwoorden.\n"
+"\t--no-gpg-checks\t\tnegeer fouten bij GPG-controles en ga door.\n"
+"\t--root, -R <dir>\twerk vanuit een andere hoofddirectory.\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "Uitgebreidheid: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "Niet-interactieve modus wordt geactiveerd."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "Modus zonder GPG-controles wordt geactiveerd."
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "Ongeldige tabelstijl"
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "Probeer -h voor informatie over het gebruik."
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1047,7 +1084,7 @@
" Zie 'man zypper' voor meer details.\n"
" --debug-solver Voer een test uit voor foutopsporing\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1069,7 +1106,7 @@
"-n, --name Selecteer oplosbaren op naam, niet op capaciteit\n"
" --debug-solver Voer een test uit voor foutopsporing\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1083,7 +1120,7 @@
"\n"
"Dit commando heeft geen aanvullende opties.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1105,7 +1142,7 @@
"--disabled,-d voeg de bron toe als uitgeschakeld\n"
"--no-refresh,-n voeg de bron toe met automatisch vernieuwen uitgeschakeld\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1121,7 +1158,7 @@
"Commando-opties:\n"
"-e, --export <BESTAND.repo> exporteer alle gedefinieerde bronnen als één lokaal .repo-bestand\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1138,7 +1175,7 @@
"--loose-auth\tnegeer authenticatiegegevens in het URL-adres\n"
"--loose-query\tnegeer de query-tekenreeks in het URL-adres\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1151,7 +1188,7 @@
"Wijs een nieuwe alias toe aan de bron die is opgegeven door alias.\n"
"Dit commando heeft geen aanvullende opties.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1165,14 +1202,15 @@
msgstr ""
"modifyrepo (mr) <opties> <alias>\n"
"\n"
-"Wijzig de eigenschappen van de bron die is opgegeven door alias.\n\n"
+"Wijzig de eigenschappen van de bron die is opgegeven door alias.\n"
+"\n"
"\n"
"--disable,-d\t\tschakel de bron uit (maar verwijder deze niet)\n"
"--enable,-e\t\tactiveer een uitgeschakelde bron\n"
"--enable-autorefresh,-a\tactiveer het automatisch vernieuwen van de bron\n"
"--disable-autorefresh\tschakel het automatisch vernieuwen van de bron uit\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1196,7 +1234,7 @@
"-B, --build-only bouw alleen de database, download geen metadata.\n"
"-D, --download-only download alleen rauwe metadata, bouw de database niet.\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1216,7 +1254,7 @@
"-r, --repo <alias> som alleen opwaarderingen op van de bron die is gespecificeerd door de alias.\n"
" --best-effort gebruik bij het opwaarderen een benadering die het best-mogelijke resultaat probeert te geven, waarbij lagere versies dan het allernieuwste ook acceptabel zijn..\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1237,16 +1275,16 @@
"Waardeer alle geïnstalleerde oplosbren op naar nieuwere versies, wanneer mogelijk.\n"
"\n"
"Commando-opties:\n"
-"\n\n"
+"\n"
+"\n"
"-t, --type <type> type oplosbare (package, patch, pattern, product) (standaard: patch)\n"
"-r, --repo <alias> beperk opwaarderingen tot de bron gespecificeerd door de alias\n"
" --skip-interactive sla interactieve opwaarderingen over\n"
-"-l, --auto-agree-with-licenses zeg automatisch ja op licenties van derden die daar om vragen."
-" Zie man zypper voor meer informatie.\n"
+"-l, --auto-agree-with-licenses zeg automatisch ja op licenties van derden die daar om vragen. Zie man zypper voor meer informatie.\n"
" --best-effort gebruik bij het opwaarderen een benadering die het best-mogelijke resultaat probeert te geven, waarbij lagere versies dan het allernieuwste ook acceptabel zijn..\n"
" --debug-solver voer een test uit voor foutopsporing\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1290,7 +1328,7 @@
" \n"
" De jokertekens * en ? kunnen ook worden gebruikt binnen zoektermen.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1308,7 +1346,7 @@
"\n"
"-r, --repo <alias> controleer alleen op patches in de bron gespecificeerd door de alias.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1326,7 +1364,7 @@
"\n"
"-r, --repo <alias> controleer alleen op patches in de bron gespecificeerd door de alias.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1344,7 +1382,7 @@
"\n"
"-r, --repo <alias> controleer alleen op patches in de bron gespecificeerd door de alias.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1358,7 +1396,7 @@
"\n"
"Dit commando is een alias voor 'zypper info -t patch' en bedoelt voor compatibiliteit met rug.\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1372,7 +1410,7 @@
"\n"
"Dit commando heeft geen aanvullende opties.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1388,24 +1426,24 @@
"Commando-opties:\n"
"-r, --repo <alias> werk alleen met opwaarderingen uit de bron die is gespecificeerd door alias.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "Programma-argumenten die geen optie zijn: "
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "Bronnen uitgeschakeld, gebruikt alleen de database van geïnstalleerde pakketten."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "Negeert geïnstalleerde oplosbare pakketten..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "Er is al een Zypp-transactie gaande. Dit betekent dat er een ander programma draait dat de bibliotheek libzypp gebruikt voor pakketbeheer. Al dit soort programma's dienen te worden afgesloten voordat u dit commando kunt gebruiken."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1415,105 +1453,105 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "Er zijn root-privileges nodig om de systeembronnen te wijzigen."
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "Onvoldoende argumenten. Er is tenminste één URL-adres en alias nodig."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "Gespecificeerd type is geen geldig brontype:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Zie 'zypper -h addrepo' of man zypper voor een lijst met bekende brontypen."
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "Vereist argument ontbreekt."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Bron niet gevonden aan de hand van de alias, probeert nu te verwijderen op URL-adres..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "Bron niet gevonden aan de hand van opgegeven alias of URL-adres"
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "Alias is een vereist argument."
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "Er zijn root-privileges vereist voor het vernieuwen van de systeeminstallatiebronnen."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Er zijn root-privileges vereist voor het installeren en deïnstalleren van pakketten."
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Onbekend type oplosbare: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Waarschuwing: geen bronnen gedefinieerd. Er wordt nu alleen gewerkt met de geïnstalleerde oplosbare pakketten. Er kan niets worden geïnstalleerd."
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "Genereert een test..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "Test is met succes gegenereerd."
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "Fout bij genereren van test."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "Naam van bronpakket is een vereist argument."
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "Onbekend type oplosbaar pakket"
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "Geen oplosbaren gevonden."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Draaiend als 'rug' kan het argument 'best-effort' niet worden gebruikt bij het opwaarderen."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "Er zijn root-privileges vereist voor het bijwerken van pakketten."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "Onverwachte uitzondering."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "U draait al een shell van zypper."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "Maak een foutenrapport om dit te melden."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "Zie http://en.opensuse.org/Zypper#Troubleshooting voor instructies."
@@ -1523,20 +1561,24 @@
msgstr "Onbekend commando '%s'"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "I/O-fout"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "Ongeldig object"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "Fout"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Plaats medium [%s] # %d en typ 'y' om verder te gaan of 'n' om de operatie te annuleren."
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "Downloadt: "
@@ -1615,11 +1657,28 @@
msgid "Installation of %s failed:"
msgstr "Installatie van %s is mislukt:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "Catalogus"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "Installatiebron"
+#~ msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+#~ msgstr "Ondertekenverificatie mislukt voor %s met publieke-sleutel-id %s, %s, vingerafdruk %s. Waarschuwing: dit kan zijn veroorzaakt door een kwaadaardige wijziging in het bestand! Doorgaan is riskant! Wilt u toch doorgaan?"
+
+#~ msgid "y"
+#~ msgstr "j"
+
+#~ msgid "Y"
+#~ msgstr "J"
+
+#~ msgid "n"
+#~ msgstr "N"
+
+#~ msgid "N"
+#~ msgstr "N"
+
+#~ msgid "Invalid answer '%s', enter '%s' or '%s':"
+#~ msgstr "Onjuist antwoord '%s'. Kies '%s' of '%s'."
Modified: trunk/zypper/po/pa.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/pa.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/pa.po (original)
+++ trunk/zypper/po/pa.po Tue Sep 11 10:57:42 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypper.pa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
"PO-Revision-Date: 2007-08-18 08:46+0530\n"
"Last-Translator: A S Alam <aalam(a)users.sf.net>\n"
"Language-Team: Panjabi <punjabi-l10n(a)lists.sf.net>\n"
@@ -55,37 +55,49 @@
msgstr "à¨à© ਤà©à¨¸à©à¨ à¨à©à©°à¨à© id %s, %s, ਫਿੰà¨à¨°à¨ªà¨°à¨¿à©°à¨ %s à¨à©±à¨¤à© à¨à¨°à©à¨¸à¨¾ à¨à¨°à¨¦à© ਹà©"
#: ../src/zypper-keyring-callbacks.h:110
-#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
+#, fuzzy, c-format
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "%s ਦ੠ਫà©à¨²à©à¨¹ ਡਿà¨à¨¼à¨ ਵà©à¨§à¨¤à¨¾ à¨
ਣਡਿੱਠ੠à¨à©à¨¤à© à¨à¨¾ ਰਹ੠ਹ੠(%s ਦ੠ਲà©à©à© ਸà©, %s ਮਿਲਿà¨)।"
+
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
msgstr ""
-#: ../src/zypper-keyring-callbacks.h:119
-#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+#: ../src/zypper-keyring-callbacks.h:120
+#, fuzzy, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "%s ਲਠਡਿà¨à¨¼à¨ ਵà©à¨§à¨¤à¨¾ ਫà©à¨²à©à¨¹à¥¤ %s ਦ੠ਲà©à© ਸà©, %s ਮਿਲਿà¨à¥¤"
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
msgstr ""
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "ਫਾà¨à¨² %s ਲਠà¨à©à¨ ਡਿà¨à¨¼à¨ ਨਹà©à¨ ਹà©à¥¤"
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "à¨à¨¾à¨°à© ਰੱà¨à¨£à¨¾ ਹà©?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "ਫਾà¨à¨² %2$s ਲਠà¨
ਣà¨à¨¾à¨£ ਡਿà¨à¨¼à¨ %1$s"
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "%s ਦ੠ਫà©à¨²à©à¨¹ ਡਿà¨à¨¼à¨ ਵà©à¨§à¨¤à¨¾ à¨
ਣਡਿੱਠ੠à¨à©à¨¤à© à¨à¨¾ ਰਹ੠ਹ੠(%s ਦ੠ਲà©à©à© ਸà©, %s ਮਿਲਿà¨)।"
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "%s ਲਠਡਿà¨à¨¼à¨ ਵà©à¨§à¨¤à¨¾ ਫà©à¨²à©à¨¹à¥¤ %s ਦ੠ਲà©à© ਸà©, %s ਮਿਲਿà¨à¥¤"
@@ -121,11 +133,11 @@
msgstr "'%s' ਨà©à©° ਹà¨à¨¾à¨à¨£ ਵਾਲ੠ਪà©à¨à©à¨à¨¾à¨ ਦ੠ਲਿਸਠ'ਠà¨à©à©à¨¨ ਲਠਫà©à¨²à©à¨¹ ਹà©à¥¤"
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "ਨਹà©à¨ ਲੱà¨à¨¿à¨"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "ਸਮੱਸਿà¨: "
@@ -136,146 +148,146 @@
msgstr " ਹੱਲ %d: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "number, (r)etry or (c)ancel> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "ਹੱਲ਼ %s ਲਾà¨à© à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s ਸਮੱਸਿà¨à¨µà¨¾à¨:"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "ਦਿੱਤ੠ਸਮਰੱਥਾ ਨਹà©à¨ ਲੱà¨à©"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "à¨à©à¨ ਵ੠ਨਹà©à¨ ਹà©à¥¤"
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "à¨à©à©±à¨² ਡਾà¨à¨¨à¨²à©à¨¡ à¨à¨à¨¾à¨°: %s"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "à¨à¨¾à¨°à¨µà¨¾à¨ ਦ੠ਬਾà¨
ਦ, ਹà©à¨° %s ਵਰਤ੠à¨à¨¾à¨µà©à¨à©à¥¤"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "à¨à¨¾à¨°à¨µà¨¾à¨ ਬਾà¨
ਦ, %s à¨à¨¾à¨²à© ਹà©à¨µà©à¨à©à¥¤"
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "%s à¨à¨à¨à¨®à¨¾à¨ ਲਾਠਹਨ"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr ""
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "ਨਿਰà¨à¨°à¨¤à¨¾ ਹੱਲ਼ à¨à©à¨¤à© à¨à¨¾ ਰਹ੠ਹà©..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d ਪà©à¨à¨ ਲà©à©à©à¨¦à© (%d ਸà©à¨°à©±à¨à¨¿à¨ ਪà©à¨à¨)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "à¨à©°à¨¸à¨à¨¾à¨² à¨à©à¨¤à¨¾"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨² à¨à©à¨¤à¨¾"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "ਹà©à¨£ ਢà©à©±à¨à¨µà¨¾à¨ ਨਹà©à¨"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "ਢà©à©±à¨à¨µà¨¾à¨ ਨਹà©à¨"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "ਲਾà¨à© à¨à©à¨¤à¨¾"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "ਲà©à© ਨਹà©à¨"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "ਨਿà¨à¨¾à¨°à¨¾"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "ਲà©à© ਹà©"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "à¨à¨²à¨¤à©"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "à¨à©à¨à¨¾à¨²à¨¾à¨: "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à©: "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "ਨਾà¨"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "ਵਰà¨à¨¨"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "à¨à©à¨à¨¾à¨à¨°à©"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "ਹਾਲਤ"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "à¨à©à¨ ਲà©à©à©à¨¦à¨¾ ਪà©à¨à¨ ਨਹà©à¨ ਮਿਲਿà¨à¥¤"
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -283,38 +295,47 @@
"à¨à©à¨¤à¨¾à¨µà¨¨à©: à¨à©à¨µà¨² à¨
ੱਪਡà©à¨à¨° ਨà©à©° ਪਰà¨à¨¾à¨µà¨¿à¨¤ à¨à¨°à¨¨ ਲਠਹ੠à¨
ੱਪਡà©à¨ à¨à¨ªà¨²à©±à¨¬à¨§ ਹਨ।\n"
"ਹà©à¨° ਵ੠à¨à¨ªà¨²à©±à¨¬à¨§ ਹਨ।\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "à¨à©à¨ à¨
ੱਪਡà©à¨ ਨਹà©à¨ ਲੱà¨à¨¿à¨à¥¤"
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "ਬੰਡਲ"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "ਢਾà¨à¨à¨¾"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "à¨à©à¨¤à¨¾à¨µà¨¨à©: %s à¨à©°à¨à¨°à¨à¨à¨à¨¿à¨µ ਹà©, à¨à©±à¨¡à¨¿à¨ à¨à¨¾ ਰਿਹਾ ਹà©à¥¤"
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "à¨à¨®à¨¿à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+#, fuzzy
+msgid "Problem downloading the package file from the repository:"
+msgstr "'%s' ਤà©à¨ ਫਾà¨à¨²à¨¾à¨ ਡਾà¨à¨¨à¨²à©à¨¡ à¨à¨°à¨¨ ਦà©à¨°à¨¾à¨¨ ਸਮੱਸਿà¨à¥¤"
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "à¨à¨¸à¨¼à¨¾à¨°à© ਲਠà¨à©±à¨¤à© ਦਿੱਤਾ à¨à¨²à¨¤à© ਸà©à¨¨à©à¨¹à¨¾ ਵà©à¨à© à¨à©à¥¤"
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -330,402 +351,434 @@
"- à¨à©à¨ ਹà©à¨° à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ ਮà©à¨¡à¨¿à¨ (à¨à© à¨à¨¹ à¨à¨°à¨¾à¨¬ ਹà©à¨µà©)\n"
" - ਹà©à¨° ਰਿਪà©à¨à¨¼à¨à¨°à© ਸ਼ਾਮਲ à¨à¨°à©"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "à¨à©±à¨ à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¨ ਪà©à¨à¨ ਲਠਤà©à¨¹à¨¾à¨¡à© ਮਸ਼à©à¨¨ ਨà©à©° ਮà©à©-à¨à¨¾à¨²à© à¨à¨°à¨¨à¨¾ ਪਵà©à¨à¨¾à¥¤ à¨à¨¿à©°à¨¨à©à¨¹à¨¾à¨ à¨à©à¨¤à© ਹ੠ਸà¨à© à¨à¨°à© à¨à©à¥¤"
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "à¨à©à¨¤à¨¾à¨µà¨¨à©: à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¨ ਪà©à¨à¨à¨¾à¨ ਵਿੱਠà¨à©±à¨ ਲਠਤà©à¨¹à¨¾à¨¨à©à©° à¨à¨ªà¨£à© ਮਸ਼à©à¨¨ ਨà©à©° ਮà©à©-à¨à¨¾à¨²à© à¨à¨°à¨¨à¨¾ ਪਵà©à¨à¨¾à¥¤ à¨à¨¿à©°à¨¨à©à¨¹à¨¾à¨ à¨à©à¨¤à© ਹ੠ਸà¨à© à¨à¨°à©à¥¤"
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "à¨à©à¨¤à¨¾à¨µà¨¨à©: à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¨ ਪà©à¨à¨à¨¾à¨ ਵਿੱਠà¨à©±à¨ ਪà©à¨à©à¨ ਮà©à¨¨à©à¨à¨° ਨà©à©° ਪਰà¨à¨¾à¨µà¨¿à¨¤ à¨à¨° ਰਿਹਾ ਹà©, à¨à¨¸à¨à¨°à¨à© à¨
à¨à¨²à© à¨à¨¾à¨°à¨µà¨¾à¨ à¨à¨°à¨¨ ਲਠà¨à¨¸ ਨà©à©° ਮà©à©-à¨à¨¾à¨²à© à¨à¨°à¨¨à¨¾ ਲਾà¨à¨¼à¨®à© ਹà©à¥¤"
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "%s %s ਲਾà¨à¨¸à©à¨à¨¸ ਨਾਲ à¨à¨à©à¨®à©à¨à¨¿à¨ ਹ੠ਸਹਿਮਤ।"
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "%s %s ਲਾà¨à¨¸à©à¨à¨¸:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "à¨à¨¹ ਪà©à¨à©à¨ à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਲਠਤà©à¨¹à¨¾à¨¨à©à©° à¨à©±à¨¤à© ਦਿੱਤ੠ਲਾà¨à¨¸à©à¨à¨¸ ਦà©à¨à¨ ਸ਼ਰਤਾਠਨਾਲ ਸਹਿਮਤ ਹà©à¨£à¨¾ ਪਵà©à¨à¨¾à¥¤ à¨à© à¨à¨¾à¨°à© ਰੱà¨à¨£à¨¾ ਹà©?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "ਲà©à©à©à¨¦à© ਲਾà¨à¨¸à©à¨à¨¸ ਪà©à¨¸à¨¼à¨à© ਦ੠ਲà©à© ਹà©à¨£ à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ à¨
ਧà©à¨°à© à¨à©±à¨¡à© à¨à¨¾ ਰਹ੠ਹà©à¥¤"
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "à¨à¨¾à¨°à¨µà¨¾à¨ ਨà©à©° à¨à©°à¨à¨°à¨à¨à¨à¨¿à¨µ ਮà©à¨¡ ਵਿੱਠਮà©à© à¨à¨¾à¨²à© à¨à¨°à© à¨à© à¨
ਤ੠ਲà©à©à©à¨¦à© ਲਾà¨à¨¸à©à¨à¨¸ ਨਾਲ ਸਹਿਮਤ੠ਦਿਠà¨à¨¾à¨ --auto-agree-with-licenses à¨à©à¨£ ਦਿà¨à¥¤"
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "%s %s ਲਾà¨à¨¸à©à¨à¨¸ ਨਾਲ ਯà©à¨à¨¼à¨° ਨਾ-ਸਹਿਮਤ੠à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ à¨
ਧà©à¨°à© à¨à©±à¨¡à© à¨à¨¾ ਰਹ੠ਹà©à¥¤"
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "ਸà©à¨°à¨¸ ਪà©à¨à©à¨ %s-%s à¨à©°à¨¸à¨à¨¾à¨² à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "ਸà©à¨°à¨¸ ਪà©à¨à©à¨ %s-%s ਠà©à¨ ਤਰà©à¨¹à¨¾à¨ à¨à©°à¨¸à¨à¨¾à¨² ਹ੠à¨à¨¿à¨à¥¤"
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "ਸà©à¨°à¨¸ ਪà©à¨à©à¨ %s-%s à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਦà©à¨°à¨¾à¨¨ ਸਮੱਸਿà¨:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "ਸà©à¨°à¨¸ ਪà©à¨à©à¨ '%s' ਨਹà©à¨ ਲੱà¨à¨¿à¨à¥¤"
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "à¨à©à©±à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹ੠à¨à¨¿ à¨à© %s ਮà©à¨à¨¾-ਡਾà¨à¨¾ ਤਾà¨à¨¼à¨¾ ਹà©"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "'%s' ਤਾà¨à¨¼à¨¾ à¨à©à¨¤à¨¾ à¨à¨¾à¨à¨¦à¨¾ ਹà©à¥¤"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(ਫà©à¨°à¨¸ à¨à¨°à¨à©)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' à¨
ੱਪ-à¨à©-ਡà©à¨ ਹà©à¥¤"
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "ਰਾà¨
ਮà©à¨à¨¾à¨¡à¨¾à¨à¨¾ ਤਾà¨à¨¼à¨¾ ਲਠਫà©à¨°à¨¸ à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "'%s' ਤà©à¨ ਫਾà¨à¨²à¨¾à¨ ਡਾà¨à¨¨à¨²à©à¨¡ à¨à¨°à¨¨ ਦà©à¨°à¨¾à¨¨ ਸਮੱਸਿà¨à¥¤"
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "à¨à¨¸à¨¼à¨¾à¨°à© ਲਠà¨à©±à¨¤à© ਦਿੱਤਾ à¨à¨²à¨¤à© ਸà©à¨¨à©à¨¹à¨¾ ਵà©à¨à© à¨à©à¥¤"
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "'%s' ਲਠà¨à©à¨ URL ਨਹà©à¨ ਹà©à¥¤"
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr ""
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "à¨à¨¹ ਰਿਪà©à¨à¨¼à¨à¨°à© ਲਠà¨à©à¨ à¨à¨²à©à¨à¨¸ ਨਹà©à¨ ਹà©à¥¤"
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' à¨à¨²à¨¤ ਹà©à¥¤"
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr ""
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "'%s' ਤà©à¨ ਮà©à¨à¨¾-ਡਾà¨à¨¾ ਡਾà¨à¨¨à¨²à©à¨¡ à¨à¨°à¨¨ ਦà©à¨°à¨¾à¨¨ à¨à¨²à¨¤à©:"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© à¨à©à¨à© ਬਿਲਡ à¨à¨°à¨¨ ਲਠਫà©à¨°à¨¸ à¨à©à¨¤à¨¾ à¨à¨¾à¨à¨¦à¨¾ ਹà©"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' ਤà©à¨ ਮà©à¨à¨¾-ਡਾà¨à¨¾ ਪਾਰਸਿੰਠਦà©à¨°à¨¾à¨¨ à¨à¨²à¨¤à©:"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr ""
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "'%s' ਲਠਰਿਪà©à¨à¨¼à¨à¨°à© ਮà©à¨à¨¾à¨¡à¨¾à¨à¨¾ ਲà©à¨à¨² à¨à©à¨à© ਵਿੱਠਨਹà©à¨ ਹà©à¥¤"
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "à¨à©à¨à© ਡਾà¨à¨¾à¨¬ ਬਿਲਡਿੰਠà¨à¨²à¨¤à©:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' ਨਹà©à¨ ਲੱà¨à©à¥¤"
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "'%s' ਲਠਰਿਪà©à¨à¨¼à¨à¨°à© ਵà©à¨°à¨µà¨¾ ਪà©à©à¨¹à¨¨ ਦà©à¨°à¨¾à¨¨ à¨à¨²à¨¤à© ਹà©à¥¤"
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "à¨à¨¾à¨°à¨¨: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' à¨à©±à¨¤à© ਦਿੱਤ੠à¨à¨²à¨¤à© à¨à¨°à¨à© à¨à¨¯à©à¨ à¨à©à¨¤à© à¨à¨¾ ਰਹ੠ਹà©à¥¤"
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' à¨à¨à¨-à¨à¨«-ਡà©à¨ ਹà©à¥¤ ਤà©à¨¸à©à¨ à¨à¨¸ ਨà©à©° à¨
ੱਪਡà©à¨ à¨à¨°à¨¨ ਲਠroot ਦ੠ਤà©à¨° à¨à©±à¨¤à© 'zypper refresh' à¨à¨²à¨¾ ਸà¨à¨¦à© ਹà©à¥¤"
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "ਯà©à¨ à¨à©à¨¤à©"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "ਤਾà¨à¨¼à¨¾ à¨à¨°à©"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "à¨à¨¿à¨¸à¨®"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "à¨à¨à¨à¨¿à¨µ"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "à¨à¨¯à©à¨ à¨à©à¨¤à©"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "ਯà©à¨ à¨à©à¨¤à©"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "ਤਾà¨à¨¼à¨¾ à¨à¨°à©"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "à¨à¨ª-ਨਾà¨"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "ਹਾà¨"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "ਨਹà©à¨"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "à¨à©à¨ ਰਿਪà©à¨à¨¼à¨à¨°à© ਨਹà©à¨ ਦਿੱਤ੠à¨à¨ ਹà©à¥¤ à¨à©±à¨ à¨à¨¾à¨ ਹà©à¨° ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਸ਼ਾਮਲ à¨à¨°à¨¨ ਲਠ'zypper addrepo' ਵਰਤà©à¨à¥¤"
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© ਤà©à¨ ਪà©à©à¨¹à¨¨ ਦà©à¨°à¨¾à¨¨ à¨à¨²à¨¤à©:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "%s ਨà©à©° ਲਿà¨à¨£ ਲਠà¨à©à¨²à©à¨¹à¨¿à¨ ਨਹà©à¨ à¨à¨¾ ਸà¨à¨¦à¨¾à¥¤ ਸ਼ਾà¨à¨¦ ਤà©à¨¹à¨¾à¨¨à©à©° ਲਿà¨à¨£ à¨
ਧਿà¨à¨¾à¨° ਨਾ ਹà©?"
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਠà©à¨ ਤਰà©à¨¹à¨¾à¨ %s ਲਠà¨à¨à¨¸à¨ªà©à¨°à¨ à¨à©à¨¤à©à¨à¨ à¨à¨à¨à¨à¥¤"
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "à¨à¨¯à©à¨ à¨à©à¨¤à© ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' à¨à©±à¨¡à© à¨à¨¾ ਰਹ੠ਹà©"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' à¨à©±à¨¤à© ਦਿੱਤ੠à¨à¨²à¨¤à© à¨à¨°à¨à© à¨à©±à¨¡à© à¨à¨¾ ਰਹ੠ਹà©à¥¤"
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' à¨à¨¸ ਦ੠à¨à¨²à©à¨à¨¸ à¨à¨¾à¨ ਨੰਬਰ ਨਾਲ ਨਹà©à¨ ਲੱà¨à© ਹà©à¥¤"
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "ਦਿੱਤà©à¨à¨ ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਦ੠ਲਿਸਠਵà©à¨à¨£ ਲਠ'zypper repos' ਵਰਤà©à¨à¥¤"
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "ਦਿੱਤà©à¨à¨ ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਯà©à¨ ਨਹà©à¨ à¨à¨¾à¨ ਦਿੱਤà©à¨à¨ ਹ੠ਨਹà©à¨à¥¤"
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "à¨à©à¨ ਵ੠ਯà©à¨ à¨à©à¨¤à© ਰਿਪà©à¨à¨¼à¨à¨°à© à¨à¨ªà¨²à©±à¨¬à¨§ ਨਹà©à¨ ਹà©à¥¤"
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© ਸ਼ਾਮਲ à¨à¨°à¨¨ à¨à¨¾à¨ ਯà©à¨ à¨à¨°à¨¨ ਲਠ'zypper addrepo' à¨à¨¾à¨ 'zypper modifyrepo' à¨à¨®à¨¾à¨à¨¡à¨¾à¨ ਵਰਤà©à¨à¥¤"
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "à¨à¨²à¨¤à©à¨à¨ à¨à¨°à¨à© ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਤਾà¨à¨¼à¨¾ ਨਹà©à¨ à¨à©à¨¤à©à¨à¨ à¨à¨¾ ਸà¨à©à¨à¨à¥¤"
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "à¨à©à¨ ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਤਾà¨à¨¼à¨¾ ਨਹà©à¨ à¨à©à¨¤à©à¨à¨ à¨à¨¾ ਸà¨à©à¨à¨, à¨à¨¿à¨à¨à¨à¨¿ à¨à©±à¨ à¨à¨²à¨¤à© ਸà©à¥¤"
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "ਦਿੱਤà©à¨à¨ ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਤਾà¨à¨¼à¨¾ à¨à©à¨¤à©à¨à¨ à¨à¨à¨à¨à¥¤"
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "ਸਠਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਤਾà¨à¨¼à¨¾ à¨à©à¨¤à©à¨à¨ à¨à¨à¨à¨à¥¤"
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "à¨à¨¹ ਬਦਲਣਯà©à¨ à¨à©à¨µà¨² ਪà©à©à¨¹à¨¨ ਵਾਸਤ੠ਮà©à¨¡à¨¿à¨ (CD/DVD) ਹà©, à¨à¨à©-ਤਾà¨à¨¼à¨¾ à¨à¨¯à©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©à¥¤"
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© ਨਾਠ'%s' ਪਹਿਲਾਠਹ੠ਮà©à¨à©à¨¦ ਹà©à¥¤ ਹà©à¨° à¨à¨²à©à¨à¨¸ ਵਰਤà©à¨ à¨à©à¥¤"
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "ਦਿੱਤ੠à¨à¨¿à¨à¨¾à¨£à© à¨à©±à¨¤à© à¨à©±à¨ ਠà©à¨ ਰਿਪà©à¨à¨¼à¨à¨°à© ਨਹà©à¨ ਲੱà¨à© à¨à¨¾ ਸà¨à¨¦à©:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr ""
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "ਦਿੱਤ੠URL ਤà©à¨ ਰਿਪà©à¨à¨¼à¨à¨°à© ਡਾà¨à¨¾ à¨à¨°à¨¾à¨à¨¸à¨«à¨° à¨à¨°à¨¨ ਦà©à¨°à¨¾à¨¨ ਸਮੱਸਿà¨:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "à¨à©à©±à¨ à¨à¨°à© à¨à¨¿ à¨à© URL à¨
ਸà©à©±à¨¸à¨¬à¨² ਹà©à¥¤"
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© ਸ਼ਾਮਲ à¨à¨°à¨¨ ਦà©à¨°à¨¾à¨¨ à¨
ਣà¨à¨¾à¨£à© ਸਮੱਸਿà¨:"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' ਠà©à¨ ਤਰà©à¨¹à¨¾à¨ ਸ਼ਾਮਲ ਹ੠à¨à¨"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "à¨à¨à©-ਤਾà¨à¨¼à¨¾"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "ਮà©à¨¡à¨¿à¨ '%s' ਤà©à¨ ਡਾà¨à¨¾ ਪà©à©à¨¹à¨¿à¨ à¨à¨¾ ਰਿਹਾ ਹà©"
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "ਮà©à¨¡à¨¿à¨ '%s' ਤà©à¨ ਡਾà¨à¨¾ ਪà©à©à¨¹à¨¨ ਦà©à¨°à¨¾à¨¨ ਸਮੱਸਿà¨"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "à¨à©à©±à¨ à¨à¨°à© à¨à¨¿ à¨à¨¿ ਤà©à¨¹à¨¾à¨¡à¨¾ à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ ਮà©à¨¡à¨¿à¨ ਵà©à¨§ à¨
ਤ੠ਪà©à©à¨¹à¨¨à¨¯à©à¨ ਹà©à¥¤"
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+#, fuzzy
+msgid "Problem accessing the file at the specified URL"
+msgstr "ਦਿੱਤ੠URL ਤà©à¨ ਰਿਪà©à¨à¨¼à¨à¨°à© ਡਾà¨à¨¾ à¨à¨°à¨¾à¨à¨¸à¨«à¨° à¨à¨°à¨¨ ਦà©à¨°à¨¾à¨¨ ਸਮੱਸਿà¨à¥¤"
+
+#: ../src/zypper-sources.cc:796
+#, fuzzy
+msgid "Please check if the URL is valid and accessible."
+msgstr "à¨à©à©±à¨ à¨à¨°à© à¨à¨¿ à¨à© URL à¨
ਸà©à©±à¨¸à¨¬à¨² ਹà©à¥¤"
+
+#: ../src/zypper-sources.cc:803
+#, fuzzy
+msgid "Problem parsing the file at the specified URL"
+msgstr "ਦਿੱਤ੠URL ਤà©à¨ ਰਿਪà©à¨à¨¼à¨à¨°à© ਡਾà¨à¨¾ à¨à¨°à¨¾à¨à¨¸à¨«à¨° à¨à¨°à¨¨ ਦà©à¨°à¨¾à¨¨ ਸਮੱਸਿà¨à¥¤"
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr ""
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr ""
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© %s ਨà©à©° ਹà¨à¨¾à¨à¨à¥¤"
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© %s ਦਾ ਨਾਠ%s ਬਦਲਿà¨"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© %s ਨਹà©à¨ ਲੱà¨à©à¥¤"
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਨà©à©° ਸà©à¨§à¨£ ਦà©à¨°à¨¾à¨¨ à¨à¨²à¨¤à©:"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© %s à¨
ਣ-ਬਦਲ੠ਹ੠à¨à©±à¨¡à© à¨à¨¾ ਰਹ੠ਹà©"
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s ਨà©à©° %s ਨਾਲ ਵਰਤਿਠà¨à¨¿à¨ ਹà©, à¨à© à¨à¨¿ à¨à©±à¨ ਦà©à¨à© ਦ੠ਵਿਰà©à¨§à© ਹਨ। à¨à¨¹ ਵਿਸ਼à©à¨¸à¨¼à¨¤à¨¾ à¨
ਣ-ਬਦਲ੠à¨à©±à¨¡à© à¨à¨¾à¨µà©à¨à©à¥¤"
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© %s ਠà©à¨ ਤਰà©à¨¹à¨¾à¨ ਸà©à¨§à© à¨à¨ ਹà©à¥¤"
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' ਡਾà¨à¨¾ ਲਿਠà¨à¨¾ ਰਿਹਾ ਹà©..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' à¨à©à¨à© ਨਹà©à¨ ਹà©à¥¤ à¨à©à¨à© à¨à©à¨¤à¨¾ à¨à¨¾ ਰਹ੠ਹà©..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "'%s' ਤà©à¨ ਡਾà¨à¨¾ ਲà©à¨¡ à¨à¨°à¨¨ ਦà©à¨°à¨¾à¨¨ ਸਮੱਸਿà¨"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "'%s' ਤà©à¨ ਹੱਲ-à¨à¨°à¨¤à¨¾ à¨à¨²à¨¤à© à¨à¨°à¨à© ਲà©à¨¡ ਨਹà©à¨ à¨à©à¨¤à© à¨à¨¾ ਸà¨à©à¥¤"
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(%d ਹੱਲ ਲੱà¨à©)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "à¨à¨¹ à¨à¨°à¨¨ ਤà©à¨ ਪਹਿਲਾਠ'zypper refresh' ਵਰਤà©à¨ à¨à¨¾à¨ /var/cache/zypp/zypp.db ਨà©à©° ਹà¨à¨¾ ਦਿà¨à¥¤"
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "RPM ਡਾà¨à¨¾à¨¬à©à¨¸ ਪà©à©à¨¹à¨¿à¨ à¨à¨¾ ਰਿਹਾ ਹà©..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s ਹੱਲ) "
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -761,41 +814,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "à¨à¨²à¨¤ à¨à¨µà¨¾à¨¬à¥¤ à¨
ੱà¨à¨° a, r à¨à¨¾à¨ i ਹ੠à¨à©à¨£à©à¥¤"
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "y"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "Y"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "ਹਾà¨"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "ਨਹà©à¨"
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "à¨à¨²à¨¤ à¨à¨µà¨¾à¨¬ '%s', '%s' à¨à¨¾à¨ '%s' ਹ੠ਲਿà¨à©:"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr ""
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -898,64 +932,39 @@
msgid "Requires:"
msgstr "ਲà©à©à©à¨à¨¦à¨¾:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "à¨à©à¨ ਰਿਪà©à¨à¨¼à¨à¨°à© ਸੰਰà¨à¨¿à¨¤ ਨਹà©à¨ ਹà©à¥¤ à¨à©à¨ à¨à¨°à¨¨ ਤà©à¨ ਪਹਿਲਾਠ'zypper addrepo' à¨à¨®à¨¾à¨à¨¡ ਵਰਤ à¨à© à¨à©±à¨à©-à¨à©±à¨ à¨à©±à¨ ਰਿਪà©à¨à¨¼à¨à¨°à© ਸ਼ਾਮਲ à¨à¨°à©à¥¤"
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "ਦਿੱਤ੠à¨à©à¨ ਸà©à¨®à¨¾ ਨਾਲ ਰਲਦ੠à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¨ ਹੱਲ-ਯà©à¨ ਨà©à©° ਪà©à¨°à©-à¨à©à¨à© à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©..."
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr " ਵਿà¨à©à¨ ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "à¨à©à¨à¨à© à¨à©à¨¤à©à¥¤"
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr " à¨à©±à¨ ਢà©à©±à¨à¨µà¨¾à¨ ਨਿਯਮਤ ਸਮà©à¨à¨°à¨¨ ਨਹà©à¨ ਹà©: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "à¨à¨¹ ਬੱਠਹà©, zypper ਲਠà¨à©±à¨ ਬੱਠà¨à¨¾à¨£à¨à¨¾à¨°à© ਦਿਠà¨à©à¥¤"
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "ਦਿੱਤਾ URL à¨à¨²à¨¤ ਹà©à¥¤"
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" à¨à©à¨£à¨¾à¨:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
+#, fuzzy
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -996,28 +1005,54 @@
"\tpatch-info\t\tShow full information for patches\n"
"\tsource-install, si\tInstall a source package\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" à¨à©à¨£à¨¾à¨:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "ਵà©à¨°à¨µà¨¾: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "à¨à¨¼à©à¨°-à¨à©°à¨à¨°à¨à¨à¨à¨¿à¨µ ਮà©à¨¡ à¨à¨¾à¨²à© à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©à¥¤"
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "no-gpg-checks ਮà©à¨¡ à¨à¨¾à¨²à© à¨à©à¨¤à¨¾ à¨à¨¾à¨à¨¦à¨¾ ਹà©à¥¤"
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "à¨à¨²à¨¤ à¨à©à¨¬à¨² ਸà¨à¨¾à¨à¨² "
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "ਮੱਦਦ ਲਠ-h ਵਰਤà©à¨à¥¤"
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1043,7 +1078,7 @@
" See 'man zypper' for more details.\n"
" --debug-solver Create solver test case for debugging\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1065,7 +1100,7 @@
"-n, --name Select resolvables by plain name, not by capability\n"
" --debug-solver Create solver test case for debugging\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1079,7 +1114,7 @@
"\n"
"This command has no additional options.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1101,7 +1136,7 @@
"-d, --disabled Add the repository as disabled\n"
"-n, --no-refresh Add the repository with auto-refresh disabled\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1117,7 +1152,7 @@
" Command options:\n"
"-e, --export <FILE.repo> Export all defined repositories as a single local .repo file\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1135,7 +1170,7 @@
" --loose-auth\tIgnore user authentication data in the URL\n"
" --loose-query\tIgnore query string in the URL\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1149,7 +1184,7 @@
"\n"
"This command has no additional options.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1171,7 +1206,7 @@
"-a, --enable-autorefresh Enable auto-refresh of the repository\n"
" --disable-autorefresh Disable auto-refresh of the repository\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1195,7 +1230,7 @@
"-B, --build-only Only build the database, don't download metadata.\n"
"-D, --download-only Only download raw metadata, don't build the database\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1215,7 +1250,7 @@
"-r, --repo <alias> List only updates from the repository specified by the alias.\n"
" --best-effort Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable.\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1245,7 +1280,7 @@
" --best-effort Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable\n"
" --debug-solver Create solver test case for debugging\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1289,7 +1324,7 @@
"\n"
"* and ? wildcards can also be used within search strings.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1307,7 +1342,7 @@
"\n"
"-r, --repo <alias> Check for patches only in the repository specified by the alias.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1325,7 +1360,7 @@
"\n"
"-r, --repo <alias> Check for patches only in the repository specified by the alias.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1343,7 +1378,7 @@
"\n"
"-r, --repo <alias> Work only with the repository specified by the alias.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1357,7 +1392,7 @@
"\n"
"This is a rug compatibility alias for 'zypper info -t patch'\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1371,7 +1406,7 @@
"\n"
"This command has no additional options.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1387,24 +1422,24 @@
" Command options:\n"
"-r, --repo <alias> Work only with updates from repository specified by alias.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "ਨਾ-à¨à©à¨£ ਪਰà©à¨à¨°à¨¾à¨® à¨à¨°à¨à©à¨®à¨¿à©°à¨: "
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ à¨à¨¯à©à¨ ਹਨ, à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¨ ਪà©à¨à©à¨à¨¾à¨ ਲਠਡਾà¨à¨¾à¨¬à©à¨¸ ਦ੠ਵਰਤà©à¨ ਨਾਲ ਹà©à¥¤"
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¨ ਹੱਲਯà©à¨ à¨
ਣਡਿੱਠà¨à©à¨¤à© à¨à¨¾ ਰਹ੠ਹਨ..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "à¨à©±à¨ ZYpp à¨à¨°à¨¾à¨à¨¸à©à¨à¨¸à¨¼à¨¨ ਪਹਿਲਾਠਹ੠à¨à¨¾à¨°à© ਹà©à¥¤ ਮਤਲਬ à¨à¨¿ à¨à©à¨ ਹà©à¨° à¨à¨¾à¨°à¨ libzypp ਲਾà¨à¨¬à¨°à©à¨°à© ਨà©à©° ਪà©à¨à©à¨ ਪਰਬੰਧ ਲਠਵਰਤ ਰਿਹਾ ਹà©à¥¤ à¨à¨¹ à¨à¨®à¨¾à¨à¨¡ ਵਰਤਣ ਤà©à¨ ਪਹਿਲਾਠà¨à¨¹ ਸਠà¨à¨¾à¨°à¨ ਬੰਦ à¨à©à¨¤à© ਹà©à¨£à© à¨à¨¾à¨¹à©à¨¦à© ਹਨ।"
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1414,105 +1449,105 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "ਸਿਸà¨à¨® ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਸà©à¨§à¨£ ਲਠroot à¨
ਧਿà¨à¨¾à¨° à¨à¨¾à¨¹à©à¨¦à© ਹਨ।"
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "ਬਹà©à¨¤ ਥà©à©à©à¨¹à© à¨à¨°à¨à©à¨®à¨¿à©°à¨ ਹਨ। à¨à©±à¨à©-à¨à©±à¨ URL à¨
ਤ੠à¨à¨²à©à¨à¨¸ ਲà©à©à©à¨¦à¨¾ ਹà©à¥¤"
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "ਦਿੱਤ੠à¨à¨¿à¨¸à¨® à¨à©±à¨ ਵà©à¨§ ਰਿਪà©à¨à¨¼à¨à¨°à© à¨à¨¿à¨¸à¨® ਨਹà©à¨ ਹà©:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr ""
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "ਲà©à©à©à¨¦à¨¾ à¨à¨°à¨à©à¨®à¨¿à©°à¨ à¨à©à©°à¨® ਹà©à¥¤"
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "à¨à¨²à©à¨à¨¸ ਨਾਲ ਰਿਪà©à¨à¨¼à¨à¨°à© ਨਹà©à¨ ਮਿਲà©, URL ਨਾਲ ਹà¨à¨¾à¨à¨£ ਦ੠à¨à©à¨¸à¨¼à¨¿à¨¸à¨¼ à¨à¨¾à¨°à©..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "ਦਿੱਤ੠à¨à¨²à©à¨à¨¸ à¨à¨¾à¨ URL ਨਾਲ ਰਿਪà©à¨à¨¼à¨à¨°à© ਨਹà©à¨ ਮਿਲ੠ਹà©à¥¤"
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "à¨à¨²à©à¨à¨¸ ਲà©à©à©à¨¦à¨¾ à¨à¨°à¨à©à¨®à¨¿à©°à¨ ਹà©à¥¤"
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "ਸਿਸà¨à¨® ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਤਾà¨à¨¼à¨¾ à¨à¨°à¨¨ ਲਠroot à¨
ਧਿà¨à¨¾à¨° ਲà©à©à©à¨¦à© ਹਨ।"
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "ਪà©à¨à©à¨ à¨à©°à¨¸à¨à¨¾à¨² à¨
ਤ੠à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਲਠroot à¨
ਧਿà¨à¨¾à¨° ਲà©à©à©à¨¦à© ਹਨ।"
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "à¨
ਣà¨à¨¾à¨£ ਹੱਲ-ਯà©à¨ à¨à¨¿à¨¸à¨®: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "à¨à©à¨¤à¨¾à¨µà¨¨à©: ਰਿਪà©à¨à¨¼à¨à¨°à©à¨à¨ ਦਿੱਤà©à¨à¨ ਨਹà©à¨ ਹਨ। à¨à©°à¨¸à¨à¨¾à¨² ਹੱਲ਼ਯà©à¨ ਨਾਲ ਹ੠à¨à¨¾à¨°à¨µà¨¾à¨ ਹà©à¨µà©à¨à©à¥¤ à¨à©à¨ ਵ੠à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ ਹà©à¨µà©à¨à¨¾à¥¤"
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "ਸਲà©à¨µà¨° à¨à©à¨¸à¨ à¨à©à¨¸ ਤਿà¨à¨° à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "ਸà©à¨²à¨µà¨° à¨à©à¨¸à¨ à¨à©à¨¸ ਬਣਾà¨à¨ à¨à¨¿à¨à¥¤"
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "ਸà©à¨²à¨µà¨° à¨à©à¨¸à¨ à¨à©à¨¸à¨ª ਬਣਾà¨à¨£ ਦà©à¨°à¨¾à¨¨ à¨à¨²à¨¤à©à¥¤"
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "ਸà©à¨°à¨¸ ਪà©à¨à©à¨ ਨਾਠà¨à©±à¨ ਲà©à©à©à¨¦à¨¾ à¨à¨°à¨à©à¨®à¨¿à©°à¨ ਹà©à¥¤"
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "à¨
ਣà¨à¨¾à¨£ ਹੱਲਯà©à¨ à¨à¨¿à¨¸à¨® "
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "à¨à©à¨ ਹੱਲ਼ ਨਹà©à¨ ਲੱà¨à¨¿à¨à¥¤"
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "'rug' ਵਾà¨à¨ à¨à©±à¨² ਰਿਹਾ ਹà©, à¨à¨¸à¨à¨°à¨à© à¨
ੱਪਡà©à¨ ਨà©à©° 'best-effort' ਢੰਠਨਾਲ ਨਹà©à¨ à¨à¨²à¨¾à¨à¨ à¨à¨¾ ਸà¨à¨¦à¨¾à¥¤"
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "ਪà©à¨à©à¨ à¨
ੱਪਡà©à¨ à¨à¨°à¨¨ ਲਠroot à¨
ਧਿà¨à¨¾à¨° ਲà©à©à©à¨¦à© ਹਨ।"
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "à¨
à¨à¨¾à¨¨à¨ à¨
ਪਵਾਦ à¨à¨à¨ ਹà©à¥¤"
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "ਤà©à¨¸à©à¨ zypper ਦ੠ਸ਼à©à¨² ਪਹਿਲਾਠਹ੠à¨à¨²à¨¾ ਰਹ੠ਹà©à¥¤"
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "à¨à¨¸ ਬਾਰ੠ਬੱਠਰਿਪà©à¨°à¨ à¨à¨°à© à¨à©à¥¤"
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "ਸਮੱਸਿਠਹੱਲ਼ ਵਾਸਤ੠ਹਦਾà¨à¨¤à¨¾à¨ ਲਠhttp://en.opensuse.org/Zypper ਵà©à¨à©à¥¤"
@@ -1522,20 +1557,24 @@
msgstr "à¨
ਣà¨à¨¾à¨£ à¨à¨®à¨¾à¨à¨¡ '%s'"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "I/O à¨à¨²à¨¤à©"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "à¨à¨²à¨¤ à¨à¨¬à¨à©à¨à¨"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "à¨à¨²à¨¤à©"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "ਮà©à¨¡à¨¿à¨ [%s] # %d ਪਾਠà¨
ਤ੠à¨à¨¾à¨°à© ਰੱà¨à¨£ ਲਠ'y' à¨à¨¾à¨ à¨à¨¾à¨°à¨µà¨¾à¨ ਰੱਦ à¨à¨°à¨¨ ਲਠ'n' ਦੱਬà©à¥¤"
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "ਡਾà¨à¨¨à¨²à©à¨¡ à¨à©à¨¤à¨¾ à¨à¨¾ ਰਿਹਾ ਹà©: "
@@ -1615,11 +1654,25 @@
msgid "Installation of %s failed:"
msgstr "%s ਦ੠à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ ਫà©à¨²à©à¨¹ ਹà©à¨:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "à¨à©à¨à¨¾à¨²à¨¾à¨"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à©"
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "Y"
+#~ msgstr "Y"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "N"
+#~ msgstr "N"
+
+#~ msgid "Invalid answer '%s', enter '%s' or '%s':"
+#~ msgstr "à¨à¨²à¨¤ à¨à¨µà¨¾à¨¬ '%s', '%s' à¨à¨¾à¨ '%s' ਹ੠ਲਿà¨à©:"
Modified: trunk/zypper/po/pl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/pl.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/pl.po (original)
+++ trunk/zypper/po/pl.po Tue Sep 11 10:57:42 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
"PO-Revision-Date: 2007-08-21 21:29+0100\n"
"Last-Translator: wadim dziedzic <nikdo(a)aviary.pl>\n"
"Language-Team: <pl(a)li.org>\n"
@@ -54,37 +54,50 @@
msgstr "Czy ufaÄ kluczowi: id: %s, %s, odcisk: %s"
#: ../src/zypper-keyring-callbacks.h:110
-#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
+#, fuzzy, c-format
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
msgstr "Uwaga: zignorowano nieudanÄ
weryfikacjÄ sygnatury dla %s. ID klucza: %s, %s odcisk: %s. ProszÄ jeszcze raz skontrolowaÄ czy nie jest to spowodowane przez niebezpieczne zmiany w pliku."
-#: ../src/zypper-keyring-callbacks.h:119
-#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "Nieudana weryfikacja sygnatury dla %s. ID klucza: %s, %s, odcisk: %s. Uwaga: może to byÄ spowodowane przez niebezpieczne zmiany w pliku. Kontynuacja wiÄ
że siÄ z ryzykiem. KontynuowaÄ?"
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:120
+#, fuzzy, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Weryfikacja podsumowania dla %s nie powiodÅa siÄ. Oczekiwano %s, napotkano %s."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:125
+#, fuzzy
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Kontynuacja mimo wszystko"
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "Brak podsumowania dla pliku %s."
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "Czy kontynuowaÄ?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "Nieznane podsumowanie %s dla pliku %s."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "Zignorowano nieudanÄ
weryfikacjÄ podsumowania dla %s (oczekiwano %s, napotkano %s)"
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Weryfikacja podsumowania dla %s nie powiodÅa siÄ. Oczekiwano %s, napotkano %s."
@@ -120,11 +133,11 @@
msgstr "Dodanie \"%s\" do listy pakietów przeznaczonych do usuniÄcia nie powiodÅo siÄ."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Nie znaleziono"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "Problem:"
@@ -135,146 +148,146 @@
msgstr " RozwiÄ
zanie %d: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "liczba, (p)onów lub (a)nuluj"
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "p"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "a"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "Zastosowanie rozwiÄ
zania %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "Problemy (%s): "
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "Nie znaleziono podanej wÅaÅciwoÅci"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "Brak zadaÅ."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "CaÅkowity rozmiar danych do pobrania: %s"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "Po wykonaniu operacji użyte zostanie dodatkowo %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Po wykonaniu operacji zwolnione zostanie %s."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "Elementów zablokowanych: %s"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "Ustalanie statusu agregatów"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "RozwiÄ
zywanie zależnoÅci..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "potrzebnych poprawek: %d (poprawki bezpieczeÅstwa: %d)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Zainstalowano"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "UsuniÄto"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Już nieodpowiednia"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Nieodpowiednia"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Zastosowana"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Niepotrzebna"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Uszkodzona"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Potrzebna"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "bÅÄ
d"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Katalog: "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Repozytorium:"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Nazwa"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "Wersja"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "Kategoria"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Status"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "Nie znaleziono potrzebnych poprawek."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -282,38 +295,47 @@
"UWAGA: Te uaktualnienia dotyczÄ
samego programu uaktualniajÄ
cego.\n"
"DostÄpne sÄ
także inne uaktualnienia.\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "Nie znaleziono aktualizacji."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Zestaw"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "UWAGA: %s jest interaktywna, pominiÄto."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "zatwierdzanie"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+#, fuzzy
+msgid "Problem downloading the package file from the repository:"
+msgstr "Problem podczas pobierania plików z \"%s\"."
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "WiÄcej informacji można znaleÅºÄ w powyższym komunikacie bÅÄdów."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -330,402 +352,434 @@
"- użycie innego noÅnika instalacyjnego,\n"
"- użycie innego repozytorium."
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Jedna z zainstalowanych poprawek wymaga ponownego uruchomienia komputera. ProszÄ wykonaÄ to jak najszybciej."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "UWAGA: Jedna z zainstalowanych poprawek wymaga ponownego uruchomienia komputera. ProszÄ wykonaÄ to jak najszybciej."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "UWAGA: Jedna z zainstalowanych poprawek dotyczy menedżera pakietów. Należy uruchomiÄ go ponownie przed dalszym użyciem."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Automatycznie zaakceptowano licencjÄ obiektu \"%s\" typu \"%s\""
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "licencja %s %s:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Aby zainstalowaÄ ten pakiet, należy zaakceptowaÄ warunki powyższej licencji. KontynuowaÄ?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "Przerwanie instalacji z powodu braku akceptacji licencji."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "ProszÄ wykonaÄ operacjÄ w trybie interaktywnym i zgodziÄ siÄ z warunkami licencji lub użyÄ opcji --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "Przerwanie instalacji z powodu braku akceptacji licencji %s %s."
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "Insalowanie pakietu z kodem źródÅowym %s-%s"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "Pakiet z kodem źródÅowym %s-%s zostaÅ zainstalowany pomyÅlnie."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problem podczas instalacji pakietu z kodem źródÅowym %s-%s"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "Pakiet z kodem źródÅowym \"%s\" nie zostaÅ znaleziony."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "Sprawdzanie czy trzeba odÅwieżyÄ metadane dla %s."
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "OdÅwieżanie \"%s\""
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(wymuszony)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "Repozytorium \"%s\" jest aktualne."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "Wymuszono odÅwieżenie metadanych"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "Problem podczas pobierania plików z \"%s\"."
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "WiÄcej informacji można znaleÅºÄ w powyższym komunikacie bÅÄdów."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "Nie zdefiniowano adresów URL dla \"%s\"."
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "ProszÄ dodaÄ conajmniej jeden bazowy adres URL (baseurl=URL) do pliku %s dla repozytorium \"%s\"."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "Nie okreÅlono aliasu dla tego repozytorium."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "Repozytorium \"%s\" jest niepoprawne."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "ProszÄ sprawdziÄ czy zdefiniowane dla tego repozytorium adresy URL wskazujÄ
na poprawne repozytorium."
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "Problem podczas pobierania metadanych dla \"%s\":"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "Wymuszono przebudowane pamiÄci podrÄcznej repozytorium"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "BÅÄ
d przetwaezania metadanych dla \"%s\":"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "Może to byÄ spowodowane przez niepoprawne metadane w repozytorium lub przez bÅÄ
d w parserze metadanych. W tym drugim przypadku proszÄ zgÅosiÄ bÅÄ
d wg instrucji pod adresem http://en.opensuse.org/Zypper#Troubleshooting"
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "Metadane repozytorium \"%s\" nie zostaÅy znalezione w pamiÄci podrÄcznej."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "BÅÄ
d podczas budowania pamiÄci podrÄcznej:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "Nie znaleziono repozytorium \"%s\"."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "BÅÄ
d odczytu pliku opisu repozytorium \"%s\"."
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "Powód: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "WyÅÄ
czono repozytorium \"%s\" z powodu powyższego bÅÄdu."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "Repozytorium \"%s\" jest nieaktualne. Aby je zaktualizowaÄ, należy uruchomiÄ polecenie \"zypper refresh\" jako użytkownik root."
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "WÅÄ
czono"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "OdÅwież"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "Typ"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "Aktywny"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "WyÅÄ
czono"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "WÅÄ
czono"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "OdÅwież"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "Alias"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Tak"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "Nie"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "Nie zdefiniowano żadnych repozytoriów. Aby je dodaÄ, należy skorzystaÄ z polecenia \"zypper addrepo\"."
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "BÅÄ
d odczytu repozytoriów:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "Nie można otworzyÄ %s do zapisu. ProszÄ sprawdziÄ prawa dostÄpu."
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "Repozytoria zostaÅy wyeksportowane do \"%s\"."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "PominiÄto wyÅÄ
czone repozytorium \"%s\""
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "PominiÄto wyÅÄ
czone repozytorium \"%s\" z powodu powyższego bÅÄdu."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "Nie znaleziono repozytorium \"%s\" wg aliasu i/lub numeru."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "Polecenie \"zypper repos\" wyÅwietla listÄ zdefiniowanych repozytoriów."
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "Podane repozytoria nie sÄ
wÅÄ
czone lub zdefiniowane."
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "Brak zdefiniowanych wÅÄ
czonych repozytoriów."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "Aby dodaÄ lub wÅÄ
czyÄ repozytorium, należy skorzystaÄ z polecenia \"zypper addrepo\" lub \"zypper addrepo\"."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "Nie można odÅwieżyÄ repozytoriów z powodu bÅÄdów."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "CzÄÅÄ repozytoriów nie zostaÅa odÅwieżona z powodu bÅÄdów."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "OdÅwieżono podane repozytoria."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "OdÅwieżono wszystkie repozytoria."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "To jest wymienny noÅnik tylko do odczytu (CD/DVD). AutoodÅwieżanie wyÅÄ
czone."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "Repozytorium \"%s\" już istnieje. ProszÄ użyÄ innego aliasu."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "Nie można znaleÅºÄ poprawnego repozytorium w podanym miejscu:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "Nie można okreÅliÄ typu repozytorium. ProszÄ sprawdziÄ czy zdefiniowane adresy URL wskazujÄ
na poprawne repozytoria:"
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "Problem podczas przesyÅania danych repozytorium spod podanego adresu URL:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "ProszÄ sprawdziÄ czy podany adres URL jest dostÄpny."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "NieokreÅlony problem podczas dodawania repozytorium:"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "Repozytorium \"%s\" zostaÅo dodane z powodzeniem"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "AutoodÅwieżanie"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "Odczytywanie danych z noÅnika \"%s\""
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "Problem podczas odczytywania danych z noÅnika \"%s\""
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "ProszÄ sprawdziÄ czy noÅnik instalacyjny jest poprawny i odczytywalny."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+#, fuzzy
+msgid "Problem accessing the file at the specified URL"
+msgstr "Problem podczas przesyÅania danych repozytorium spod podanego adresu URL:"
+
+#: ../src/zypper-sources.cc:796
+#, fuzzy
+msgid "Please check if the URL is valid and accessible."
+msgstr "ProszÄ sprawdziÄ czy podany adres URL jest dostÄpny."
+
+#: ../src/zypper-sources.cc:803
+#, fuzzy
+msgid "Problem parsing the file at the specified URL"
+msgstr "Problem podczas przesyÅania danych repozytorium spod podanego adresu URL:"
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr ""
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr ""
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "Repozytorium \"%s\" zostaÅo usuniÄte."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "Zmieniono nazwÄ repozytorium %s na %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "Repozytorium \"%s\" nie zostaÅo znalezione"
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "WystÄ
piÅ bÅÄ
d podczas modyfikacji repozytorium."
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "Nie zmieniono repozytorium \"%s\"."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "Użyto %s razem z %s, które siÄ wykluczajÄ
. WÅasnoÅÄ ta pozostanie niezmieniona."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "Modyfikacja repozytorium \"%s\" zakoÅczona powodzeniem."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "Pobieranie danych repozytorium \"%s\"..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "Brak pamiÄci podrÄcznej dla repozytorium \"%s\". Tworzenie..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "Problem przy wczytywaniu danych z \"%s\""
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "Pakiety z \"%s\" nie zostaÅy wczytane z powodu bÅÄdu."
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(znalezionych pakietów: %d)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "Przedtem proszÄ spróbowaÄ uruchomiÄ \"zypper refresh\" lub usubÄ
Ä plik /var/cache/zypp/zypp.db."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "Odczytywanie bazy danych RPM..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(pakietów: %s)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -761,41 +815,24 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "Niepoprawna odpowiedź. ProszÄ podaÄ literÄ p, a lub i."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "t"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "T"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+#, fuzzy
+msgid "yes"
+msgstr "Tak"
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+#, fuzzy
+msgid "no"
+msgstr "n"
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "Niepoprawna odpowiedź: \"%s\". ProszÄ podaÄ \"%s\" lub \"%s\":"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr ""
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -898,64 +935,39 @@
msgid "Requires:"
msgstr "Wymaga:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "Nie skonfigurowano żadnego repozytorium. ProszÄ dodaÄ conajmniej jedno (polecenie \"zypped addrepo\") przed użyciem wyszukiwania."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "WstÄpne wczytywanie do pamiÄci podrÄcznej zainstalowanych pakietów speÅniajÄ
cych podane kryteria wyszukiwania..."
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr " z ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "w pamiÄci podrÄcznej."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr " nie jest prawidÅowym wyrażeniem regularnym: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "Jest to bÅÄ
d, proszÄ wypeÅniÄ raport bÅÄdu w tej sprawie."
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "Podany adres URL jest nieprawidlowy."
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" Opcje:\n"
-"\t--help, -h\t\tPomoc\n"
-"\t--version, -V\t\tWyÅwietla informacje o wersji\n"
-"\t--quiet, -q\t\tTryb cichy, wyÅwietla tylko informacje o bÅÄdach.\n"
-"\t--verbose, -v\t\tWyÅwietla dodatkowe informacje\n"
-"\t--terse, -t\t\tUżywa formy zwiÄzÅej, odpowiedniej do dalszego przetwarzania maszynowego\n"
-"\t--table-style, -s\tStyl tablicowy (liczbowy)\n"
-"\t--rug-compatible, -r\tWÅÄ
cza tryb kompatybilnoÅci z rug\n"
-"\t--non-interactive\tBez zadawania pytaÅ; automatycznie stosuje domyÅlne ustawienia\n"
-"\t--no-gpg-checks\t\tIgnoruje bÅÄdy kontroli GPG\n"
-"\t--root, -R <dir>\tPracuje na innym drzewie katalogów.\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
+#, fuzzy
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -996,28 +1008,54 @@
"\tpatch-info\t\tWyÅwietla peÅne informacje na temat poprawek\n"
"\tsource-install, si\tInstaluje pakiet z kodem źródÅowym\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" Opcje:\n"
+"\t--help, -h\t\tPomoc\n"
+"\t--version, -V\t\tWyÅwietla informacje o wersji\n"
+"\t--quiet, -q\t\tTryb cichy, wyÅwietla tylko informacje o bÅÄdach.\n"
+"\t--verbose, -v\t\tWyÅwietla dodatkowe informacje\n"
+"\t--terse, -t\t\tUżywa formy zwiÄzÅej, odpowiedniej do dalszego przetwarzania maszynowego\n"
+"\t--table-style, -s\tStyl tablicowy (liczbowy)\n"
+"\t--rug-compatible, -r\tWÅÄ
cza tryb kompatybilnoÅci z rug\n"
+"\t--non-interactive\tBez zadawania pytaÅ; automatycznie stosuje domyÅlne ustawienia\n"
+"\t--no-gpg-checks\t\tIgnoruje bÅÄdy kontroli GPG\n"
+"\t--root, -R <dir>\tPracuje na innym drzewie katalogów.\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "SzczegóÅowoÅÄ: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "RozpoczÄto tryb wsadowy."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "RozpoczÄto tryb bez sprawdzeÅ gpg"
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "NieprawidÅowy styl tabeli"
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "Opcja -h wyÅwietla pomoc"
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1043,7 +1081,7 @@
" WiÄcej informacji wyÅwietla polecenie \"man zypper\".\n"
" --debug-solver Tworzy test dla mechanizmu rozwiÄ
zywania zależnoÅci (debugowanie)\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1065,7 +1103,7 @@
"-n, --name Wybór obiektów wg nazwy , nie wg capability\n"
" --debug-solver Tworzy test dla mechanizmu rozwiÄ
zywania zależnoÅci (debugowanie)\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1079,7 +1117,7 @@
"\n"
"To polecenie nie posiada żadnych opcji.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1100,7 +1138,7 @@
"--disabled,-d Dodaje repozytorium jako nieaktywne\n"
"--no-refresh,-n Dodaje repozytorium z wyÅÄ
czonym automatycznym odÅwieżaniem\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1116,7 +1154,7 @@
" Opcje:\n"
"-e, --export <PLIK.repo> Eksportuje wszystkie zdefiniowane repozytoria do jednego pliku .repo\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1133,7 +1171,7 @@
" --loose-auth\tIgnoruje dane uwoerzytelniania w adresie URL\n"
" --loose-query\tIgnoruje ciÄ
g zapytania w adresie URL\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1147,7 +1185,7 @@
"\n"
"To polecenie nie posiada żadnych dodatkowych opcji.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1168,7 +1206,7 @@
"--enable-autorefresh,-a WÅÄ
cza autoodÅwieżanie repozytorium\n"
"--disable-autorefresh WyÅÄ
cza autoodÅwieżanie repozytorium\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1192,7 +1230,7 @@
"-B, --build-only Tylko buduje bazÄ danych, bez pobrania metadanych\n"
"-D, --download-only Tylko pobiera metadane, bez przebudowania bazy danych\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1212,7 +1250,7 @@
"-r, --repo <alias> WyÅwietla tylko aktualizacje z repozytorium okreÅlonego przez alias\n"
" --best-effort Wykonuje \"najlepszÄ
\" aktualizacjÄ -- dozwolone sÄ
aktualizacje nie do najnowszych wersji.\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1242,7 +1280,7 @@
" --best-effort Wykonuje \"najlepszÄ
\" aktualizacjÄ -- dozwolone sÄ
aktualizacje nie do najnowszych wersji.\n"
" --debug-solver Tworzy test dla mechanizmu rozwiÄ
zywania zależnoÅci (debugowanie)\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1286,7 +1324,7 @@
"\n"
"Znaki specjalne * oraz ? mogÄ
byÄ używane wewnÄ
trz fraz wyszukiwania.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1304,7 +1342,7 @@
"\n"
"-r, --repo <alias> Ogranicza tylko do poprawek z repozytorium okreÅlonego przez alias.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1322,7 +1360,7 @@
"\n"
"-r, --repo <alias> Ogranicza tylko do poprawek z repozytorium okreÅlonego przez alias.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1340,7 +1378,7 @@
"\n"
"-r, --repo <alias> UwzglÄdnia tylko repozytorium okreÅlone przez alias.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1354,7 +1392,7 @@
"\n"
"To polecenie to alias dla \"zypper info -t patch\".\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1368,7 +1406,7 @@
"\n"
"To polecenie nie ma dodatkowych opcji.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1384,24 +1422,24 @@
" Opcje:\n"
"-r, --repo <alias> Ogranicza tylko do aktualizacji z repozytorium okreÅlonego przez alias.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "Parametry programu nie bÄdÄ
ce opcjami: "
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "Repozytoria wyÅÄ
czone, użyto tylko bazy zainstalowanych pakietów."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "Zainstalowane pakiety rozwiÄ
zywalne zostanÄ
zignorowane"
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "Transakcja Zypp jest w trakcie wykonania. Oznacza to, że uruchomiona jest inna aplikacja korzystajÄ
ca z biblioteki libzypp. Należy jÄ
zamknÄ
Ä przed użyciem tego polecenia."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1411,105 +1449,105 @@
" ___ _ e. __ ,o\n"
" \" \""
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "Do modyfikacji repozytoriów konieczne sÄ
uprawnienia administratora."
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "Zbyt maÅo parametrów. Wymagany jest conajmniej alias i adres URL."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "Podany typ repozytorium nie jest poprawny:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Polecenie \"zypper -h addrepo\" wyÅwietla listÄ znanych typów repozytoriów."
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "Brak wymaganego parametru."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Nie znaleziono repozytorium wg aliasu. Próba usuniÄcia wg adresu URL..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "Nie znaleziono repozytorium o danym aliasie i/lub adresie URL."
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "Alias jest wymaganym parametrem"
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "Do odÅwieżania repozytoriów konieczne sÄ
uprawnienia administratora."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "Do instalacji/usuwania pakietów konieczne sÄ
uprawnienia administratora."
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Nieznany typ pakietu: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Ostrzeżenie: Brak repozytorów. Operacja obejmie tylko zainstalowane pakiety. Nic nowego nie może zostaÄ zainstalowane."
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "Tworzenie testu dla mechanizmu zarzÄ
dzania pakietami..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "Test mechanizmu rozwiÄ
zywania zależnoÅci zostaÅ poprawnie wygenerowany."
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "BÅÄ
d podczas tworzenia testu dla mechanizmu zarzÄ
dzania pakietami."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "Nazwa pakietu jest wymaganym parametrem."
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "Nieznany typ pakietu rozwiÄ
zywalnego"
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "Nie znaleziono pakietów."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "Uruchomiono jako \"rug\". Nie można wykonaÄ \"najlepszej\" aktualizacji."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "Do aktualizacji pakietów konieczne sÄ
uprawnienia administratora."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "Niespodziewany wyjÄ
tek."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "PowÅoka zyppera jest już uruchomiona."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "ProszÄ wypeÅniÄ raport bÅÄdu w tej sprawie."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "W celu uzyskania dodatkowych informacji, zajrzyj na http://en.opensuse.org/Zypper#Troubleshooting ."
@@ -1519,20 +1557,25 @@
msgstr "Nieznane polecenie \"%s\""
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "BÅÄ
d wejÅcia/wyjÅcia"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "NieprawidÅowy obiekt"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+#, fuzzy
+msgid "Error"
+msgstr "bÅÄ
d"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "ProszÄ wÅożyÄ noÅnik [%s] # %d i nacisnÄ
Ä 't' aby kontynuowaÄ lub 'n' aby przerwaÄ operacjÄ."
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "Pobieranie:"
@@ -1611,14 +1654,29 @@
msgid "Installation of %s failed:"
msgstr "BÅÄ
d podczas instalacji %s:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "Katalog"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "Repozytorium"
+#~ msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+#~ msgstr "Nieudana weryfikacja sygnatury dla %s. ID klucza: %s, %s, odcisk: %s. Uwaga: może to byÄ spowodowane przez niebezpieczne zmiany w pliku. Kontynuacja wiÄ
że siÄ z ryzykiem. KontynuowaÄ?"
+
+#~ msgid "y"
+#~ msgstr "t"
+
+#~ msgid "Y"
+#~ msgstr "T"
+
+#~ msgid "N"
+#~ msgstr "N"
+
+#~ msgid "Invalid answer '%s', enter '%s' or '%s':"
+#~ msgstr "Niepoprawna odpowiedź: \"%s\". ProszÄ podaÄ \"%s\" lub \"%s\":"
+
#~ msgid "Summary:"
#~ msgstr "Podsumowanie:"
@@ -1824,9 +1882,6 @@
#~ msgid "Cleaning cache..."
#~ msgstr "Inicjalizacja cache..."
-#~ msgid "Continuing anyway"
-#~ msgstr "Kontynuacja mimo wszystko"
-
#~ msgid "removing source "
#~ msgstr "usuwanie źródÅa "
Modified: trunk/zypper/po/pt.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/pt.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/pt.po (original)
+++ trunk/zypper/po/pt.po Tue Sep 11 10:57:42 2007
@@ -11,8 +11,8 @@
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
-"PO-Revision-Date: 2007-08-18 18:31+0100\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"PO-Revision-Date: 2007-09-10 21:55+0100\n"
"Last-Translator: Carlos Gonçalves <carlos(a)pinguix.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@
#: ../src/zypper-keyring-callbacks.h:40
#, c-format
msgid "Warning: Accepting an unsigned file %s."
-msgstr "Atenção: A aceitar um ficheiro %s não assinado."
+msgstr "Aviso: A aceitar um ficheiro %s não assinado."
#: ../src/zypper-keyring-callbacks.h:46
#, c-format
@@ -58,37 +58,49 @@
#: ../src/zypper-keyring-callbacks.h:110
#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "Atenção: A ignorar falha na verificação da assinatura para %s com a id da chave pública %s, %s, impressão digital %s! Verifique se não é causado por alguma modificação maliciosa no ficheiro!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "Atenção: A ignorar falha na verificação da assinatura para %s com a id da chave pública %s, %s, impressão digital %s!"
-#: ../src/zypper-keyring-callbacks.h:119
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "Verifique se não é causado por alguma modificação maliciosa no ficheiro!"
+
+#: ../src/zypper-keyring-callbacks.h:120
#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "Verificação da assinatura falhou para %s com a id da chave pública %s, %s, impressão digital %s. Aviso: Isto pode ser causado por uma alteração maliciosa no ficheiro! Continuar é arriscado! Continuar à mesma?"
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "Falha na verificação da assinatura para %s com a id da chave pública %s, %s, impressão digital %s."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr "Aviso: Isto pode ser causado por uma alteração maliciosa no ficheiro!"
+
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
+msgstr "Continuar é arriscado! Continuar mesmo assim?"
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "Ficheiro %s sem digest."
# internal key used: Ok
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "Continuar?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "Digest %s desconhecido para o ficheiro %s."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "A ignorar falhas na verificação 'digest' para %s (era esperado %s, %s encontrado)."
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "Falhou a verificação 'digest' para %s. à espera de %s, %s encontrado."
@@ -124,11 +136,11 @@
msgstr "Falhou a adição de '%s' à lista de pacotes a remover."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Não encontrado"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "Problema: "
@@ -139,146 +151,146 @@
msgstr " Solução %d: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "número, (r)epetir ou (c)ancelar> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "A aplicar solução %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s Problemas:"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "Não foi encontrada a capacidade especÃficada"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "Nada para fazer."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "Tamanho total da descarga: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
-msgstr "Depois da operação, %s adicionais irão ser utilizados."
+msgstr "Depois da operação, %s adicionais serão utilizados."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "Depois da operação, %s irão ser libertados."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "%s itens bloqueados"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "A estabelecer o estado dos agregados"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "A resolver dependências..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d correcções necessárias (%d correcções de segurança)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "Instalado"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Desinstalado"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Já Não Aplicável"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Não Aplicável"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "Aplicado"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Desnecessário"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "Quebrado"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "Necessário"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "erro"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "Catálogo: "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "Repositório: "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Nome"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "Versão"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "Categoria"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "Estado"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "Nenhuma correcção necessária encontrada."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -286,38 +298,46 @@
"AVISO: Estes são apenas as actualizações que afectam o actualizador propriamente dito.\n"
"Também existem outras disponÃveis.\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "Nenhuma actualização encontrada."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "Conjunto"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "Arch"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "AVISO: %s é interactivo, ignorado."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "a enviar"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+msgid "Problem downloading the package file from the repository:"
+msgstr "Problema ao descarregar o ficheiro do pacote do repositório:"
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "Por favor, veja a mensagem acima para uma sugestão."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -333,403 +353,432 @@
"- utilize outro suporte de instalação (se por exemplo estiver danificado)\n"
"- utilize outro repositório"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Uma das correcções instaladas requer a reinicialização da sua máquina. Por favor, faça-o tão cedo quanto possÃvel."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "AVISO: Uma das correcções instaladas requer a reinicialização da sua máquina. Por favor, faça-o tão cedo quanto possÃvel."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "AVISO: Uma das correcções instaladas afecta o gestor de pacotes propriamente dito, pelo que este necessita de ser reiniciado antes de executar as operações seguintes."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "Automaticamente concordar com a licença %s %s."
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "%s %s licença:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Por forma a instalar este pacote, deve concordar com os termos da licença acima. Continuar?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "A interromper a instalação devido à necessidade de confirmação do(s) licenciamento(s)."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "Por favor, reinicie a operação em modo interactivo e confirme a concordância com a(s) licença(s) necessária(s) ou utilize a opção --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "A interromper a instalação devido a desacordo do utilizador com a licença %s %s."
# /usr/lib/YaST2/clients/sw_single.ycp:12
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "A instalar o pacote de código %s-%s"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "O pacote de código %s-%s foi instalado com sucesso."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "Problema ao instalar o pacote de código %s-%s:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "Pacote de código '%s' não encontrado."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "A verificar se refresca a metadata de %s"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "A refrescar '%s'"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(forçado)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "O repositório '%s' está actualizado."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "A forçar resfrescagem de metadata sem formatação"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "Problema ao descarregar ficheiros de '%s'."
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "Por favor, veja a mensagem acima para uma sugestão."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "Nenhum URL definido para '%s'."
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "Por favor, adicione uma ou mais entradas de URL base (baseurl=URL) ao %s para o repositório '%s'."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "Nenhuma alcunha definida para este repositório."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "Repositório '%s' inválido."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "Por favor, verifique se o os URLs definidos para este repositório estão a apontar para um repositório válido."
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "Erro ao descarregar a metadata para '%s':"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "A forçar construção da cache do repositório"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "Erro ao interpretar a metadata de '%s':"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "Isto pode ser causado por metadata inválida no repositório ou por um defeito na interpretação da metadata. Neste último caso, ou se em dúvida, por favor preencha uma reportagem de defeito seguindo as instruções em http://en.opensuse.org/Zypper#Troubleshooting"
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "Não foi encontrada a metadata do repositório '%s' na cache local."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "Erro ao construir a base de dados da cache:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "Repositório '%s' não encontrado."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "Erro na leitura do ficheiro de descrição do repositório '%s'."
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "Razão: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "A desactivar o repositório '%s' devido ao erro acima."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "O repositório '%s' está desactualizado. Para o actualizar, poderá correr 'zypper refresh'."
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "Activado"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "Refrescar"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "Tipo"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "Activo"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "Desactivado"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "Activado"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "Refrescar"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "Alcunha"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Sim"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "Não"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "Nenhum repositório definido. Use o comando 'zypper addrep' para adicionar um ou mais repositórios."
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "Erro na leitura dos repositórios:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "Não foi possÃvel abrir %s para escrita. Talvez não tem permissões de escrita?"
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "Os repositórios foram exportados com sucesso para %s."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "A saltar o repositório desactivado '%s'"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "A saltar o repositório '%s' devido ao erro acima."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "O repositório '%s' não foi encontrado pela alcunha ou número."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "Use 'zypper repos' para obter a lista dos repositórios definidos."
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "Os repositórios especificados não estão activados nem definidos."
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "Não existem repositórios activados definidos."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "Use os comandos 'zypper addrepo' ou 'zypper modifyrepo' para adicionar ou activar repositórios."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "Não foi possÃvel refrescar os repositórios devido a erros."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "Alguns dos repositórios não foram refrescados devido a um erro."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "Os repositórios especificados foram refrescados."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "Todos os repositórios foram refrescados."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "Este é um suporte apenas de leitura alterável (CD/DVD), a desactivar refrescagem automática."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "O repositório com o nome '%s' já existe. Por favor, escolha uma outra alcunha."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "Não é possÃvel encontrar um repositório válido na localização dada:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "Não foi possÃvel determinar o tipo do repositório. Por favor, verifique se os URLs definidos (veja abaixo) apontam para um repositório válido:"
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "Problema ao transferir dados do repositório do URL especificado:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "Por favor, verifique se o repositório especificado está acessÃvel."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "Programa desconhecido ao adicionar o repositório:"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "O repositório '%s' foi adicionado com sucesso"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "Auto-refrescar"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "A ler os dados do suporte '%s'"
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "Problema ao ler os dados do suporte '%s'"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "Por favor, verifique se o seu suporte de instalação é válido e legÃvel."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+msgid "Problem accessing the file at the specified URL"
+msgstr "Problema ao aceder o ficheiro no URL especificado"
+
+#: ../src/zypper-sources.cc:796
+msgid "Please check if the URL is valid and accessible."
+msgstr "Por favor, verifique se o URL é válido e está acessÃvel."
+
+#: ../src/zypper-sources.cc:803
+msgid "Problem parsing the file at the specified URL"
+msgstr "Problema ao interpretar o ficheiro no URL especificado"
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr "Ã um ficheiro .repo? Veja http://en.opensuse.org/Standards/RepoInfo para detalhes."
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr "Problema encontrado ao tentar ler o ficheiro no URL especificado"
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "Repositório %s foi removido."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "Repositório %s renomeado para %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "Repositório %s não encontrado."
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "Erro enquanto modificava o repositório:"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "A deixar o repositório %s inalterado."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s usado juntamente com %s, que contradiz um com o outro. Esta propriedade não será alterada."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "O repositório %s foi modificado com sucesso."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "A obter dados do repositório '%s'..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "O repositório '%s' não está em cache. A colocar em cache..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "Problema ao carregar dados de '%s'"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "Os resolúveis de '%s' não foram carregados devido a um erro."
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(%d resolúveis encontrados)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "Tente 'zypper refresh' ou até mesmo remover /var/cache/zypp/zypp.db antes de o fazer."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "A ler base de dados RPM..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s resolúveis)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -765,41 +814,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "Resposta inválida. Escolha a letra a, r ou i."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "s"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "S"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
-
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "sim"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "não"
+
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "Resposta '%s' inválida, introduza '%s' ou '%s':"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr "Resposta '%s' inválida. Introduza 'y' para '%s' ou 'n' para '%s', se nada mais funcionar"
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -902,64 +932,38 @@
msgid "Requires:"
msgstr "Requer:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "Nenhum repositório configurado. Por favor, adicione pelo menos um repositório utilizando o comando 'zypper addrepo' antes de usar a pesquisa."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "A criar pré-cache dos solúveis instalados que coincidem com o critério de pesquisa dado... "
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr " de entre ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "em cache."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr " não é uma expressão regular válida: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "Este é um bug, por favor submeta um relatório de erro do zypper."
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "O URL dado é inválido."
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" Opções:\n"
-"\t--help, -h\t\tAjuda\n"
-"\t--version, -V\t\tMostra o número da versão\n"
-"\t--quiet, -q\t\tSuprimir saÃdas normais, mostrar apenas mensagens de erros.\n"
-"\t--verbose, -v\t\tAumentar verbosidade\n"
-"\t--terse, -t\t\tSaÃda terse para consumo por uma máquina\n"
-"\t--table-style, -s\tEstilo tabela (inteiro)\n"
-"\t--rug-compatible, -r\tLigar compatibilidade rug\n"
-"\t--non-interactive\tNão perguntar nada, utilizar respostas pré-definidas automaticamente.\n"
-"\t--no-gpg-checks\t\tIgnorar falhas de verificação GPG e continuar.\n"
-"\t--root, -R <dir>\tOperar num directório raiz diferente\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -980,7 +984,7 @@
"\tsource-install, si\tInstall a source package\n"
msgstr ""
" Comandos:\n"
-"\thelp\t\t\tAjuda\n"
+"\thelp, ?\t\t\tAjuda\n"
"\tshell, sh\t\tAceita múltiplos comandos de uma vez\n"
"\tinstall, in\t\tInstalar pacotes ou resolúveis\n"
"\tremove, rm\t\tRemover pacotes ou resolúveis\n"
@@ -1000,28 +1004,54 @@
"\tpatch-info\t\tMostrar informação completa de correcções\n"
"\tsource-install, si\tInstalar um pacote de código\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" Opções:\n"
+"\t--help, -h\t\tAjuda\n"
+"\t--version, -V\t\tMostra o número da versão\n"
+"\t--quiet, -q\t\tSuprimir saÃdas normais, mostrar apenas mensagens de erros.\n"
+"\t--verbose, -v\t\tAumentar verbosidade\n"
+"\t--terse, -t\t\tSaÃda terse para consumo por uma máquina\n"
+"\t--table-style, -s\tEstilo tabela (inteiro)\n"
+"\t--rug-compatible, -r\tLigar compatibilidade rug\n"
+"\t--non-interactive\tNão perguntar nada, utilizar respostas pré-definidas automaticamente.\n"
+"\t--no-gpg-checks\t\tIgnorar falhas de verificação GPG e continuar.\n"
+"\t--root, -R <dir>\tOperar num directório raiz diferente\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "Verbosidade: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "A entrar em modo não-interactivo."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "A entrar em modo não-verificar-gpg."
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "Estilo inválido de tabela "
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "Tente -h para ajuda."
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1047,7 +1077,7 @@
" Veja 'man zypper' para mais detalhes.\n"
" --debug-solver Criar caso de teste de resolução para depuração\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1069,7 +1099,7 @@
"-n, --name Seleccionar resolúveis por nome simples, não por capacidade\n"
" --debug-solver Criar caso de teste de resolução para depuração\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1083,7 +1113,7 @@
"\n"
"Este comando não tem opções adicionais.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1105,7 +1135,7 @@
"\t--disabled,-d\t\tAdicionar o repositório como desactivado\n"
"\t--no-refresh,-n\t\tAdicionar o repositório com refrescagem automática desactivada\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1121,7 +1151,7 @@
" Opções de comando:\n"
"-e, --export <FICHEIRO.repo> Exportar todos os repositórios definidos como um único ficheiro .repo local\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1139,7 +1169,7 @@
"\t--loose-auth\tIgnorar dados de autenticação do utilizador no URL\n"
"\t--loose-query\tIgnorar cadeia de pesquisa no URL\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1153,7 +1183,7 @@
"\n"
"Este comando não tem opções adicionais.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1175,7 +1205,7 @@
"-a, --enable-autorefresh Activar refrescagem automática do repositório\n"
" --disable-autorefresh Desactivar refrescagem automática do repositório\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1199,7 +1229,7 @@
"-B, --build-only Apenas construir a base de dados, não descarregar metadata.\n"
"-D, --download-only Apenas transferir metadata sem formatação, não construir a base de dados\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1219,7 +1249,7 @@
"-r, --repo <alcunha> Lista apenas as actualizações do repositório especificado pela alcunha.\n"
" --best-effort Faz uma abordagem 'best effort' para actualizar, é também aceitável actualizações para uma versão mais baixa do que uma versão última-e-maior.\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1249,7 +1279,7 @@
" --best-effort Faz uma abordagem 'best effort' para actualizar, é também aceitável actualizações para uma versão mais baixa do que uma versão última-e-maior\n"
" --debug-solver Cria um caso de teste re solução para depuração\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1293,7 +1323,7 @@
"\n"
"Os metacaracteres * e ? podem também ser utilizados dentro das cadeias de pesquisa.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1311,7 +1341,7 @@
"\n"
"-r, --repo <alcunha> Verifica por correcções apenas nos repositórios especificados pela alcunha.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1329,7 +1359,7 @@
"\n"
"-r, --repo <alcunha> Verifica por correcções apenas nos repositórios especificados pela alcunha.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1347,7 +1377,7 @@
"\n"
"-r, --repo <alcunha> Apenas funciona com repositórios especificados pela alcunha.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1361,7 +1391,7 @@
"\n"
"Alcunha de compabilidade com o rug para 'zypper info -t correcção'\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1375,7 +1405,7 @@
"\n"
"Este comando não tem opções adicionais.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1391,132 +1421,155 @@
" Opções de comando:\n"
"-r, --repo <alcunha> Apenas funciona com actualizações de repositórios especificados pela alcunha.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "Argumentos do programa sem opções: "
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "Repositórios desactivos, a usar apenas a base de dados dos pacotes instalados."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "A ignorar resolúveis instalados..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
-msgstr "Uma transacção ZYpp já se encontra em progresso. Isto significa que existe uma outra aplicação a correr a usar a biblioteca libzypp do gestor de pacotes. Todas essas aplicações devem ser encerradas antes de usar este comando."
+msgstr "Uma transacção ZYpp já se encontra em progresso. Isto significa que existe uma outra aplicação a correr a usar a biblioteca libzypp do gestor de pacotes. Todas essas aplicações deveram ser encerradas antes de usar este comando."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
msgstr ""
-" \\\\\\\\\\\n"
-" \\\\\\\\\\\\\\__o\n"
-"__\\\\\\\\\\\\\\'/_"
+" :#@@@@@@@@@@@@@@#;` @@+, \n"
+" .@@@@@@@@@@@@@@@@@@@@@@#:@@@@@@#: \n"
+" :@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@#` \n"
+" ,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@+ `@+ \n"
+" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@# @@# @` \n"
+" :@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@`#@ .:@@ \n"
+" #@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @@#@;+@ \n"
+" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@+@@@:.@@@ @@,\n"
+" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ ;@@` . +@@@\n"
+" +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@: +@@@@@@# \n"
+" ,@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@; .'+; ,\n"
+" @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@:` :+@,\n"
+" '@@@@@` '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@; \n"
+" @@@@; @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@: \n"
+"`@@@+ ,@@@@+ @@@@@@@@@@@@@@@@@@@@@. `,::,` \n"
+";@@@ ,@@@@@@@ @@@@@@' #@@@@@@, \n"
+"#@@@ @@@:,@@@@ ,@@@@' ,@@@@@ \n"
+"@@@@ @@ '@@' @@@@ `@@@@` \n"
+"'@@@ @@: @@@ ;@@@ .@@@; \n"
+",@@@ @@@@@, +@@ @@@ :@@@ \n"
+" @@@+ @@@@. @@@ ,@ #@,`: \n"
+" '@@@: ` @@@ + ` \n"
+" @@@@# `@@@, \n"
+" @@@@@@@@@@@@ \n"
+" #@@@@@@@@# \n"
+" +@@@@#` "
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "São necessários privilégios de administrador para modificar os repositórios do sistema."
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "Argumentos insuficientes. à necessário, pelo menos, o URL e alcunha."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "O tipo especificado não é um tipo de repositório válido:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Veja 'zypper -h addrepo' ou man zypper para obter a lista dos tipos de repositórios conhecidos."
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "Argumentos necessários em falta."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "Repositório não encontrado pela alcunha, a tentar apagar pelo URL..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "Repositório não encontrado pela alcunha ou URL dado."
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "A alcunha é um argumento necessário."
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "São necessários privilégios de administrador para refrescar os repositórios do sistema."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "São necessários privilégios de administrador para instalar ou remover pacotes."
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "Tipo de resolúvel desconhecido: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Aviso: Nenhum repositório definido. A operar apenas com os resolúveis instalados. Nada pode ser instalado."
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "A gerar o caso de teste de resolução..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "O caso de teste de resolução foi generado com sucesso."
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "Erro ao criar o caso de teste de resolução."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "O nome do pacote de código é um argumento requirido."
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "Tipo de resolúvel desconhecido "
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "Resolúveis não encontrados."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "A correr como 'rug', não pode fazer uma abordagem 'best-effort' para actualizar."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "São necessários privilégios de administrador para actualizar os pacotes."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "Excepção inesperada."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "Você já está a correr o zypper na consola."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "Por favor submeta um relatório de erro sobre disto."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "Consulte http://en.opensuse.org/Zypper#Troubleshooting para instruções."
@@ -1526,20 +1579,24 @@
msgstr "Comando '%s' desconhecido"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "Erro de E/S"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "Objecto inválido"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "Erro"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "Insira o suporte [%s] # %d e digite 's' para continuar ou 'n' para cancelar a operação."
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "A descarregar: "
@@ -1619,11 +1676,11 @@
msgid "Installation of %s failed:"
msgstr "A instalação de %s falhou:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "Catálogo"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "Repositório"
Modified: trunk/zypper/po/ru.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/ru.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/ru.po (original)
+++ trunk/zypper/po/ru.po Tue Sep 11 10:57:42 2007
@@ -6,13 +6,13 @@
#
# Aleksey Osipov <aliks-os(a)yandex.ru>, 2007.
# Nikolay Derkach <nderkach(a)gmail.com>, 2007.
-# Igor Kondrashkin <poseidos(a)mail.ru>, 2007
+# Igor Kondrashkin <poseidos(a)mail.ru>, 2007.
msgid ""
msgstr ""
"Project-Id-Version: zypper\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
-"PO-Revision-Date: 2007-08-19 17:29+0400\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
+"PO-Revision-Date: 2007-09-09 12:04+0400\n"
"Last-Translator: Nikolay Derkach <nderkach(a)gmail.com>\n"
"Language-Team: <opensuse-ru(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
@@ -58,37 +58,49 @@
#: ../src/zypper-keyring-callbacks.h:110
#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
-msgstr "Ðнимание: игноÑиÑÑеÑÑÑ Ð½ÐµÑдаÑÐ½Ð°Ñ Ð¿ÑовеÑка подпиÑи Ð´Ð»Ñ %s Ñ Ð¸Ð´ÐµÐ½ÑиÑикаÑоÑом оÑкÑÑÑого клÑÑа %s, %s, оÑпеÑаÑком %s! ÐÑовеÑÑÑе, не вÑзвано ли ÑÑо какими-либо вÑедоноÑнÑми изменениÑми в Ñайле!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
+msgstr "ÐÑедÑпÑеждение: игноÑиÑÑеÑÑÑ Ð½ÐµÑдаÑÐ½Ð°Ñ Ð¿ÑовеÑка подпиÑи Ð´Ð»Ñ %s Ñ Ð¸Ð´ÐµÐ½ÑиÑикаÑоÑом оÑкÑÑÑого клÑÑа %s, %s, оÑпеÑаÑком %s!"
-#: ../src/zypper-keyring-callbacks.h:119
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr "ÐÑовеÑÑÑе дваждÑ, не вÑзвано ли ÑÑо какими-либо вÑедоноÑнÑми изменениÑми в Ñайле!"
+
+#: ../src/zypper-keyring-callbacks.h:120
#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "ÐеÑдаÑÐ½Ð°Ñ Ð¿ÑовеÑки подпиÑи Ð´Ð»Ñ %s Ñ Ð¸Ð´ÐµÐ½ÑиÑикаÑоÑом оÑкÑÑÑого клÑÑа %s, %s, оÑпеÑаÑком %s. Ðнимание: ÑÑо Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²Ñзвано какими-либо вÑедоноÑнÑми изменениÑми в Ñайле! ÐÑодолжаÑÑ ÑиÑковано! ÐÑе Ñавно пÑодолжиÑÑ?"
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "ÐÑовеÑка подпиÑи Ð´Ð»Ñ %s Ñ Ð¸Ð´ÐµÐ½ÑиÑикаÑоÑом оÑкÑÑÑого клÑÑа %s, %s, оÑпеÑаÑком %s завеÑÑилаÑÑ Ð½ÐµÑдаÑей."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr "ÐÑедÑпÑеждение: ÐÑо Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²Ñзвано вÑедоноÑнÑм изменением в Ñайле!"
+
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
+msgstr "ÐÑодолжаÑÑ ÑиÑковано! ÐÑе Ñавно пÑодолжиÑÑ?"
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "ÐÐµÑ Ð´Ð°Ð¹Ð´Ð¶ÐµÑÑа Ð´Ð»Ñ Ñайла %s"
# continue button label
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "ÐÑодолжиÑÑ?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "ÐеизвеÑÑнÑй дайджеÑÑ %s Ð´Ð»Ñ Ñайла %s."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "ÐгноÑиÑÑеÑÑÑ Ð½ÐµÑдаÑÐ½Ð°Ñ Ð¿ÑовеÑка дайджеÑÑа Ð´Ð»Ñ %s (ожидалоÑÑ %s, обнаÑÑжено %s)."
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "ÐÑовеÑка дайждеÑÑа Ð´Ð»Ñ %s завеÑÑилаÑÑ Ð½ÐµÑдаÑей. ÐжидалоÑÑ %s, найдено %s."
@@ -125,11 +137,11 @@
msgstr "Ðе ÑдалоÑÑ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ '%s' в ÑпиÑок пакеÑов Ð´Ð»Ñ ÑдалениÑ."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Ðе найден"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "ÐÑоблема:"
@@ -140,188 +152,196 @@
msgstr " РеÑение %d: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "номеÑ, (r)повÑÐ¾Ñ Ð¸Ð»Ð¸ (c)оÑмена>"
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "ÐÑименение ÑеÑÐµÐ½Ð¸Ñ %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s ÐÑоблемÑ:"
# popup message
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "Ð£ÐºÐ°Ð·Ð°Ð½Ð½Ð°Ñ ÑпоÑобноÑÑÑ Ð½Ðµ найдена."
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "ÐеÑего вÑполнÑÑÑ."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "ÐолнÑй ÑÐ°Ð·Ð¼ÐµÑ Ð·Ð°Ð³ÑÑзки: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "ÐоÑле ÑÑой опеÑаÑии бÑÐ´ÐµÑ Ð¸ÑполÑзовано дополниÑелÑно %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "ÐоÑле ÑÑой опеÑаÑии бÑÐ´ÐµÑ Ð¾Ñвобождено %s."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "%s ÑлеменÑов заблокиÑовано"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "УÑÑановка ÑоÑÑоÑÐ½Ð¸Ñ Ð°Ð³ÑегаÑов"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "РазÑеÑение завиÑимоÑÑей..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "необÑ
одимо %d иÑпÑавлений (%d иÑпÑавлений безопаÑноÑÑи)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "УÑÑановлено"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "Ðе ÑÑÑановлен"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "Ðолее непÑименимо"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "ÐепÑименимо"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "ÐÑименено"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Ðе нÑжен"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "ÐÑпоÑÑено"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "ÐеобÑ
одимо"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "оÑибка"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "ÐаÑалог:"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "РепозиÑаÑий: "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "ÐмÑ"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "ÐеÑÑиÑ"
# frame label, around checkbuttons
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "ÐаÑегоÑиÑ"
# table header: module status
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "СоÑÑоÑние"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "Ðе найдено необÑ
одимÑÑ
иÑпÑавлений."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
msgstr ""
-"ÐÐÐÐÐÐÐÐ: ÑÑо ÑолÑко обновлениÑ, оÑноÑÑÑиеÑÑ Ðº ÑÐ°Ð¼Ð¾Ð¼Ñ ÑÑедÑÑÐ²Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ.\n"
+"ÐÐ ÐÐУÐÐ ÐÐÐÐÐÐÐ: ÑÑо ÑолÑко обновлениÑ, оÑноÑÑÑиеÑÑ Ðº ÑÐ°Ð¼Ð¾Ð¼Ñ ÑÑедÑÑÐ²Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ.\n"
"ÐмеÑÑÑÑ Ð¸ дÑÑгие.\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "Ðе найдено обновлений."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "СбоÑка"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "ÐÑÑ
."
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
-msgstr "ÐÐÐÐÐÐÐÐ: %s инÑеÑакÑивен, пÑопÑÑен."
+msgstr "ÐÐ ÐÐУÐÐ ÐÐÐÐÐÐÐ: %s инÑеÑакÑивен, пÑопÑÑен."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "ÑикÑиÑование"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+msgid "Problem downloading the package file from the repository:"
+msgstr "ÐÑоблема пÑи загÑÑзке Ñайла пакеÑа из 'ÑепозиÑаÑиÑ:"
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "РекомендаÑÐ¸Ñ Ð¸Ð¼ÐµÐµÑÑÑ Ð² вÑданном Ñанее ÑообÑении об оÑибке."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -337,410 +357,440 @@
" - иÑполÑзÑйÑе Ð´Ð»Ñ ÑÑÑановки дÑÑгие ноÑиÑели (напÑимеÑ, из-за повÑеждениÑ)\n"
" - иÑполÑзÑйÑе дÑÑгой ÑепозиÑаÑий"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "ÐÐ»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ из ÑÑÑановленнÑÑ
иÑпÑавлений ÑÑебÑеÑÑÑ Ð¿ÐµÑезагÑÑзка компÑÑÑеÑа. ÐÑполниÑе ее как можно бÑÑÑÑее."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "ÐÐ ÐÐУÐÐ ÐÐÐÐÐÐÐ: Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ из ÑÑÑановленнÑÑ
иÑпÑавлений ÑÑебÑеÑÑÑ Ð¿ÐµÑезагÑÑзка компÑÑÑеÑа. ÐÑполниÑе ее как можно бÑÑÑÑее."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "ÐÐ ÐÐУÐÐ ÐÐÐÐÐÐÐ: одно из ÑÑÑановленнÑÑ
иÑпÑавлений заÑÑÐ°Ð³Ð¸Ð²Ð°ÐµÑ Ñам Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ Ð¿Ð°ÐºÐµÑов, поÑÑÐ¾Ð¼Ñ ÑÑебÑеÑÑÑ ÐµÐ³Ð¾ пеÑезапÑÑк пеÑед вÑполнением какиÑ
-либо далÑнейÑиÑ
опеÑаÑий."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "ÐвÑомаÑиÑеÑкое ÑоглаÑие Ñ Ð»Ð¸Ñензией %s %s."
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "лиÑÐµÐ½Ð·Ð¸Ñ %s %s:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "ЧÑÐ¾Ð±Ñ ÑÑÑановиÑÑ ÑÑÐ¾Ñ Ð¿Ð°ÐºÐµÑ, необÑ
одимо ÑоглаÑиÑÑÑÑ Ñ ÑÑловиÑми вÑÑепÑиведенной лиÑензии. ÐÑодолжиÑÑ?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "УÑÑановка пÑеÑвана в ÑвÑзи Ñ Ð½ÐµÐ¾Ð±Ñ
одимоÑÑÑÑ Ð¿Ð¾Ð´ÑвеÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð»Ð¸Ñензии(й)."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "ÐÑполниÑе опеÑаÑÐ¸Ñ Ð¿Ð¾Ð²ÑоÑно в инÑеÑакÑивном Ñежиме и подÑвеÑдиÑе ÑоглаÑие Ñ ÑÑебÑемой лиÑензией(Ñми), или же иÑполÑзÑйÑе паÑамеÑÑ --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "УÑÑановка пÑеÑвана из-за неÑоглаÑÐ¸Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ñ Ð»Ð¸Ñензией %s %s."
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "УÑÑановка пакеÑа Ñ Ð¸ÑÑ
однÑм кодом %s-%s"
# summary text heading
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "ÐÐ°ÐºÐµÑ Ñ Ð¸ÑÑ
однÑм кодом %s-%s ÑÑпеÑно ÑÑÑановлен."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "ÐÑоблема пÑи ÑÑÑановки пакеÑа Ñ Ð¸ÑÑ
однÑм кодом %s-%s:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "ÐÐ°ÐºÐµÑ Ñ Ð¸ÑÑ
однÑм кодом '%s' не найден."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "ÐÑовеÑка, обновлÑÑÑ Ð»Ð¸ меÑаданнÑе Ð´Ð»Ñ %s"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "Ðбновление '%s'"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(пÑинÑдиÑелÑнÑй)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "РепозиÑаÑий '%s' не обновлен."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "ÐÑинÑдиÑелÑное обновление необÑабоÑаннÑÑ
меÑаданнÑÑ
"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "ÐÑоблема пÑи загÑÑзке Ñайлов из '%s'"
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "РекомендаÑÐ¸Ñ Ð¸Ð¼ÐµÐµÑÑÑ Ð² вÑданном Ñанее ÑообÑении об оÑибке."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "Ðе опÑеделено URL-адÑеÑов Ð´Ð»Ñ '%s'."
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "ÐобавÑÑе Ð¾Ð´Ð½Ñ Ð¸Ð»Ð¸ более запиÑей оÑновнÑÑ
URL-адÑеÑов (baseurl=URL) в %s Ð´Ð»Ñ ÑепозиÑаÑÐ¸Ñ '%s'."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "Ðе опÑеделен пÑевдоним Ð´Ð»Ñ ÑÑого ÑепозиÑаÑиÑ."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "РепозиÑаÑий '%s' недопÑÑÑим."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "ÐÑовеÑÑÑе, ÑÑо URL-адÑеÑа, опÑеделеннÑе Ð´Ð»Ñ ÑÑого ÑепозиÑаÑÐ¸Ñ ÑказÑваÑÑ Ð½Ð° допÑÑÑимÑй ÑепозиÑаÑий."
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "ÐÑибка загÑÑзки меÑаданнÑÑ
из '%s':"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "ÐÑинÑдиÑелÑное поÑÑÑоение кÑÑа ÑепозиÑаÑиÑ"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "ÐÑибка обÑабоÑки меÑаданнÑÑ
Ð´Ð»Ñ '%s':"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "ÐÑо Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð²Ñзвано недопÑÑÑимÑми меÑаданнÑми в ÑепозиÑаÑии или оÑибкой в анализаÑоÑе меÑаданнÑÑ
. РпоÑледнем ÑлÑÑае или пÑи налиÑии Ñомнений пÑедÑÑавÑÑе оÑÑÐµÑ Ð¾Ð± оÑибке, вÑполнив ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð½Ð° ÑÑÑаниÑе http://en.opensuse.org/Zypper#Troubleshooting"
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "ÐеÑаданнÑе Ð´Ð»Ñ ÑепозиÑаÑÐ¸Ñ '%s' не Ð½Ð°Ð¹Ð´ÐµÐ½Ñ Ð² локалÑном кÑÑе."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "ÐÑибка пÑи поÑÑÑоении Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
кÑÑа:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "РепозиÑаÑий '%s' не найден."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "ÐÑибка пÑи ÑÑении Ñайла опиÑÐ°Ð½Ð¸Ñ ÑепозиÑаÑÐ¸Ñ '%s'."
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "ÐÑиÑина: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "ÐÑклÑÑение ÑепозиÑаÑÐ¸Ñ '%s' из-за вÑÑеÑказанной оÑибки."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "РепозиÑаÑий '%s' ÑÑÑаÑел. Ðожно запÑÑÑиÑÑ 'zypper refresh' Ð¾Ñ Ð¸Ð¼ÐµÐ½Ð¸ админиÑÑÑаÑоÑа (root) Ð´Ð»Ñ ÐµÐ³Ð¾ обновлениÑ."
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "вклÑÑено"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "Ðбновление"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "Тип"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "ÐкÑивнÑй"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "ÐÑклÑÑен"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "вклÑÑено"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "Ðбновление"
+
+# Translators: table column headings
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "ÐÑевдоним"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Ðа"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "ÐеÑ"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "РепозиÑаÑии не опÑеделенÑ. ÐÑполÑзÑйÑе ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ 'zypper addrepo' Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ или более ÑепозиÑаÑиев."
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "ÐÑибка ÑÑÐµÐ½Ð¸Ñ ÑепозиÑаÑиев:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "Ðе полÑÑилоÑÑ Ð¾ÑкÑÑÑÑ %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи. Ðозможно, Ñ Ð²Ð°Ñ Ð½ÐµÑ Ð¿Ñав на запиÑÑ?"
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "РепозиÑаÑий ÑÑпеÑно ÑкÑпоÑÑиÑован в %s."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "ÐÑопÑÑкаеÑÑÑ Ð¾ÑклÑÑеннÑй ÑепозиÑаÑий '%s'"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "ÐÑопÑÑк ÑепозиÑаÑÐ¸Ñ '%s' из-за Ñказанной вÑÑе оÑибки."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "РепозиÑаÑий '%s' не найден по ÑÐ²Ð¾ÐµÐ¼Ñ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ñ Ð¸Ð»Ð¸ номеÑÑ."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "ÐÑполÑзÑйÑе 'zypper repos' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑпиÑка опÑеделеннÑÑ
ÑепозиÑаÑиев."
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "УказаннÑе ÑепозиÑаÑии не вклÑÑÐµÐ½Ñ Ð¸Ð»Ð¸ не опÑеделенÑ."
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "ÐклÑÑеннÑе ÑепозиÑаÑии не опÑеделенÑ."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "ÐÑполÑзÑйÑе ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ 'zypper addrepo' или 'zypper modifyrepo' Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ вклÑÑÐµÐ½Ð¸Ñ ÑепозиÑаÑиев."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "Ðе ÑдалоÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸ÑÑ ÑепозиÑаÑии из-за оÑибок."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "ÐекоÑоÑÑе ÑепозиÑаÑии не Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ñ Ð¸Ð·-за оÑибки."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "УказаннÑе ÑепозиÑаÑии обновленÑ."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "ÐÑе ÑепозиÑаÑии обновленÑ."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "ÐÑо ÑменнÑй ноÑиÑелÑ, доÑÑÑпнÑй ÑолÑко Ð´Ð»Ñ ÑÑÐµÐ½Ð¸Ñ (CD/DVD), оÑклÑÑение авÑомаÑиÑеÑкого обновлениÑ."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "РепозиÑаÑий под названием '%s' Ñже ÑÑÑеÑÑвÑеÑ. ÐÑполÑзÑйÑе дÑÑгой пÑевдоним."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "Ðевозможно найÑи допÑÑÑимÑй ÑепозиÑаÑий в данном меÑÑе:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "Ðе ÑдалоÑÑ Ð¾Ð¿ÑеделиÑÑ Ñип ÑепозиÑаÑиÑ. ÐÑовеÑÑÑе, ÑказÑваÑÑ Ð»Ð¸ введеннÑе URL-адÑеÑа (Ñм. ниже) на допÑÑÑимÑй ÑепозиÑаÑий:"
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "ÐÑоблема пеÑедаÑи даннÑÑ
ÑепозиÑаÑÐ¸Ñ Ñ Ñказанного URL-адÑеÑа:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "ÐÑовеÑÑÑе, доÑÑÑпен ли ÑказаннÑй URL-адÑеÑ."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "ÐеизвеÑÑÐ½Ð°Ñ Ð¿Ñоблема пÑи добавлении ÑепозиÑаÑиÑ:"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "РепозиÑаÑий '%s' ÑÑпеÑно добавлен"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "ÐвÑомаÑиÑеÑкое обновление"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "ЧÑение даннÑÑ
Ñ Ð½Ð¾ÑиÑÐµÐ»Ñ Ð¸Ð· '%s'"
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "ÐÑоблема пÑи ÑÑении даннÑÑ
Ñ Ð½Ð¾ÑиÑÐµÐ»Ñ Ð¸Ð· '%s'"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "ÐÑовеÑÑÑе, ÑÑо Ð²Ð°Ñ ÑÑÑановоÑнÑй ноÑиÑÐµÐ»Ñ Ð´Ð¾Ð¿ÑÑÑим и ÑиÑаем."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+msgid "Problem accessing the file at the specified URL"
+msgstr "ÐÑоблема пÑи доÑÑÑпе к ÑÐ°Ð¹Ð»Ñ Ð¿Ð¾ ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ URL-адÑеÑÑ."
+
+#: ../src/zypper-sources.cc:796
+msgid "Please check if the URL is valid and accessible."
+msgstr "ÐÑовеÑÑÑе, ÑÑо URL-адÑÐµÑ Ð¿Ñавилен и доÑÑÑпен."
+
+#: ../src/zypper-sources.cc:803
+msgid "Problem parsing the file at the specified URL"
+msgstr "ÐÑоблема пÑи обÑабоÑке Ñайла по ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ URL-адÑеÑÑ."
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr "ЯвлÑеÑÑÑ Ð»Ð¸ ÑÑÐ¾Ñ Ñайл Ñайлом .repo? ÐодÑобноÑÑи ÑмоÑÑиÑе на http://en.opensuse.org/Standards/RepoInfo."
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr "ÐÑоизоÑла оÑибка пÑи попÑÑке пÑоÑиÑаÑÑ Ñайл по ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð¼Ñ URL-адÑеÑÑ"
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "РепозиÑаÑий %s Ñдален."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "РепозиÑаÑий %s пеÑеименован в %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "РепозиÑаÑий %s не найден."
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "ÐÑибка пÑи изменении ÑепозиÑаÑиÑ:"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "РепозиÑаÑий %s оÑÑавлен без изменений."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s иÑполÑзÑеÑÑÑ Ð²Ð¼ÐµÑÑе Ñ %s, коÑоÑÑе пÑоÑивоÑеÑÐ°Ñ Ð´ÑÑг дÑÑгÑ. ÐÑо ÑвойÑÑво оÑÑанеÑÑÑ Ð±ÐµÐ· изменениÑ."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "РепозиÑаÑий %s ÑÑпеÑно изменен."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "ÐоÑÑÑановление даннÑÑ
ÑепозиÑаÑÐ¸Ñ '%s'..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "РепозиÑаÑий '%s' не кÑÑиÑован. ÐÑÑиÑование..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "ÐÑоблема загÑÑзки даннÑÑ
из '%s'"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "ÐбÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей из '%s' не бÑли загÑÑÐ¶ÐµÐ½Ñ Ð¸Ð·-за оÑибки."
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(найдено %d обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "ÐопÑобÑйÑе 'zypper refresh' или даже Ñдаление /var/cache/zypp/zypp.db пеÑед Ñем, как ÑÑо ÑделаÑÑ."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "ЧÑение Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
RPMâ¦"
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей %s)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
"Use rug or yast2 for that.\n"
msgstr ""
"Ðемон ZENworks Management запÑÑен.\n"
-"ÐÐÐÐÐÐÐÐ: ÑÑа команда не бÑÐ´ÐµÑ ÑинÑ
ÑонизиÑоваÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ.\n"
+"ÐÐ ÐÐУÐÐ ÐÐÐÐÐÐÐ: ÑÑа команда не бÑÐ´ÐµÑ ÑинÑ
ÑонизиÑоваÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ.\n"
"ÐÐ»Ñ ÑÑого ÑледÑÐµÑ Ð¸ÑполÑзоваÑÑ rug или yast2.\n"
#: ../src/zypp-checkpatches.cc:125
@@ -769,41 +819,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "ÐедопÑÑÑимÑй оÑвеÑ. ÐÑбеÑиÑе бÑÐºÐ²Ñ a, r или i."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "y"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "Y"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
-
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "да"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "неÑ"
+
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "ÐедопÑÑÑимÑй оÑÐ²ÐµÑ '%s', введиÑе '%s' или '%s':"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr "ÐедопÑÑÑимÑй оÑÐ²ÐµÑ '%s'. ÐÑли ниÑего дÑÑгого не полÑÑаеÑÑÑ, введиÑе 'y' Ð´Ð»Ñ '%s' или 'n' Ð´Ð»Ñ '%s'"
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -909,64 +940,38 @@
msgid "Requires:"
msgstr "ТÑебÑеÑ:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "РепозиÑаÑии не наÑÑÑоенÑ. ÐобавÑÑе по кÑайней меÑе один ÑепозиÑаÑий пÑи помоÑи ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ 'zypper addrepo' пеÑед иÑполÑзованием поиÑка."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "ÐÑедваÑиÑелÑное кÑÑиÑование ÑÑÑановленнÑÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей, оÑвеÑаÑÑиÑ
даннÑм кÑиÑеÑиÑм поиÑкаâ¦"
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr "из ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "кÑÑиÑовано."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr "- невеÑное ÑегÑлÑÑное вÑÑажение: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "ÐÑо оÑибка, ÑообÑиÑе о ней в оÑÑеÑе, каÑаÑÑемÑÑ zypper."
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "ÐаннÑй URL-адÑÐµÑ Ð½ÐµÐ´Ð¾Ð¿ÑÑÑим."
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" ÐаÑамеÑÑÑ:\n"
-"\t--help, -h\t\tСпÑавка\n"
-"\t--version, -V\t\tÐÑвод номеÑа веÑÑии\n"
-"\t--quiet, -q\t\tСокÑÑÑие обÑÑного вÑвода, пеÑаÑаÑÑÑÑ ÑолÑко ÑообÑений об оÑибкаÑ
.\n"
-"\t--verbose, -v\t\tÐолее подÑобнÑе ÑообÑениÑ\n"
-"\t--terse, -t\t\tСжаÑÑй вÑвод Ð´Ð»Ñ Ð¸ÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑом\n"
-"\t--table-style, -s\tСÑÐ¸Ð»Ñ ÑаблиÑÑ (Ñелое ÑиÑло)\n"
-"\t--rug-compatible, -r\tÐклÑÑение Ñежима ÑовмеÑÑимоÑÑи Ñ rug\n"
-"\t--non-interactive\tÐе задаваÑÑ Ð²Ð¾Ð¿ÑоÑÑ, иÑполÑзоваÑÑ Ð°Ð²ÑомаÑиÑеÑки оÑвеÑÑ Ð¿Ð¾ ÑмолÑаниÑ\n"
-"\t--no-gpg-checks\t\tÐгноÑиÑоваÑÑ Ð½ÐµÑдаÑнÑе пÑовеÑки GPG и пÑодолжаÑÑ.\n"
-"\t--root, -R <dir>\tÐÑполÑзоваÑÑ Ð´ÑÑгой коÑневой каÑалог\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -987,7 +992,7 @@
"\tsource-install, si\tInstall a source package\n"
msgstr ""
" ÐомандÑ:\n"
-"\thelp\t\t\tСпÑавка\n"
+"\thelp, ?\t\t\tСпÑавка\n"
"\tshell, sh\t\tÐÑием неÑколÑкиÑ
команд ÑÑазÑ\n"
"\tinstall, in\t\tУÑÑановка пакеÑов или обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей\n"
"\tremove, rm\t\tУдаление пакеÑов или обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей\n"
@@ -1007,28 +1012,54 @@
"\tpatch-info\t\tÐÑобÑажение полной инÑоÑмаÑии об иÑпÑавлениÑÑ
\n"
"\tsource-install, si\tУÑÑановка пакеÑа Ñ Ð¸ÑÑ
однÑм кодом\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" ÐаÑамеÑÑÑ:\n"
+"\t--help, -h\t\tСпÑавка\n"
+"\t--version, -V\t\tÐÑвод номеÑа веÑÑии\n"
+"\t--quiet, -q\t\tСокÑÑÑие обÑÑного вÑвода, пеÑаÑаÑÑÑÑ ÑолÑко ÑообÑений об оÑибкаÑ
.\n"
+"\t--verbose, -v\t\tÐолее подÑобнÑе ÑообÑениÑ\n"
+"\t--terse, -t\t\tСжаÑÑй вÑвод Ð´Ð»Ñ Ð¸ÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑеÑом\n"
+"\t--table-style, -s\tСÑÐ¸Ð»Ñ ÑаблиÑÑ (Ñелое ÑиÑло)\n"
+"\t--rug-compatible, -r\tÐклÑÑение Ñежима ÑовмеÑÑимоÑÑи Ñ rug\n"
+"\t--non-interactive\tÐе задаваÑÑ Ð²Ð¾Ð¿ÑоÑÑ, иÑполÑзоваÑÑ Ð°Ð²ÑомаÑиÑеÑки оÑвеÑÑ Ð¿Ð¾ ÑмолÑаниÑ\n"
+"\t--no-gpg-checks\t\tÐгноÑиÑоваÑÑ Ð½ÐµÑдаÑнÑе пÑовеÑки GPG и пÑодолжаÑÑ.\n"
+"\t--root, -R <dir>\tÐÑполÑзоваÑÑ Ð´ÑÑгой коÑневой каÑалог\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "УÑÐ¾Ð²ÐµÐ½Ñ Ð´ÐµÑализаÑии: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "ÐеÑеÑ
од в неинÑеÑакÑивнÑй Ñежим."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "ÐеÑеÑ
од в Ñежим без пÑовеÑки GPG."
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "ÐедопÑÑÑимÑй ÑÑÐ¸Ð»Ñ ÑаблиÑÑ"
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "ÐÐ»Ñ Ð²Ñзова ÑпÑавки ÑкажиÑе -h."
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1054,7 +1085,7 @@
" СмоÑÑиÑе 'man zypper' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´ÑобноÑÑей.\n"
" --debug-solver СоздаÑÑ Ð½Ð°Ð±Ð¾Ñ ÑеÑÑовÑÑ
даннÑÑ
ÑеÑаÑÑей пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ Ð¾Ñладки\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1076,7 +1107,7 @@
"-n, --name ÐÑбÑаÑÑ Ð¾Ð±ÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей по обÑÑÐ½Ð¾Ð¼Ñ Ð¸Ð¼ÐµÐ½Ð¸, не по ÑпоÑобноÑÑи\n"
" --debug-solver СоздаÑÑ Ð½Ð°Ð±Ð¾Ñ ÑеÑÑовÑÑ
даннÑÑ
ÑеÑаÑÑей пÑогÑÐ°Ð¼Ð¼Ñ Ð´Ð»Ñ Ð¾Ñладки\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1090,7 +1121,7 @@
"\n"
"ÐÑа команда не Ð¸Ð¼ÐµÐµÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑелÑнÑÑ
паÑамеÑÑов.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1112,7 +1143,7 @@
"-d, --disabled ÐобавиÑÑ ÑепозиÑаÑий оÑклÑÑеннÑм\n"
"-n, --no-refresh ÐобавиÑÑ ÑепозиÑаÑий Ñ Ð¾ÑклÑÑеннÑм авÑомаÑиÑеÑким обновлением\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1128,7 +1159,7 @@
" ÐаÑамеÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ:\n"
"-e, --export <ФÐÐÐ.repo> ÐкÑпоÑÑиÑоваÑÑ Ð²Ñе опÑеделеннÑе ÑепозиÑаÑии в один локалÑнÑй Ñайл .repo\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1146,7 +1177,7 @@
" --loose-auth\tÐгноÑиÑоваÑÑ Ð´Ð°Ð½Ð½Ñе пÑовеÑки подлинноÑÑи полÑзоваÑÐµÐ»Ñ Ð² URL-адÑеÑе\n"
" --loose-query\tÐгноÑиÑоваÑÑ ÑÑÑÐ¾ÐºÑ Ð·Ð°Ð¿ÑоÑа в URL-адÑеÑе\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1160,7 +1191,7 @@
"\n"
"ÐÑа команда не Ð¸Ð¼ÐµÐµÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑелÑнÑÑ
паÑамеÑÑов.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1181,7 +1212,7 @@
"-a, --enable-autorefresh ÐклÑÑиÑÑ Ð°Ð²ÑомаÑиÑеÑкое обновление ÑепозиÑаÑиÑ\n"
" --disable-autorefresh ÐÑклÑÑиÑÑ Ð°Ð²ÑомаÑиÑеÑкое обновление ÑепозиÑаÑиÑ\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1205,7 +1236,7 @@
"-B, --build-only ТолÑко поÑÑÑоиÑÑ Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
, не загÑÑжаÑÑ Ð¼ÐµÑаданнÑе.\n"
"-D, --download-only ТолÑко загÑÑзиÑÑ Ð½ÐµÐ¾Ð±ÑабоÑаннÑе маÑаданнÑе, не ÑÑÑоиÑÑ Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1225,7 +1256,7 @@
"-r, --repo <пÑевдоним> ÐеÑеÑиÑлиÑÑ ÑолÑко Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸Ð· каÑалога, Ñказанного пÑевдонимом.\n"
" --best-effort ÐÑполÑзоваÑÑ Ð¿Ð¾Ð´Ñ
од 'наилÑÑÑиÑ
дейÑÑвий' Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾ не ÑамÑÑ
поÑледниÑ
веÑÑий Ñакже пÑиемлемÑ.\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1254,7 +1285,7 @@
" --best-effort ÐÑполÑзоваÑÑ Ð¿Ð¾Ð´Ñ
од 'наилÑÑÑиÑ
дейÑÑвий' Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ, Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾ не ÑамÑÑ
поÑледниÑ
веÑÑий Ñакже пÑиемлемÑ.\n"
" --debug-solver СоздаÑÑ Ð½Ð°Ð±Ð¾Ñ ÑеÑÑовÑÑ
даннÑÑ
Ð´Ð»Ñ Ð¾Ñладки ÑеÑаÑÑей пÑогÑаммÑ\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1298,7 +1329,7 @@
"\n"
"* и ? -- ÑÐ¸Ð¼Ð²Ð¾Ð»Ñ Ð¿Ð¾Ð´ÑÑановки, коÑоÑÑе можно иÑполÑзоваÑÑ Ð¸ в ÑÑÑокаÑ
поиÑка.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1316,7 +1347,7 @@
"\n"
"-r, --repo <пÑевдоним> ÐÑовеÑиÑÑ Ð½Ð°Ð»Ð¸Ñие иÑпÑавлений ÑолÑко в ÑепозиÑаÑии, Ñказанном пÑевдонимом.\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1334,7 +1365,7 @@
"\n"
"-r, --repo <пÑевдоним> ÐÑовеÑиÑÑ Ð½Ð°Ð»Ð¸Ñие иÑпÑавлений ÑолÑко в ÑепозиÑаÑии, Ñказанном пÑевдонимом.\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1352,7 +1383,7 @@
"\n"
"-r, --repo <пÑевдоним> РабоÑаÑÑ ÑолÑко Ñ ÑепозиÑаÑием, Ñказанном пÑевдонимом.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1366,7 +1397,7 @@
"\n"
"ÐÑо пÑевдоним ÑовмеÑÑимоÑÑи Ñ rug Ð´Ð»Ñ 'zypper info -t patch'\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1380,7 +1411,7 @@
"\n"
"ÐÑа команда не Ð¸Ð¼ÐµÐµÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑелÑнÑÑ
паÑамеÑÑов.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1397,24 +1428,24 @@
"\n"
"-r, --repo <пÑевдоним> РабоÑаÑÑ ÑолÑко Ñ ÑепозиÑаÑием, Ñказанном пÑевдонимом.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "ÐÑгÑменÑÑ Ð¿ÑогÑаммÑ, не ÑвлÑÑÑиеÑÑ Ð¿Ð°ÑамеÑÑами:"
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "РепозиÑаÑии оÑклÑÑенÑ, иÑполÑзÑеÑÑÑ ÑолÑко база даннÑÑ
ÑÑÑановленнÑÑ
пакеÑов."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "ÐгноÑиÑÑÑÑÑÑ ÑÑÑановленнÑе обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "ÐбÑабоÑка запÑоÑа ZYpp Ñже вÑполнÑеÑÑÑ. ÐÑо знаÑиÑ, вÑполнÑеÑÑÑ Ð´ÑÑгое пÑиложение, иÑполÑзÑÑÑее библиоÑÐµÐºÑ libzypp Ð´Ð»Ñ ÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°ÐºÐµÑами. ÐеÑед иÑполÑзованием данной ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð²Ñе Ñакие пÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ Ð·Ð°ÐºÑÑÑÑ."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1424,105 +1455,105 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "ÐÐ»Ñ Ð¿ÑоÑмоÑÑа ÑиÑÑемнÑÑ
ÑепозиÑаÑиев ÑÑебÑÑÑÑÑ Ð¿Ñивилегии ÑÑпеÑполÑзоваÑелÑ."
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "СлиÑком мало аÑгÑменÑов. Ðо кÑайней меÑе ÑÑебÑÑÑÑÑ URL-адÑÐµÑ Ð¸ пÑевдоним."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "УказаннÑй Ñип не ÑвлÑеÑÑÑ Ð´Ð¾Ð¿ÑÑÑимÑм Ñипом ÑепозиÑаÑиÑ:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "ÐÐ»Ñ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑпиÑка извеÑÑнÑÑ
Ñипов ÑепозиÑаÑиев воÑполÑзÑйÑеÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°Ð¼Ð¸ 'zypper -h addrepo' или man zypper."
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "ТÑебÑемÑй аÑгÑÐ¼ÐµÐ½Ñ Ð¾ÑÑÑÑÑÑвÑеÑ."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "РепозиÑаÑий не бÑл найден по пÑевдонимÑ, попÑÑка ÑдалиÑÑ Ð¿Ð¾ URL-адÑеÑÑ..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "РепозиÑаÑий не бÑл найден по Ð´Ð°Ð½Ð½Ð¾Ð¼Ñ Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼Ñ Ð¸Ð»Ð¸ URL-адÑеÑÑ."
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "ÐÑевдоним ÑвлÑеÑÑÑ ÑÑебÑемÑм аÑгÑменÑом."
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "ÐÐ»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑиÑÑемнÑÑ
ÑепозиÑаÑиев ÑÑебÑÑÑÑÑ Ð¿Ñивилегии ÑÑпеÑполÑзоваÑелÑ."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "ÐÐ»Ñ ÑÑÑановки или ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°ÐºÐµÑов ÑÑебÑÑÑÑÑ Ð¿Ñивилегии ÑÑпеÑполÑзоваÑелÑ."
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "ÐеизвеÑÑнÑй Ñип обÑекÑа ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "ÐÑедÑпÑеждение: не опÑеделено никакиÑ
ÑепозиÑаÑиев. РабоÑа ведеÑÑÑ ÑолÑко Ñ ÑÑÑановленнÑми обÑекÑами ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей. ÐелÑÐ·Ñ Ð½Ð¸Ñего ÑÑÑановливаÑÑ."
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "СоздаеÑÑÑ Ð½Ð°Ð±Ð¾Ñ ÑеÑÑовÑÑ
даннÑÑ
Ð´Ð»Ñ ÑеÑаÑÑей пÑогÑаммÑ..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "ÐÐ°Ð±Ð¾Ñ ÑеÑÑовÑÑ
даннÑÑ
ÑеÑаÑÑей пÑогÑÐ°Ð¼Ð¼Ñ ÑÑпеÑно Ñоздан."
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "ÐÑибка пÑи Ñоздании набоÑа ÑеÑÑовÑÑ
даннÑÑ
Ð´Ð»Ñ ÑеÑаÑÑей пÑогÑаммÑ."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "ÐÐ¼Ñ Ð¿Ð°ÐºÐµÑа Ñ Ð¸ÑÑ
однÑм кодом ÑвлÑеÑÑÑ ÑÑебÑемÑм аÑгÑменÑом."
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "ÐеизвеÑÑнÑй Ñип обÑекÑа ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "Ðе найдено никакиÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "ÐÑполнÑеÑÑÑ ÐºÐ°Ðº 'rug', не полÑÑаеÑÑÑ Ð¸ÑполÑзоваÑÑ Ð¿Ð¾Ð´Ñ
од 'наидÑÑÑиÑ
дейÑÑвий' Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "ÐÐ»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°ÐºÐµÑов ÑÑебÑÑÑÑÑ Ð¿Ñивилегии ÑÑпеÑполÑзоваÑелÑ."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "Ðеожиданное иÑклÑÑение."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "У Ð²Ð°Ñ Ñже запÑÑена оболоÑка zypper."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "СообÑиÑе об ÑÑом в оÑÑеÑе об оÑибкаÑ
."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "Ð£ÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÐ½Ñ Ð½Ð° ÑÑÑаниÑе http://en.opensuse.org/Zypper#Troubleshooting."
@@ -1532,20 +1563,24 @@
msgstr "ÐеизвеÑÑÐ½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° '%s'"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "ÐÑибка ввода/вÑвода"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "ÐедопÑÑÑимÑй обÑекÑ"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "ÐÑибка"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "ÐÑÑавÑÑе ноÑиÑÐµÐ»Ñ [%s] # %d и введиÑе 'y' Ð´Ð»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ 'n' Ð´Ð»Ñ Ð¿ÑекÑаÑÐµÐ½Ð¸Ñ Ð¾Ð¿ÐµÑаÑии."
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "ÐагÑÑжаеÑÑÑ: "
@@ -1625,11 +1660,11 @@
msgid "Installation of %s failed:"
msgstr "Сбой пÑи ÑÑÑановке %s:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "ÐаÑалог"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "РепозиÑаÑий"
Modified: trunk/zypper/po/uk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/uk.po?rev=7174&r1=7173…
==============================================================================
--- trunk/zypper/po/uk.po (original)
+++ trunk/zypper/po/uk.po Tue Sep 11 10:57:42 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypper.uk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
"PO-Revision-Date: 2007-08-19 19:21-0700\n"
"Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>\n"
"Language-Team: Ukrainian <translation(a)linux.org.ua>\n"
@@ -56,37 +56,49 @@
#: ../src/zypper-keyring-callbacks.h:110
#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
msgstr ""
-#: ../src/zypper-keyring-callbacks.h:119
-#, c-format
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:120
+#, fuzzy, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "ÐеÑевÑÑка дайджеÑÑÑ Ð´Ð»Ñ %s зазнала невдаÑÑ. ÐÑÑкÑвалоÑÑ %s, знайдено %s."
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:125
+msgid "Continuing is risky! Continue anyway?"
msgstr ""
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "Ðема дайджеÑÑÑ Ð´Ð»Ñ Ñайла %s."
# continue button label
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "ÐÑодовжиÑи?"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "ÐевÑдомий дайджеÑÑ %s Ð´Ð»Ñ Ñайла %s."
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr ""
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "ÐеÑевÑÑка дайджеÑÑÑ Ð´Ð»Ñ %s зазнала невдаÑÑ. ÐÑÑкÑвалоÑÑ %s, знайдено %s."
@@ -122,11 +134,11 @@
msgstr "Ðе вдалоÑÑ Ð´Ð¾Ð´Ð°Ñи \"%s\" до ÑпиÑÐºÑ Ð¿Ð°ÐºÑнкÑв Ð´Ð»Ñ Ð²Ð¸Ð»ÑÑеннÑ."
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "Ðе знайдено"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "ÐÑоблема: "
@@ -137,146 +149,146 @@
msgstr " ÐиÑÑÑÐµÐ½Ð½Ñ %d: "
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "номеÑ, (r)повÑоÑно або (c)cкаÑÑваÑи> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "п"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "Ñ"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "ÐаÑÑоÑÑÐ²Ð°Ð½Ð½Ñ ÑÑÑÐµÐ½Ð½Ñ %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "ÐÑоблеми %s:"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "ÐÐºÐ°Ð·Ð°Ð½Ñ ÑÑнкÑÑоналÑнÑÑÑÑ Ð½Ðµ знайдено"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "Ðема Ñо ÑобиÑи."
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
#, c-format
msgid "Overall download size: %s."
msgstr "ÐагалÑний ÑозмÑÑ Ð·Ð²Ð°Ð½ÑаженнÑ: %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "ÐÑÑÐ»Ñ Ð´ÑÑ, бÑде додаÑково вжиÑо %s."
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
#, c-format
msgid "After the operation, %s will be freed."
msgstr "ÐÑÑÐ»Ñ Ð´ÑÑ, %s бÑде вивÑлÑнено."
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "%s елеменÑÑв заблоковано"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "ÐÑÑановлÑÑÑÑÑÑ ÑÑан агÑегованого"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "Розв'ÑÐ·Ð°Ð½Ð½Ñ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑей..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "%d поÑÑÑбно лаÑок (%d лаÑки безпеки)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "ÐÑÑановленÑ"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "ÐÑибÑанÑ"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "ÐÑлÑÑ Ð½Ðµ пÑдÑ
одиÑÑ"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "Ðе ÑÑоÑÑÑÑÑÑÑ"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "ÐаÑÑоÑовано"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "Ðе поÑÑÑбнÑ"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "ÐоламанÑ"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "ÐоÑÑÑбнÑ"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "помилка"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "ÐаÑалог: "
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "СÑ
овиÑе: "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "Ðазва"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "ÐеÑÑÑÑ"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "ÐаÑегоÑÑÑ"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "СÑан"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "Ðе знайдено поÑÑÑбниÑ
лаÑок."
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -284,38 +296,47 @@
"УÐÐÐÐ: Ð¦Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑÑоÑÑÑÑÑÑÑ ÑÑлÑки пÑогÑами оновленнÑ.\n"
"Ðле Ñ Ñакож ÑнÑÑ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ.\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "Ðе знайдено оновленÑ."
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "ÐбÑÑка"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "ÐÑÑ
."
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "УÐÐÐÐ: %s Ñ ÑнÑеÑакÑивноÑ, пÑопÑÑкаÑÑÑÑÑ."
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "пеÑедаÑÑÑÑÑ"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+#, fuzzy
+msgid "Problem downloading the package file from the repository:"
+msgstr "ÐÑоблема Ð·Ñ Ð·Ð²Ð°Ð½ÑаженнÑм ÑайлÑв з \"%s\"."
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "ÐÑÐ´Ñ Ð»Ð°Ñка, див. повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñо Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ Ð´Ð»Ñ Ð¿Ñдказки."
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -331,402 +352,434 @@
"- замÑнÑÑÑ Ð½Ð¾ÑÑй вÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ (ÑкÑо поÑкоджений)\n"
"- ÑкоÑиÑÑайÑеÑÑ ÑнÑим ÑÑ
овиÑем"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "Ðдна з вÑÑановлениÑ
лаÑок поÑÑебÑÑ Ð¿ÐµÑезапÑÑÐºÑ Ð²Ð°Ñого комп'ÑÑеÑа. ÐÑÐ´Ñ Ð»Ð°Ñка, зÑобÑÑÑ Ñе Ñкомога ÑвидÑе."
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "Ðдна з вÑÑановлениÑ
лаÑок поÑÑебÑÑ Ð¿ÐµÑезапÑÑÐºÑ Ð²Ð°Ñого комп'ÑÑеÑа. ÐÑÐ´Ñ Ð»Ð°Ñка, зÑобÑÑÑ Ñе Ñкомога ÑвидÑе."
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "Ðдна з вÑÑановлениÑ
лаÑок ÑÑоÑÑÑÑÑÑÑ Ñамого менеджеÑа пакÑнкÑв, Ñ ÑÐ¾Ð¼Ñ Ð¿Ð¾ÑÑÑбний пеÑезапÑÑк пеÑед наÑÑÑпними дÑÑми."
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "ÐвÑомаÑиÑно погоджÑÑÑÑÑÑ Ð· лÑÑензÑÑÑ %s %s."
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
#, c-format
msgid "%s %s license:"
msgstr "ÐÑÑензÑÑ %s %s:"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "Щоб вÑÑановиÑи Ñей пакÑнок, ви мÑÑиÑе погодиÑиÑÑ Ð· Ñмовами ÑÑÑÑ Ð»ÑÑензÑÑ. ÐÑодовжиÑи?"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÐµÑеÑиваÑÑÑÑÑ, бо поÑÑÑбно пÑийнÑÑи лÑÑензÑÑ(Ñ)."
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "ÐÑÐ´Ñ Ð»Ð°Ñка, пеÑезапÑÑÑÑÑÑ Ð´ÑÑ Ð² ÑнÑеÑакÑÐ¸Ð²Ð½Ð¾Ð¼Ñ ÑÐµÐ¶Ð¸Ð¼Ñ Ð¹ погодÑÑеÑÑ Ð· поÑÑÑбними лÑÑензÑÑми або ÑкоÑиÑÑайÑеÑÑ Ð¿Ð°ÑамеÑÑом --auto-agree-with-licenses."
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÐµÑеÑиваÑÑÑÑÑ, бо коÑиÑÑÑÐ²Ð°Ñ Ð½Ðµ погодивÑÑ Ð· лÑÑензÑÑÑ %s %s."
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
#, c-format
msgid "Installing source package %s-%s"
msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°ÐºÑнка джеÑела %s-%s"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "ÐакÑнок джеÑела %s-%s бÑло ÑÑпÑÑно вÑÑановлено."
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "ÐÑоблема з вÑÑановленнÑм пакÑнка джеÑела %s-%s:"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
#, c-format
msgid "Source package '%s' not found."
msgstr "ÐакÑнок джеÑела \"%s\" не знайдено."
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "ÐеÑевÑÑка Ñи оÑвÑжаÑи меÑÐ°Ð´Ð°Ð½Ñ Ð´Ð»Ñ %s"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
#, c-format
msgid "Refreshing '%s'"
msgstr "ÐÑвÑÐ¶ÐµÐ½Ð½Ñ \"%s\""
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(пÑимÑÑово)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
#, c-format
msgid "Repository '%s' is up to date."
msgstr "СÑ
овиÑе \"%s\" не поÑÑебÑÑ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ."
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "ÐÑимÑÑове оÑвÑÐ¶ÐµÐ½Ð½Ñ ÑиÑиÑ
меÑаданиÑ
"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
#, c-format
msgid "Problem downloading files from '%s'."
msgstr "ÐÑоблема Ð·Ñ Ð·Ð²Ð°Ð½ÑаженнÑм ÑайлÑв з \"%s\"."
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "ÐÑÐ´Ñ Ð»Ð°Ñка, див. повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñо Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ Ð´Ð»Ñ Ð¿Ñдказки."
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
#, c-format
msgid "No URLs defined for '%s'."
msgstr "Ðе визнаÑено Ð¶Ð¾Ð´Ð½Ð¾Ñ Ð°Ð´ÑеÑи URLs Ð´Ð»Ñ \"%s\"."
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "ÐÑÐ´Ñ Ð»Ð°Ñка, додайÑе один або декÑлÑка запиÑÑв базовиÑ
URL (baseurl=URL) до %s Ð´Ð»Ñ ÑÑ
овиÑа \"%s\"."
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "ÐÐ»Ñ ÑÑого ÑÑ
овиÑа нема пÑевдонÑмÑ."
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
#, c-format
msgid "Repository '%s' is invalid."
msgstr "СÑ
овиÑе \"%s\" - не Ñинне."
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr ""
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "Ðомилка званÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð¼Ð°ÑаданиÑ
\"%s\":"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "ÐÑимÑÑово ÑÑвоÑÑÑÑÑÑÑ ÐºÐµÑ ÑÑ
овиÑа"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "Ðомилка аналÑÐ·Ñ Ð¼ÐµÑаданиÑ
Ð´Ð»Ñ \"%s\":"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr ""
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "ÐеÑÐ°Ð´Ð°Ð½Ñ ÑÑ
овиÑа \"%s\" не знайдено в локалÑÐ½Ð¾Ð¼Ñ ÐºÐµÑÑ."
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "Ðомилка ÑÑвоÑÐµÐ½Ð½Ñ ÐºÐµÑÑ Ð±Ð°Ð·Ð¸ даниÑ
:"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
#, c-format
msgid "Repository '%s' not found."
msgstr "Ðе знайдено ÑÑ
овиÑе \"%s\"."
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "Ðомилка ÑиÑÐ°Ð½Ð½Ñ Ñайла опиÑÑ ÑÑ
овиÑа \"%s\"."
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "ÐÑиÑина: "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "ÐÐ¸Ð¼ÐºÐ½ÐµÐ½Ð½Ñ ÑÑ
овиÑа \"%s\" ÑеÑез Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ Ð²Ð¸Ñе."
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "СÑ
овиÑе \"%s\" - заÑÑаÑÑле. Щоб його оÑвÑжиÑи, можеÑе виконаÑи \"zypper refresh\"."
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "УвÑмкнено"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "ÐновиÑи"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "Тип"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "ÐкÑивний"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "Ðимкнено"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "УвÑмкнено"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "ÐновиÑи"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "ÐÑевдонÑм"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "Так"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "ÐÑ"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "Ðе визнаÑено жодного ÑÑ
овиÑа. ÐживайÑе ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ \"zypper addrepo\", Ñоб додаÑи одне Ñ Ð±ÑлÑÑе ÑÑ
овиÑ."
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "Ðомилка ÑиÑÐ°Ð½Ð½Ñ ÑÑ
овиÑ:"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "Ðе вдаÑÑÑÑÑ Ð²ÑдкÑиÑи %s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸ÑÑ. Ðожливо ви не маÑÑе пÑав запиÑÑ?"
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "СÑ
овиÑа бÑло ÑÑпÑÑно екÑпоÑÑовано до %s."
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "ÐÑопÑÑкаÑÑÑÑÑ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ðµ ÑÑ
овиÑе \"%s\""
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "ÐÑопÑÑкаÑÑÑÑÑ ÑÑ
овиÑе \"%s\" ÑеÑез ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ."
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "СÑ
овиÑе \"%s\" не знайдено за його пÑевдонÑмом або номеÑом."
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "ÐживайÑе \"zypper repos\", Ñоб оÑÑимаÑи ÑпиÑок визнаÑениÑ
ÑÑ
овиÑ."
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "ÐÐºÐ°Ð·Ð°Ð½Ñ ÑÑ
овиÑа не ÑвÑмкнено або не визнаÑено."
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "ÐÐµÐ¼Ð°Ñ Ð²Ð¸Ð·Ð½Ð°ÑениÑ
ÑвÑмкнениÑ
ÑÑ
овиÑ."
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "ÐÐ»Ñ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ð±Ð¾ оÑвÑÐ¶ÐµÐ½Ð½Ñ ÑÑ
Ð¾Ð²Ð¸Ñ Ð²Ð¶Ð¸Ð²Ð°Ð¹Ñе команди \"zypper addrepo\" Ñ \"zypper modifyrepo\"."
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "ЧеÑез помилки не вдалоÑÑ Ð¾ÑвÑжиÑи ÑÑ
овиÑа."
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "ÐеÑÐºÑ ÑÑ
овиÑа не бÑло оÑвÑжено ÑеÑез помилкÑ."
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "ÐÐºÐ°Ð·Ð°Ð½Ñ ÑÑ
овиÑа бÑло оÑвÑжено."
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "ÐÑÑ ÑÑ
овиÑа бÑло оÑвÑжено."
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "Це змÑнний ноÑÑй ÑÑлÑки Ð´Ð»Ñ ÑиÑÐ°Ð½Ð½Ñ (ÐÐ/DVD), авÑооÑвÑÐ¶ÐµÐ½Ð½Ñ Ð±Ñде вимкнено."
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "Ðже ÑÑнÑÑ ÑÑ
овиÑе з Ð½Ð°Ð·Ð²Ð¾Ñ \"%s\". ÐÑÐ´Ñ Ð»Ð°Ñка, введÑÑÑ ÑнÑÑ Ð½Ð°Ð·Ð²Ñ."
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "Ðе вдаÑÑÑÑÑ Ð·Ð½Ð°Ð¹Ñи в ÑÑÐ¾Ð¼Ñ Ð¼ÑÑÑÑ Ñинне ÑÑ
овиÑе:"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "Ðе вдалоÑÑ Ð²Ð¸Ð·Ð½Ð°ÑиÑи Ñип ÑÑ
овиÑа. ÐÑÐ´Ñ Ð»Ð°Ñка, пеÑевÑÑÑе Ñи Ð²ÐºÐ°Ð·Ð°Ð½Ñ Ð°Ð´ÑеÑи URL (див. нижÑе) вказÑÑÑÑ Ð½Ð° Ñинне ÑÑ
овиÑе:"
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "Ðомилка пеÑенеÑÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ
ÑÑ
овиÑа з Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ñ Ð°Ð´ÑеÑи URL:"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "ÐÑÐ´Ñ Ð»Ð°Ñка, пеÑевÑÑÑе Ñи доÑÑÑпна вказана адÑеÑа URL."
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "Ðиникла невÑдома пÑоблема пÑи Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ ÑÑ
овиÑа:"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
#, c-format
msgid "Repository '%s' successfully added"
msgstr "СÑ
овиÑе \"%s\" ÑÑпÑÑно додано"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "ÐвÑооÑвÑженнÑ"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
#, c-format
msgid "Reading data from '%s' media"
msgstr "ЧиÑÐ°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ
з ноÑÑÑ \"%s\""
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
#, c-format
msgid "Problem reading data from '%s' media"
msgstr "ÐÑоблема з ÑиÑаннÑм даниÑ
з ноÑÑÑ \"%s\"."
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "ÐеÑевÑÑÑе Ñи Ð²Ð°Ñ Ð½Ð¾ÑÑй вÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñинний Ñ Ð· нÑого можна ÑиÑаÑи."
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+#, fuzzy
+msgid "Problem accessing the file at the specified URL"
+msgstr "Ðомилка пеÑенеÑÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ
ÑÑ
овиÑа з Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ñ Ð°Ð´ÑеÑи URL:"
+
+#: ../src/zypper-sources.cc:796
+#, fuzzy
+msgid "Please check if the URL is valid and accessible."
+msgstr "ÐÑÐ´Ñ Ð»Ð°Ñка, пеÑевÑÑÑе Ñи доÑÑÑпна вказана адÑеÑа URL."
+
+#: ../src/zypper-sources.cc:803
+#, fuzzy
+msgid "Problem parsing the file at the specified URL"
+msgstr "Ðомилка пеÑенеÑÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ
ÑÑ
овиÑа з Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ñ Ð°Ð´ÑеÑи URL:"
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr ""
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr ""
+
+#: ../src/zypper-sources.cc:870
#, c-format
msgid "Repository %s has been removed."
msgstr "СÑ
овиÑе %s бÑло вилÑÑено."
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "СÑ
овиÑе %s пеÑейменоване на %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
#, c-format
msgid "Repository %s not found."
msgstr "СÑ
овиÑе %s не знайдено."
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "Ðомилка змÑни ÑÑ
овиÑа:"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
#, c-format
msgid "Leaving repository %s unchanged."
msgstr "СÑ
овиÑе %s бÑде залиÑене без змÑн."
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s вживаÑÑÑÑÑ Ñазом з %s, Ñо ÑÑпеÑеÑиÑÑ Ð¾Ð´Ð½Ðµ одномÑ. Ð¦Ñ Ð²Ð»Ð°ÑÑивÑÑÑÑ Ð±Ñде залиÑено без змÑни."
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "СÑ
овиÑе %s ÑÑпÑÑно змÑнено."
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "ÐÑÑÐ¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ
ÑÑ
овиÑа \"%s\"..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "Ðе ÑкеÑовано ÑÑ
овиÑе \"%s\". ТÑÐ¸Ð²Ð°Ñ ÐºÐµÑÑваннÑ..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "ÐÑоблема заванÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ
з \"%s\""
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "ÐоÑÑÑÐ±Ð½Ñ Ð¿Ð°ÐºÑнки з \"%s\" не заванÑажено ÑеÑез помилкÑ."
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(%d знайдено поÑÑÑбниÑ
пакÑнкÑв)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "СпÑобÑйÑе \"zypper refresh\" або, навÑÑÑ, пеÑед Ñим вилÑÑÑÑÑ /var/cache/zypp/zypp.db."
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "ЧиÑÐ°Ð½Ð½Ñ Ð±Ð°Ð·Ð¸ даниÑ
RPM..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s поÑÑÑбниÑ
пакÑнкÑв)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -764,41 +817,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "Ðе Ñинна вÑдповÑдÑ. ÐибеÑÑÑÑ Ð»ÑÑеÑÑ a, r, або i."
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "Ñ"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "Т"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "н"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "Ð"
-
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "Ñак"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "нÑ"
+
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "Ðе Ñинна вÑдповÑÐ´Ñ \"%s\", введÑÑÑ \"%s\", або \"%s\":"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr ""
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -901,64 +935,39 @@
msgid "Requires:"
msgstr "ÐоÑÑебÑÑ:"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "Ðе налаÑÑовано жодного ÑÑ
овиÑа. ÐÑÐ´Ñ Ð»Ð°Ñка, додайÑе пÑÐ¸Ð½Ð°Ð¹Ð¼Ð½Ñ Ð¾Ð´Ð½Ðµ ÑÑ
овиÑе за Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ \"zypper addrepo\", пеÑÑ Ð½Ñж вживаÑи поÑÑк."
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "ÐÐ°Ð¿Ð¸Ñ Ð² ÐºÐµÑ Ð²ÑÑановлениÑ
поÑÑÑбниÑ
пакÑнкÑв, ÑÐºÑ Ð²ÑдповÑдаÑÑÑ Ð´Ð°Ð½Ð¸Ð¼ кÑиÑеÑÑÑм... "
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr " Ð½ÐµÐ¼Ð°Ñ ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "в кеÑÑ."
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr " не Ñ Ñинним ÑоÑмалÑним виÑазом: \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "Це вада в кодÑ, бÑÐ´Ñ Ð»Ð°Ñка, напиÑÑÑÑ Ð·Ð²ÑÑ Ð¿Ñо Ð¿Ð¾Ð¼Ð¸Ð»ÐºÑ Ð² пÑогÑÐ°Ð¼Ñ zypper."
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "Ðана адÑеÑа URL не Ñ ÑинноÑ."
-#: ../src/zypper.cc:110
-#, fuzzy
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" ÐаÑамеÑÑи:\n"
-"\t--help, -h\t\tÐовÑдка\n"
-"\t--version, -V\t\tÐоказаÑи Ð½Ð¾Ð¼ÐµÑ Ð²ÐµÑÑÑÑ\n"
-"\t--verbose, -v\t\tÐбÑлÑÑиÑи багаÑоÑлÑвнÑÑÑÑ\n"
-"\t--terse, -t\t\tÐбмежений вивÑд Ð´Ð»Ñ ÑÐ¿Ð¾Ð¶Ð¸Ð²Ð°Ð½Ð½Ñ Ð¼Ð°ÑиноÑ\n"
-"\t--table-style, -s\tÐ ÑÑÐ¸Ð»Ñ ÑаблиÑÑ (ÑÑле ÑиÑло)\n"
-"\t--rug-compatible, -r\tУвÑмкнÑÑи ÑÑмÑÑнÑÑÑÑ Ð· rug\n"
-"\t--non-interactive\tÐÑÑого не пиÑаÑи, авÑомаÑиÑно вживаÑи ÑÐ¸Ð¿Ð¾Ð²Ñ Ð²ÑдповÑдÑ. (в ÑÑадÑÑ ÑозÑобки)\n"
-"\t--root, -R <dir>\tÐÑаÑÑваÑи в ÑнÑÐ¾Ð¼Ñ ÐºÐ¾ÑÐµÐ½ÐµÐ²Ð¾Ð¼Ñ ÐºÐ°ÑалозÑ\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
#, fuzzy
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -996,28 +1005,53 @@
"\tinfo, if\t\tÐоказаÑи Ð¿Ð¾Ð²Ð½Ñ ÑнÑоÑмаÑÑÑ Ð¿Ñо пакÑнки\n"
"\tpatch-info\t\tÐоказаÑи Ð¿Ð¾Ð²Ð½Ñ ÑнÑоÑмаÑÑÑ Ð¿Ñо лаÑки\n"
-#: ../src/zypper.cc:164
+#: ../src/zypper.cc:136
+#, fuzzy
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" ÐаÑамеÑÑи:\n"
+"\t--help, -h\t\tÐовÑдка\n"
+"\t--version, -V\t\tÐоказаÑи Ð½Ð¾Ð¼ÐµÑ Ð²ÐµÑÑÑÑ\n"
+"\t--verbose, -v\t\tÐбÑлÑÑиÑи багаÑоÑлÑвнÑÑÑÑ\n"
+"\t--terse, -t\t\tÐбмежений вивÑд Ð´Ð»Ñ ÑÐ¿Ð¾Ð¶Ð¸Ð²Ð°Ð½Ð½Ñ Ð¼Ð°ÑиноÑ\n"
+"\t--table-style, -s\tÐ ÑÑÐ¸Ð»Ñ ÑаблиÑÑ (ÑÑле ÑиÑло)\n"
+"\t--rug-compatible, -r\tУвÑмкнÑÑи ÑÑмÑÑнÑÑÑÑ Ð· rug\n"
+"\t--non-interactive\tÐÑÑого не пиÑаÑи, авÑомаÑиÑно вживаÑи ÑÐ¸Ð¿Ð¾Ð²Ñ Ð²ÑдповÑдÑ. (в ÑÑадÑÑ ÑозÑобки)\n"
+"\t--root, -R <dir>\tÐÑаÑÑваÑи в ÑнÑÐ¾Ð¼Ñ ÐºÐ¾ÑÐµÐ½ÐµÐ²Ð¾Ð¼Ñ ÐºÐ°ÑалозÑ\n"
+
+#: ../src/zypper.cc:167
#, c-format
msgid "Verbosity: %d"
msgstr "ÐагаÑоÑлÑвнÑÑÑÑ: %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "ÐоÑаÑок не-ÑнÑеÑакÑивного ÑежимÑ."
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "ÐоÑаÑок ÑÐµÐ¶Ð¸Ð¼Ñ Ð±ÐµÐ·-пеÑевÑÑки-gpg."
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "ÐепÑидаÑний ÑÑÐ¸Ð»Ñ ÑаблиÑÑ "
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "ÐведÑÑÑ -h Ð´Ð»Ñ Ð´Ð¾Ð²Ñдки."
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1032,7 +1066,7 @@
" --debug-solver Create solver test case for debugging\n"
msgstr ""
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1045,7 +1079,7 @@
" --debug-solver Create solver test case for debugging\n"
msgstr ""
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
#, fuzzy
msgid ""
"source-install (si) <name> ...\n"
@@ -1058,7 +1092,7 @@
"\n"
"ÐновиÑи (оÑвÑжиÑи ÑнÑоÑмаÑÑÑ) вÑÑ Ð´Ð¶ÐµÑела вÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ÑиÑÑеми.\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
#, fuzzy
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
@@ -1081,7 +1115,7 @@
"\t--disabled,-d\t\tÐодаÑи ÑлÑÐ¶Ð±Ñ Ñк вимкненÑ\n"
"\t--no-refresh,-n\t\tÐе оновлÑваÑи меÑÐ°Ð´Ð°Ð½Ñ Ð°Ð²ÑомаÑиÑно\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1091,7 +1125,7 @@
"-e, --export <FILE.repo> Export all defined repositories as a single local .repo file\n"
msgstr ""
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1102,7 +1136,7 @@
" --loose-query\tIgnore query string in the URL\n"
msgstr ""
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1116,7 +1150,7 @@
"\n"
"Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° не Ð¼Ð°Ñ Ð´Ð¾Ð´Ð°ÑковиÑ
паÑамеÑÑÑв.\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1138,7 +1172,7 @@
"-a, --enable-autorefresh УвÑмкнÑÑи авÑооÑвÑÐ¶ÐµÐ½Ð½Ñ ÑÑ
овиÑа\n"
" --disable-autorefresh ÐимкнÑÑи авÑооÑвÑÐ¶ÐµÐ½Ð½Ñ ÑÑ
овиÑа\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1152,7 +1186,7 @@
"-D, --download-only Only download raw metadata, don't build the database\n"
msgstr ""
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1164,7 +1198,7 @@
" --best-effort Do a 'best effort' approach to update, updates to a lower than latest-and-greatest version are also acceptable.\n"
msgstr ""
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1181,7 +1215,7 @@
" --debug-solver Create solver test case for debugging\n"
msgstr ""
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
#, fuzzy
msgid ""
"search [options] [querystring...]\n"
@@ -1225,7 +1259,7 @@
"\n"
"Також можна вживаÑи Ñаблони замÑни * Ñ ? Ð´Ð»Ñ Ð¿Ð¾ÑÑÐºÑ Ð² ÑÑдкаÑ
.\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1243,7 +1277,7 @@
"\n"
"-r, --repo <пÑевдонÑм> ÐеÑевÑÑÑÑи наÑвнÑÑÑÑ Ð»Ð°Ñок ÑÑлÑки Ñ ÑÑ
овиÑÑ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ð¼Ñ Ð¿ÑевдонÑмом .\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1261,7 +1295,7 @@
"\n"
"-r, --repo <пÑевдонÑм> ÐеÑевÑÑÑÑи наÑвнÑÑÑÑ Ð»Ð°Ñок ÑÑлÑки Ñ ÑÑ
овиÑÑ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ð¼Ñ Ð¿ÑевдонÑмом .\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1279,7 +1313,7 @@
"\n"
"-r, --repo <alias> ÐÑаÑÑваÑи ÑÑлÑки Ð·Ñ ÑÑ
овиÑами, ÑÐºÑ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾ пÑевдонÑмом.\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1293,7 +1327,7 @@
"\n"
"Це пÑевдонÑм Ð´Ð»Ñ ÑÑмÑÑноÑÑÑ rug з \"zypper info -t patch\"\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1307,7 +1341,7 @@
"\n"
"Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° не Ð¼Ð°Ñ Ð´Ð¾Ð´Ð°ÑковиÑ
паÑамеÑÑÑв.\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1324,24 +1358,24 @@
"-r, --repo <alias> ÐÑаÑÑваÑи ÑÑлÑки з оновленнÑми Ð·Ñ ÑÑ
овиÑа,\n"
"пÑевдонÑм Ñкого вказано.\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "ÐÑгÑменÑи пÑогÑами (не-паÑамеÑÑи): "
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "СÑ
овиÑа вимкнено, бÑде вживаÑиÑÑ ÑÑлÑки база даниÑ
вÑÑановлениÑ
пакÑнкÑв."
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "ÐгноÑÑÐ²Ð°Ð½Ð½Ñ Ð²ÑÑановлениÑ
поÑÑÑбниÑ
пакÑнкÑв..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "Ðже виконÑÑÑÑÑÑ ÑÑанзакÑÑÑ ZYpp. Це ознаÑаÑ, Ñо виконÑÑÑÑÑÑ ÑнÑа пÑогÑама, Ñка Ð²Ð¶Ð¸Ð²Ð°Ñ Ð±ÑблÑоÑÐµÐºÑ libzypp Ð´Ð»Ñ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð°ÐºÑнками. ÐÑÑ ÑÐ°ÐºÑ Ð¿ÑогÑами поÑÑÑбно закÑиÑи, пеÑÑ Ð½Ñж зможеÑе вживаÑи ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ."
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1351,105 +1385,105 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "ÐÐ»Ñ Ð·Ð¼Ñни ÑиÑÑемниÑ
ÑÑ
Ð¾Ð²Ð¸Ñ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð¿ÑивÑÐ»ÐµÑ Ð°Ð´Ð¼ÑнÑÑÑÑаÑоÑа."
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "Ðамало аÑгÑменÑÑв. ÐоÑÑÑбнÑ, пÑинаймнÑ, адÑеÑа URL Ñ Ð¿ÑевдонÑм."
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "Ðказаний Ñип не Ñ Ñинним Ñипом ÑÑ
овиÑа:"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "Щоб оÑÑимаÑи ÑпиÑок вÑдомиÑ
ÑипÑв ÑÑ
овиÑ, ÑкоÑиÑÑайÑеÑÑ \"zypper -h addrepo\" або \"man zypper\"."
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "ÐоÑÑÑбний аÑгÑÐ¼ÐµÐ½Ñ Ð²ÑдÑÑÑнÑй."
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "СÑ
овиÑе не знайдено за даним пÑевдонÑмом, ÑпÑоба вилÑÑÐµÐ½Ð½Ñ Ð·Ð° адÑеÑÐ¾Ñ URL..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "СÑ
овиÑе не знайдено за даним пÑевдонÑмом або адÑеÑÐ¾Ñ URL."
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "ÐÑевдонÑм - Ñе поÑÑÑбний аÑгÑменÑ."
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "ÐÐ»Ñ Ð¾ÑвÑÐ¶ÐµÐ½Ð½Ñ ÑиÑÑемниÑ
ÑÑ
Ð¾Ð²Ð¸Ñ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð¿ÑивÑÐ»ÐµÑ Ð°Ð´Ð¼ÑнÑÑÑÑаÑоÑа."
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "ÐÐ»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ Ð²Ð¸Ð»ÑÑÐµÐ½Ð½Ñ Ð¿Ð°ÐºÑнкÑв поÑÑÑÐ±Ð½Ñ Ð¿ÑивÑÐ»ÐµÑ Ð°Ð´Ð¼ÑнÑÑÑÑаÑоÑа."
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
#, c-format
msgid "Unknown resolvable type: %s"
msgstr "ÐевÑдомий Ñип поÑÑÑбного пакÑнка: %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "Увага: Ð½ÐµÐ¼Ð°Ñ Ð²Ð¸Ð·Ð½Ð°ÑениÑ
ÑÑ
овиÑ. ÐÑÑ ÑÑлÑки з вÑÑановленими поÑÑÑбними пакÑнками. ÐÑÑого неможливо вÑÑановиÑи."
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "СÑвоÑÐµÐ½Ð½Ñ ÑеÑÑÑ..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "ТеÑÑ ÑÑвоÑено ÑÑпÑÑно."
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "Ðомилка ÑÑвоÑÐµÐ½Ð½Ñ ÑеÑÑÑ."
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "Ðазва пакÑнка джеÑела - Ñе поÑÑÑбний аÑгÑменÑ."
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "ÐевÑдомий Ñип поÑÑÑбного пакÑнка "
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "Ðе знайдено пакÑнкÑв Ð´Ð»Ñ Ð²Ð¸ÑÑÑеннÑ."
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "ÐиконÑÑÑÑÑÑ Ñк \"rug\", до Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¸Ð¹ пÑдÑ
Ñд Ñк \"best-effort\"."
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "ÐÐ»Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°ÐºÑнкÑв поÑÑÑÐ±Ð½Ñ Ð¿ÑивÑÐ»ÐµÑ Ð°Ð´Ð¼ÑнÑÑÑÑаÑоÑа."
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "ÐепеÑедбаÑений винÑÑок."
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "У Ð²Ð°Ñ Ð²Ð¶Ðµ запÑÑено Ð¾Ð±Ð¾Ð»Ð¾Ð½ÐºÑ zypper."
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "ÐÑÐ´Ñ Ð»Ð°Ñка, надÑÑлÑÑÑ Ð¿Ñо Ñе звÑÑ Ð¿Ñо помилкÑ."
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "Ðив. http://en.opensuse.org/Zypper#Troubleshooting Ð´Ð»Ñ Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¸."
@@ -1459,20 +1493,24 @@
msgstr "ÐевÑдома команда \"%s\""
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "Ðомилка вводÑ/виводÑ"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "Ðе Ñинний об'ÑкÑ"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "Ðомилка"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "ÐÑÐ´Ñ Ð»Ð°Ñка, вÑÑавÑе ноÑÑй [%s] # %d Ñ Ð²Ð²ÐµÐ´ÑÑÑ \"Ñ\", Ñоб пÑодовжиÑи або \"н\", Ñоб ÑкаÑÑваÑи дÑÑ."
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "ÐванÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ð·Ð½Ð°Ð»Ð¾: "
@@ -1551,11 +1589,25 @@
msgid "Installation of %s failed:"
msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ %s зазнало невдаÑÑ:"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "ÐаÑалог"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "СÑ
овиÑе"
+#~ msgid "y"
+#~ msgstr "Ñ"
+
+#~ msgid "Y"
+#~ msgstr "Т"
+
+#~ msgid "n"
+#~ msgstr "н"
+
+#~ msgid "N"
+#~ msgstr "Ð"
+
+#~ msgid "Invalid answer '%s', enter '%s' or '%s':"
+#~ msgstr "Ðе Ñинна вÑдповÑÐ´Ñ \"%s\", введÑÑÑ \"%s\", або \"%s\":"
Modified: trunk/zypper/po/zh_TW.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/zh_TW.po?rev=7174&r1=7…
==============================================================================
--- trunk/zypper/po/zh_TW.po (original)
+++ trunk/zypper/po/zh_TW.po Tue Sep 11 10:57:42 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 15:18+0200\n"
+"POT-Creation-Date: 2007-08-31 15:19+0200\n"
"PO-Revision-Date: 2005-03-09 13:54+0100\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -34,6 +34,7 @@
msgstr "å¯å
¥éé° %s å°ä¿¡ä»»çéé°åï¼"
#: ../src/zypper-keyring-callbacks.h:66
+#, c-format
msgid "Warning: Accepting file %s signed with an unknown key %s."
msgstr "è¦åï¼å°æ¥åæªæ¡ %sï¼æ¤æªæ¡ä½¿ç¨æªç¥çéé° %s ç°½åã "
@@ -53,37 +54,51 @@
msgstr "æ¨è¦ä¿¡ä»»éé° ID %sï¼%sï¼æç´ %s å"
#: ../src/zypper-keyring-callbacks.h:110
-#, c-format
-msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s! Double-check this is not caused by some malicious changes in the file!"
+#, fuzzy, c-format
+msgid "Warning: Ignoring failed signature verification for %s with public key id %s, %s, fingerprint %s!"
msgstr "è¦åï¼å¿½ç¥ %s çç°½åé©èé¯èª¤(以å
Œ
±éé° ID %sï¼%sï¼æç´ %s)ï¼è«å次確èªæªæ¡ä¸¦ééå°æ¡æçä¿®æ¹ï¼"
-#: ../src/zypper-keyring-callbacks.h:119
-msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
-msgstr "%s çç°½åé©èé¯èª¤(以å
Œ
±éé° ID %sï¼%sï¼æç´ %s)ï¼è¦åï¼éå¯è½æ¯å çºæªæ¡éå°æ¡æçä¿®æ¹ï¼ç¹¼çºé²è¡å°æ風éªï¼ç¡è«å¦ä½è¦ç¹¼çºåï¼"
+#: ../src/zypper-keyring-callbacks.h:113
+msgid "Double-check this is not caused by some malicious changes in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:120
+#, fuzzy, c-format
+msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s."
+msgstr "%s çæè¦ç¢ºèªå¤±æãææ %sï¼æ¾å° %sã"
+
+#: ../src/zypper-keyring-callbacks.h:123
+msgid "Warning: This might be caused by a malicious change in the file!"
+msgstr ""
+
+#: ../src/zypper-keyring-callbacks.h:125
+#, fuzzy
+msgid "Continuing is risky! Continue anyway?"
+msgstr "éæ¯è¦ç¹¼çºå "
-#: ../src/zypper-keyring-callbacks.h:133
+#: ../src/zypper-keyring-callbacks.h:136
#, c-format
msgid "No digest for file %s."
msgstr "æªæ¡ %s ç¡æè¦ã"
# internal key used: Ok
#. there are resolvables to install/uninstall
-#: ../src/zypper-keyring-callbacks.h:133 ../src/zypper-keyring-callbacks.h:141
-#: ../src/zypper-keyring-callbacks.h:160 ../src/zypper-misc.cc:1369
+#: ../src/zypper-keyring-callbacks.h:136 ../src/zypper-keyring-callbacks.h:144
+#: ../src/zypper-keyring-callbacks.h:163 ../src/zypper-misc.cc:1371
msgid "Continue?"
msgstr "è¦ç¹¼çºåï¼"
-#: ../src/zypper-keyring-callbacks.h:140
+#: ../src/zypper-keyring-callbacks.h:143
#, c-format
msgid "Unknown digest %s for file %s."
msgstr "ä¸ææè¦ %s (æªæ¡ %s)ã"
-#: ../src/zypper-keyring-callbacks.h:153
+#: ../src/zypper-keyring-callbacks.h:156
#, c-format
msgid "Ignoring failed digest verification for %s (expected %s, found %s)."
msgstr "å¿½ç¥ %s çæè¦é©è失æ(ææ %sï¼æ¾å° %s)ã"
-#: ../src/zypper-keyring-callbacks.h:159
+#: ../src/zypper-keyring-callbacks.h:162
#, c-format
msgid "Digest verification failed for %s. Expected %s, found %s."
msgstr "%s çæè¦ç¢ºèªå¤±æãææ %sï¼æ¾å° %sã"
@@ -93,6 +108,7 @@
msgstr "åå§åç®æ¨"
#: ../src/zypper-misc.cc:270
+#, c-format
msgid "Cannot parse capability '%s'."
msgstr "ç¡æ³åæç¸å®¹æ§ '%s'ã"
@@ -118,11 +134,11 @@
msgstr "ç¡æ³å° '%s' æ°å¢å°è¦ç§»é¤çå¥ä»¶æ¸
å®ä¸ã"
#. TranslatorExplanation These are reasons for various failures.
-#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:41
+#: ../src/zypper-misc.cc:355 ../src/zypper-callbacks.h:42
msgid "Not found"
msgstr "æ¾ä¸å°"
-#: ../src/zypper-misc.cc:421 ../src/zypper-misc.cc:493
+#: ../src/zypper-misc.cc:421
msgid "Problem: "
msgstr "åé¡ï¼ "
@@ -133,143 +149,146 @@
msgstr "解決æ¹æ¡ %dï¼"
#. input prompt
-#: ../src/zypper-misc.cc:446
+#: ../src/zypper-misc.cc:449
msgid "number, (r)etry or (c)ancel> "
msgstr "æ¸åï¼é試(r)æåæ¶(c)> "
#. translators: corresponds to (r)etry
-#: ../src/zypper-misc.cc:454
+#: ../src/zypper-misc.cc:457
msgid "r"
msgstr "r"
#. translators: corresponds to (c)ancel
-#: ../src/zypper-misc.cc:457
+#: ../src/zypper-misc.cc:460
msgid "c"
msgstr "c"
-#: ../src/zypper-misc.cc:463
+#: ../src/zypper-misc.cc:466
#, c-format
msgid "Applying solution %s"
msgstr "å¥ç¨è§£æ±ºæ¹æ¡ %s"
-#: ../src/zypper-misc.cc:486
+#: ../src/zypper-misc.cc:488
#, c-format
msgid "%s Problems:"
msgstr "%s åé¡"
-#: ../src/zypper-misc.cc:489
+#: ../src/zypper-misc.cc:491
msgid "Specified capability not found"
msgstr "æ¾ä¸å°æå®çç¸å®¹æ§"
-#: ../src/zypper-misc.cc:620 ../src/zypper-misc.cc:622
+#: ../src/zypper-misc.cc:621 ../src/zypper-misc.cc:623
msgid "Nothing to do."
msgstr "ç¡å·è¡åä½ã"
-#: ../src/zypper-misc.cc:736
+#: ../src/zypper-misc.cc:737
+#, fuzzy, c-format
msgid "Overall download size: %s."
msgstr "å
¨é¨ä¸è¼å¤§å°ï¼ %1ã"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:740
+#: ../src/zypper-misc.cc:741
#, c-format
msgid "After the operation, additional %s will be used."
msgstr "å®ææä½å¾ï¼å°å¢å %s ç使ç¨ã"
#. TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
-#: ../src/zypper-misc.cc:748
+#: ../src/zypper-misc.cc:749
+#, c-format
msgid "After the operation, %s will be freed."
msgstr "å®ææä½å¾ï¼å°éåº %sã"
-#: ../src/zypper-misc.cc:795
+#: ../src/zypper-misc.cc:796
#, c-format
msgid "%s items locked"
msgstr "%s é
ç®éå®"
-#: ../src/zypper-misc.cc:796
+#: ../src/zypper-misc.cc:797
msgid "Establishing status of aggregates"
msgstr "æ£å¨å»ºç«æ´åçæ
"
-#: ../src/zypper-misc.cc:804
+#: ../src/zypper-misc.cc:805
msgid "Resolving dependencies..."
msgstr "æ£å¨è§£æç¸ä¾æ§..."
-#: ../src/zypper-misc.cc:829
+#: ../src/zypper-misc.cc:831
+#, c-format
msgid "%d patches needed (%d security patches)"
msgstr "éè¦ %d åä¿®è£ç¨å¼(%d åå®å
¨æ§ä¿®æ£)"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Installed"
msgstr "å·²å®è£"
-#: ../src/zypper-misc.cc:838 ../src/zypper-info.cc:148
+#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:148
msgid "Uninstalled"
msgstr "已解é¤å®è£"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "No Longer Applicable"
msgstr "ä¸åé©ç¨"
-#: ../src/zypper-misc.cc:840 ../src/zypper-info.cc:150
+#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:150
msgid "Not Applicable"
msgstr "ä¸é©ç¨"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Applied"
msgstr "å·²å¥ç¨"
-#: ../src/zypper-misc.cc:842 ../src/zypper-info.cc:152
+#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:152
msgid "Not Needed"
msgstr "ä¸éè¦"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Broken"
msgstr "å·²ææ¯"
-#: ../src/zypper-misc.cc:844 ../src/zypper-info.cc:154
+#: ../src/zypper-misc.cc:846 ../src/zypper-info.cc:154
msgid "Needed"
msgstr "éè¦"
#. if ResStatus interface changes
-#: ../src/zypper-misc.cc:846
+#: ../src/zypper-misc.cc:848
msgid "error"
msgstr "é¯èª¤"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Catalog: "
msgstr "ç®éï¼"
-#: ../src/zypper-misc.cc:875 ../src/zypper-misc.cc:995
-#: ../src/zypper-misc.cc:1144 ../src/zypper-info.cc:92
+#: ../src/zypper-misc.cc:877 ../src/zypper-misc.cc:997
+#: ../src/zypper-misc.cc:1146 ../src/zypper-info.cc:92
msgid "Repository: "
msgstr "å¥ä»¶åº«ï¼ "
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1150 ../src/zypper-sources.cc:310
-#: ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1152 ../src/zypper-sources.cc:316
+#: ../src/zypper-sources.cc:357 ../src/zypper-search.h:299
msgid "Name"
msgstr "å稱"
#. best_effort does not know version or arch yet
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Version"
msgstr "çæ¬"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
msgid "Category"
msgstr "åé¡"
-#: ../src/zypper-misc.cc:876 ../src/zypper-misc.cc:996
-#: ../src/zypper-sources.cc:308
+#: ../src/zypper-misc.cc:878 ../src/zypper-misc.cc:998
+#: ../src/zypper-sources.cc:316
msgid "Status"
msgstr "çæ
"
-#: ../src/zypper-misc.cc:902
+#: ../src/zypper-misc.cc:904
msgid "No needed patches found."
msgstr "æ²æéè¦çä¿®è£ç¨å¼ã"
-#: ../src/zypper-misc.cc:1030
+#: ../src/zypper-misc.cc:1032
msgid ""
"WARNING: These are only the updates affecting the updater itself.\n"
"There are others available too.\n"
@@ -277,38 +296,47 @@
"è¦åï¼ éäºæ¯åªå½±é¿æ´æ°ç¨å¼æ¬èº«çæ´æ°ã\n"
"éæå
¶ä»çæ´æ°ã\n"
-#: ../src/zypper-misc.cc:1040 ../src/zypper-misc.cc:1186
+#: ../src/zypper-misc.cc:1042 ../src/zypper-misc.cc:1188
msgid "No updates found."
msgstr "æ²æç¼ç¾æ´æ°ã"
#. TranslatorExplanation S stands for Status
#. TranslatorExplanation S as Status
-#: ../src/zypper-misc.cc:1142 ../src/zypper-search.h:259
+#: ../src/zypper-misc.cc:1144 ../src/zypper-search.h:286
msgid "S"
msgstr "S"
#. TranslatorExplanation This is Bundle in as used in rug.
-#: ../src/zypper-misc.cc:1147 ../src/zypper-search.h:268
+#: ../src/zypper-misc.cc:1149 ../src/zypper-search.h:295
msgid "Bundle"
msgstr "é
å¥"
-#: ../src/zypper-misc.cc:1152 ../src/zypper-search.h:272
+#: ../src/zypper-misc.cc:1154 ../src/zypper-search.h:299
msgid "Arch"
msgstr "çµæ§"
#. Skipping a patch because it is interactive and
#. --skip-interactive is requested. %s is a name of a
#. patch
-#: ../src/zypper-misc.cc:1310
+#: ../src/zypper-misc.cc:1312
#, c-format
msgid "WARNING: %s is interactive, skipped."
msgstr "è¦åï¼ %s æ¯äºå模å¼ï¼ç¥éã"
-#: ../src/zypper-misc.cc:1373
+#: ../src/zypper-misc.cc:1375
msgid "committing"
msgstr "æ交"
-#: ../src/zypper-misc.cc:1391
+#: ../src/zypper-misc.cc:1390
+#, fuzzy
+msgid "Problem downloading the package file from the repository:"
+msgstr "å¾ '%s' ä¸è¼æªæ¡åºç¾åé¡ã"
+
+#: ../src/zypper-misc.cc:1391 ../src/zypper-sources.cc:89
+msgid "Please, see the above error message to for a hint."
+msgstr "è«æª¢è¦ä¸é¢çé¯èª¤è¨æ¯ä»¥ç²å¾æ示ã"
+
+#: ../src/zypper-misc.cc:1401
msgid ""
"The package integrity check failed. This may be a problem with the repository or media. Try one of the following:\n"
"\n"
@@ -324,374 +352,434 @@
" â 使ç¨å¦ä¸åå®è£åªé« (ä¾å¦åªé«æå£æ)\n"
" â 使ç¨å¦ä¸åå¥ä»¶åº«"
-#: ../src/zypper-misc.cc:1411
+#: ../src/zypper-misc.cc:1421
msgid "One of installed patches requires reboot of your machine. Please, do it as soon as possible."
msgstr "å
¶ä¸ä¸åå®è£çä¿®è£ç¨å¼éè¦éæ°ååæ¨çæ©å¨ã è«ç¡å¿«éæ°ååé»è
¦ã"
-#: ../src/zypper-misc.cc:1414
+#: ../src/zypper-misc.cc:1424
msgid "WARNING: One of installed patches requires a reboot of your machine. Please do it as soon as possible."
msgstr "è¦åï¼ å
¶ä¸ä¸åå®è£çä¿®è£ç¨å¼éè¦éæ°ååæ¨çæ©å¨ã è«ç¡å¿«éæ°ååé»è
¦ã"
-#: ../src/zypper-misc.cc:1420
+#: ../src/zypper-misc.cc:1430
msgid "WARNING: One of installed patches affects the package manager itself, thus it requires its restart before executing any further operations."
msgstr "è¦åï¼ å
¶ä¸ä¸åå®è£çä¿®è£ç¨å¼æå½±é¿å¥ä»¶ç®¡çå¡æ¬èº«ï¼å æ¤å¿
é éæ°ååï¼æè½å·è¡ä¸ä¸åä½æ¥ã"
-#: ../src/zypper-misc.cc:1446
+#: ../src/zypper-misc.cc:1456
+#, c-format
msgid "Automatically agreeing with %s %s license."
msgstr "èªååæ %s %s ææ¬ã"
-#: ../src/zypper-misc.cc:1457
+#: ../src/zypper-misc.cc:1467
+#, c-format
msgid "%s %s license:"
msgstr "%s %s ææ¬ï¼"
-#: ../src/zypper-misc.cc:1461
+#: ../src/zypper-misc.cc:1471
msgid "In order to install this package, you must agree to terms of the above licencse. Continue?"
msgstr "è¥è¦å®è£æ¤å¥ä»¶ï¼æ¨å¿
é æ¥åä¸è¿°ææ¬æ¢æ¬¾ã è¦ç¹¼çºåï¼"
-#: ../src/zypper-misc.cc:1472
+#: ../src/zypper-misc.cc:1482
msgid "Aborting installation due to the need for license(s) confirmation."
msgstr "å çºå¿
é 確èªææ¬æ¢æ¬¾ï¼æ以ä¸æ¢å®è£ã"
#. TranslatorExplanation Don't translate the '--auto-agree-with-licenses',
#. it is a command line option
-#: ../src/zypper-misc.cc:1476
+#: ../src/zypper-misc.cc:1486
msgid "Please, restart the operation in interactive mode and confirm your agreement with required license(s), or use the --auto-agree-with-licenses option."
msgstr "è«å¨äºå模å¼ä¸éæ°ååä½æ¥ï¼ä¸¦ç¢ºèªæ¨åæææ¬åç´ï¼æä½¿ç¨ --auto-agree-with-licenses çé¸é
ã"
-#: ../src/zypper-misc.cc:1487
+#: ../src/zypper-misc.cc:1497
+#, c-format
msgid "Aborting installation due to user disagreement with %s %s license."
msgstr "ä¸æ¢å®è£ï¼å çºä½¿ç¨è
ä¸æ¥å %s %s ææ¬ã"
-#: ../src/zypper-misc.cc:1557
+#: ../src/zypper-misc.cc:1567
+#, c-format
msgid "Installing source package %s-%s"
msgstr "æ£å¨å®è£ä¾æºå¥ä»¶ %s-%s"
-#: ../src/zypper-misc.cc:1565
+#: ../src/zypper-misc.cc:1575
+#, c-format
msgid "Source package %s-%s successfully installed."
msgstr "ä¾æºå¥ä»¶ %s-%s å·²æåå®è£ã"
-#: ../src/zypper-misc.cc:1571
+#: ../src/zypper-misc.cc:1581
+#, c-format
msgid "Problem installing source package %s-%s:"
msgstr "å®è£ä¾æºå¥ä»¶ %s-%s ç¼çåé¡ï¼"
-#: ../src/zypper-misc.cc:1579
+#: ../src/zypper-misc.cc:1589
+#, c-format
msgid "Source package '%s' not found."
msgstr "æ¾ä¸å°ä¾æºå¥ä»¶ '%s'ã"
-#: ../src/zypper-sources.cc:48
+#: ../src/zypper-sources.cc:52
#, c-format
msgid "Checking whether to refresh metadata for %s"
msgstr "檢æ¥æ¯å¦éè¦éæ°æ´ç %s çä¸ç¹¼è³è¨"
-#: ../src/zypper-sources.cc:57
+#: ../src/zypper-sources.cc:61
+#, c-format
msgid "Refreshing '%s'"
msgstr "æ£å¨éæ°æ´ç '%s'"
-#: ../src/zypper-sources.cc:59
+#: ../src/zypper-sources.cc:63
msgid "(forced)"
msgstr "(å¼·è¿«)"
-#: ../src/zypper-sources.cc:64
+#: ../src/zypper-sources.cc:68
+#, c-format
msgid "Repository '%s' is up to date."
msgstr "å¥ä»¶åº« '%s' å·²æ¯ææ°çæ
ã"
-#: ../src/zypper-sources.cc:76
+#: ../src/zypper-sources.cc:80
msgid "Forcing raw metadata refresh"
msgstr "å¼·è¿«ä¸å®æ´çä¸ç¹¼è³æéæ°æ´ç"
-#: ../src/zypper-sources.cc:84
+#: ../src/zypper-sources.cc:88
+#, c-format
msgid "Problem downloading files from '%s'."
msgstr "å¾ '%s' ä¸è¼æªæ¡åºç¾åé¡ã"
-#: ../src/zypper-sources.cc:85
-msgid "Please, see the above error message to for a hint."
-msgstr "è«æª¢è¦ä¸é¢çé¯èª¤è¨æ¯ä»¥ç²å¾æ示ã"
-
-#: ../src/zypper-sources.cc:92
+#: ../src/zypper-sources.cc:96
+#, c-format
msgid "No URLs defined for '%s'."
msgstr "'%s' æ²æå®ç¾© URLã"
#. TranslatorExplanation the first %s is a .repo file path
-#: ../src/zypper-sources.cc:96
+#: ../src/zypper-sources.cc:100
#, c-format
msgid "Please, add one or more base URL (baseurl=URL) entries to %s for repository '%s'."
msgstr "è«å å
¥ä¸åææ¸ååºç¤ URL (baseurl=URL) å° %s æä¾å¥ä»¶åº« '%s' 使ç¨ã"
-#: ../src/zypper-sources.cc:104
+#. ! \todo correct the message after 10.3 release
+#: ../src/zypper-sources.cc:109
msgid "No alias defined this repository."
msgstr "éåå¥ä»¶åº«æªå®ç¾©å¥åã"
-#: ../src/zypper-sources.cc:112
+#: ../src/zypper-sources.cc:117
+#, c-format
msgid "Repository '%s' is invalid."
msgstr "å¥ä»¶åº« '%s' ä¸é©ç¨ã"
-#: ../src/zypper-sources.cc:113
+#: ../src/zypper-sources.cc:118
msgid "Please, check if the URLs defined for this repository are pointing to a valid repository."
msgstr "è«æª¢æ¥æ¤å¥ä»¶åº«å®ç¾©ç URL æ¯å¦æåå¯ç¨çå¥ä»¶åº«ã"
-#: ../src/zypper-sources.cc:121
+#: ../src/zypper-sources.cc:126
+#, c-format
msgid "Error downloading metadata for '%s':"
msgstr "å¾ '%s' ä¸è¼ä¸ç¹¼è³æç¼çé¯èª¤ï¼"
-#: ../src/zypper-sources.cc:148
+#: ../src/zypper-sources.cc:153
msgid "Forcing building of repository cache"
msgstr "強迫建ç«å¥ä»¶åº«å¿«å"
-#: ../src/zypper-sources.cc:161
+#: ../src/zypper-sources.cc:166
+#, c-format
msgid "Error parsing metadata for '%s':"
msgstr "åæ '%s' çä¸ç¹¼è³æç¼çé¯èª¤ï¼"
#. TranslatorExplanation Don't translate the URL unless it is translated, too
-#: ../src/zypper-sources.cc:163
+#: ../src/zypper-sources.cc:168
msgid "This may be caused by invalid metadata in the repository, or by a bug in the metadata parser. In the latter case, or if in doubt, please, file a bug report by folowing instructions at http://en.opensuse.org/Zypper#Troubleshooting"
msgstr "éå¯è½æ¯å çºå¥ä»¶åº«çä¸ç¹¼è³è¨ä¸é©ç¨ï¼æä¸ç¹¼è³è¨åæå¨çé¯èª¤ãè¥æ¯å¾è
çæ
å½¢(ææ¨æ·çæ¯)è«åè http://en.opensuse.org/Zypper#Troubleshooting çæå¼ç¼åºé¯èª¤åå ±ã"
-#: ../src/zypper-sources.cc:177
+#: ../src/zypper-sources.cc:182
+#, c-format
msgid "Repository metadata for '%s' not found in local cache."
msgstr "å¨æ¬æ©å¿«åä¸æ¾ä¸å°å¥ä»¶åº« '%s' çä¸ç¹¼è³è¨ã"
-#: ../src/zypper-sources.cc:185
+#: ../src/zypper-sources.cc:190
msgid "Error building the cache database:"
msgstr "建ç«å¿«åè³æ庫æç¼çé¯èª¤ï¼"
-#: ../src/zypper-sources.cc:215
+#: ../src/zypper-sources.cc:222
+#, c-format
msgid "Repository '%s' not found."
msgstr "æ¾ä¸å°å¥ä»¶åº« '%s'ã"
-#: ../src/zypper-sources.cc:221
+#: ../src/zypper-sources.cc:228
+#, c-format
msgid "Error reading repository description file for '%s'."
msgstr "è®åå¥ä»¶åº« '%s' çæè¿°æªæç¼çé¯èª¤ã"
-#: ../src/zypper-sources.cc:223
+#: ../src/zypper-sources.cc:230
msgid "Reason: "
msgstr "çç±ï¼ "
-#: ../src/zypper-sources.cc:250
+#: ../src/zypper-sources.cc:257
#, c-format
msgid "Disabling repository '%s' because of the above error."
msgstr "å 以ä¸çé¯èª¤åç¨å¥ä»¶åº« '%s'ã"
-#: ../src/zypper-sources.cc:268
+#: ../src/zypper-sources.cc:275
#, c-format
msgid "Repository '%s' is out-of-date. You can run 'zypper refresh' as root to update it."
msgstr "å¥ä»¶åº« '%s' å·²éæãæ¨å¯ä»¥ç¨ root å·è¡ 'zypper refresh' ä¾æ´æ°å®ã"
-#. TranslatorExplanation used as e.g. "Enabled: Yes"
-#: ../src/zypper-sources.cc:309 ../src/zypper-sources.cc:681
-msgid "Enabled"
-msgstr "å·²åç¨"
-
-#: ../src/zypper-sources.cc:309
-msgid "Refresh"
-msgstr "éæ°æ´ç"
-
-#: ../src/zypper-sources.cc:310 ../src/zypper-search.h:270
+#: ../src/zypper-sources.cc:316 ../src/zypper-sources.cc:357
+#: ../src/zypper-search.h:297
msgid "Type"
msgstr "é¡å"
-#: ../src/zypper-sources.cc:326
+#. status
+#. rug's status (active, pending => active, disabled <= enabled, disabled)
+#. this is probably the closest possible compatibility arrangement
+#: ../src/zypper-sources.cc:333
msgid "Active"
msgstr "ä½ç¨ä¸"
-#: ../src/zypper-sources.cc:326
+#: ../src/zypper-sources.cc:333
msgid "Disabled"
msgstr "å·²åç¨"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#. TranslatorExplanation used as e.g. "Enabled: Yes"
+#: ../src/zypper-sources.cc:357 ../src/zypper-sources.cc:730
+msgid "Enabled"
+msgstr "å·²åç¨"
+
+#: ../src/zypper-sources.cc:357
+msgid "Refresh"
+msgstr "éæ°æ´ç"
+
+#: ../src/zypper-sources.cc:357
+msgid "Alias"
+msgstr "å¥å"
+
+#. enabled?
+#. autorefresh?
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "Yes"
msgstr "æ¯"
-#: ../src/zypper-sources.cc:331 ../src/zypper-sources.cc:332
-#: ../src/zypper-sources.cc:681 ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:373 ../src/zypper-sources.cc:375
+#: ../src/zypper-sources.cc:730 ../src/zypper-sources.cc:732
#: ../src/zypper-info.cc:160 ../src/zypper-info.cc:166
#: ../src/zypper-info.cc:168
msgid "No"
msgstr "å¦"
-#: ../src/zypper-sources.cc:350
+#: ../src/zypper-sources.cc:391
msgid "No repositories defined. Use the 'zypper addrepo' command to add one or more repositories."
msgstr "å°æªå®ç¾©å¥ä»¶åº«ãè«ç¨ 'zypper addrepo' å½ä»¤ä¾å å
¥å¥ä»¶åº«ã"
-#: ../src/zypper-sources.cc:383 ../src/zypper-sources.cc:449
+#: ../src/zypper-sources.cc:424 ../src/zypper-sources.cc:495
msgid "Error reading repositories:"
msgstr "è®åå¥ä»¶åº«ç¼çé¯èª¤ï¼"
-#: ../src/zypper-sources.cc:405
+#: ../src/zypper-sources.cc:446
#, c-format
msgid "Can't open %s for writing. Maybe you don't have write permissions?"
msgstr "ç¡æ³éå寫å
¥ %s ãå¯è½æ¨æ²æ寫å
¥çæ¬éï¼"
-#: ../src/zypper-sources.cc:413
+#: ../src/zypper-sources.cc:454
+#, c-format
msgid "Repositories have been successfully exported to %s."
msgstr "å¥ä»¶åº«å·²æåå¯åºå° %sã"
-#: ../src/zypper-sources.cc:505
+#: ../src/zypper-sources.cc:551
#, c-format
msgid "Skipping disabled repository '%s'"
msgstr "è·³éå·²åç¨çå¥ä»¶åº« '%s'"
-#: ../src/zypper-sources.cc:541
+#: ../src/zypper-sources.cc:587
#, c-format
msgid "Skipping repository '%s' because of the above error."
msgstr "å 以ä¸çé¯èª¤è·³éå¥ä»¶åº« '%s'ã"
-#: ../src/zypper-sources.cc:554
+#: ../src/zypper-sources.cc:600
+#, c-format
msgid "Repository '%s' not found by its alias or number."
msgstr "ç¡æ³ç±å®çå¥åæç·¨èæ¾å°å¥ä»¶åº« '%s'ã"
-#: ../src/zypper-sources.cc:559
+#: ../src/zypper-sources.cc:605
msgid "Use 'zypper repos' to get the list of defined repositories."
msgstr "è«ç¨ 'zypper repos' åå¾å·²å®ç¾©çå¥ä»¶åº«æ¸
å®ã"
-#: ../src/zypper-sources.cc:566
+#: ../src/zypper-sources.cc:612
msgid "Specified repositories are not enabled or defined."
msgstr "æå®çå¥ä»¶åº«å°æªåç¨æå®ç¾©ã"
-#: ../src/zypper-sources.cc:568
+#: ../src/zypper-sources.cc:614
msgid "There are no enabled repositories defined."
msgstr "å°æªå®ç¾©å·²åç¨çå¥ä»¶åº«ã"
-#: ../src/zypper-sources.cc:571
+#: ../src/zypper-sources.cc:617
msgid "Use 'zypper addrepo' or 'zypper modifyrepo' commands to add or enable repositories."
msgstr "è«ç¨ 'zypper addrepo' æ 'zypper modifyrepo' å½ä»¤ä¾å å
¥æåç¨å¥ä»¶åº«ã"
-#: ../src/zypper-sources.cc:575
+#: ../src/zypper-sources.cc:621
msgid "Could not refresh the repositories because of errors."
msgstr "å ç¼çé¯èª¤ç¡æ³éæ°æ´çå¥ä»¶åº«ã"
-#: ../src/zypper-sources.cc:577
+#: ../src/zypper-sources.cc:623
msgid "Some of the repositories have not been refreshed because of an error."
msgstr "å ç¼çé¯èª¤ï¼æäºå¥ä»¶åº«å°æªè¢«éæ°æ´çã"
-#: ../src/zypper-sources.cc:579
+#: ../src/zypper-sources.cc:625
msgid "Specified repositories have been refreshed."
msgstr "æå®çå¥ä»¶åº«å·²éæ°æ´çã"
-#: ../src/zypper-sources.cc:581
+#: ../src/zypper-sources.cc:627
msgid "All repositories have been refreshed."
msgstr "ææå¥ä»¶åº«å·²éæ°æ´çã"
-#: ../src/zypper-sources.cc:623
+#: ../src/zypper-sources.cc:667
msgid "This is a changeable read-only media (CD/DVD), disabling autorefresh."
msgstr "éæ¯ä¸åææ¹è®çå¯è®åªé« (CD/DVD)ï¼åç¨èªåéæ°æ´çã"
-#: ../src/zypper-sources.cc:636
+#: ../src/zypper-sources.cc:685
+#, c-format
msgid "Repository named '%s' already exists. Please, use another alias."
msgstr "å¥ä»¶åº«å稱 '%s' å·²åå¨ãè«ä½¿ç¨å
¶ä»çå¥åã"
-#: ../src/zypper-sources.cc:644
+#: ../src/zypper-sources.cc:693
msgid "Can't find a valid repository at given location:"
msgstr "å¨æå®çä½ç½®æ¾ä¸å°é©ç¨çå¥ä»¶åº«ï¼"
-#: ../src/zypper-sources.cc:645
+#: ../src/zypper-sources.cc:694
msgid "Could not determine the type of the repository. Please, check if the defined URLs (see below) point to a valid repository:"
msgstr "ç¡æ³æ±ºå®å¥ä»¶åº«çé¡åãè«æª¢æ¥æ¯å¦å®ç¾©ç URL (åçä¸æ¹) ççæåä¸åå¯ç¨çå¥ä»¶åº«ï¼"
-#: ../src/zypper-sources.cc:656
+#: ../src/zypper-sources.cc:705
msgid "Problem transferring repository data from specified URL:"
msgstr "ç±æå®ç URL å³è¼¸å¥ä»¶åº«è³ææç¼çé¯èª¤ï¼"
-#: ../src/zypper-sources.cc:657
+#: ../src/zypper-sources.cc:706
msgid "Please, check whether the specified URL is accessible."
msgstr "è«æª¢æ¥æå®ç URL æ¯å¦å¯ååã"
-#: ../src/zypper-sources.cc:664
+#: ../src/zypper-sources.cc:713
msgid "Unknown problem when adding repository:"
msgstr "æ°å¢å¥ä»¶åº«æç¼çæªç¥çåé¡ï¼"
-#: ../src/zypper-sources.cc:668
+#: ../src/zypper-sources.cc:717
+#, c-format
msgid "Repository '%s' successfully added"
msgstr "å·²æåæ°å¢å¥ä»¶åº« '%s'"
#. TranslatorExplanation used as e.g. "Autorefresh: Yes"
-#: ../src/zypper-sources.cc:683
+#: ../src/zypper-sources.cc:732
msgid "Autorefresh"
msgstr "èªåéæ°æ´ç"
-#: ../src/zypper-sources.cc:691
+#: ../src/zypper-sources.cc:740
+#, c-format
msgid "Reading data from '%s' media"
msgstr "æ£å¨å¾åªé« '%s' è®åè³æ"
-#: ../src/zypper-sources.cc:697
+#: ../src/zypper-sources.cc:746
+#, c-format
msgid "Problem reading data from '%s' media"
msgstr "å¾åªé« '%s' è®åè³æç¼çåé¡"
-#: ../src/zypper-sources.cc:698
+#: ../src/zypper-sources.cc:747
msgid "Please, check if your installation media is valid and readable."
msgstr "è«æª¢æ¥æ¨çå®è£åªé«æ¯å¦é©ç¨èå¯ååã"
-#: ../src/zypper-sources.cc:792
+#: ../src/zypper-sources.cc:795
+#, fuzzy
+msgid "Problem accessing the file at the specified URL"
+msgstr "ç±æå®ç URL å³è¼¸å¥ä»¶åº«è³ææç¼çé¯èª¤ï¼"
+
+#: ../src/zypper-sources.cc:796
+#, fuzzy
+msgid "Please check if the URL is valid and accessible."
+msgstr "è«æª¢æ¥æå®ç URL æ¯å¦å¯ååã"
+
+#: ../src/zypper-sources.cc:803
+#, fuzzy
+msgid "Problem parsing the file at the specified URL"
+msgstr "ç±æå®ç URL å³è¼¸å¥ä»¶åº«è³ææç¼çé¯èª¤ï¼"
+
+#. TranslatorExplanation don't translate the URL if the URL itself is not translated.
+#. Also don't translate the '.repo' string.
+#: ../src/zypper-sources.cc:806
+msgid "Is it a .repo file? See http://en.opensuse.org/Standards/RepoInfo for details."
+msgstr ""
+
+#: ../src/zypper-sources.cc:813
+msgid "Problem encountered while trying to read the file at the specified URL"
+msgstr ""
+
+#: ../src/zypper-sources.cc:870
+#, c-format
msgid "Repository %s has been removed."
msgstr "å¥ä»¶åº« %s å·²ç¶è¢«ç§»é¤ã"
-#: ../src/zypper-sources.cc:844
+#: ../src/zypper-sources.cc:922
#, c-format
msgid "Repository %s renamed to %s"
msgstr "å¥ä»¶åº« %s å·²æ¹åçº %s"
-#: ../src/zypper-sources.cc:849 ../src/zypper-sources.cc:926
+#: ../src/zypper-sources.cc:927 ../src/zypper-sources.cc:1004
+#, c-format
msgid "Repository %s not found."
msgstr "æ¾ä¸å°å¥ä»¶åº« %sã"
-#: ../src/zypper-sources.cc:854 ../src/zypper-sources.cc:931
+#: ../src/zypper-sources.cc:932 ../src/zypper-sources.cc:1009
msgid "Error while modifying the repository:"
msgstr "ä¿®æ¹å¥ä»¶åº«æç¼çé¯èª¤ï¼"
-#: ../src/zypper-sources.cc:856 ../src/zypper-sources.cc:933
+#: ../src/zypper-sources.cc:934 ../src/zypper-sources.cc:1011
+#, c-format
msgid "Leaving repository %s unchanged."
msgstr "å¥ä»¶åº« %s ç¶æä¸è®ã"
-#: ../src/zypper-sources.cc:870
+#: ../src/zypper-sources.cc:948
#, c-format
msgid "%s used together with %s, which contradict each other. This property will be left unchanged."
msgstr "%s å %s ä¸èµ·ä½¿ç¨ï¼èéå
©åæ¯å½¼æ¤è¡çªçãéåæ§è³ªå°ç¶æä¸è®ã"
-#: ../src/zypper-sources.cc:921
+#: ../src/zypper-sources.cc:999
+#, c-format
msgid "Repository %s has been sucessfully modified."
msgstr "å¥ä»¶åº« %s å·²æåä¿®æ¹ã"
-#: ../src/zypper-sources.cc:969
+#: ../src/zypper-sources.cc:1047
+#, c-format
msgid "Retrieving repository '%s' data..."
msgstr "æ£å¨è®åå¥ä»¶åº« %s..."
-#: ../src/zypper-sources.cc:976
+#: ../src/zypper-sources.cc:1054
#, c-format
msgid "Repository '%s' not cached. Caching..."
msgstr "å¥ä»¶åº« '%s' æ²æå¿«åãå¿«åä¸..."
-#: ../src/zypper-sources.cc:983 ../src/zypper-sources.cc:1002
+#: ../src/zypper-sources.cc:1061 ../src/zypper-sources.cc:1080
#, c-format
msgid "Problem loading data from '%s'"
msgstr "å¾ '%s' è¼å
¥è³ææåé¡"
-#: ../src/zypper-sources.cc:984 ../src/zypper-sources.cc:1004
+#: ../src/zypper-sources.cc:1062 ../src/zypper-sources.cc:1082
#, c-format
msgid "Resolvables from '%s' not loaded because of error."
msgstr "å çºé¯èª¤ï¼ç± '%s' æä¾ç解決æ¹æ¡ç¡æ³è¼å
¥ã"
-#: ../src/zypper-sources.cc:991
+#: ../src/zypper-sources.cc:1069
#, c-format
msgid "(%d resolvables found)"
msgstr "(æ¾å° %d 解決æ¹æ¡)"
-#: ../src/zypper-sources.cc:1003
+#: ../src/zypper-sources.cc:1081
msgid "Try 'zypper refresh', or even remove /var/cache/zypp/zypp.db before doing so."
msgstr "è«è©¦è©¦ 'zypper refresh' ï¼æå·è¡åå
ç§»é¤ /var/cache/zypp/zypp.db ã"
-#: ../src/zypper-sources.cc:1015
+#: ../src/zypper-sources.cc:1093
msgid "Reading RPM database..."
msgstr "æ£å¨è®å RPM è³æ庫..."
-#: ../src/zypper-sources.cc:1022
+#: ../src/zypper-sources.cc:1100
#, c-format
msgid "(%s resolvables)"
msgstr "(%s 解決æ¹æ¡)"
#. list name, exact match
-#: ../src/zypper-sources.cc:1110
+#: ../src/zypper-sources.cc:1188
msgid ""
"ZENworks Management Daemon is running.\n"
"WARNING: this command will not synchronize changes.\n"
@@ -706,6 +794,7 @@
msgstr "æ´æ°ç¨å¼ç¡æ³ååå¥ä»¶ç®¡çå¡å¼æã ç¶å¦ä¸åæç¨ç¨å¼ (ä¾å¦ YaST) åæéä¹å¨ä½¿ç¨æ´æ°ç¨å¼æï¼å°±æç¼çé種æ
æ³ã è«ééå
¶ä»æç¨ç¨å¼ä¸¦å次檢æ¥æ´æ°ã"
#: ../src/zypp-checkpatches.cc:185
+#, c-format
msgid ""
"Couldn't restore repository.\n"
"Detail: %s"
@@ -726,41 +815,22 @@
msgid "Invalid answer. Choose letter a, r, or i."
msgstr "ä¸é©ç¨ççæ¡ãè«ç± a ã r æ i 3ååæ¯ä¸é¸æã"
-#. TranslatorExplanation This is a Lowercase 'y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:148 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:171
-msgid "y"
-msgstr "y"
-
-#. TranslatorExplanation Uppercase 'Y' for "yes" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:152 ../src/zypper-callbacks.cc:171
-msgid "Y"
-msgstr "Y"
-
-#. TranslatorExplanation Lowercase 'n' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:156 ../src/zypper-callbacks.cc:165
-#: ../src/zypper-callbacks.cc:173
-msgid "n"
-msgstr "n"
-
-#. TranslatorExplanation Uppercase 'N' for "no" used as an
-#. answer in y/n prompts. Translate to the same letter as you translated
-#. it in the "[y/n]" string!.
-#: ../src/zypper-callbacks.cc:160 ../src/zypper-callbacks.cc:173
-msgid "N"
-msgstr "N"
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "yes"
+msgstr "æ¯"
+
+#: ../src/zypper-callbacks.cc:130 ../src/zypper-callbacks.cc:137
+#: ../src/zypper-callbacks.cc:153
+msgid "no"
+msgstr "å¦"
-#. TranslatorExplanation Example: Invalid answer 'x', enter 'y' or 'n':
-#: ../src/zypper-callbacks.cc:164
+#. TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers.
+#. The second and the third %s is the translated 'yes' and 'no' string (lowercase).
+#: ../src/zypper-callbacks.cc:152
#, c-format
-msgid "Invalid answer '%s', enter '%s' or '%s':"
-msgstr "ä¸é©ç¨ççæ¡ '%s'ï¼è«è¼¸å
¥ '%s' æ '%s'ï¼"
+msgid "Invalid answer '%s'. Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you"
+msgstr ""
#: ../src/zypper-getopt.cc:56
msgid "Unknown option "
@@ -772,12 +842,14 @@
#. TranslatorExplanation E.g. "package zypper not found."
#: ../src/zypper-info.cc:52
+#, c-format
msgid "%s %s not found."
msgstr "æ¾ä¸å° %s %s ã"
#. print info
#. TranslatorExplanation E.g. "Information for package zypper:"
#: ../src/zypper-info.cc:58
+#, c-format
msgid "Information for %s %s:"
msgstr "%s %s çè³è¨ï¼"
@@ -861,64 +933,39 @@
msgid "Requires:"
msgstr "éè¦ï¼"
-#: ../src/zypper-search.cc:42
+#: ../src/zypper-search.cc:85
msgid "No repositories configured. Please add at least one repository using 'zypper addrepo' command before using the search."
msgstr "æ²æå·²è¨å®å®æçå¥ä»¶åº«ãå¨æ¨ä½¿ç¨æå°åï¼è«ä½¿ç¨ 'zypper addrepo' å½ä»¤è³å°å å
¥ä¸åå¥ä»¶åº«ã"
-#: ../src/zypper-search.cc:182
+#: ../src/zypper-search.cc:232
msgid "Pre-caching installed resolvables matching given search criteria... "
msgstr "æ£å¨é å
å¿«å符åç¹å®æå°æ¢ä»¶çå®è£å¯è§£ææª..."
-#: ../src/zypper-search.cc:191
+#: ../src/zypper-search.cc:242
msgid " out of ("
msgstr "總å
± ("
-#: ../src/zypper-search.cc:192
+#: ../src/zypper-search.cc:243
msgid "cached."
msgstr "已快åã"
-#: ../src/zypper-search.cc:293
+#: ../src/zypper-search.cc:344
msgid " is not a valid regular expression: \""
msgstr "ä¸æ¯ææçæ£è¦è¡¨ç¤ºå¼ï¼ \""
-#: ../src/zypper-search.cc:295
+#: ../src/zypper-search.cc:346
msgid "This is a bug, please file a bug report against zypper."
msgstr "éæ¯ä¸åé¯èª¤ï¼è«å°æ¤æå ±å° zipper çé¯èª¤åå ±ä¸ã"
-#: ../src/zypper.cc:73 ../src/zypper.cc:887
+#: ../src/zypper.cc:76 ../src/zypper.cc:899
msgid "Given URL is invalid."
msgstr "æå®ç URL ç¡æã"
-#: ../src/zypper.cc:110
-msgid ""
-" Options:\n"
-"\t--help, -h\t\tHelp.\n"
-"\t--version, -V\t\tOutput the version number.\n"
-"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
-"\t--verbose, -v\t\tIncrease verbosity.\n"
-"\t--terse, -t\t\tTerse output for machine consumption.\n"
-"\t--table-style, -s\tTable style (integer).\n"
-"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
-"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
-"\t--root, -R <dir>\tOperate on a different root directory.\n"
-msgstr ""
-" é¸é
ï¼\n"
-"\t--helpï¼ -h\t\t幫å©è¨æ¯ã\n"
-"\t--versionï¼ -V\t\t輸åºçæ¬ç·¨èã\n"
-"\t--quietï¼ -q\t\té±èä¸è¬è¼¸åºï¼å
å°åºé¯èª¤è¨æ¯ã\n"
-"\t--verboseï¼ -v\t\tå¢å 詳細度ã\n"
-"\t--terseï¼ -t\t\tç°¡æ½è¼¸åºçµ¦æ©å¨ä½¿ç¨ã\n"
-"\t--table-styleï¼ -s\tè¡¨æ ¼æ¨£å¼(æ´æ¸)ã\n"
-"\t--rug-compatibleï¼ -r\téå rug ç¸å®¹æ§ã\n"
-"\t--non-interactiveï¼ -n\tä¸åä»»ä½äºï¼èªå使ç¨é è¨ççæ¡ã\n"
-"\t--no-gpg-checks\t\tå¿½ç¥ GPG 檢æ¥é¯èª¤ä¸¦ç¹¼çºã\n"
-"\t--rootï¼ -R <ç®é>\tå¨ä¸åçæ ¹ç®éä¸æä½ã\n"
-
-#: ../src/zypper.cc:123
+#: ../src/zypper.cc:84
+#, fuzzy
msgid ""
" Commands:\n"
-"\thelp\t\t\tHelp\n"
+"\thelp, ?\t\t\tHelp\n"
"\tshell, sh\t\tAccept multiple commands at once\n"
"\tinstall, in\t\tInstall packages or resolvables\n"
"\tremove, rm\t\tRemove packages or resolvables\n"
@@ -958,28 +1005,55 @@
"\tinfoï¼ if\t\t顯示å¥ä»¶çå®æ´è³è¨\n"
"\tpatch-info\t\t顯示修è£ç¨å¼çå®æ´è³è¨\n"
"\tsource-installï¼ si\tå®è£ä¾æºå¥ä»¶\n"
-
-#: ../src/zypper.cc:164
+
+#: ../src/zypper.cc:136
+msgid ""
+" Options:\n"
+"\t--help, -h\t\tHelp.\n"
+"\t--version, -V\t\tOutput the version number.\n"
+"\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+"\t--verbose, -v\t\tIncrease verbosity.\n"
+"\t--terse, -t\t\tTerse output for machine consumption.\n"
+"\t--table-style, -s\tTable style (integer).\n"
+"\t--rug-compatible, -r\tTurn on rug compatibility.\n"
+"\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
+"\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
+"\t--root, -R <dir>\tOperate on a different root directory.\n"
+msgstr ""
+" é¸é
ï¼\n"
+"\t--helpï¼ -h\t\t幫å©è¨æ¯ã\n"
+"\t--versionï¼ -V\t\t輸åºçæ¬ç·¨èã\n"
+"\t--quietï¼ -q\t\té±èä¸è¬è¼¸åºï¼å
å°åºé¯èª¤è¨æ¯ã\n"
+"\t--verboseï¼ -v\t\tå¢å 詳細度ã\n"
+"\t--terseï¼ -t\t\tç°¡æ½è¼¸åºçµ¦æ©å¨ä½¿ç¨ã\n"
+"\t--table-styleï¼ -s\tè¡¨æ ¼æ¨£å¼(æ´æ¸)ã\n"
+"\t--rug-compatibleï¼ -r\téå rug ç¸å®¹æ§ã\n"
+"\t--non-interactiveï¼ -n\tä¸åä»»ä½äºï¼èªå使ç¨é è¨ççæ¡ã\n"
+"\t--no-gpg-checks\t\tå¿½ç¥ GPG 檢æ¥é¯èª¤ä¸¦ç¹¼çºã\n"
+"\t--rootï¼ -R <ç®é>\tå¨ä¸åçæ ¹ç®éä¸æä½ã\n"
+
+#: ../src/zypper.cc:167
+#, c-format
msgid "Verbosity: %d"
msgstr "è©³ç´°ï¼ %d"
-#: ../src/zypper.cc:170
+#: ../src/zypper.cc:173
msgid "Entering non-interactive mode."
msgstr "é²å
¥éäºå模å¼ã"
-#: ../src/zypper.cc:176
+#: ../src/zypper.cc:179
msgid "Entering no-gpg-checks mode."
msgstr "é²å
¥å¿½ç¥ GPG 檢æ¥æ¨¡å¼ã"
-#: ../src/zypper.cc:186
+#: ../src/zypper.cc:189
msgid "Invalid table style "
msgstr "ç¡æçè¡¨æ ¼æ¨£å¼"
-#: ../src/zypper.cc:231
+#: ../src/zypper.cc:234
msgid "Try -h for help."
msgstr "è«å試以 -h å«åºèªªæ"
-#: ../src/zypper.cc:281
+#: ../src/zypper.cc:293
msgid ""
"install (in) [options] <capability> ...\n"
"\n"
@@ -1005,7 +1079,7 @@
" è«åé± 'man zypper' 以ç²å¾å¤è³è¨ã\n"
" --debug-solver 建ç«è§£æ±ºæ¸¬è©¦æ¡ä¾ä¾åµé¯\n"
-#: ../src/zypper.cc:310
+#: ../src/zypper.cc:322
msgid ""
"remove (rm) [options] <capability> ...\n"
"\n"
@@ -1027,7 +1101,7 @@
"-n, --name å®ç¨å稱ä¾é¸å解決æ¹æ¡ï¼èä¸ä¾ç
§ç¸å®¹æ§\n"
" --debug-solver 建ç«è§£æ±ºæ¸¬è©¦æ¡ä¾ä¾åµé¯\n"
-#: ../src/zypper.cc:329
+#: ../src/zypper.cc:341
msgid ""
"source-install (si) <name> ...\n"
"\n"
@@ -1041,7 +1115,7 @@
"\n"
"éåæ令æ²æå
¶ä»çé¸é
ã\n"
-#: ../src/zypper.cc:349
+#: ../src/zypper.cc:361
msgid ""
"addrepo (ar) [options] <URI> <alias>\n"
"\n"
@@ -1063,7 +1137,7 @@
"-d, --disabled æ°å¢å¥ä»¶åº«ä¸å°å®è¨çºåç¨\n"
"-n, --no-refresh æ°å¢å¥ä»¶åº«ä¸å°å®è¨çºåç¨èªåéæ°æ´ç\n"
-#: ../src/zypper.cc:368
+#: ../src/zypper.cc:380
msgid ""
"repos (lr)\n"
"\n"
@@ -1079,7 +1153,7 @@
" æ令é¸é
ï¼\n"
"-e, --export <æªæ¡.repo> å¯åºææå·²å®ç¾©çå¥ä»¶åº«æä¸åæ¬æ©ç .repo æª\n"
-#: ../src/zypper.cc:385
+#: ../src/zypper.cc:397
msgid ""
"removerepo (rr) [options] <alias|URL>\n"
"\n"
@@ -1097,7 +1171,7 @@
" --loose-auth\tå¿½ç¥ URL ä¸ç使ç¨è
èªèè³æ\n"
" --loose-query\tå¿½ç¥ URL ä¸çæ¥è©¢å串\n"
-#: ../src/zypper.cc:401
+#: ../src/zypper.cc:413
msgid ""
"renamerepo [options] <alias> <new-alias>\n"
"\n"
@@ -1111,7 +1185,7 @@
"\n"
"æ¬æ令æ²æå
¶ä»é¸é
ã\n"
-#: ../src/zypper.cc:419
+#: ../src/zypper.cc:431
msgid ""
"modifyrepo (mr) <options> <alias>\n"
"\n"
@@ -1133,7 +1207,7 @@
"-a, --enable-autorefresh åç¨è©²å¥ä»¶åº«çèªåéæ°æ´ç\n"
" --disable-autorefresh åç¨è©²å¥ä»¶åº«çèªåéæ°æ´ç\n"
-#: ../src/zypper.cc:442
+#: ../src/zypper.cc:454
msgid ""
"refresh (ref) [alias|#] ...\n"
"\n"
@@ -1157,7 +1231,7 @@
"-B, --build-only å
建ç«è³æ庫ï¼ä¸ä¸è¼ä¸ç¹¼è³æã\n"
"-D, --download-only å
ä¸è¼æ°çä¸ç¹¼è³æï¼ä¸å»ºç«è³æ庫\n"
-#: ../src/zypper.cc:467
+#: ../src/zypper.cc:479
msgid ""
"list-updates [options]\n"
"\n"
@@ -1177,7 +1251,7 @@
"-r, --repo <å¥å> å
ååºæå®å¥åå¥ä»¶åº«ä¸çæ´æ°ã\n"
" --best-effort ç¡æ大åªåä¾è¶¨è¿ææ°çæ
ï¼æ´æ°å°æ¯ææ°çæ¬éä½äºçä¹å¯ä»¥æ¥åã\n"
-#: ../src/zypper.cc:494
+#: ../src/zypper.cc:506
msgid ""
"update (up) [options]\n"
"\n"
@@ -1205,7 +1279,7 @@
" --best-effort ç¡æ大åªåä¾è¶¨è¿ææ°çæ
ï¼æ´æ°å°æ¯ææ°çæ¬éä½äºçä¹å¯ä»¥æ¥åã\n"
" --debug-solver 建ç«è§£æ±ºæ¸¬è©¦æ¡ä¾ä¾åµé¯\n"
-#: ../src/zypper.cc:533
+#: ../src/zypper.cc:545
msgid ""
"search [options] [querystring...]\n"
"\n"
@@ -1249,7 +1323,7 @@
" \n"
"* å ? è¬ç¨åå
ä¹å¯ä»¥ç¨å¨æå°å串ä¸ã\n"
-#: ../src/zypper.cc:565
+#: ../src/zypper.cc:577
msgid ""
"patch-check\n"
"\n"
@@ -1267,7 +1341,7 @@
"\n"
"-r, --repo <å¥å> å
檢æ¥æå®å¥åå¥ä»¶åº«ä¸çä¿®è£ç¨å¼ã\n"
-#: ../src/zypper.cc:584
+#: ../src/zypper.cc:596
msgid ""
"patches\n"
"\n"
@@ -1285,7 +1359,7 @@
"\n"
"-r, --repo <å¥å> å
ååºæå®å¥åå¥ä»¶åº«ä¸çä¿®è£ç¨å¼ã\n"
-#: ../src/zypper.cc:603
+#: ../src/zypper.cc:615
msgid ""
"info <name> ...\n"
"\n"
@@ -1303,7 +1377,7 @@
"\n"
"-r, --repo <å¥å> å
éå°æå®å¥åçå¥ä»¶åº«å·¥ä½ã\n"
-#: ../src/zypper.cc:621
+#: ../src/zypper.cc:633
msgid ""
"patch-info <patchname> ...\n"
"\n"
@@ -1317,7 +1391,7 @@
"\n"
"éæ¯ä¸å rug ç¸å®¹çå¥åï¼å°±æ¯ 'zypper info -t patch'\n"
-#: ../src/zypper.cc:635
+#: ../src/zypper.cc:647
msgid ""
"moo\n"
"\n"
@@ -1331,7 +1405,7 @@
"\n"
"æ¬æ令æ²æå
¶ä»é¸é
ã\n"
-#: ../src/zypper.cc:650
+#: ../src/zypper.cc:662
msgid ""
"xml-updates\n"
"\n"
@@ -1347,24 +1421,24 @@
" æ令é¸é
ï¼\n"
"-r, --repo <å¥å> å
éå°æå®å¥åçå¥ä»¶åº«å·¥ä½ã\n"
-#: ../src/zypper.cc:670
+#: ../src/zypper.cc:682
msgid "Non-option program arguments: "
msgstr "éé¸é
ç¨å¼å¼æ¸ï¼"
-#: ../src/zypper.cc:693
+#: ../src/zypper.cc:705
msgid "Repositories disabled, using the database of installed packages only."
msgstr "å¥ä»¶åº«å·²åç¨ï¼å
使ç¨å·²å®è£å¥ä»¶çè³æ庫ã"
-#: ../src/zypper.cc:705
+#: ../src/zypper.cc:717
msgid "Ignoring installed resolvables..."
msgstr "忽ç¥å·²å®è£ç解決æ¹æ¡..."
-#: ../src/zypper.cc:730
+#: ../src/zypper.cc:742
msgid "A ZYpp transaction is already in progress. This means, there is another application using the libzypp library for package management running. All such applications must be closed before using this command."
msgstr "æä¸å ZYpp çæ¥åæ£å¨å·è¡ä¸ãé表示æå¥çä½¿ç¨ libzypp å¥ä»¶ç®¡çç¨å¼åº«çæç¨ç¨å¼æ£å¨å·è¡ä¸ãå¨æ¨å·è¡éåå½ä»¤ä¹åï¼ææéé¡æç¨ç¨å¼é½è¦å
ééã"
#. TranslatorExplanation this is a hedgehog, paint another animal, if you want
-#: ../src/zypper.cc:755
+#: ../src/zypper.cc:767
msgid ""
" \\\\\\\\\\\n"
" \\\\\\\\\\\\\\__o\n"
@@ -1374,126 +1448,132 @@
" \\\\\\\\\\\\\\__o\n"
"__\\\\\\\\\\\\\\'/_"
-#: ../src/zypper.cc:783 ../src/zypper.cc:861 ../src/zypper.cc:932
-#: ../src/zypper.cc:972
+#: ../src/zypper.cc:795 ../src/zypper.cc:873 ../src/zypper.cc:944
+#: ../src/zypper.cc:984
msgid "Root privileges are required for modifying system repositories."
msgstr "éè¦æ Root æ¬éæè½ä¿®æ¹ç³»çµ±å¥ä»¶åº«ã"
-#: ../src/zypper.cc:810 ../src/zypper.cc:938
+#: ../src/zypper.cc:822 ../src/zypper.cc:950
msgid "Too few arguments. At least URL and alias are required."
msgstr "åæ¸éå°ãè³å°è¦æ URL åå¥åã"
-#: ../src/zypper.cc:842
+#: ../src/zypper.cc:854
msgid "Specified type is not a valid repository type:"
msgstr "æå®çé¡åä¸æ¯é©ç¨çå¥ä»¶åº«é¡åï¼"
-#: ../src/zypper.cc:843
+#: ../src/zypper.cc:855
msgid "See 'zypper -h addrepo' or man zypper to get a list of known repository types."
msgstr "åé± 'zypper -h addrepo' æ man zypper åå¾å·²ç¥çå¥ä»¶åº«é¡åã"
-#: ../src/zypper.cc:867
+#: ../src/zypper.cc:879
msgid "Required argument missing."
msgstr "缺å°éè¦çåæ¸ã"
-#: ../src/zypper.cc:880
+#: ../src/zypper.cc:892
msgid "Repository not found by alias, trying delete by URL..."
msgstr "æ¾ä¸å°è©²å¥åçå¥ä»¶åº«ï¼åè©¦ç¨ URL..."
-#: ../src/zypper.cc:913
+#: ../src/zypper.cc:925
msgid "Repository not found by given alias or URL."
msgstr "æ¾ä¸å°æå®å¥åæ URL çå¥ä»¶åº«ã"
-#: ../src/zypper.cc:978
+#: ../src/zypper.cc:990
msgid "Alias is a required argument."
msgstr "å¥åçºå¿
è¦çåæ¸ã"
-#: ../src/zypper.cc:1000
+#: ../src/zypper.cc:1012
msgid "Root privileges are required for refreshing system repositories."
msgstr "éè¦æ Root æ¬éæè½éæ°æ´ç系統å¥ä»¶åº«ã"
-#: ../src/zypper.cc:1037
+#: ../src/zypper.cc:1049
msgid "Root privileges are required for installing or uninstalling packages."
msgstr "éè¦æ Root æ¬éæè½å®è£æ移é¤å¥ä»¶ã"
-#: ../src/zypper.cc:1051 ../src/zypper.cc:1259 ../src/zypper.cc:1332
+#: ../src/zypper.cc:1063 ../src/zypper.cc:1282 ../src/zypper.cc:1355
+#, c-format
msgid "Unknown resolvable type: %s"
msgstr "ä¸æç解決æ¹æ¡é¡åï¼ %s"
-#: ../src/zypper.cc:1069
+#: ../src/zypper.cc:1081
msgid "Warning: No repositories defined. Operating only with the installed resolvables. Nothing can be installed."
msgstr "è¦åï¼æ²æå·²å®ç¾©çå¥ä»¶åº«ãæ¨åªè½ä½¿ç¨å·²å®è£ç解決æ¹æ¡æä½ãç¡æ³å®è£ä»»ä½é
ç®ã"
-#: ../src/zypper.cc:1089 ../src/zypper.cc:1357
+#: ../src/zypper.cc:1101 ../src/zypper.cc:1380
msgid "Generating solver test case..."
msgstr "æ£å¨ç¢ç解決測試æ¹æ¡..."
-#: ../src/zypper.cc:1091 ../src/zypper.cc:1359
+#: ../src/zypper.cc:1103 ../src/zypper.cc:1382
msgid "Solver test case generated successfully."
msgstr "ç¢ç解決測試æ¹æ¡æåã"
-#: ../src/zypper.cc:1094 ../src/zypper.cc:1361
+#: ../src/zypper.cc:1106 ../src/zypper.cc:1384
msgid "Error creating the solver test case."
msgstr "建ç«è§£æ±ºæ¸¬è©¦æ¹æ¡æç¼çé¯èª¤ã"
-#: ../src/zypper.cc:1116
+#: ../src/zypper.cc:1128
msgid "Source package name is a required argument."
msgstr "ä¾æºå¥ä»¶çå稱çºå¿
è¦çåæ¸ã"
-#: ../src/zypper.cc:1155
+#: ../src/zypper.cc:1169
msgid "Unknown resolvable type "
msgstr "ä¸æç解決æ¹æ¡é¡å"
-#: ../src/zypper.cc:1183
+#: ../src/zypper.cc:1206
msgid "No resolvables found."
msgstr "æªç¼ç¾è§£æ±ºæ¹æ¡ã"
#. 'rug' is the name of a program and must not be translated
#. 'best-effort' is a program parameter and can not be translated
-#: ../src/zypper.cc:1269 ../src/zypper.cc:1342
+#: ../src/zypper.cc:1292 ../src/zypper.cc:1365
msgid "Running as 'rug', can't do 'best-effort' approach to update."
msgstr "å°±å¦ 'rug' ä¸è¬å·è¡ï¼ç¡æ³é²è¡ 'best-effort' 趨è¿å®å
¨æ´æ°ã"
-#: ../src/zypper.cc:1315
+#: ../src/zypper.cc:1338
msgid "Root privileges are required for updating packages."
msgstr "éè¦æ Root æ¬éæè½æ´æ°å¥ä»¶ã"
-#: ../src/zypper.cc:1411
+#: ../src/zypper.cc:1441
msgid "Unexpected exception."
msgstr "éé æçä¾å¤ã"
-#: ../src/zypper.cc:1497
+#: ../src/zypper.cc:1526
msgid "You already are running zypper's shell."
msgstr "æ¨å·²ç¶æ£å¨å·è¡ zypper's shellã"
-#: ../src/zypper-utils.cc:44
+#: ../src/zypper-utils.cc:47
msgid "Please file a bug report about this."
msgstr "è«æåºæ¬åé¡çé¯èª¤å ±åã"
#. TranslatorExplanation remember not to translate the URL
#. unless you translate the actual page :)
-#: ../src/zypper-utils.cc:47
+#: ../src/zypper-utils.cc:50
msgid "See http://en.opensuse.org/Zypper#Troubleshooting for instructions."
msgstr "å¦éæ示ï¼è«åé± http://en.opensuse.org/Zypper#Troubleshootingã"
#: ../src/zypper-command.cc:92
+#, c-format
msgid "Unknown command '%s'"
msgstr "æªç¥çæ令 '%s'"
# error box title
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "I/O error"
msgstr "I/O é¯èª¤"
-#: ../src/zypper-callbacks.h:41
+#: ../src/zypper-callbacks.h:42
msgid "Invalid object"
msgstr "ç¡æçç©ä»¶"
-#: ../src/zypper-media-callbacks.h:47
+#: ../src/zypper-callbacks.h:50
+msgid "Error"
+msgstr "é¯èª¤"
+
+#: ../src/zypper-media-callbacks.h:56
#, c-format
msgid "Please insert media [%s] # %d and type 'y' to continue or 'n' to cancel the operation."
msgstr "è«æ¾å
¥åªé« [%s] # %d ç¶å¾éµå
¥ 'y' ç¹¼çºï¼æ 'n' 以åæ¶æ¤æä½ã"
-#: ../src/zypper-media-callbacks.h:63 ../src/zypper-media-callbacks.h:69
+#: ../src/zypper-media-callbacks.h:76 ../src/zypper-media-callbacks.h:82
msgid "Downloading: "
msgstr "æ£å¨ä¸è¼ï¼ "
@@ -1517,6 +1597,7 @@
msgstr "æ£å¨å¥ç¨ä¿®è£ç¨å¼ rpm"
#: ../src/zypper-source-callbacks.h:179
+#, c-format
msgid "Downloading %s %s-%s.%s"
msgstr "æ£å¨ä¸è¼ %s %s-%s.%s"
@@ -1547,6 +1628,7 @@
msgstr "æ£å¨ç§»é¤ "
#: ../src/zypper-rpm-callbacks.h:152
+#, c-format
msgid "Removal of %s failed:"
msgstr "ç§»é¤ %s 失æï¼"
@@ -1561,21 +1643,41 @@
#. TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
#: ../src/zypper-rpm-callbacks.h:181 ../src/zypper-rpm-callbacks.h:191
+#, c-format
msgid "Installing: %s-%s"
msgstr "æ£å¨å®è£ï¼ %s-%s"
#: ../src/zypper-rpm-callbacks.h:212
+#, c-format
msgid "Installation of %s failed:"
msgstr "å®è£ %s 失æï¼"
-#: ../src/zypper-search.h:262
+#: ../src/zypper-search.h:289
msgid "Catalog"
msgstr "ç®é"
-#: ../src/zypper-search.h:264
+#: ../src/zypper-search.h:291
msgid "Repository"
msgstr "å¥ä»¶åº«"
+#~ msgid "Signature verification failed for %s with public key id %s, %s, fingerprint %s. Warning: This might be caused by a malicious change in the file! Continuing is risky! Continue anyway?"
+#~ msgstr "%s çç°½åé©èé¯èª¤(以å
Œ
±éé° ID %sï¼%sï¼æç´ %s)ï¼è¦åï¼éå¯è½æ¯å çºæªæ¡éå°æ¡æçä¿®æ¹ï¼ç¹¼çºé²è¡å°æ風éªï¼ç¡è«å¦ä½è¦ç¹¼çºåï¼"
+
+#~ msgid "y"
+#~ msgstr "y"
+
+#~ msgid "Y"
+#~ msgstr "Y"
+
+#~ msgid "n"
+#~ msgstr "n"
+
+#~ msgid "N"
+#~ msgstr "N"
+
+#~ msgid "Invalid answer '%s', enter '%s' or '%s':"
+#~ msgstr "ä¸é©ç¨ççæ¡ '%s'ï¼è«è¼¸å
¥ '%s' æ '%s'ï¼"
+
#~ msgid "Summary:"
#~ msgstr "æè¦ï¼"
@@ -1711,9 +1813,6 @@
#~ msgid "Cleaning cache..."
#~ msgstr "èµ·å§å¿«å..."
-#~ msgid "Continuing anyway"
-#~ msgstr "éæ¯è¦ç¹¼çºå "
-
#~ msgid "removing source "
#~ msgstr "æ£å¨ç§»é¤ä¾æº"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
Author: jkupec
Date: Tue Sep 11 10:44:14 2007
New Revision: 7173
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7173&view=rev
Log:
- METADATA REFRESH POLICY section added
Modified:
trunk/zypper/doc/zypper.8
Modified: trunk/zypper/doc/zypper.8
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=7173&r1=…
==============================================================================
--- trunk/zypper/doc/zypper.8 (original)
+++ trunk/zypper/doc/zypper.8 Tue Sep 11 10:44:14 2007
@@ -299,7 +299,7 @@
.B refresh (ref) [alias|#] ...
Refresh repositories specified by their alias or number. If no repositories are specified, all enabled repositories will be refreshed.
.IP
-Refreshing a repository means downloading metadata of resolvables from media (if needed), storing it in local cache (typically under /var/cache/zypp/raw/<alias> directory) and preparsing the metadata into an sqlite database (/var/cache/zypp/zypp.db).
+See also METADATA REFRESH POLICY section for more details.
.TP
.I \-f, \-\-force
Force a complete refresh of specified repositories. This option will cause both the download of raw metadata and parsing of the metadata to be forced even if everything indicates a refresh is not needed.
@@ -349,6 +349,18 @@
.I \-R, \-\-root <dir>
Operates on a different root directory.
+.SH "METADATA REFRESH POLICY"
+.LP
+Zypper works with the metadata (information extracted from the RPM packages and other data) stored within repositories. The following refresh (metadata update) policy has been established in order to ensure zypper is working on the up-to-date metadata.
+.LP
+Refreshing a repository means downloading metadata of resolvables from media (if needed), storing it in local cache (typically under /var/cache/zypp/raw/<alias> directory) and preparsing the metadata into an sqlite database (/var/cache/zypp/zypp.db).
+.LP
+The metadata get refreshed either automatically or on user request. An \fBautomatic refresh\fR takes place right before reading metadata from the database if the \fBautorefresh is enabled\fR for the repository and the metada is reported as being out of date. If the \fBautorefresh is disabled\fR, the repository will only be refreshed on user request. You can request a refresh by calling \fBzypper refresh\fR (see the documentation of the refresh command for details).
+.LP
+The status of the repository metadata is checked for changes before actually doing the refresh. A change is detected by downloading one or two metadata index files (small files) and comparing the checksums of the cached ones and the remote ones. If the files differ, the repository is out of date and will be refreshed.
+.LP
+To delay the up-to-date check (and thus the automatic refresh) for a certain number of minutes, edit the value of the repo.refresh.delay attribute of ZYpp config file (/etc/zypp/zypp.conf). This means, zypper will not even try to download and check the index files, and you will be able to use zypper for operations like search or info without internet access or root privileges.
+
.SH "LOCKS"
.LP
The file
@@ -378,6 +390,9 @@
.B /etc/zypp/repos.d
Directory containing repository configuration (*.repo) files. You can use the \fBrepo\fR commands to manipulate these files, or you can edit them yourself. In either case, after doing the modifications, executing \fBzypper refresh\fR is strongly recommended.
.TP
+.B /etc/zypp/zypp.conf
+ZYpp configuration file.
+.TP
.B /etc/zypp/locks
File with package lock definitions, see the section LOCKS.
.TP
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7172 - /trunk/libzypp/zypp/solver/detail/Resolver.h
by haass@svn.opensuse.org 11 Sep '07
by haass@svn.opensuse.org 11 Sep '07
11 Sep '07
Author: haass
Date: Tue Sep 11 10:40:28 2007
New Revision: 7172
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7172&view=rev
Log:
Added std-constructor
Modified:
trunk/libzypp/zypp/solver/detail/Resolver.h
Modified: trunk/libzypp/zypp/solver/detail/Resolver.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/Resolver.h (original)
+++ trunk/libzypp/zypp/solver/detail/Resolver.h Tue Sep 11 10:40:28 2007
@@ -70,6 +70,7 @@
bool initialInstallation; //This item has triggered the installation
//Not already fullfilled requierement only.
+ ItemCapKind() : capKind("FRESHENS") {}
ItemCapKind( PoolItem i, Capability c, Dep k, bool initial)
: cap( c )
, capKind( k )
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
11 Sep '07
Author: jkupec
Date: Tue Sep 11 10:23:07 2007
New Revision: 7171
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7171&view=rev
Log:
- translator comments added
Modified:
trunk/zypper/src/zypper-misc.cc
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=71…
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Tue Sep 11 10:23:07 2007
@@ -700,6 +700,7 @@
it != toupgrade.end(); ++it)
{
string title = boost::str(format(_PL(
+ // TranslatorExplanation %s is a "package", "patch", "pattern", etc
"The following %s is going to be upgraded:",
"The following %s are going to be upgraded:",
it->second.size()
@@ -712,7 +713,9 @@
it != todowngrade.end(); ++it)
{
string title = boost::str(format(_PL(
+ // TranslatorExplanation %s is a "package", "patch", "pattern", etc
"The following %s is going to be downgraded:",
+ // TranslatorExplanation %s is a "packages", "patches", "patterns", etc
"The following %s are going to be downgraded:",
it->second.size()
)) % kind_to_string_localized(it->first, it->second.size()));
@@ -724,7 +727,9 @@
it != toinstall.end(); ++it)
{
string title = boost::str(format(_PL(
+ // TranslatorExplanation %s is a "package", "patch", "pattern", etc
"The following NEW %s is going to be installed:",
+ // TranslatorExplanation %s is a "packages", "patches", "patterns", etc
"The following NEW %s are going to be installed:",
it->second.size()
)) % kind_to_string_localized(it->first, it->second.size()));
@@ -736,7 +741,9 @@
it != toremove.end(); ++it)
{
string title = boost::str(format(_PL(
+ // TranslatorExplanation %s is a "package", "patch", "pattern", etc
"The following %s is going to be REMOVED:",
+ // TranslatorExplanation %s is a "packages", "patches", "patterns", etc
"The following %s are going to be REMOVED:",
it->second.size()
)) % kind_to_string_localized(it->first, it->second.size()));
@@ -755,6 +762,10 @@
// TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
cout_n << format(_("After the operation, additional %s will be used."))
% new_installed_size.asString(0,1,1);
+ //! \todo uncomment the following for bug #309112
+ /*
+ else if (new_installed_size == 0)
+ cout_n << _("No additional space will be used or freed after the operation.");*/
else
{
// get the absolute size
@@ -768,6 +779,7 @@
return retv;
}
+
/*
std::string calculate_token()
{
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
10 Sep '07
Author: jkupec
Date: Mon Sep 10 18:22:11 2007
New Revision: 7170
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7170&view=rev
Log:
changes
Modified:
trunk/zypper/package/zypper.changes
Modified: trunk/zypper/package/zypper.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re…
==============================================================================
--- trunk/zypper/package/zypper.changes (original)
+++ trunk/zypper/package/zypper.changes Mon Sep 10 18:22:11 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 10 15:39:11 CEST 2007 - jkupec(a)suse.cz
+
+- report too many arguments (#307639)
+- r7164
+
+-------------------------------------------------------------------
Mon Sep 3 17:32:33 CEST 2007 - jkupec(a)suse.cz
- fix broken compiler flags (schwab)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
10 Sep '07
Author: schubi2
Date: Mon Sep 10 16:50:25 2007
New Revision: 7169
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7169&view=rev
Log:
3.22.6
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Mon Sep 10 16:50:25 2007
@@ -3,6 +3,7 @@
- new translations added
- r 7166
+- version 3.22.6
-------------------------------------------------------------------
Mon Sep 10 15:50:49 CEST 2007 - lslezak(a)suse.cz
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
10 Sep '07
Author: schubi2
Date: Mon Sep 10 16:49:54 2007
New Revision: 7168
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7168&view=rev
Log:
3.22.6
Modified:
trunk/libzypp/VERSION.cmake
Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7168&r…
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Mon Sep 10 16:49:54 2007
@@ -47,4 +47,4 @@
SET(LIBZYPP_MAJOR "3")
SET(LIBZYPP_MINOR "22")
SET(LIBZYPP_COMPATMINOR "21")
-SET(LIBZYPP_PATCH "5")
+SET(LIBZYPP_PATCH "6")
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
10 Sep '07
Author: schubi2
Date: Mon Sep 10 16:19:53 2007
New Revision: 7167
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7167&view=rev
Log:
new translations
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Mon Sep 10 16:19:53 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 10 16:19:05 CEST 2007 - schubi(a)suse.de
+
+- new translations added
+- r 7166
+
+-------------------------------------------------------------------
Mon Sep 10 15:50:49 CEST 2007 - lslezak(a)suse.cz
- fixed disk usage counting of updated packages (#308362)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
Author: schubi2
Date: Mon Sep 10 16:18:44 2007
New Revision: 7166
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7166&view=rev
Log:
new translations
Modified:
trunk/libzypp/po/af.po
trunk/libzypp/po/ar.po
trunk/libzypp/po/bg.po
trunk/libzypp/po/bn.po
trunk/libzypp/po/bs.po
trunk/libzypp/po/ca.po
trunk/libzypp/po/cs.po
trunk/libzypp/po/cy.po
trunk/libzypp/po/da.po
trunk/libzypp/po/de.po
trunk/libzypp/po/el.po
trunk/libzypp/po/en_GB.po
trunk/libzypp/po/en_US.po
trunk/libzypp/po/es.po
trunk/libzypp/po/et.po
trunk/libzypp/po/fi.po
trunk/libzypp/po/fr.po
trunk/libzypp/po/gl.po
trunk/libzypp/po/gu.po
trunk/libzypp/po/he.po
trunk/libzypp/po/hi.po
trunk/libzypp/po/hr.po
trunk/libzypp/po/hu.po
trunk/libzypp/po/id.po
trunk/libzypp/po/it.po
trunk/libzypp/po/ja.po
trunk/libzypp/po/ka.po
trunk/libzypp/po/km.po
trunk/libzypp/po/ko.po
trunk/libzypp/po/lo.po
trunk/libzypp/po/lt.po
trunk/libzypp/po/mk.po
trunk/libzypp/po/mr.po
trunk/libzypp/po/nb.po
trunk/libzypp/po/nl.po
trunk/libzypp/po/pa.po
trunk/libzypp/po/pl.po
trunk/libzypp/po/pt.po
trunk/libzypp/po/pt_BR.po
trunk/libzypp/po/ro.po
trunk/libzypp/po/ru.po
trunk/libzypp/po/si.po
trunk/libzypp/po/sk.po
trunk/libzypp/po/sl.po
trunk/libzypp/po/sr.po
trunk/libzypp/po/sv.po
trunk/libzypp/po/ta.po
trunk/libzypp/po/tr.po
trunk/libzypp/po/uk.po
trunk/libzypp/po/vi.po
trunk/libzypp/po/wa.po
trunk/libzypp/po/xh.po
trunk/libzypp/po/zh_CN.po
trunk/libzypp/po/zh_TW.po
trunk/libzypp/po/zu.po
Modified: trunk/libzypp/po/af.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/af.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/af.po (original)
+++ trunk/libzypp/po/af.po Mon Sep 10 16:18:44 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-11-03 12:03\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -108,37 +108,37 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm-nagaan het misluk."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm het misluk."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Pakket %s se integriteitsnagaan misluk. Wil u dit weer probeer aflaai?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "Lêer %1 nie in die bewaarplek gevind nie."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Kan %s vanaf %s nie voorsien nie"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -163,27 +163,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Terugstel van hulpbronne"
@@ -2634,19 +2635,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Gewysigde konfigurasielêers vir %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm geberg %s as %s, maar dit was onmoontlik om die verskil te bepaal"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2656,13 +2657,13 @@
"Hier is die eerste 25 rëels van verskil:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm geskep %s as %s, maar dit was onmoontlik om die verskil te bepaal"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2673,46 +2674,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s installasie misluk"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm-uitset:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s geïnstalleer is goed"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Bykomende rpm-uitset:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s verwyder het misluk"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s verwyder is goed"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "geskepte rugsteun %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Installasie is gestaak soos gelas."
@@ -2730,7 +2731,7 @@
msgstr "%s vervang deur %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2738,58 +2739,68 @@
"Hierdie oplossings sal uit die stelsel geskrap word."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s sal nie ongeïnstalleer word nie, want dit word steeds vereis"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Ongeldige inligting"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s word deur ander oplossings benodig"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s word benodig deur %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2799,7 +2810,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s verkeer in konflik met ander oplossings"
@@ -2808,14 +2819,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s verkeer in konflik met %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2825,24 +2836,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s maak ander oplossings uitgedien"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s uitgediendes %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s uitgediendes:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2851,7 +2862,7 @@
"Hierdie oplossings sal uit die stelsel geskrap word."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s hang van ander oplossings af"
@@ -2859,38 +2870,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s hang af van %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s hang af van:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Kind van"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Kan %s nie installeer nie"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Geen voorsiening %s nie"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2899,32 +2910,32 @@
"\n"
"Daar is geen hulpbron wat hierdie vereiste ondersteun, beskikbaar nie."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Toekomstige probleme wat bo/onder hierdie resolusie beskryf word, sal nie alle afhanklikhede oplos nie"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Kan %s nie installeer nie, omdat dit in konflik verkeer met %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s word nie geïnstalleer nie en is as oninstalleerbaar gemerk"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Kan %s nie installeer nie vanweë afhanklikheidsprobleme"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2932,8 +2943,8 @@
msgstr "skrap %s?"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2941,79 +2952,79 @@
msgstr "moenie %s installeer nie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s het vereistes waaraan nie voldoen is nie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s het afhanklikhede wat ontbreek"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s kan nie geïnstalleer word nie vanweë ontbrekende afhanklikhede"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s vervul afhanklikhede van %s, maar sal ongeïnstalleer word"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s vervul afhanklikhede van %s, maar sal op u stelsel gehou word"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Geen nodigheid om %s te installeer nie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Kan %s nie installeer om die afhanklikhede van %s te vervul nie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Kan %s nie installeer om die afhanklikhede van %s te vervul nie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s sal nie ongeïnstalleer word nie, want dit word steeds vereis"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s uitgediendes %s. Maar %s kan nie geskrap word nie, want dit is gesluit."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Kan %s nie installeer nie, want dit verkeer in konflik"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s is oninstalleerbaar vanweë konflikte met %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3076,7 +3087,7 @@
msgstr "Moenie waar oplossings ter sprake is, installeer of skrap nie"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "om %s vir %s te vereis tydens bywerk van %s"
@@ -3434,14 +3445,22 @@
msgid "Install missing resolvables"
msgstr "Installeer ontbrekende oplossings"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3492,6 +3511,14 @@
msgid "%s part of %s"
msgstr "%s deel van %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "ontsluit alle oplossings"
Modified: trunk/libzypp/po/ar.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ar.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/ar.po (original)
+++ trunk/libzypp/po/ar.po Mon Sep 10 16:18:44 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-09-27 09:57+0200\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -114,37 +114,37 @@
msgid "History:"
msgstr "XF86History"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "Ùش٠اÙتØÙÙ Ù
Ù applydeltarpm."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "ÙØ´Ù applydeltarpm."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Ùش٠اÙتØÙÙ Ù
٠سÙاÙ
Ø© اÙØزÙ
Ø© %s. Ù٠ترÙد إعادة Ù
ØاÙÙØ© Ø¥ÙزاÙÙاØ"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "ÙÙ
ÙتÙ
اÙعثÙر عÙ٠اÙÙ
ÙÙ %1 Ù٠اÙÙ
خزÙ."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "تعذر تÙÙÙر %s Ù
Ù %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -169,27 +169,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "ÙتÙ
اÙآ٠إضاÙØ© اÙÙ
Ùارد"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "ÙتÙ
اÙآ٠إضاÙØ© اÙÙ
Ùارد"
@@ -2640,19 +2641,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Ù
ÙÙات تÙÙÙÙ %s اÙت٠تÙ
تغÙÙرÙا:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "تÙ
ØÙظ rpm %s باعتبارÙا %s ÙÙÙ٠تعذر تØدÙد اÙÙرÙ"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2662,13 +2663,13 @@
"ÙÙÙ
ا ÙÙ٠أÙÙ 25 سطرÙا Ù
٠سطÙر اÙÙرÙ:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "تÙ
Ø¥Ùشاء rpm %s باعتبارÙا %s ÙÙÙ٠تعذر تØدÙد اÙÙرÙ"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2679,46 +2680,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Ùش٠تثبÙت %s"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "Ù
خرجات rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "تÙ
تثبÙت %s بÙجاØ"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Ù
خرجات rpm اÙإضاÙÙØ©:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "ÙØ´Ùت إزاÙØ© %s"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "تÙ
ت إزاÙØ© %s بÙجاØ"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "تÙ
Ø¥Ùشاء اÙÙسخة اÙاØتÙاطÙØ© %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "تÙ
Ø¥ÙÙا٠اÙتثبÙت ÙÙÙÙا ÙÙتعÙÙÙ
ات."
@@ -2736,7 +2737,7 @@
msgstr "%s تÙ
استبداÙ٠ب٠%s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2744,58 +2745,68 @@
"سÙتÙ
ØØ°Ù Ùذ٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙÙ Ù
٠اÙÙظاÙ
."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "ÙÙ ÙتÙ
Ø¥Ùغاء تثبÙت %s ÙØ£ÙÙ Ùا Ùزا٠Ù
Ø·ÙÙبÙا"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "اÙÙ
عÙÙÙ
ات غÙر صاÙØØ©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s Ù
Ø·ÙÙب بÙاسطة اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙأخرÙ"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s Ù
Ø·ÙÙب بÙاسطة %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2805,7 +2816,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "Ùتعارض %s Ù
ع اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙأخرÙ"
@@ -2814,14 +2825,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s Ùتعارض Ù
ع %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2831,24 +2842,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s Ùجع٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙأخر٠ÙدÙÙ
Ø©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s Ùجع٠اÙعÙصر اÙتاÙÙ ÙدÙÙ
Ùا %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s Ùجع٠اÙعÙصر اÙتاÙÙ ÙدÙÙ
Ùا:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2857,7 +2868,7 @@
"سÙتÙ
ØØ°Ù Ùذ٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙÙ Ù
٠اÙÙظاÙ
."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ÙعتÙ
د عÙ٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙأخرÙ"
@@ -2865,38 +2876,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s ÙعتÙ
د عÙÙ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s ÙعتÙ
د عÙÙ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "عÙصر Ùرع٠ÙÙ"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "تعذر تثبÙت %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Ùا ÙÙجد Ø£Ù Ø´ÙØ¡ ÙÙÙر %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2905,32 +2916,32 @@
"\n"
"Ùا ÙتÙÙر Ø£Ù Ù
Ùرد ÙدعÙ
Ùذا اÙÙ
تطÙب."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ÙتÙجة ÙÙÙ
Ø´ÙÙات اÙÙ
ÙضØØ© أعÙاÙ/أدÙاÙØ ÙÙ ÙÙÙÙ
Ùذا اÙتØدÙد بØÙ ÙاÙØ© اÙتبعÙات"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "تعذر تثبÙت %s ÙØ£ÙÙ Ùتعارض Ù
ع %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "ÙÙ
ÙتÙ
تثبÙت %s ÙتÙ
Ùضع عÙاÙ
Ø© عÙÙÙ ÙÙاب٠ÙØ¥Ùغاء اÙتثبÙت"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "تعذر تثبÙت %s بسبب ÙجÙد Ù
Ø´ÙÙات Ù٠اÙتبعÙØ©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2938,8 +2949,8 @@
msgstr "ØØ°Ù %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2947,79 +2958,79 @@
msgstr "عدÙ
تثبÙت %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "ÙÙ
ÙتÙ
استÙÙاء Ù
تطÙبات %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "تÙ
ÙÙد تبعÙات %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "تعذر تثبÙت %s بسبب عدÙ
ÙجÙد اÙتبعÙات"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "ÙستÙÙÙ %s تبعÙات %sØ ÙÙ٠سÙتÙ
Ø¥Ùغاء تثبÙتÙ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "ÙستÙÙÙ %s تبعÙات %sØ ÙÙ٠سÙتÙ
اÙاØتÙاظ ب٠Ù٠اÙÙظاÙ
ÙدÙÙ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Ùا داع٠ÙتثبÙت %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "تعذر تثبÙت %s ÙاستÙÙاء تبعÙات %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "تعذر تثبÙت %s ÙاستÙÙاء تبعÙات %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "ÙÙ ÙتÙ
Ø¥Ùغاء تثبÙت %s ÙØ£ÙÙ Ùا Ùزا٠Ù
Ø·ÙÙبÙا"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s Ùجع٠%s ÙدÙÙ
Ùا. ÙÙÙ Ùتعذر ØØ°Ù %s ÙØ£ÙÙ Ù
ÙÙÙ."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "تعذر تثبÙت %s ÙØ£ÙÙ Ù
تعارض"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ÙÙ
Ù٠إÙغاء تثبÙت٠ÙØ£ÙÙ Ùتعارض Ù
ع %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3082,7 +3093,7 @@
msgstr "عدÙ
تثبÙت اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙÙ
تعÙÙØ© Ø£Ù ØØ°ÙÙا"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ÙØ·Ùب %s ÙÙ %s عÙد تØدÙØ« %s"
@@ -3440,14 +3451,22 @@
msgid "Install missing resolvables"
msgstr "تثبÙت اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙÙ
ÙÙÙدة"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3498,6 +3517,15 @@
msgid "%s part of %s"
msgstr "%s جزء Ù
Ù %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "Ù
Ùعد اÙاستØÙاÙ: %1"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "Ø¥Ùغاء ÙÙÙ ÙاÙØ© اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙÙ"
Modified: trunk/libzypp/po/bg.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bg.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/bg.po (original)
+++ trunk/libzypp/po/bg.po Mon Sep 10 16:18:44 2007
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: zypp.bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-11-09 18:05+0200\n"
"Last-Translator: Borislav Mitev <morbid_viper(a)tkzs.org>\n"
"Language-Team: Bulgarian <bg(a)li.org>\n"
@@ -118,36 +118,36 @@
msgid "History:"
msgstr "ÐÑеглед на иÑÑоÑиÑÑа"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Ðикой не доÑÑÐ°Ð²Ñ %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -172,27 +172,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2742,19 +2743,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "ÐÑоменени Ñайлове Ñ Ð½Ð°ÑÑÑойки за %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm запази %s каÑо %s, но е невÑзможно да Ñе оÑкÑие ÑазликаÑа"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2764,13 +2765,13 @@
"ÐÑо пÑÑвиÑе 25 Ñеда Ð¾Ñ ÑазликиÑе:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm ÑÑздаде %s каÑо %s, но е невÑзможно да Ñе оÑкÑие ÑазликаÑа"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2781,46 +2782,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "ÐнÑÑалиÑанеÑо на %s бе неÑÑпеÑно"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "ÐзÑ
од Ð¾Ñ rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "ÐнÑÑалиÑанеÑо на %s бе ÑÑпеÑно"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "ÐопÑлниÑелен изÑ
од Ð¾Ñ rpm:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "ÐÑемаÑ
ванеÑо на %s бе неÑÑпеÑно"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "ÐÑемаÑ
ванеÑо на %s бе ÑÑпеÑно"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "ÑÑздадено ÑезеÑвно копие %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2838,7 +2839,7 @@
msgstr "%s е заменен Ð¾Ñ %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2846,58 +2847,68 @@
"Тези пакеÑи Ñе бÑÐ´Ð°Ñ Ð¸Ð·ÑÑиÑи Ð¾Ñ ÑиÑÑемаÑа."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s нÑма да бÑде деинÑÑалиÑан, заÑоÑо вÑе оÑе е необÑ
одим"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Ðевалидна инÑоÑмаÑиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s е необÑ
одим на дÑÑг пакеÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s е необÑ
одим на %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2907,7 +2918,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s е в конÑÐ»Ð¸ÐºÑ Ñ Ð´ÑÑги пакеÑи"
@@ -2916,14 +2927,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s е в конÑÐ»Ð¸ÐºÑ Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2933,24 +2944,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s пÑави ненÑжни дÑÑги пакеÑи"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s пÑави ненÑжно %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s пÑави ненÑжно: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2959,7 +2970,7 @@
"Тези пакеÑи Ñе бÑÐ´Ð°Ñ Ð¸Ð·ÑÑиÑи Ð¾Ñ ÑиÑÑемаÑа."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s завиÑи Ð¾Ñ Ð´ÑÑги пакеÑи"
@@ -2967,38 +2978,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s завиÑи Ð¾Ñ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s завиÑи оÑ: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "ÐеÑе на"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "%s не може да бÑде инÑÑалиÑан"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Ðикой не доÑÑÐ°Ð²Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -3007,32 +3018,32 @@
"\n"
"ÐÑма налиÑен ÑеÑÑÑÑ Ð·Ð° поддÑÑжкаÑа на Ñова изиÑкване."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ÐоÑади пÑоблемиÑе, коиÑо Ñа показани по-долÑ/гоÑе Ñега нÑма да Ð¼Ð¾Ð³Ð°Ñ Ð´Ð° ÑеÑдовлеÑвоÑÑÑ Ð²ÑиÑки завиÑимоÑÑи."
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s не може да бÑде инÑÑалиÑан, заÑоÑо е в конÑÐ»Ð¸ÐºÑ Ñ %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s не е инÑÑалиÑан и не може да бÑде маÑкиÑан за деинÑÑалиÑане."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "%s не може да бÑде инÑÑалиÑан поÑади пÑобем ÑÑÑ Ð·Ð°Ð²Ð¸ÑимоÑÑиÑе"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3040,8 +3051,8 @@
msgstr "изÑÑиване на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3049,79 +3060,79 @@
msgstr "без инÑÑалиÑане на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s има незадоволени изиÑканиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s има липÑваÑи завиÑимоÑÑи"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s не може да бÑде инÑÑалиÑан поÑади липÑваÑи завиÑимоÑÑи"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s задоволÑва завиÑимоÑÑиÑе на %s, но Ñе бÑде деинÑÑалиÑан"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s задоволÑва завиÑимоÑÑиÑе на %s, но Ñе бÑде деинÑÑалиÑан"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "ÐÑма нÑжда Ð¾Ñ Ð¸Ð½ÑÑалиÑане на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s не може да бÑде инÑÑалиÑан за задоволÑване на завиÑимоÑÑиÑе на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s не може да бÑде инÑÑалиÑан за задоволÑване на завиÑимоÑÑиÑе на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s нÑма да бÑде деинÑÑалиÑан, заÑоÑо вÑе оÑе е необÑ
одим"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s пÑави ненÑжен %s, но %s не може да бÑде изÑÑиÑ, заÑоÑо е заклÑÑен."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s не може да бÑде инÑÑалиÑан, заÑоÑо е в конÑликÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s е недеинÑÑалиÑÑем поÑади конÑликÑа Ñ %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3184,7 +3195,7 @@
msgstr "Ðез инÑÑалиÑане или пÑемаÑ
ване на конÑликÑниÑе пакеÑи"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "за изиÑканоÑо %s за %s, когаÑо Ñе обновÑва %s"
@@ -3542,14 +3553,22 @@
msgid "Install missing resolvables"
msgstr "ÐнÑÑалиÑане на липÑваÑиÑе пакеÑи"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3600,6 +3619,14 @@
msgid "%s part of %s"
msgstr "%s е ÑаÑÑ Ð¾Ñ %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "оÑклÑÑване на вÑиÑки пакеÑи"
Modified: trunk/libzypp/po/bn.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bn.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/bn.po (original)
+++ trunk/libzypp/po/bn.po Mon Sep 10 16:18:44 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n"
@@ -107,37 +107,37 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm যাà¦à¦¾à¦ বà§à¦¯à¦°à§à¦¥ হà§à§à¦à§à¥¤"
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm বà§à¦¯à¦°à§à¦¥ হà§à§à¦à§à¥¤"
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "%s পà§à¦¯à¦¾à¦à§à¦à§à¦° শà§à¦¦à§à¦§à¦¤à¦¾ যাà¦à¦¾à¦ বà§à¦¯à¦°à§à¦¥ হà§à§à¦à§à¥¤ à¦à¦ªà¦¨à¦¿ à¦à¦¿ à¦à¦à¦¾à¦à§ পà§à¦¨à¦°à¦¾à§ ডাà¦à¦¨à¦²à§à¦¡ à¦à¦°à¦¾à¦° à¦à§à¦·à§à¦à¦¾ à¦à¦°à¦¤à§ à¦à¦¾à¦¨?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "রিপà§à¦¸à¦¿à¦à¦¾à¦°à¦¿à¦¤à§ ফাà¦à¦² %1 পাà¦à§à¦¾ যাà§à¦¨à¦¿"
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "%s থà§à¦à§ %s পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à¦¤à§ পারৠনা"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -162,27 +162,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "সà¦à¦¸à§à¦¥à¦¾à¦¨ পà§à¦¨à¦à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦à§"
@@ -2633,19 +2634,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr " %s-à¦à¦° à¦à¦¨à§à¦¯ পরিবরà§à¦¤à¦¿à¦¤ à¦à¦¨à¦«à¦¿à¦à¦¾à¦°à§à¦¶à¦¨ ফাà¦à¦²à¦¸à¦®à§à¦¹ :"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm %s à¦à§ %sরà§à¦ªà§ সà¦à¦°à¦à§à¦·à¦£ à¦à¦°à§à¦à¦¿à¦² ,à¦à¦¿à¦¨à§à¦¤à§ পারà§à¦¥à¦à§à¦¯ নিরà§à¦ªà¦£ à¦à¦°à¦¾ à¦
সমà§à¦à¦¬ হà§à§à¦à¦¿à¦² "
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2655,13 +2656,13 @@
"à¦à¦à¦¾à¦¨à§ পারà§à¦¥à¦à§à¦¯à§à¦° পà§à¦°à¦¥à¦® ২৫ à¦à¦¿ লাà¦à¦¨ দà§à¦à§à¦¾ à¦à¦à§:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm %s à¦à§ %sরà§à¦ªà§ সà¦à¦°à¦à§à¦·à¦£ à¦à¦°à§à¦à¦¿à¦² ,à¦à¦¿à¦¨à§à¦¤à§ পারà§à¦¥à¦à§à¦¯ নিরà§à¦ªà¦£ à¦à¦°à¦¾ à¦
সমà§à¦à¦¬ হà§à§à¦à¦¿à¦² "
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2672,46 +2673,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² বà§à¦¯à¦°à§à¦¥ হà§à§à¦à§ "
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm à¦à¦à¦à¦ªà§à¦"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² ঠিঠà¦à¦à§"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "à¦
তিরিà¦à§à¦¤ তথà§à¦¯"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s à¦
পসারণ বà§à¦¯à¦°à§à¦¥ হà§à§à¦à§"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s à¦
পসারণ ঠিঠà¦à¦à§"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "%s বà§à¦¯à¦¾à¦à¦à¦ª তà§à¦°à§ à¦à¦°à¦à§"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "নিরà§à¦¦à§à¦¶à¦®à¦¤ সà§à¦¥à¦¾à¦ªà¦¨à¦¾ বাতিল à¦à¦°à¦¾ হà§à§à¦à§à¥¤"
@@ -2729,7 +2730,7 @@
msgstr "%s পà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ হà§à§à¦à§ %s দà§à¦¬à¦¾à¦°à¦¾"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2737,58 +2738,68 @@
"à¦à¦ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿ সিসà§à¦à§à¦® থà§à¦à§ মà§à¦à§ দà§à¦à§à¦¾ হবà§à¥¤"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s বিসà§à¦¥à¦¾à¦ªà¦¿à¦¤ হবৠনা à¦à¦¾à¦°à¦£ à¦à¦à¦¾à¦° à¦à¦à¦¨à¦ পà§à¦°à§à§à¦à¦¨ à¦à¦à§"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "à¦
বà§à¦§ তথà§à¦¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ রিà¦à¦²à¦à§à¦¬à¦²à§à¦° %s পà§à¦°à§à§à¦à¦¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s à¦à¦° %s দরà¦à¦¾à¦°"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2798,7 +2809,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ বিশà§à¦²à§à¦·à§à¦¯à¦à§à¦²à¦¿à¦° সà¦à§à¦à§ %s à¦à¦° দà§à¦¬à¦¨à§à¦¦à§à¦¬"
@@ -2807,14 +2818,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s-à¦à¦° সà¦à§à¦à§ %s-à¦à¦° দà§à¦¬à¦¨à§à¦¦à§à¦¬"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2824,24 +2835,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿à¦à§ পà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ দিà§à§à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s %sà¦à§ পà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ দিà§à§à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s পà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ দিà§à§à¦à§: %sà¦à§"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2850,7 +2861,7 @@
"à¦à¦ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿ সিসà§à¦à§à¦® থà§à¦à§ মà§à¦à§ দà§à¦à§à¦¾ হবà§à¥¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s à¦
নà§à¦¯ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿à¦° à¦à¦ªà¦°à§ নিরà§à¦à¦° à¦à¦°à§"
@@ -2858,38 +2869,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s নিরà§à¦à¦° à¦à¦°à§ %s à¦à¦° à¦à¦ªà¦°à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s নিরà§à¦à¦° à¦à¦°à§ à¦à¦° à¦à¦ªà¦°à§: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "à¦à¦° সনà§à¦¤à¦¾à¦¨"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "in/ssTklà¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾ যাবৠনা"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "à¦à§à¦¨à¦à¦à¦¾à¦ %s পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§ না"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2898,32 +2909,32 @@
"\n"
"à¦à¦®à¦¨ à¦à§à¦¨à¦ সà¦à¦¸à§à¦¥à¦¾à¦¨ à¦à¦ªà¦²à¦¬à§à¦§ নà§à¦ যা à¦à¦ পà§à¦°à§à§à¦à¦¨à¦à¦¿à¦à§ সমরà§à¦¥à¦¨ à¦à¦°à§"
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "à¦à¦ রà§à¦à¦²à¦¿à¦à¦¶à¦¨à§à¦° à¦à¦ªà¦°à§/নিà¦à§ বরà§à¦£à¦¿à¦¤ সমসà§à¦¯à¦¾à¦à§à¦²à¦¿ সমসà§à¦¤ নিরà§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿à¦° সমাধান à¦à¦°à¦¬à§ না"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ পারৠনা à¦à¦¾à¦°à¦£ à¦à¦à¦¾ %s à¦à¦° সাথৠবিবাদ তà§à¦°à¦¿ à¦à¦°à¦à§"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾ নà§à¦ à¦à¦¬à¦ à¦à¦¨à¦à¦¨à§à¦¸à¦à¦² হিসাবৠà¦à¦¿à¦¹à§à¦¨à¦¿à¦¤ à¦à¦°à¦¾ হà§à§à¦à§"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "নিরà§à¦à¦°à¦¤à¦¾ সমসà§à¦¯à¦¾à¦à§à¦²à¦¿à¦° à¦à¦¾à¦°à¦£à§ %s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ পারৠনা"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2931,8 +2942,8 @@
msgstr "%s মà§à¦à§ ফà§à¦²à§à¦¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2940,79 +2951,79 @@
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à§ না"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s à¦à¦° à¦
পà§à¦°à§à¦£ পà§à¦°à§à§à¦à¦¨ à¦à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s à¦à¦° হারিà§à§ যাà¦à§à¦¾ নিরà§à¦à¦°à¦¶à§à¦²à¦à§à¦²à¦¿ à¦à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "হারিà§à§ যাà¦à§à¦¾ নিরà§à¦à¦°à¦¶à§à¦²à¦à§à¦²à¦¿à¦° à¦à¦¨à§à¦¯ %s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾ যাবৠনা"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s %s à¦à¦° নিরà§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ পà§à¦°à¦£ à¦à¦°à§ à¦à¦¿à¦¨à§à¦¤à§ বিসà§à¦¥à¦¾à¦ªà¦¿à¦¤ হবà§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s %s à¦à¦° নিরà§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ পà§à¦°à¦£ à¦à¦°à§ à¦à¦¿à¦¨à§à¦¤à§ à¦à¦à§ à¦à¦ªà¦¨à¦¾à¦° সিসà§à¦à§à¦®à§ রাà¦à¦¾ হবà§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾à¦° পà§à¦°à§à§à¦à¦¨ নà§à¦"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s à¦à¦° নিরà§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ পà§à¦°à¦£ à¦à¦°à¦¾à¦° à¦à¦¨à§à¦¯à§ %s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ পারৠনা"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s à¦à¦° নিরà§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ পà§à¦°à¦£ à¦à¦°à¦¾à¦° à¦à¦¨à§à¦¯à§ %s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ পারৠনা"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s বিসà§à¦¥à¦¾à¦ªà¦¿à¦¤ হবৠনা à¦à¦¾à¦°à¦£ à¦à¦à¦¾à¦° à¦à¦à¦¨à¦ পà§à¦°à§à§à¦à¦¨ à¦à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s %s à¦à§ পà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ দিà§à§à¦à§à¥¤ à¦à¦¿à¦¨à§à¦¤à§ %s মà§à¦à§ দà§à¦à§à¦¾ যাৠনা à¦à¦¾à¦°à¦£ à¦à¦à¦¾ লঠহà§à§ à¦à¦à§à¥¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ পারৠনা à¦à¦¾à¦°à¦£ à¦à¦à¦¾ বিবাদ তà§à¦°à¦¿ à¦à¦°à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s à¦à¦° সà¦à§à¦à§ দà§à¦¬à¦¨à§à¦¦à§à¦¬à§à¦° à¦à¦¨à§à¦¯ %s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾à¦° à¦
যà§à¦à§à¦¯"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3075,7 +3086,7 @@
msgstr "%1 à¦à¦° দà§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° সাথà§"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s à¦à¦¨à§à¦¨à§à¦¤ à¦à¦°à¦¾à¦° সমà§à§ %s à¦à¦° à¦à¦¨à§à¦¯à§ %s à¦à¦° পà§à¦°à§à§à¦à¦¨à§à¦° à¦à¦¨à§à¦¯à§"
@@ -3433,14 +3444,22 @@
msgid "Install missing resolvables"
msgstr "ডà§à¦°à¦¾à¦à¦à¦¾à¦° à¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾ হà¦à§à¦à§..."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3491,6 +3510,14 @@
msgid "%s part of %s"
msgstr "%s, %s à¦à¦° à¦
à¦à§à¦"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "%1 à¦à¦° দà§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° সাথà§"
Modified: trunk/libzypp/po/bs.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bs.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/bs.po (original)
+++ trunk/libzypp/po/bs.po Mon Sep 10 16:18:44 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2002-07-23 18:27+0200\n"
"Last-Translator: Damir Bjelobradic <Nagual(a)lugbih.org>\n"
"Language-Team: Bosnian <i18n(a)suse.de>\n"
@@ -113,36 +113,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -166,27 +166,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2970,19 +2971,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "Editor konfiguracijskih datoteka"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2990,13 +2991,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -3005,12 +3006,12 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, fuzzy, c-format
msgid "%s install failed"
msgstr "Nova instalacija"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
#, fuzzy
msgid "rpm output:"
msgstr ""
@@ -3019,36 +3020,36 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, fuzzy, c-format
msgid "%s installed ok"
msgstr "&Da, instaliraj"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
#, fuzzy
msgid "Additional rpm output:"
msgstr "&Dodatne informacije za korisnika"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -3066,64 +3067,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3131,7 +3142,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3140,14 +3151,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3155,31 +3166,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3187,68 +3198,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instaliram driver..."
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3256,8 +3267,8 @@
msgstr "Izbrii"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3265,79 +3276,79 @@
msgstr "Instaliram driver..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "&Da, instaliraj"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3399,7 +3410,7 @@
msgstr "Instaliram driver..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3761,14 +3772,22 @@
msgid "Install missing resolvables"
msgstr "Instaliram driver..."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3819,6 +3838,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/ca.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ca.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/ca.po (original)
+++ trunk/libzypp/po/ca.po Mon Sep 10 16:18:44 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-02-26 19:15+0100\n"
"Last-Translator: Olga López\n"
"Language-Team: Catalan\n"
@@ -113,37 +113,37 @@
msgid "History:"
msgstr "XF86History"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "La comprovació de l'applydeltarpm ha fallat."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "L'applydeltarpm ha fallat."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "El paquet %s no ha superat la comprovació d'integritat. Voleu intentar baixar-lo de nou?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "No s'ha trobat el fitxer %1 al dipòsit."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "No es pot proporcionar %s des de %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -168,27 +168,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "S'estan afegint recursos"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "S'estan afegint recursos"
@@ -2781,19 +2782,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Fitxers de configuració modificats per a %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "L'rpm ha desat %s com a %s però no ha estat possible determinar la diferència"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2803,13 +2804,13 @@
"Aquestes són les primeres 25 lÃnies de diferència:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "L'rpm ha creat %s com a %s però no ha estat possible determinar la diferència"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2820,46 +2821,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "S'ha produït un error en instal·lar %s"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "Sortida de l'rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s s'ha instal·lat correctament"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Sortida addicional de l'rpm:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "S'ha produït un error en suprimir %s"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s s'ha suprimit correctament"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "còpia de seguretat creada %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "La instal·lació s'ha avortat tal com heu indicat."
@@ -2877,7 +2878,7 @@
msgstr "%s ha estat reemplaçat per %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2885,58 +2886,68 @@
"Aquests Ãtems amb dependències es suprimiran del sistema."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s no es desinstal·larà perquè encara es necessita"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "La informació no és và lida"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "Altres Ãtems amb dependències necessiten %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s requereix %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2946,7 +2957,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s entra en conflicte amb altres Ãtems amb dependències"
@@ -2955,14 +2966,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s entra en conflicte amb %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2972,24 +2983,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s desactualitza altres Ãtems amb dependències"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s desactualitza %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s desactualitza:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2998,7 +3009,7 @@
"Aquests Ãtems amb dependències es suprimiran del sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depèn d'altres Ãtems amb dependències"
@@ -3006,38 +3017,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s depèn de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s depèn de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Fill de"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "No es pot instal·lar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "No es proporciona %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -3046,32 +3057,32 @@
"\n"
"No hi ha cap recurs disponible que admeti aquest requisit."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Atesos els problemes descrits anteriorment o a continuació, aquesta resolució no resoldrà totes les dependències"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "No es pot instal·lar %s perquè entra en conflicte amb %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s no s'ha instal·lat i s'ha marcat com a no instal·lable"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "No es pot instal·lar %s a causa de problemes de dependència"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3079,8 +3090,8 @@
msgstr "suprimeix %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3088,79 +3099,79 @@
msgstr "no instal·lis %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s té requisits no complerts"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "Falten dependències per a %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s no es pot instal·lar atès que falten dependències"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s compleixen les dependències de %s però es desinstal·laran"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s compleixen les dependències de %s però es conservaran al sistema"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "No cal instal·lar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "No es pot instal·lar %s per a complir les dependències de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "No es pot instal·lar %s per a complir les dependències de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s no es desinstal·larà perquè encara es necessita"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s desactualitza %s. No obstant, %s no es pot suprimir perquè està bloquejat."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "No es pot instal·lar %s perquè entra en conflicte"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s no es pot instal·lar atesos els conflictes amb %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3223,7 +3234,7 @@
msgstr "No instal·lis ni suprimeixis els Ãtems amb dependències relacionats"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "per a requerir %s per a %s en actualitzar %s"
@@ -3581,15 +3592,25 @@
msgid "Install missing resolvables"
msgstr "Instal·la els Ãtems amb dependències que falten"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
#, fuzzy
msgid "Regarding all resolvables with a compatible architecture."
msgstr "S'estan capturant els Ãtems amb dependències que coincideixen amb el criteri de cerca definit..."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "S'estan capturant els Ãtems amb dependències que coincideixen amb el criteri de cerca definit..."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "S'estan capturant els Ãtems amb dependències que coincideixen amb el criteri de cerca definit..."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3640,6 +3661,15 @@
msgid "%s part of %s"
msgstr "%s és part de %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b>Temps d'espera de doble clic </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "desbloqueja tots els Ãtems amb dependències"
Modified: trunk/libzypp/po/cs.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/cs.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/cs.po (original)
+++ trunk/libzypp/po/cs.po Mon Sep 10 16:18:44 2007
@@ -11,8 +11,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
-"PO-Revision-Date: 2007-08-23 18:25+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
+"PO-Revision-Date: 2007-09-06 19:10+0200\n"
"Last-Translator: Jakub Hegenbart <jhegenbart(a)suse.cz>\n"
"Language-Team: <cs(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -116,36 +116,36 @@
msgid "History:"
msgstr "Historie:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "Kontrola aplikovánà delta RPM se nezdaÅila."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "Aplikovánà delta RPM se nezdaÅilo."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Kontrola integrity balÃÄku %s se nezdaÅila. Chcete pokus opakovat?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "Adresa URL nebyla nalezena v repozitáÅi."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Nelze poskytnout soubor %s z repozitáÅe %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "NaÄÃtá se vyrovnávacà pamÄÅ¥ repozitáÅe '%s'"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "NaÄÃtajà se balÃÄky oprav RPM a delta RPM z vyrovnávacà pamÄti repozitáÅe '%s'"
@@ -169,27 +169,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "ProbÃhá ÄistÄnà vyrovnávacà pamÄti repozitáÅe '%s'."
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Na zadané adrese nebo adresách URL nebyla nalezena platná metadata"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "VytváÅà se vyrovnávacà pamÄÅ¥ repozitáÅe '%s'"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "NaÄÃtá se vyrovnávacà pamÄÅ¥ repozitáÅe '%s'"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "PÅidává se repozitáŠ'%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "OdebÃrá se repozitáŠ'%s'"
@@ -2705,19 +2706,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "ZmÄnÄné konfiguraÄnà soubory pro %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "Program rpm uložil %s jako %s, ale nebylo možné zjistit rozdÃl"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2727,13 +2728,13 @@
"PrvnÃch 25 Åádek rozdÃlů:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "Program rpm vytvoÅil %s jako %s, ale nebylo možné zjistit rozdÃl"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2744,47 +2745,47 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Instalace %s selhala"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "Výstup programu rpm:"
#
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s nainstalován ok"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Dalšà výstup programu rpm:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "OdstranÄnà %s se nezdaÅilo"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s odstranÄnà ok"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "vytvoÅena záloha %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Instalace byla zruÅ¡ena podle pÅÃkazu."
@@ -2802,64 +2803,74 @@
msgstr "%s nahrazen %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s bude odstranÄn uživatelem.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s bude odstranÄn jinou aplikacÃ. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s bude nainstalován uživatelem.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s bude nainstalován jinou aplikacÃ. (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "V Äasovém limitu %d s nebylo nalezeno žádné platné ÅeÅ¡enÃ"
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr "ÅeÅ¡itel vyÄerpal zadaný Äasový limit"
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Nebylo nalezeno žádné platné ÅeÅ¡enà se závislostmi pouze nejlepÅ¡Ã architektury."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "PÅi této operaci byly vzaty v úvahu pouze závislosti s nejlepÅ¡Ã architekturou.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Pokud jsou zahrnuty vÅ¡echny možné závislosti, může operace trvat delÅ¡Ã dobu, ale dospÄje k platnému výsledku."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Chybná informace"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s je požadován jinými balÃÄky"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s je požadován pro %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2869,7 +2880,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s koliduje"
@@ -2878,14 +2889,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s koliduje s %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2895,24 +2906,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s je novÄjÅ¡Ã než jiné závisejÃcà balÃÄky"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s je novÄjÅ¡Ã než %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s je novÄjÅ¡Ã než: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2921,7 +2932,7 @@
"Tyto balÃÄky budou smazány."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s závislà na jiných balÃÄcÃch"
@@ -2929,38 +2940,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s závisà na %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s závisà na: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Potomek"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Nelze nainstalovat %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Žádný balÃÄek neposkytuje %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2968,31 +2979,31 @@
"\n"
"Požadavky nelze uspokojit z žádného dostupného zdroje."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Kvůli uvedeným nebo následujÃcÃm problémům nevyÅeÅ¡Ã toto ÅeÅ¡enà vÅ¡echny závislosti"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Nelze nainstalovat %s, protože způsobuje konflikt s %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s nebude nainstalován a byl oznaÄen jako nenainstalovatelný"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Vzhledem k problémům se závislostà nelze nainstalovat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3000,8 +3011,8 @@
msgstr "smazat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3009,79 +3020,79 @@
msgstr "neinstalovat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s obsahuje nevyÅeÅ¡ené závislosti"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s má nesplnÄné závislosti"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s nelze nainstalovat kvůli nesplnÄným závislostem"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s splÅuje závislosti %s, bude vÅ¡ak odinstalován"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s splÅuje závislosti %s, bude vÅ¡ak ponechán v systému"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Nenà potÅeba instalovat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Nelze nainstalovat %s ke splnÄnà závislostà %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Nelze nainstalovat %s ke splnÄnà závislostà %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s nebude odinstalován, protože je stále vyžadován"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s je novÄjÅ¡Ã než %s, ale %s nelze odstranit, protože je uzamÄený."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Nelze nainstalovat %s, protože způsobuje konflikt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s nelze nainstalovat, koliduje s %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Požadavek %s nelze splnit."
@@ -3142,7 +3153,7 @@
msgstr "Neinstalovat a nemazat pÅÃsluÅ¡né závislosti"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "vyžadujÃcà %s pro %s pÅi aktualizaci %s"
@@ -3500,14 +3511,22 @@
msgid "Install missing resolvables"
msgstr "Nainstalovat chybÄjÃcà závislosti"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "Spustà ÅeÅ¡itel se zváženÃm VÅ ECH možnostÃ"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "V úvahu jsou brány všechny závislosti s kompatibilnà architekturou."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr "Spustà ÅeÅ¡itel pouze pro nejlepÅ¡Ã architekturu."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr "V úvahu jsou brány pouze závislosti s nejlepšà architekturou."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3558,6 +3577,14 @@
msgid "%s part of %s"
msgstr "%s Äást ze %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr "Dvojnásobný Äasový limit"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr "PÅÃÅ¡tÄ spustà ÅeÅ¡itel s dvojnásobným Äasovým limitem."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "odemknout vÅ¡echny závisejÃcà balÃÄky"
Modified: trunk/libzypp/po/cy.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/cy.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/cy.po (original)
+++ trunk/libzypp/po/cy.po Mon Sep 10 16:18:44 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2003-09-23 10:33+0200\n"
"Last-Translator: Kevin Donnelly <kevin(a)dotmon.com>\n"
"Language-Team: Welsh <i18n(a)suse.de>\n"
@@ -111,36 +111,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -164,27 +164,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2857,19 +2858,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "Copïo ffeiliau ffurfweddu i'r cysawd a osodwyd"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2877,13 +2878,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2892,46 +2893,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, fuzzy, c-format
msgid "%s install failed"
msgstr "Methodd yr arsefydliad."
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, fuzzy, c-format
msgid "%s installed ok"
msgstr "&Ie, gosod"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr ""
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, fuzzy, c-format
msgid "%s remove failed"
msgstr "Methodd rpm."
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2949,64 +2950,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3014,7 +3025,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3023,14 +3034,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3038,31 +3049,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3070,68 +3081,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Arsefydlu %s: \"%s\""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Rhaid arsefydlu'r pecynnau yma:"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3139,8 +3150,8 @@
msgstr "&Dileu"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3148,79 +3159,79 @@
msgstr "Arsefydlu %s: \"%s\""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "&Ie, gosod"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3282,7 +3293,7 @@
msgstr "Gosod gyrrydd..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3644,14 +3655,22 @@
msgid "Install missing resolvables"
msgstr "Gosod gyrrydd..."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3702,6 +3721,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/da.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/da.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/da.po (original)
+++ trunk/libzypp/po/da.po Mon Sep 10 16:18:44 2007
@@ -11,8 +11,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
-"PO-Revision-Date: 2007-08-23 15:16+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
+"PO-Revision-Date: 2007-09-07 14:07+0200\n"
"Last-Translator: Martin Schlander <suse(a)linuxin.dk>\n"
"Language-Team: <opensuse-translation(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
@@ -116,36 +116,36 @@
msgid "History:"
msgstr "Historik:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm-kontrol mislykkedes."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm mislykkedes."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Pakken %s bestod ikke integritetstjek. Vil du forsøge igen?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "Ingen URL i softwarekilden."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Kan ikke levere filen %s fra softwarekilden %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "Læser '%s' softwarekilde-cache"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "Læser rettelses- og deltarpms fra '%s' softwarekilde-cache"
@@ -169,27 +169,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "Tømmer cache for softwarekilden '%s'"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Ingen gyldig metadata fundet på specificerede URL(s)"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "Opbygger cache for softwarekilden '%s'"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "Læser cache for softwarekilden '%s'"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "Tilføjer softwarekilden '%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "Fjerner softwarekilden '%s'"
@@ -2716,19 +2717,19 @@
#
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Konfigurationsfiler er ændret for %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm gemte %s som %s, men det var umuligt at bestemme forskellen"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2738,13 +2739,13 @@
"Her er de første 25 linjer af forskelle:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm oprettede %s som %s, men det var umuligt at bestemme forskellen"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2755,46 +2756,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Installation af %s mislykkedes"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm output:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s blev installeret"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Yderligere rpm output:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Fjernelse af %s mislykkedes"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s fjernelse ok"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "backup %s blev oprettet"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Installation er blevet afbrudt som ønsket."
@@ -2812,64 +2813,74 @@
msgstr "%s erstattet af %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s vil blive slettet af brugeren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s vil blive slettet af et andet program (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s vil blive installeret af brugeren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s vil blive installeret af et andet program. (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Ingen gyldig løsning fundet indenfor %d sekunder"
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr "Afhængighedsløseren har nået en defineret timeout"
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Ingen gyldig løsning fundet udelukkende med resolvables fra bedste arktitektur."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "I denne kørsel er kun resolvables med den bedste arkitektur taget i betragtning.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "At tage alle mulige resolvables i betragtning tager tid men kan give et godt resultat."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Ugyldig information"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s behøves af andre ændringer"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s er nødvendig for %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2879,7 +2890,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s konflikter med andre ændringer"
@@ -2888,14 +2899,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s konflikter med %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2905,24 +2916,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s forælder andre ændringer"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s forælder %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s forælder %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2931,7 +2942,7 @@
"Disse resolvables vil blive slettet fra systemet."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s afhænger af andre resolvables"
@@ -2939,38 +2950,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s afhænger af %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s afhænger af %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Barn af"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "%s kan ikke installeres"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Ingen tilbyder %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2978,31 +2989,31 @@
"\n"
"Der er ingen tilgængelige ressourcer, der understøtter dette krav."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Grundet problemerne beskrevet ovenfor/nedenunder vil denne beslutning ikke løse alle afhængigheder"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Kan ikke installere %s, fordi den konflikter med %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s er ikke blevet installeret og er markeret som ikke-installerbar"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Kan ikke installere %s grundet afhængighedsproblemer"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3010,8 +3021,8 @@
msgstr "slet %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3019,81 +3030,81 @@
msgstr "installér ikke %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s har ikke-opfyldte krav"
#
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s har manglende afhængigheder"
#
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Kan ikke installere %s grundet afhængighedsproblemer"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s opfylder afhængighedskravene til %s, men vil blive afinstalleret"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s opfylder afhængighederne for %s, men vil blive bevaret på systemet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Det er ikke nødvendigt at installere %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Kan ikke installere %s, for at opfylde afhængighedskravene til %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Kan ikke installere %s, for at opfylde afhængighedskravene til %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s vil ikke blive afinstalleret, da den stadig kræves"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s forælder %s. Men %s kan ikke slettes, fordi den er låst."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Kan ikke installere %s, fordi den konflikter"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s kan ikke installeres på grund af konflikter med %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Kravet %s kan ikke opfyldes."
@@ -3154,7 +3165,7 @@
msgstr "Installér ikke, eller slet de pågældende resolvables"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "for at kræve %s til %s når du opgraderer %s"
@@ -3515,14 +3526,22 @@
msgid "Install missing resolvables"
msgstr "Installer manglende resolvables"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "Få afhængighedsløseren til at køre med ALLE muligheder."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Tager alle resolvables med kompatibel arkitektur i betragtning."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr "Få afhængighedsløseren til kun at køre med bedste arkitektur."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr "Tager kun resolvables med bedste arkitektur i betragtning."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3573,6 +3592,14 @@
msgid "%s part of %s"
msgstr "%s del af %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr "Dobbel timeout"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr "Start næste kørsel af afhængighedsløseren med fordoblet timeout."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "LÃ¥s alle resolvables op"
Modified: trunk/libzypp/po/de.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/de.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/de.po (original)
+++ trunk/libzypp/po/de.po Mon Sep 10 16:18:44 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2005-03-09 13:54+0100\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -112,36 +112,36 @@
msgid "History:"
msgstr "Folgende Fehler sind aufgetreten:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "Applydeltarpm-Prüfung nicht bestanden."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "Fehler bei applydeltarpm"
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Paket %s besteht Integritätsprüfung nicht. Soll ein erneuter Download-Versuch gestartet werden?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "Das Repository enthält keine URL."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "%s kann nicht vom Repository %s bereitgestellt werden."
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "Lese '%s' Repository Cache"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "Lese Patch- und Delta-RPMs vom '%s' Repository Cache."
@@ -165,27 +165,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "Säubere Cache für Repository '%s'"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Keine gültigen Metadaten an der angegebenen Adresse (URL) gefunden"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "Erzeuge Cache für Repository '%s'"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "Lese Cache für Repository '%s'"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "Füge Repository '%s' hinzu"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "Entferne Repository '%s'"
@@ -2636,19 +2637,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Geänderte Konfigurationsdateien für %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm hat %s als %s gespeichert, der Unterschied konnte jedoch nicht ermittelt werden"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2658,13 +2659,13 @@
"Hier die ersten 25 Zeilen mit Unterschieden:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm hat %s als %s erstellt, der Unterschied konnte jedoch nicht ermittelt werden"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2675,46 +2676,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Fehler bei der Installation von %s"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm-Ausgabe:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s ordnungsgemäà installiert"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Zusätzliche rpm-Ausgabe:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Fehler beim Entfernen von %s"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s ordnungsgemäà entfernt"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "Sicherung %s erstellt"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Die Installation wurde gemäà Anweisung abgebrochen."
@@ -2732,67 +2733,77 @@
msgstr "%s ersetzt durch %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s wird durch Benutzerinteraktion gelöscht.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s werden durch ein anderes Programm gelöscht.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s wird vom Benutzer installiert.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s wird durch ein andere Programm installiert.\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, fuzzy, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Wenn nur Abhängigkeiten der besten Architektur für diese Maschine verwendet werden, wird keine eindeutige Lösung gefunden."
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Wenn nur Abhängigkeiten der besten Architektur für diese Maschine verwendet werden, wird keine eindeutige Lösung gefunden."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
#, fuzzy
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Bei diesem Resolver-Lauf wurden nur Abhängigkeiten für die beste Architektur berücksichtigt.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
#, fuzzy
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Alle evtl. möglichen auflösbaren Objekte zu berücksichtigen braucht viel Zeit, kann aber zu einem besseren Ergebnis führen."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Ungültige Informationen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s wird von anderen auflösbaren Objekten benötigt."
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s wird benötigt von %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2802,7 +2813,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s steht in Konflikt mit anderen auflösbaren Objekten"
@@ -2811,14 +2822,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s steht in Konflikt mit %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2828,24 +2839,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s ersetzt andere auflösbare Objekte"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s ersetzt %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s ersetzt:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2854,7 +2865,7 @@
"Diese auflösbaren Objekte werden aus dem System gelöscht."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s hängt von anderen auflösbaren Objekten ab"
@@ -2862,38 +2873,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s hängig von %s ab"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s ist abhängig von:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Untergeordnetes Element von"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Installation von %s nicht möglich"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Kein Objekt stellt %s bereit."
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2902,32 +2913,32 @@
"\n"
"Es ist keine Ressource verfügbar, die diese Anforderung unterstützt."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Aufgrund der oben/unten beschriebenen Problemen löst diese Auflösung nicht alle Abhängigkeiten"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Installation von %s aufgrund eines Konflikts mit %s nicht möglich"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s ist nicht installiert und als nicht installierbar gekennzeichnet"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Installation von %s aufgrund von Abhängigkeitsproblemen nicht möglich"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2935,8 +2946,8 @@
msgstr "%s löschen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2944,79 +2955,79 @@
msgstr "%s nicht installieren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "Unerfüllbare Anforderungen von %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "Fehlende Abhängigkeiten von %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s kann aufgrund fehlender Abhängigkeiten nicht installiert werden"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s erfüllt die Abhängigkeiten von %s, wird jedoch deinstalliert"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s erfüllt die Abhängigkeiten von %s, wird jedoch in Ihrem System beibehalten"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "%s muss nicht installiert werden"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Installation von %s zur Erfüllung der Abhängigkeiten von %s nicht möglich"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Installation von %s zur Erfüllung der Abhängigkeiten von %s nicht möglich"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s wird nicht deinstalliert; wird noch immer benötigt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s ersetzt %s. %s kann aber nicht gelöscht werden, weil gesperrt."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Installation von %s aufgrund eines Konflikts nicht möglich"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s kann nicht installiert werden aufgrund von Konflikten mit %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3079,7 +3090,7 @@
msgstr "Betreffende auflösbare Objekte nicht installieren oder löschen"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, 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"
@@ -3437,15 +3448,25 @@
msgid "Install missing resolvables"
msgstr "Fehlende auflösbare Objekte installieren"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
#, fuzzy
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Alle evtl. möglichen auflösbaren Objekte zu berücksichtigen braucht viel Zeit, kann aber zu einem besseren Ergebnis führen."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "Alle evtl. möglichen auflösbaren Objekte zu berücksichtigen braucht viel Zeit, kann aber zu einem besseren Ergebnis führen."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "Alle evtl. möglichen auflösbaren Objekte zu berücksichtigen braucht viel Zeit, kann aber zu einem besseren Ergebnis führen."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3496,6 +3517,14 @@
msgid "%s part of %s"
msgstr "%s ist Teil von %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "Entsperren aller auflösbaren Objekte"
Modified: trunk/libzypp/po/el.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/el.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/el.po (original)
+++ trunk/libzypp/po/el.po Mon Sep 10 16:18:44 2007
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: zypp.el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-08-16 18:04+0300\n"
"Last-Translator: Vasileios Giannakopoulos <billg(a)hellug.gr>\n"
"Language-Team: Îλληνικά\n"
@@ -117,37 +117,37 @@
msgid "History:"
msgstr "ÎαÏάλογοÏ:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "ÎλεγÏÎ¿Ï applydeltarpm αÏÎÏÏ
Ïε."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm αÏÎÏÏ
Ïε."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Το ÏακÎÏο %s αÏÎÏÏ
Ïε ÏÏον ÎλεγÏο ακεÏαιÏÏηÏαÏ. ÎÎλεÏε να ÏÏ
νεÏίÏεÏε;"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "Î ÏοÏθήκη ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏάÏÏαÏÎ·Ï '%s'."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "ÎδÏ
ναμία ÏαÏοÏÎ®Ï %s αÏÏ %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, fuzzy, c-format
msgid "Reading '%s' repository cache"
msgstr "Î ÏοÏθήκη ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏάÏÏαÏÎ·Ï '%s'."
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -171,27 +171,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "Î ÏοÏθήκη ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏάÏÏαÏÎ·Ï '%s'."
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, fuzzy, c-format
msgid "Building repository '%s' cache"
msgstr "Î ÏοÏθήκη ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏάÏÏαÏÎ·Ï '%s'."
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, fuzzy, c-format
msgid "Reading repository '%s' cache"
msgstr "Î ÏοÏθήκη ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏάÏÏαÏÎ·Ï '%s'."
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "Î ÏοÏθήκη ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏάÏÏαÏÎ·Ï '%s'."
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Î ÏοÏθήκη ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏάÏÏαÏÎ·Ï '%s'."
@@ -2645,19 +2646,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Îλλαγή αÏÏείÏν ÏÏθμιÏÎ·Ï Î³Î¹Î± %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "Το rpm αÏοθηκεÏÏηκε %s ÏÏ %s αλλά ήÏαν αδÏναÏο να διαÏανεί η διαÏοÏά"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2667,13 +2668,13 @@
"ÎÎ´Ï ÎµÎ¯Î½Î±Î¹ οι ÏÏÏÏÎµÏ 25 γÏαμμÎÏ ÏÎ·Ï Î´Î¹Î±ÏοÏάÏ:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "Το rpm αÏοθηκεÏÏηκε %s ÏÏ %s αλλά ήÏαν αδÏναÏο να διαÏανεί η διαÏοÏά"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2684,46 +2685,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s εγκαÏάÏÏαÏη αÏÎÏÏ
Ïε"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "αÏοÏÎλεÏμα rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s εγκαÏάÏÏαÏη ok"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "ÎÏιÏÏÏÏθεÏο αÏοÏÎλεÏμα rpm:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s αÏαίÏεÏη αÏÎÏÏ
Ïε"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s αÏαίÏεÏη ok"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "δημιοÏ
Ïγία ανÏιγÏάÏοÏ
αÏÏÎ±Î»ÎµÎ¯Î±Ï %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "ΠεγκαÏάÏÏαÏη ακÏ
ÏÏθηκε ÏÏÏÏ Î´Î¹Î±ÏάÏθηκε."
@@ -2741,7 +2742,7 @@
msgstr "%s ανÏικαÏαÏÏάθηκε αÏÏ %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2749,61 +2750,71 @@
"ÎÏ
Ïά Ïα εÏιλÏÏιμα θα διαγÏαÏοÏν αÏÏ Ïο ÏÏÏÏημα."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "Το %s δεν θα αÏεγκαÏαÏÏαθεί γιαÏί ακÏμη αÏαιÏείÏαι"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, fuzzy, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Îεν βÏÎθηκε ÎγκÏ
Ïη λÏÏη με μοναδικά εÏιλÏÏιμα ÏÎ·Ï ÎºÎ±Î»ÏÏεÏÎ·Ï Î±ÏÏιÏεκÏονικήÏ"
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Îεν βÏÎθηκε ÎγκÏ
Ïη λÏÏη με μοναδικά εÏιλÏÏιμα ÏÎ·Ï ÎºÎ±Î»ÏÏεÏÎ·Ï Î±ÏÏιÏεκÏονικήÏ"
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
#, fuzzy
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Îε αÏ
ÏÏ ÎµÎºÏελείÏε μÏνο εÏιλÏÏιμα με Ïην καλÏÏεÏη θεÏÏοÏμενη αÏÏιÏεκÏονική.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
#, fuzzy
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "ÎÏον αÏοÏά Ïλα Ïα Ïιθανά εÏιλÏÏιμα, ÏαίÏνει ÏÏÏνο αλλά μÏοÏεί να Ï
ÏάÏξει ÎγκÏ
Ïο αÏοÏÎλεÏμα."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "ÎανθαÏμÎνη ÏληÏοÏοÏία"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "Το %s ÏÏειάζεÏαι αÏÏ Î¬Î»Î»Î± εÏιλÏÏιμα"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "Το %s ÏÏειάζεÏαι αÏÏ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2813,7 +2824,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "Το %s ÏÏ
γκÏοÏεÏαι με άλλα εÏιλÏÏιμα"
@@ -2822,14 +2833,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "Το %s ÏÏ
γκÏοÏεÏαι με %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2839,24 +2850,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "Το %s ÏεÏαλαιÏνει άλλα εÏιλÏÏιμα"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "Το %s ÏεÏαλαιÏνει %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "Το %s ÏεÏαλαιÏνει: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2865,7 +2876,7 @@
"ÎÏ
Ïά Ïα εÏιλÏÏιμα θα διαγÏαÏοÏν αÏÏ Ïο ÏÏÏÏημα."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "Το %s εξαÏÏάÏαι αÏÏ Î¬Î»Î»Î± εÏιλÏÏιμα"
@@ -2873,38 +2884,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "Το %s εξαÏÏάÏαι αÏÏ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "Το %s εξαÏÏάÏαι αÏÏ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Παιδί ÏοÏ
"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "ÎανÎÎ½Î±Ï Î´ÎµÎ½ ÏαÏÎÏει Ïο %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2913,32 +2924,32 @@
"\n"
"Îεν Ï
ÏάÏÏει διαθÎÏÎ¹Î¼Î¿Ï ÏÏÏÎ¿Ï ÏοÏ
να Ï
ÏοÏÏηÏίζει αÏ
Ïή Ïην αÏαίÏηÏη."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ÎξαιÏÎ¯Î±Ï ÏÏοβλημάÏÏν ÏοÏ
ÏεÏιγÏάÏονÏαι ÏαÏαÏάνÏ/ÏαÏακάÏÏ Î±Ï
Ïή η εÏίλÏ
Ïη δεν θα λÏÏει ÏÎ»ÎµÏ ÏÎ¹Ï ÎµÎ¾Î±ÏÏήÏειÏ"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s εÏειδή ÏÏ
γκÏοÏεÏαι με Ïο %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Το %s δεν είναι εγκαÏεÏÏημÎνο και ÎÏει ÏημειÏθεί ÏÏ Î¼Î· εγκαÏαÏÏήÏιμο"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s εξαιÏÎ¯Î±Ï ÏÏοβλημάÏÏν εξαÏÏήÏεÏν"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2946,8 +2957,8 @@
msgstr "διαγÏαÏή %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2955,79 +2966,79 @@
msgstr "να μην εγκαÏαÏÏαθεί Ïο %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "Ïο %s ÎÏει μη εκÏληÏÏμÎÎ½ÎµÏ Î±ÏαιÏήÏειÏ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "Ïο %s ÎÏει ελλειÏÎµÎ¯Ï ÎµÎ¾Î±ÏÏήÏειÏ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Ïο %s δε μÏοÏεί να εγκαÏαÏÏαθεί εξαιÏÎµÎ¯Î±Ï ÎµÎ»Î»ÎµÎ¹ÏÏν εξαÏÏήÏεÏν"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "Ïο %s εκÏληÏÏνει ÏÎ¹Ï ÎµÎ¾Î±ÏÏήÏÎµÎ¹Ï ÏοÏ
%s αλλά θα αÏεγκαÏαÏÏαθεί"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "Ïο %s εκÏληÏÏνει ÏÎ¹Ï ÎµÎ¾Î±ÏÏήÏÎµÎ¹Ï ÏοÏ
%s αλλά θα διαÏηÏηθεί ÏÏο ÏÏÏÏημα ÏαÏ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Îαμια ανάγκη για εγκαÏάÏÏαÏη %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s με ÏκοÏÏ Ïην εκÏλήÏÏÏη ÏÏν εξαÏÏήÏεÏν ÏοÏ
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s με ÏκοÏÏ Ïην εκÏλήÏÏÏη ÏÏν εξαÏÏήÏεÏν ÏοÏ
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "Το %s δεν θα αÏεγκαÏαÏÏαθεί γιαÏί ακÏμη αÏαιÏείÏαι"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "Το %s ÏεÏαλαιÏνει Ïο %s. Îλλά Ïο %s δεν μÏοÏεί να διαγÏαÏεί εÏειδή είναι κλειδÏμÎνο."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s εÏειδή ÏÏ
γκÏοÏεÏαι"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "Το %s είναι μη εγκαÏαÏÏήÏιμο εξαιÏÎ¯Î±Ï ÏÏ
γκÏοÏÏεÏν με Ïο %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3090,7 +3101,7 @@
msgstr "Îα μην γίνει εγκαÏάÏÏαÏη ή διαγÏαÏή ÏοÏ
αÏοÏά εÏιλÏÏιμα"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "για Ïην αÏαίÏηÏη %s για %s ÏÏαν αναβαθμίζεÏαι Ïο %s"
@@ -3448,15 +3459,25 @@
msgid "Install missing resolvables"
msgstr "ÎγκαÏÎÏÏηÏε Ïα ÏαμÎνα εÏιλÏÏιμα"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "Îάνε μια ÏÏÏÏαÏη ÎÎΩΠÏÏν ÏιθανοÏήÏÏν."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
#, fuzzy
msgid "Regarding all resolvables with a compatible architecture."
msgstr "ÎÏον αÏοÏά Ïλα Ïα εÏιλÏÏιμα με ÏÏ
μβαÏή αÏÏιÏεκÏονική."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "Îάνε μια ÏÏÏÏαÏη ÎÎΩΠÏÏν ÏιθανοÏήÏÏν."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "ÎÏον αÏοÏά Ïλα Ïα εÏιλÏÏιμα με ÏÏ
μβαÏή αÏÏιÏεκÏονική."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3507,6 +3528,15 @@
msgid "%s part of %s"
msgstr "Το %s είναι μÎÏÎ¿Ï ÏοÏ
%s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+#, fuzzy
+msgid "Start the next solver run with doubled timeout."
+msgstr "Îάνε μια ÏÏÏÏαÏη ÎÎΩΠÏÏν ÏιθανοÏήÏÏν."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "ÎεκλείδÏμα ÏλÏν ÏÏν εÏιλÏÏιμÏν"
Modified: trunk/libzypp/po/en_GB.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/en_GB.po?rev=7166&r1=…
==============================================================================
--- trunk/libzypp/po/en_GB.po (original)
+++ trunk/libzypp/po/en_GB.po Mon Sep 10 16:18:44 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-08-19 16:20+0100\n"
"Last-Translator: Benjamin Weber <b.weber(a)warwick.ac.uk>\n"
"Language-Team: <en(a)li.org>\n"
@@ -115,36 +115,36 @@
msgid "History:"
msgstr "History:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm check failed."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm failed."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Package %s fails integrity check. Do you want to retry?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "No url in repository."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Can't provide file %s from repository %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "Reading '%s' repository cache"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "Reading patch and delta rpms from '%s' repository cache"
@@ -168,27 +168,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "Cleaning repository '%s' cache"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Valid metadata not found at specified URL(s)"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "Building repository '%s' cache"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "Reading repository '%s' cache"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "Adding repository '%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "Removing repository '%s'"
@@ -2639,19 +2640,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Changed configuration files for %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm saved %s as %s, but it was impossible to determine the difference"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2661,13 +2662,13 @@
"Here are the first 25 lines of difference:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm created %s as %s, but it was impossible to determine the difference"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2678,46 +2679,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s install failed"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm output:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s installed ok"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Additional rpm output:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s remove failed"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s remove ok"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "created backup %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Installation has been aborted as directed."
@@ -2735,64 +2736,74 @@
msgstr "%s replaced by %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s will be deleted by the user.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s will be installed by the user.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s will be installed by another application. (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, fuzzy, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "No valid solution found with just resolvables of best architecture."
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "No valid solution found with just resolvables of best architecture."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "With this run only resolvables with the best architecture have been regarded.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Regarding all possible resolvables takes time, but can come to a valid result."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Invalid information"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s is needed by other resolvables"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s is needed by %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2802,7 +2813,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s conflicts with other resolvables"
@@ -2811,14 +2822,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s conflicts with %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2828,24 +2839,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s obsoletes other resolvables"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s obsoletes %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s obsoletes:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2854,7 +2865,7 @@
"These resolvables will be deleted from the system."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depends on other resolvables"
@@ -2862,38 +2873,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s depends on %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s depends on:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Child of"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Cannot install %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "None provides %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2901,31 +2912,31 @@
"\n"
"There is no resource available which supports this requirement."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Due to the problems described above/below, this resolution will not solve all dependencies"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Cannot install %s, because it is conflicting with %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s is not installed and has been marked as not installable"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Cannot install %s due to dependency problems"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2933,8 +2944,8 @@
msgstr "delete %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2942,79 +2953,79 @@
msgstr "do not install %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s has unfulfilled requirements"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s has missing dependencies"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s cannot be installed due to missing dependencies"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s fulfils dependencies of %s but will be uninstalled"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s fulfils dependencies of %s but will be kept on your system"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "No need to install %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Cannot install %s to fulfil the dependencies of %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Cannot install %s to fulfil the dependencies of %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s will not be uninstalled, because it is still required"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s obsoletes %s. But %s cannot be deleted, because it is locked."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Cannot install %s, because it is conflicting"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s is not installable due to conflicts with %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Requirement %s cannot be fulfilled."
@@ -3075,7 +3086,7 @@
msgstr "Do not install or delete the resolvables concerned"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "for requiring %s for %s when upgrading %s"
@@ -3433,14 +3444,24 @@
msgid "Install missing resolvables"
msgstr "Install missing resolvables"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "Make a solver run with ALL possibilities."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Regarding all resolvables with a compatible architecture."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "Make a solver run with ALL possibilities."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "Regarding all resolvables with compatible architecture."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3491,6 +3512,15 @@
msgid "%s part of %s"
msgstr "%s part of %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+#, fuzzy
+msgid "Start the next solver run with doubled timeout."
+msgstr "Make a solver run with ALL possibilities."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "unlock all resolvables"
Modified: trunk/libzypp/po/en_US.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/en_US.po?rev=7166&r1=…
==============================================================================
--- trunk/libzypp/po/en_US.po (original)
+++ trunk/libzypp/po/en_US.po Mon Sep 10 16:18:44 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-28 11:53+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-08-22 14:13+0200\n"
"Last-Translator: proofreader <i18n(a)suse.de>\n"
"Language-Team: English <i18n(a)suse.de>\n"
@@ -110,36 +110,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Reading log entries from %s."
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -164,27 +164,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2642,19 +2643,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2662,13 +2663,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2677,46 +2678,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr ""
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2734,64 +2735,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2799,7 +2810,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2808,14 +2819,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2823,31 +2834,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2855,68 +2866,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2924,8 +2935,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2933,79 +2944,79 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Requirement %s cannot be fulfilled."
@@ -3066,7 +3077,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3424,14 +3435,22 @@
msgid "Install missing resolvables"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3482,6 +3501,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr ""
Modified: trunk/libzypp/po/es.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/es.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/es.po (original)
+++ trunk/libzypp/po/es.po Mon Sep 10 16:18:44 2007
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-05-31 13:42\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -116,37 +116,37 @@
msgid "History:"
msgstr "XF86Historial"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "Comprobación de applydeltarpm incorrecta."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "Error de applydeltarpm."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "El paquete %s no ha superado la comprobación de integridad. ¿Desea volver a intentar descargarlo?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "No se encuentra el archivo %1 en el repositorio."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "No es posible proporcionar %s de %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -171,27 +171,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "Añadiendo recursos"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Añadiendo recursos"
@@ -2650,19 +2651,19 @@
# modules/Mail.ycp:563
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Modificados archivos de configuración para %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm guardado %s como %s, pero no es posible determinar la diferencia"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2672,13 +2673,13 @@
"A continuación se presentan las primeras 25 lÃneas de diferencia:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm creado %s como %s, pero no es posible determinar la diferencia"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2691,23 +2692,23 @@
# clients/online_update_start.ycp:188
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Error al instalar %s"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "Salida de rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "Instalación correcta de %s"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Salida de rpm adicional:"
@@ -2716,13 +2717,13 @@
# clients/inst_prepdisk.ycp:507 clients/inst_prepdisk.ycp:526
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Error al eliminar %s"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "Eliminación de %s correcta"
@@ -2730,12 +2731,12 @@
# include/nis_server/io.ycp:582
# include/backup/ui.ycp:1286
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "creada copia de seguridad %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "La instalación se ha cancelado siguiendo las indicaciones."
@@ -2753,7 +2754,7 @@
msgstr "%s es sustituido por %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2761,58 +2762,68 @@
"Estas resoluciones se suprimirán del sistema."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s no se desinstalará porque aún es necesario"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Información no válida"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "Otras resoluciones necesitan %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s es necesario para %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2822,7 +2833,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s entra en conflicto con otras resoluciones"
@@ -2831,14 +2842,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s está en conflicto con %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2848,24 +2859,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s deja obsoletas a otras resoluciones"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s deja obsoleto a %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s deja obsoleto a:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2874,7 +2885,7 @@
"Estas resoluciones se suprimirán del sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depende de otras resoluciones"
@@ -2882,20 +2893,20 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s depende de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s depende de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Elemento secundario de"
@@ -2904,19 +2915,19 @@
# include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "No es posible instalar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "No se proporciona %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2925,32 +2936,32 @@
"\n"
"No hay ningún recurso disponible que cumpla este requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Debido a los problemas descritos a continuación o anteriormente, esta resolución no resolverá todas las dependencias"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "No es posible instalar %s porque entra en conflicto con %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s no se ha instalado y se ha marcado como no instalable"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "No es posible instalar %s debido a problemas de dependencias"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2961,8 +2972,8 @@
# include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249
# include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2970,80 +2981,80 @@
msgstr "no instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s tiene requisitos sin cumplir"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "Faltan dependencias de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s no se puede instalar debido a dependencias que no están presentes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s satisface las dependencias de %s, pero se desinstalará"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s satisface las dependencias de %s, pero se conservará en el sistema"
# clients/online_update_load.ycp:1004
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "No es necesario instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "No es posible instalar %s para satisfacer las dependencias de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "No es posible instalar %s para satisfacer las dependencias de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s no se desinstalará porque aún es necesario"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s deja obsoleto a %s. Pero no se puede suprimir %s porque está bloqueado."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "No es posible instalar %s porque tiene un conflicto"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s no se puede instalar debido a conflictos con %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3109,7 +3120,7 @@
msgstr "No instalar ni suprimir las resoluciones relativas"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "para requerir %s para %s al actualizar %s"
@@ -3478,14 +3489,22 @@
msgid "Install missing resolvables"
msgstr "Instalar resoluciones que faltan"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3536,6 +3555,15 @@
msgid "%s part of %s"
msgstr "%s forma parte de %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b>Tiempo lÃmite para hacer doble clic </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "desbloquear todas las resoluciones"
Modified: trunk/libzypp/po/et.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/et.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/et.po (original)
+++ trunk/libzypp/po/et.po Mon Sep 10 16:18:44 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: zypp.et\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-05-04 13:39+0300\n"
"Last-Translator: Ain Vagula <avagula(a)gmail.com>\n"
"Language-Team: Estonian <linux-ee(a)lists.eenet.ee>\n"
@@ -114,37 +114,37 @@
msgid "History:"
msgstr "XF86History"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "Probleem hoidla andmete parsimisel."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -168,27 +168,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Hoidla '%s' lisamine."
@@ -2649,19 +2650,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2669,13 +2670,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2684,46 +2685,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Paketi %s paigaldamine nurjus"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm-i väljund:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "Paketi %s paigaldamine õnnestus"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Täiendav rpm-i väljund:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Paketi %s eemaldamine nurjus"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "Paketi %s eemaldamine õnnestus"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2741,64 +2742,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s tuleb paigaldada."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Vigane teave"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2806,7 +2817,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2815,14 +2826,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2830,31 +2841,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2862,68 +2873,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2931,8 +2942,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2940,79 +2951,79 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s tuleb paigaldada."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3073,7 +3084,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3431,14 +3442,22 @@
msgid "Install missing resolvables"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3489,6 +3508,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr ""
Modified: trunk/libzypp/po/fi.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/fi.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/fi.po (original)
+++ trunk/libzypp/po/fi.po Mon Sep 10 16:18:44 2007
@@ -13,10 +13,10 @@
msgstr ""
"Project-Id-Version: zypp.fi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
-"PO-Revision-Date: 2007-08-23 21:18+0300\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
+"PO-Revision-Date: 2007-09-06 16:40+0300\n"
"Last-Translator: Jyri Palokangas <jmp(a)opensuse.fi>\n"
-"Language-Team: Suomi <fi(a)li.org>\n"
+"Language-Team: Suomi <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -118,36 +118,36 @@
msgid "History:"
msgstr "Historia:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "rpm-muunnospaketin tarkistus epäonnistui."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "rpm-muunnos epäonnistui"
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Paketin %s yhtenäisyystarkistus epäonnistui. Haluatko yrittää uudelleen?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "Ei verkko-osoitetta asennuslähteessä."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Tiedostoa %s ei voitu ladata asennuslähteestä %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "Luetaan '%s' -asennuslähteen välimuistia"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "Luetaan paikkaus- ja muutosrpm -tiedostoja '%s' -asennuslähteen välimuistista."
@@ -171,27 +171,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "Puhdistetaan '%s' -asennuslähteen välimuisti"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Annetuista verkko-osoitteista ei löytynyt kelpaavaa metatietoa"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "Rakennetaan '%s' -asennuslähteen välimuistia"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
-msgstr "Luetaan '%s' -asennuslähteen välumuistia"
+msgstr "Luetaan '%s' -asennuslähteen välimuistia"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "Lisätään asennuslähdettä '%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "Poistetaan asennuslähdettä '%s'"
@@ -2769,19 +2770,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Muunnettiin määritystiedostoja paketille %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm tallensi tiedoston %s tiedostona %s, mutta erojen selvittäminen ei onnistunut"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2791,13 +2792,13 @@
"Tässä on ensimmäiset 25 vaihtunutta riviä:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, 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 selvittäminen ei onnistunut"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2808,46 +2809,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s asennus epäonnistui"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm-tuloste:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s asennettu"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "rpm-lisätuloste:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s poistaminen epäonnistui"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s poistaminen onnistui"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "luotiin varmuuskopio %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Asennus on keskeytetty ohjeiden mukaan."
@@ -2865,64 +2866,74 @@
msgstr "%s korvataan osalla %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s poistetaan käyttäjän mukana.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s poistetaan toisen ohjelman mukana. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s asennetaan käyttäjän mukana.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s asennetaan toisen ohjelman mukana. (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, fuzzy, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Parhaiten soveltuvasta arkkitehtuurin paketeista ei löytynyt sopivia ratkaisuja pakettiriivuuksien tyydyttämiseksi."
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Parhaiten soveltuvasta arkkitehtuurin paketeista ei löytynyt sopivia ratkaisuja pakettiriivuuksien tyydyttämiseksi."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Tällä ajolla harkitaan ainoastaan parhaiten soveltuvan arkkitehtuuria.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Tarkastelemalla kaikkia mahdollisia vaihtoehtoja voidaan löytää sopiva ratkaisu, mutta se vie aikaa."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Epäkelvot tiedot"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "Muut osat tarvitsevat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%2$s tarvisee osaa %1$s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2932,7 +2943,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s on ristiriidassa muiden osien kanssa"
@@ -2941,14 +2952,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s on ristiriidassa osan %s kanssa"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2958,24 +2969,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s vanhentaa muut osat"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s vanhentaa %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s vanhentaa:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2984,7 +2995,7 @@
"Nämä osat poistetaan järjestelmästä."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s on riippuvainen muista osista"
@@ -2992,38 +3003,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s on riippuvainen osasta %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s riippuu osasta:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Lapsi"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Ei voida asentaa %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Mikään ei tarjoa %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -3031,31 +3042,31 @@
"\n"
"Ei ole saatavilla osaa, joka täyttäisi tämän riippuvuuden."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Yllä tai alla kuvattujen ongelmien takia tämä ehdotus ei ratkaise kaikkia riippuvuuksia"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Ei voida asentaa osaa %s, koska se on ristiriidassa osan %s kanssa"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s ei asennettu ja se on merkitty poistettavaksi"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Ei voida asentaa %s riippuvuusongelmien vuoksi"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3063,8 +3074,8 @@
msgstr "poista %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3072,79 +3083,79 @@
msgstr "älä asenna %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "Osalla %s on täyttämättömiä vaatimuksia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "osalla %s on puuttuvia riippuvuuksia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Osaa %s ei voida asentaa puuttuvien riippuvuuksien takia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "Osa %s täyttää osan %s riippuvuudet, mutta se poistetaan"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "Osa %s täyttää osan %s riippuvuudet ja se säilytetään järjestelmässä"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Ei tarvetta asentaa %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Ei voida asentaa %s täyttämään osan %s riippuvuudet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Ei voida asentaa %s täyttämään osan %s riippuvuudet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ei poisteta, koska sitä tarvitaan edelleen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "osa %s vanhentaa %s. Mutta %s ei voida poistaa koska se on lukittu."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "osaa %s ei voida asentaa, koska se on ristiriidassa"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s on poistettavissa, koska se on ristiriidassa osan %s kanssa"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Tarvetta %s ei voida täyttää."
@@ -3205,7 +3216,7 @@
msgstr "Ãlä asenna tai poista tätä koskevia osia"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "tarvitaan %s osaa %s varten, kun päivitetään %s"
@@ -3563,14 +3574,24 @@
msgid "Install missing resolvables"
msgstr "Asenna puuttuvat osat"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "Etsitään KAIKKI mahdolliset vaihtoehdot."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Harkitaan kaikkia osia, jotka ovat yhteensopivaa arkkitehtuuria."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "Etsitään KAIKKI mahdolliset vaihtoehdot."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "Harkitaan kaikkia osia, jotka ovat yhteensopivaa arkkitehtuuria."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3621,6 +3642,15 @@
msgid "%s part of %s"
msgstr "%s kuuluu osaan %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+#, fuzzy
+msgid "Start the next solver run with doubled timeout."
+msgstr "Etsitään KAIKKI mahdolliset vaihtoehdot."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "Poista kaikki lukitukset"
@@ -5117,4 +5147,3 @@
"Tiedoston %s tarkistussumma on virheellinen.\n"
"Odotettiin arvoa %s, saatiin %s\n"
"Käytetäänkö tiedostoa silti?"
-
Modified: trunk/libzypp/po/fr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/fr.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/fr.po (original)
+++ trunk/libzypp/po/fr.po Mon Sep 10 16:18:44 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-08-29 17:29+0200\n"
"Last-Translator: Guillaume GARDET <guillaume.gardet(a)free.fr>\n"
"Language-Team: French Team <opensuse-fr(a)opensuse.org>\n"
@@ -38,8 +38,7 @@
msgid "Path parameter parsing not supported for this URL"
msgstr "Analyse du paramètre de chemin non prise en charge pour cette URL"
-#: ../zypp/url/UrlBase.cc:782
-#: ../zypp/url/UrlBase.cc:1229
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Analyse de la chaîne de requête non prise en charge pour cette URL"
@@ -86,8 +85,7 @@
msgid "Url scheme requires path name"
msgstr "Le schéma de l'Url requiert un nom de chemin"
-#: ../zypp/url/UrlBase.cc:1117
-#: ../zypp/url/UrlBase.cc:1131
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Chemin relatif non autorisé en présence d'une autorité"
@@ -116,36 +114,36 @@
msgid "History:"
msgstr "Historique:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "La vérification d'applydeltarpm a échoué."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm a échoué."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Ãchec de la vérification de l'intégrité du paquetage %s. Souhaitez-vous tenter de le télécharger de nouveau ?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "Pas d'URL dans le référentiel."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Impossible de fournir %s à partir de %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "Lecture de '%s' depuis le cache du dépôt"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "Lecture du correctif et du delta du RPM depuis '%s' le dépôt"
@@ -155,13 +153,11 @@
msgid "Unsupported HTTP authentication method '%s'"
msgstr "Méthode d'autentification HTTP '%s' non supportée"
-#: ../zypp/media/MediaCurl.cc:715
-#: ../zypp/media/MediaCurl.cc:784
+#: ../zypp/media/MediaCurl.cc:715 ../zypp/media/MediaCurl.cc:784
msgid "Invalid user name or password."
msgstr "Mot de passe ou nom d'utilisateur invalide."
-#: ../zypp/media/MediaCurl.cc:718
-#: ../zypp/media/MediaCurl.cc:787
+#: ../zypp/media/MediaCurl.cc:718 ../zypp/media/MediaCurl.cc:787
#, c-format
msgid "Authentication required for '%s'"
msgstr "Authentification requise pour '%s'"
@@ -171,27 +167,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "Nettoyage du cache du dépôt '%s'"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Metadata valide non trouvée à l'URL spécifiée"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "Construction du cache du dépôt '%s'"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "Lecture du cache du dépôt '%s'"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "Ajout du référentiel '%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "Suppression du référentiel '%s'"
@@ -213,8 +210,7 @@
msgid "Invalid empty Url object reference"
msgstr "Référence de l'objet d'Url vide non valide"
-#: ../zypp/Url.cc:321
-#: ../zypp/Url.cc:335
+#: ../zypp/Url.cc:321 ../zypp/Url.cc:335
msgid "Unable to parse Url components"
msgstr "Impossible d'analyser les composants de l'Url"
@@ -224,8 +220,7 @@
#. Defined LanguageCode constants
#. Defined CountryCode constants
-#: ../zypp/LanguageCode.cc:225
-#: ../zypp/CountryCode.cc:215
+#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215
msgid "No Code"
msgstr "Pas de code"
@@ -290,8 +285,7 @@
msgstr "Akkadien"
#. language code: alb sqi sq
-#: ../zypp/LanguageCode.cc:262
-#: ../zypp/LanguageCode.cc:264
+#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264
msgid "Albanian"
msgstr "Albanais"
@@ -341,8 +335,7 @@
msgstr "Aragonais"
#. language code: arm hye hy
-#: ../zypp/LanguageCode.cc:284
-#: ../zypp/LanguageCode.cc:286
+#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286
msgid "Armenian"
msgstr "Arménien"
@@ -442,8 +435,7 @@
msgstr "Balinais"
#. language code: baq eus eu
-#: ../zypp/LanguageCode.cc:326
-#: ../zypp/LanguageCode.cc:328
+#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328
msgid "Basque"
msgstr "Basque"
@@ -553,8 +545,7 @@
msgstr "Bulgare"
#. language code: bur mya my
-#: ../zypp/LanguageCode.cc:372
-#: ../zypp/LanguageCode.cc:374
+#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374
msgid "Burmese"
msgstr "Birman"
@@ -619,8 +610,7 @@
msgstr "Djaghatai"
#. language code: chi zho zh
-#: ../zypp/LanguageCode.cc:400
-#: ../zypp/LanguageCode.cc:402
+#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402
msgid "Chinese"
msgstr "Chinois"
@@ -730,8 +720,7 @@
msgstr "Couchitiques (autres langues)"
#. language code: cze ces cs
-#: ../zypp/LanguageCode.cc:446
-#: ../zypp/LanguageCode.cc:448
+#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448
msgid "Czech"
msgstr "Tchèque"
@@ -806,8 +795,7 @@
msgstr "Néerlandais moyen (vers 1050-1350)"
#. language code: dut nld nl
-#: ../zypp/LanguageCode.cc:478
-#: ../zypp/LanguageCode.cc:480
+#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480
msgid "Dutch"
msgstr "Hollandais"
@@ -912,8 +900,7 @@
msgstr "Fon"
#. language code: fre fra fr
-#: ../zypp/LanguageCode.cc:522
-#: ../zypp/LanguageCode.cc:524
+#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524
msgid "French"
msgstr "Français"
@@ -963,14 +950,12 @@
msgstr "Germaniques (autres langues)"
#. language code: geo kat ka
-#: ../zypp/LanguageCode.cc:544
-#: ../zypp/LanguageCode.cc:546
+#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546
msgid "Georgian"
msgstr "Géorgien"
#. language code: ger deu de
-#: ../zypp/LanguageCode.cc:548
-#: ../zypp/LanguageCode.cc:550
+#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550
msgid "German"
msgstr "Allemand"
@@ -1040,8 +1025,7 @@
msgstr "Grec ancien (jusqu'Ã 1453)"
#. language code: gre ell el
-#: ../zypp/LanguageCode.cc:578
-#: ../zypp/LanguageCode.cc:580
+#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580
msgid "Greek, Modern (1453-)"
msgstr "Grec moderne (après 1453)"
@@ -1146,8 +1130,7 @@
msgstr "Igbo"
#. language code: ice isl is
-#: ../zypp/LanguageCode.cc:622
-#: ../zypp/LanguageCode.cc:624
+#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624
msgid "Icelandic"
msgstr "Islandais"
@@ -1518,8 +1501,7 @@
msgstr "Lushai"
#. language code: mac mkd mk
-#: ../zypp/LanguageCode.cc:772
-#: ../zypp/LanguageCode.cc:774
+#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774
msgid "Macedonian"
msgstr "Macédonien"
@@ -1559,8 +1541,7 @@
msgstr "Mandingue"
#. language code: mao mri mi
-#: ../zypp/LanguageCode.cc:790
-#: ../zypp/LanguageCode.cc:792
+#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792
msgid "Maori"
msgstr "Maori"
@@ -1580,8 +1561,7 @@
msgstr "Masai"
#. language code: may msa ms
-#: ../zypp/LanguageCode.cc:800
-#: ../zypp/LanguageCode.cc:802
+#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802
msgid "Malay"
msgstr "Malais"
@@ -1722,8 +1702,7 @@
#. language code: nau na
#. :NPL:524:
-#: ../zypp/LanguageCode.cc:858
-#: ../zypp/CountryCode.cc:380
+#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:380
msgid "Nauru"
msgstr "Nauruan"
@@ -1923,8 +1902,7 @@
msgstr "Perse, ancien (vers 600-400 av. J.-C.)"
#. language code: per fas fa
-#: ../zypp/LanguageCode.cc:938
-#: ../zypp/LanguageCode.cc:940
+#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940
msgid "Persian"
msgstr "Persan"
@@ -2009,8 +1987,7 @@
msgstr "Tsigane"
#. language code: rum ron ro
-#: ../zypp/LanguageCode.cc:974
-#: ../zypp/LanguageCode.cc:976
+#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976
msgid "Romanian"
msgstr "Roumain"
@@ -2070,8 +2047,7 @@
msgstr "Santal"
#. language code: scc srp sr
-#: ../zypp/LanguageCode.cc:1000
-#: ../zypp/LanguageCode.cc:1002
+#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002
msgid "Serbian"
msgstr "Serbe"
@@ -2086,8 +2062,7 @@
msgstr "Ãcossais"
#. language code: scr hrv hr
-#: ../zypp/LanguageCode.cc:1008
-#: ../zypp/LanguageCode.cc:1010
+#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010
msgid "Croatian"
msgstr "Croate"
@@ -2142,8 +2117,7 @@
msgstr "Slaves (autres langues)"
#. language code: slo slk sk
-#: ../zypp/LanguageCode.cc:1032
-#: ../zypp/LanguageCode.cc:1034
+#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034
msgid "Slovak"
msgstr "Slovaque"
@@ -2338,8 +2312,7 @@
msgstr "Thaï"
#. language code: tib bod bo
-#: ../zypp/LanguageCode.cc:1112
-#: ../zypp/LanguageCode.cc:1114
+#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114
msgid "Tibetan"
msgstr "Tibétain"
@@ -2360,8 +2333,7 @@
#. language code: tkl
#. :TJK:762:
-#: ../zypp/LanguageCode.cc:1122
-#: ../zypp/CountryCode.cc:428
+#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:428
msgid "Tokelau"
msgstr "Tokelau"
@@ -2437,8 +2409,7 @@
#. language code: tvl
#. :TTO:780:
-#: ../zypp/LanguageCode.cc:1152
-#: ../zypp/CountryCode.cc:435
+#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:435
msgid "Tuvalu"
msgstr "Tuvalu"
@@ -2538,8 +2509,7 @@
msgstr "Washo"
#. language code: wel cym cy
-#: ../zypp/LanguageCode.cc:1192
-#: ../zypp/LanguageCode.cc:1194
+#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194
msgid "Welsh"
msgstr "Gallois"
@@ -2623,8 +2593,7 @@
msgid "Zuni"
msgstr "Zuni"
-#: ../zypp/ZYppFactory.cc:279
-#: ../zypp/ZYppFactory.cc:334
+#: ../zypp/ZYppFactory.cc:279 ../zypp/ZYppFactory.cc:334
msgid "Software management is already running."
msgstr "La gestion des logiciels est déjà en cours d'exécution."
@@ -2665,8 +2634,7 @@
msgid "Not a CDROM drive"
msgstr "Pas un lecteur de CDROM"
-#: ../zypp/target/hal/HalException.h:46
-#: ../zypp/target/hal/HalException.h:55
+#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55
#: ../zypp/target/hal/HalException.h:64
msgid "Hal Exception"
msgstr "Exception Hal"
@@ -2674,19 +2642,19 @@
# TLABEL sw_single_2002_01_04_0147__11
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Fichiers de configuration modifiés pour %s :"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm a enregistré %s sous le nom de %s mais il a été impossible de déterminer la différence"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2696,13 +2664,13 @@
"Dans les 25 premières lignes, la différence se présente comme suit :\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm a créé %s sous le nom de %s mais il a été impossible de déterminer la différence"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2714,53 +2682,51 @@
# TLABEL online_update_2002_01_04_0147__112
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Ãchec de l'installation de %s"
# TLABEL firewall_2002_03_14_2340__2
-#: ../zypp/target/rpm/RpmDb.cc:1927
-#: ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "Sortie rpm :"
# TLABEL online_update_2002_01_04_0147__83
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s installé."
# TLABEL firewall_2002_03_14_2340__51
-#: ../zypp/target/rpm/RpmDb.cc:1936
-#: ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Sortie rpm supplémentaire :"
# TLABEL partitioning_2002_01_04_0147__99
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Ãchec du retrait de %s"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "Réussite du retrait de %s"
# TLABEL backup_2002_03_14_2340__102
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "- sauvegarde %s créée"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "L'installation a été abandonnée comme indiqué."
@@ -2778,67 +2744,77 @@
msgstr "%s remplacé par %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s sera supprimé par l'utilisateur.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s sera supprimé par une autre apllication. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s sera installé par l'utilisateur.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s sera installé par une autre application. (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, fuzzy, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Aucune solution trouvée avec les solutions de la meillleur architecture."
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Aucune solution trouvée avec les solutions de la meillleur architecture."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
#, fuzzy
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Par ce processus, seuls les résolutions avec la meilleur architecture ont été considérées.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
#, fuzzy
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Considérer toutes les résolutions possibles prend du temps mais peut amener à un résultat valide."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Informations incorrectes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s est requis par d'autres correctifs"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s est requis par %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2848,7 +2824,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s est en conflit avec d'autres correctifs"
@@ -2857,14 +2833,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s en conflit avec %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2874,24 +2850,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s rend d'autres correctifs obsolètes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s rend obsolète %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s rend obsolète :%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2900,7 +2876,7 @@
"Ces correctifs seront supprimés du système."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s dépend d'autres correctifs"
@@ -2908,39 +2884,39 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s dépend de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s dépend de :%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Enfant de"
# TLABEL partitioning_2002_01_04_0147__180
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Impossible d'installer %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Aucun ne fournit %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2949,34 +2925,34 @@
"\n"
"Aucune ressource disponible qui prenne en charge cette exigence."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Ãtant donné les problèmes décrits ci-dessus/dessous, cette solution ne résoudra pas toutes les dépendances"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Impossible d'installer %s car il est en conflit avec %s"
# TLABEL autoinst_2002_08_07_0216__335
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s n'est pas installé et est marqué comme non installable"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Impossible d'installer %s à cause de problèmes de dépendance"
# TLABEL packages_2002_01_04_0147__198
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2985,8 +2961,8 @@
# TLABEL partitioning_2002_01_04_0147__180
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2994,80 +2970,80 @@
msgstr "ne pas installer %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s ne respecte pas certaines exigences"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s comporte des dépendances manquantes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Impossible d'installer %s à cause de dépendances manquantes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s satisfait les dépendances de %s mais sera désinstallé"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s satisfait les dépendances de %s mais sera conservé sur votre système"
# TLABEL online_update_2002_01_04_0147__92
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Aucune nécessité d'installer %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Impossible d'installer %s pour satisfaire les dépendances de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Impossible d'installer %s pour satisfaire les dépendances de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ne sera pas désinstallé car il est toujours requis"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s %s obsolètes. Mais il est impossible de supprimer %s qui est verrouillé."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Impossible d'installer %s à cause d'un conflit"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ne peut pas être installé car il est en conflit avec %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3131,7 +3107,7 @@
msgstr "Ne pas installer ou supprimer les correctifs concernés"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, 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"
@@ -3497,15 +3473,25 @@
msgid "Install missing resolvables"
msgstr "Installer les correctifs manquants"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "Créer un solutionneur qui couvre toutes les possibilités."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
#, fuzzy
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Regarder toutes les solutions compatible avec cette architecture."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "Créer un solutionneur qui couvre toutes les possibilités."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "Regarder toutes les solutions compatible avec cette architecture."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3556,6 +3542,16 @@
msgid "%s part of %s"
msgstr "%s - partie de %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b>Timeout du double-clic </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+#, fuzzy
+msgid "Start the next solver run with doubled timeout."
+msgstr "Créer un solutionneur qui couvre toutes les possibilités."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "déverrouiller tous les correctifs"
@@ -3785,8 +3781,7 @@
#. :CCK:166:
#. :CAF:140:
-#: ../zypp/CountryCode.cc:255
-#: ../zypp/CountryCode.cc:257
+#: ../zypp/CountryCode.cc:255 ../zypp/CountryCode.cc:257
msgid "Congo"
msgstr "Congo"
@@ -4853,65 +4848,89 @@
#~ msgid "%s is freshened by %s"
#~ msgstr "%s est rafraichis par %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Impossible d'analyser l'autorité de l'Url"
+
#~ msgid "Ignore this requirement generally"
#~ msgstr "Ignorer cette exigence en règle générale"
+
#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
#~ msgstr "%s est requis par un autre correctif à installer, donc sa liaison ne sera pas supprimée."
+
#~ msgid "Cannot create a file needed to perform update installation."
#~ msgstr "Impossible de créer un fichier nécessaire pour installer la mise à jour."
+
#~ msgid "Unable to restore all sources."
#~ msgstr "Impossible de restaurer toutes les sources."
+
#~ msgid "At least one source already registered, stored sources cannot be restored."
#~ msgstr "Au moins une source est déjà enregistrée ; les sources stockées ne peuvent pas être restaurées."
+
#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
#~ msgstr "Impossible d'installer %s pour satisfaire les dépendances de %s"
+
#~ msgid "%s dependend on %s"
#~ msgstr "%s dépendant de %s"
+
#~ msgid "Reading index files"
#~ msgstr "Lecture des fichiers d'index"
+
#~ msgid "The signed repomd.xml file failed the signature check."
#~ msgstr "Le fichier repomd.xml signé a échoué au contrôle de signature."
# TLABEL restore_2002_08_07_0216__60
#~ msgid "Reading product from %s"
#~ msgstr "Lecture du produit depuis %s"
+
# TLABEL restore_2002_08_07_0216__60
#~ msgid "Reading filelist from %s"
#~ msgstr "Lecture de la liste de fichiers depuis %s"
+
# TLABEL restore_2002_08_07_0216__60
#~ msgid "Reading packages from %s"
#~ msgstr "Lecture des paquetages depuis %s"
+
# TLABEL restore_2002_08_07_0216__60
#~ msgid "Reading selection from %s"
#~ msgstr "Lecture de la sélection depuis %s"
+
# TLABEL restore_2002_08_07_0216__60
#~ msgid "Reading pattern from %s"
#~ msgstr "Lecture du modèle depuis %s"
+
#~ msgid "Reading patches index %s"
#~ msgstr "Lecture de l'index des correctifs %s"
+
# TLABEL autoinst_2002_08_07_0216__71
#~ msgid "Reading patch %s"
#~ msgstr "Lecture du correctif %s"
+
#~ msgid "The script file failed the checksum test."
#~ msgstr "Ãchec du fichier de script lors du test relatif à la somme de contrôle."
+
#~ msgid "Reading packages file"
#~ msgstr "Lecture du fichier des paquetages"
+
# progress indicator label
#~ msgid "Reading translation: %s"
#~ msgstr "Lecture de la traduction : %s"
+
#, fuzzy
#~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?"
#~ msgstr "Ãchec de la vérification de l'intégrité du paquetage %s. Souhaitez-vous tenter de le télécharger de nouveau, ou voulez-vous annuler l'installation ?"
+
#~ msgid " miss checksum."
#~ msgstr " a manqué la somme de contrôle."
+
#~ msgid " fails checksum verification."
#~ msgstr " a échoué lors de la vérification des sommes de contrôle."
+
#~ msgid "Downloading %s"
#~ msgstr "Téléchargement de %s"
+
#~ msgid "Downloaded %s from %s"
#~ msgstr "Téléchargement de %s à partir de %s"
+
#~ msgid "%s needed by %s"
#~ msgstr "%s requis par %s"
-
Modified: trunk/libzypp/po/gl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/gl.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/gl.po (original)
+++ trunk/libzypp/po/gl.po Mon Sep 10 16:18:44 2007
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2002-07-23 11:51+0200\n"
"Last-Translator: Jesús Bravo Ãlvarez <jba(a)pobox.com>\n"
"Language-Team: Galician <i18n(a)suse.de>\n"
@@ -115,36 +115,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -168,27 +168,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -3016,19 +3017,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "Vaise gardar agora a configuración do son."
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -3036,13 +3037,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -3051,46 +3052,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr ""
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -3108,64 +3109,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3173,7 +3184,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3182,14 +3193,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3197,31 +3208,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3229,68 +3240,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instalando en:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3298,8 +3309,8 @@
msgstr "Eliminar"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3307,79 +3318,79 @@
msgstr "Instalando en:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3441,7 +3452,7 @@
msgstr "Instalando o controlador..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3802,14 +3813,22 @@
msgid "Install missing resolvables"
msgstr "Instalando o controlador..."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3860,6 +3879,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/gu.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/gu.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/gu.po (original)
+++ trunk/libzypp/po/gu.po Mon Sep 10 16:18:44 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: nis\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-11-11 18:41+0530\n"
"Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions<linux_team(a)agreeya.com>\n"
@@ -107,37 +107,37 @@
msgid "History:"
msgstr "XF86History "
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm àªàªàª¾àª¸àª£à« àªàª°àªµàª¾àª®àª¾àª નિષà«àª«àª³."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm નિષà«àª«àª³."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "%s પà«àªà«àª પà«àª°à«àª£àª¤àª¾ àªàªàª¾àª¸àª£à«àª®àª¾àª નિષà«àª«àª³ àªàª àªà«. તમૠતૠફરà«àª¥à« ડાàªàª¨àª²à«àª¡ àªàª°àªµàª¾àª¨à« પà«àª°àª¯àª¤à«àª¨ àªàª°àªµàª¾ માàªàªà« àªà«?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "રિપà«àª¸à«àªàª°à«àª®àª¾àª ફાàªàª² %1 મળૠનહà«àª."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "%s માàªàª¥à« %s પà«àª°à«àª પાડૠશàªàª¾àª¤à«àª નથà«"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -161,27 +161,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "સાધનૠàªàª®à«àª°àª¾àª¯ àªà«"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "સાધનૠàªàª®à«àª°àª¾àª¯ àªà«"
@@ -2632,19 +2633,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "%s માàªà« àªàª¨à«àª«àª¿àªà«àª¯à«àª°à«àª¶àª¨ ફાàªàª²à« બદલાàª:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "%s તરà«àªà« rpm ઠ%s સાàªàªµà«àª¯à«àª પરàªàª¤à« તફાવત àªà«àª¦à« પાડવા તૠàª
શàªà«àª¯ હતà«àª"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2654,13 +2655,13 @@
"àª
હà«àª તફાવતà«àª¨àª¾ પà«àª°àª¥àª® 25 લાàªàª¨à« àªà«: \n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "%s તરà«àªà« rpm ઠ%s રàªà«àª¯à«àª પરàªàª¤à« તફાવત àªà«àª¦à« પાડવા તà«àª
શàªà«àª¯ હતà«àª"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2671,46 +2672,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s નà«àª સà«àª¥àª¾àªªàª¨ નિષà«àª«àª³"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm àªàªàªàªªà«àª:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s નà«àª સà«àª¥àª¾àªªàª¨ બરાબર"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "વધારાનà«àª rpm àªàªàªàªªà«àª:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s નૠદà«àª° àªàª°àªµàª¾àª®àª¾àª નિષà«àª«àª³"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s નૠદà«àª° àªàª°àªµàª¾àª®àª¾àª બરાબર"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "%s નà«àª બà«àªàª
પ રàªàª¾àª¯à«àª"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "સà«àªàª¨àª¾ પà«àª°àª®àª¾àª£à« સà«àª¥àª¾àªªàª¨ àª
àªàªàª¾àªµà«àª²à«àª હતà«àª."
@@ -2728,7 +2729,7 @@
msgstr "%s દà«àªµàª¾àª°àª¾ %s નૠàªàªà«àª¯àª¾àª મà«àªàª¾àª¯à«àª"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2736,58 +2737,68 @@
"ઠરિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સિસà«àªàª®àª®àª¾àªàª¥à« àªàª¾àª¢à« નાàªàªµàª¾àª®àª¾àª àªàªµàª¶à«."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s àª
સà«àª¥àª¾àªªàª¿àª¤ થશૠનહà«àª àªàª¾àª°àª£àªà« તૠહàªà« àªàª°à«àª°à« àªà«"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "àª
માનà«àª¯ માહિતà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "àª
નà«àª¯ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ દà«àªµàª¾àª°àª¾ %s àªàª°à«àª°à« હતà«àª"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s દà«àªµàª¾àª°àª¾ %s àªàª°à«àª°à« હતà«àª"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2797,7 +2808,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s, àª
નà«àª¯ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સાથૠવિસàªàªàª¤ àªà«"
@@ -2806,14 +2817,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s, %s સાથૠવિસàªàªàª¤ àªà«"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2823,24 +2834,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s àª
નà«àª¯ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ àª
લઠપાડૠàªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s àª
લઠપાડવà«àª %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s àª
લઠપાડવà«àª : %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2849,7 +2860,7 @@
"ઠરિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સિસà«àªàª®àª®àª¾àªàª¥à« àªàª¾àª¢à« નાàªàªµàª¾àª®àª¾àª àªàªµàª¶à«."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s àª
નà«àª¯ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ પર àªàª§àª¾àª° રાàªà« àªà«"
@@ -2857,38 +2868,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s, %s પર àªàª§àª¾àª° રાàªà« àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s પર àªàª§àª¾àª° રાàªà« àªà« : %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "નà«àª àªàª¾àªàª²à«àª¡"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "%s સà«àª¥àª¾àªªàª¿ શàªàª¾àª¶à« નહà«àª"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "%s àªà«àª àªàªªàª¤à«àª નથà«"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2897,32 +2908,32 @@
"\n"
"àªà«àª સà«àª¤à«àª°à«àª¤ પà«àª°àª¾àªªà«àª¯ નથૠàªà« ઠàªàª°à«àª°àª¿àª¯àª¾àª¤àª¨à« સહાય àªàª°à«."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ઠરિàªà«àª²à«àª¯à«àª¶àª¨àª¨à« àªàªªàª°/નà«àªà« દરà«àª¶àª¾àªµà«àª² બાàªà« નિàªàª³àª¤à« મà«àª¶à«àªà«àª²à«àª બધૠપરાધિનતાàªàª¨à« àªàªà«àª²àª²àª¾àªµà« શàªàª¶à« નહà«àª"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s સà«àª¥àª¾àªªàª¿ શàªàª¾àª¶à« નહà«àª àªàª¾àª°àª£àªà« તૠ%s સાથૠવિસàªàªàª¤ àªà«"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s સà«àª¥àªªàª¾àª¯à«àª નથૠàª
નૠàª
સà«àª¥àª¾àªªàª¨ તરà«àªà« àªàª¿àª¹àª¿àª¤ àªàª°à«àª¯à«àª હતà«àª"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "પરાધિનતા મà«àª¶à«àªà«àª²à«àªàª¨à« àªàª¾àª°àª£à« %s સà«àª¥àª¾àªªàª¿ શàªàª¾àª¯à«àª નથà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2930,8 +2941,8 @@
msgstr "%s àªàª¾àª¢à« નાàªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2939,79 +2950,79 @@
msgstr "%s સà«àª¥àª¾àªªàª¶à« નહà«àª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s પાસૠàª
પà«àª°à«àª£ àªàª°à«àª°àª¿àª¯àª¾àª¤à« àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s પાસૠàªà«àªà« àªàª¯à«àª²à« પરાધિનતા àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "àªà«àªà« àªàª¯à«àª²à« પરાધિનતાનૠàªàª¾àª°àª£à« %s સà«àª¥àª¾àªªàª¿ શàªàª¾àª¯à«àª નથà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s, %s નૠપરાધિનતા પà«àª°à«àª£ àªàª°à« àªà« પરàªàª¤à« તૠàª
સà«àª¥àª¾àªªàª¿àª¤ àªàª°àª¾àª¶à«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s, %s નૠપરાધિનતા પà«àª°à«àª£ àªàª°à« àªà« પરàªàª¤à« તૠતમારા સિસà«àªàª® પર રાàªàª¶à«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "%s સà«àª¥àª¾àªªàªµàª¾àª¨à« àªàª°à«àª° નથà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s નૠપરાધિનતા પà«àª°à«àª£ àªàª°àªµàª¾ %s સà«àª¥àª¾àªªà« શàªàª¶à« નહà«àª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s નૠપરાધિનતા પà«àª°à«àª£ àªàª°àªµàª¾ %s સà«àª¥àª¾àªªà« શàªàª¶à« નહà«àª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s àª
સà«àª¥àª¾àªªàª¿àª¤ થશૠનહà«àª àªàª¾àª°àª£àªà« તૠહàªà« àªàª°à«àª°à« àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s àª
લઠપાડવà«àª %s. પરàªàª¤à« %s àªàª¾àª¢à« શàªàª¾àª¶à« નહà«àª àªàª¾àª°àª£àªà« તૠલà«àª àªàª°à«àª²à«àª àªà«."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s સà«àª¥àª¾àªªàª¿àª¤ àªàª°à« શàªàª¾àª¶à« નહà«àª àªàª¾àª°àª£àªà« તૠવિસàªàªàª¤ àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s સાથૠવિસàªàªàª¤ હà«àªµàª¾àª¥à« %s àª
સà«àª¥àª¾àªªàª¿àª¤ àªà«"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3074,7 +3085,7 @@
msgstr "સàªàª¬àªàª§àª¿àª¤ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સà«àª¥àª¾àªªà« àªà« àªàª¾àª¢à« નહà«àª"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "àªà«àª¯àª¾àª°à« %s àª
દà«àª¯àª¤àª¨ àªàª°àª¤àª¾ હà«àªµ તà«àª¯àª¾àª°à« %s માàªà« %s àªàª°à«àª°à« àªà«"
@@ -3432,14 +3443,22 @@
msgid "Install missing resolvables"
msgstr "àªà«àªà« àªàª¯à«àª²àª¾ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સà«àª¥àª¾àªªà«"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3490,6 +3509,15 @@
msgid "%s part of %s"
msgstr "%s, %s નૠàªàª¾àª àªà«"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b> ડબલ-àªà«àª²àª¿àª àªàª¾àªàª®àªàªàª </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "બધા રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ àª
નલà«àª àªàª°à«"
Modified: trunk/libzypp/po/he.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/he.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/he.po (original)
+++ trunk/libzypp/po/he.po Mon Sep 10 16:18:44 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2004-08-09 10:24+0200\n"
"Last-Translator: xxx <yyy(a)example.org>\n"
"Language-Team: Hebrew <i18n(a)suse.de>\n"
@@ -110,36 +110,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -163,27 +163,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2953,19 +2954,19 @@
# Commandline help title
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "ק××¨× ×§×××¥ ×××ר×ת"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2973,13 +2974,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2988,47 +2989,47 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, fuzzy, c-format
msgid "%s install failed"
msgstr "××ª×§× × × ×ש××"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
#, fuzzy
msgid "Additional rpm output:"
msgstr "××××¢ × ×סף"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, fuzzy, c-format
msgid "%s remove failed"
msgstr "rpm × ×ש×."
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, fuzzy, c-format
msgid "created backup %s"
msgstr "×× ×ª×צ×ר ×××××××"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -3046,64 +3047,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3111,7 +3122,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3120,14 +3131,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3135,31 +3146,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3167,70 +3178,70 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "×תק×× ×¢×:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
# main dialog: Button Delete partition
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3239,8 +3250,8 @@
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3248,79 +3259,79 @@
msgstr "×תק×× ×¢×:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "&××× ×ער×ת ק×××ת"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3382,7 +3393,7 @@
msgstr "×תק×× ×ר××ר..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3747,14 +3758,22 @@
msgid "Install missing resolvables"
msgstr "×תק×× ×ר××ר..."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3805,6 +3824,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/hi.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hi.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/hi.po (original)
+++ trunk/libzypp/po/hi.po Mon Sep 10 16:18:44 2007
@@ -4,7 +4,7 @@
msgstr ""
"Project-Id-Version: zypp.hi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-08-24 22:33+0530\n"
"Last-Translator: Sangeeta Kumari <k.sangeeta09(a)gmail.com>\n"
"Language-Team: Hindi <en(a)li.org>\n"
@@ -109,37 +109,37 @@
msgid "History:"
msgstr "à¤à¤¤à¤¿à¤¹à¤¾à¤¸:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm à¤à¤¾à¤à¤ नाà¤à¤¾à¤® रहà¥à¥¤"
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm नाà¤à¤¾à¤® रहा।"
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "पà¥à¤à¥à¤ %s नॠà¤à¤à¥à¤à¤°à¤£ à¤à¤¾à¤à¤ à¤à¥ नाà¤à¤¾à¤® à¤à¤¿à¤¯à¤¾à¥¤ à¤à¥à¤¯à¤¾ à¤à¤ª à¤à¤¸à¤à¥ डाà¤à¤¨à¤²à¥à¤¡à¤¿à¤à¤ à¤à¤¾ पà¥à¤°à¤¯à¤¾à¤¸ फिर सॠà¤à¤°à¤¨à¤¾ à¤à¤¾à¤¹à¤¤à¥ हà¥à¤?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "à¤à¥à¤· मà¥à¤ फाà¤à¤² %1 नहà¥à¤ पà¥à¤°à¤¾à¤ªà¥à¤¤ हà¥à¤à¥¤"
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "%s सॠ%s पà¥à¤°à¤¦à¤¾à¤¨ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -164,27 +164,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "सà¤à¤¸à¤¾à¤§à¤¨ à¤à¥à¤¡à¤¼ रहा"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "सà¤à¤¸à¤¾à¤§à¤¨ à¤à¥à¤¡à¤¼ रहा"
@@ -2635,19 +2636,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "%s: à¤à¥ लिठपरिवरà¥à¤¤à¤¿à¤¤ à¤à¤à¤«à¤¿à¤à¤°à¥à¤¶à¤¨ फाà¤à¤²à¥à¤"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm नॠ%s à¤à¥ रà¥à¤ª मà¥à¤ %s सहà¥à¤à¤¾ लà¥à¤à¤¿à¤¨ à¤
à¤à¤¤à¤° निरà¥à¤§à¤¾à¤°à¤¿à¤¤ à¤à¤°à¤¨à¤¾ à¤
सà¤à¤à¤µ था "
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2657,13 +2658,13 @@
"यहाठà¤
à¤à¤¤à¤° à¤à¥ पहलॠ25 पà¤à¤à¥à¤¤à¤¿à¤¯à¤¾à¤ हà¥à¤ :\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm नॠ%s à¤à¥ रà¥à¤ª मà¥à¤ %s सà¥à¤à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ लà¥à¤à¤¿à¤¨ à¤
à¤à¤¤à¤° निरà¥à¤§à¤¾à¤°à¤¿à¤¤ à¤à¤°à¤¨à¤¾ à¤
सà¤à¤à¤µ था"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2674,46 +2675,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ à¤
सफल "
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm à¤à¤à¤à¤ªà¥à¤ :"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ ठà¥à¤"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "à¤
तिरिà¤à¥à¤¤ rpm à¤à¤à¤à¤ªà¥à¤ :"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s सà¥à¤¥à¤¾à¤¨à¤¾à¤à¤¤à¤°à¤£ à¤
सफल रहा"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s सà¥à¤¥à¤¾à¤¨à¤¾à¤à¤¤à¤°à¤£ ठà¥à¤"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "बà¥à¤à¤
प %s सà¥à¤à¤¿à¤¤"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "à¤à¥à¤¸à¤¾ निरà¥à¤¦à¥à¤¶à¤¿à¤¤ था, सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ à¤à¥à¤¡à¤¼ दिया à¤à¤¯à¤¾à¥¤"
@@ -2731,7 +2732,7 @@
msgstr "%s सॠ%s à¤à¥ पà¥à¤°à¤¤à¤¿à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2739,58 +2740,68 @@
"यॠरिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ सिसà¥à¤à¤® सॠमिà¤à¤¾ दिठà¤à¤¾à¤à¤à¤à¥à¥¤"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s à¤à¥ à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤à¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤
ब à¤à¥ हà¥"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "à¤
मानà¥à¤¯ सà¥à¤à¤¨à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2798,7 +2809,7 @@
msgstr "%s à¤à¥ à¤à¤¨à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हॠ:%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s à¤à¤¾ à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ सॠà¤à¤à¤°à¤¾à¤µ हà¥"
@@ -2807,14 +2818,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s à¤à¤¾ %s सॠà¤à¤à¤°à¤¾à¤µ हॠ"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2824,24 +2835,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤à¥ पà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° दà¥à¤¤à¤¾ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s à¤à¥ %s पà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° दà¥à¤¤à¤¾ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s पà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° दà¥à¤¤à¤¾ हॠ: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2850,7 +2861,7 @@
"यॠरिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ सिसà¥à¤à¤® सॠमिà¤à¤¾ दिठà¤à¤¾à¤à¤à¤à¥à¥¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ पर निरà¥à¤à¤° à¤à¤°à¤¤à¤¾ हà¥"
@@ -2858,38 +2869,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s पर %s निरà¥à¤à¤° à¤à¤°à¤¤à¤¾ हॠ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s à¤à¤¨ पर निरà¥à¤à¤° à¤à¤°à¤¤à¤¾ हॠ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "à¤à¥ सà¤à¤¤à¤¤à¤¿"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "%s à¤à¤¾ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "à¤à¥à¤ नहà¥à¤ %s पà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2898,32 +2909,32 @@
"\n"
"à¤à¥à¤ सà¥à¤°à¥à¤¤ à¤à¤ªà¤²à¤¬à¥à¤§ नहà¥à¤ हॠà¤à¥ à¤à¤¸ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ समरà¥à¤¥à¤¨ दà¥à¥¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "à¤à¤¸ रिà¤à¥à¤²à¥à¤¯à¥à¤¶à¤¨ à¤à¥ à¤à¤ªà¤°/नà¥à¤à¥ वरà¥à¤£à¤¿à¤¤ शà¥à¤· समसà¥à¤¯à¤¾à¤à¤ सà¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¤¾à¤¸à¤®à¤¾à¤§à¤¾à¤¨ नहà¥à¤ à¤à¤°à¥à¤à¤à¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s à¤à¤¾ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¤¾ %s à¤à¥ साथ à¤à¤à¤°à¤¾à¤µ हà¥"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾ हॠà¤à¤° à¤
नà¤à¤à¤¸à¥à¤à¤¾à¤² यà¥à¤à¥à¤¯ à¤à¥ रà¥à¤ª मà¥à¤ à¤à¤¿à¤¹à¥à¤¨à¤¿à¤¤ à¤à¤° दिया à¤à¤¯à¤¾ हà¥"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "निरà¥à¤à¤°à¤¤à¤¾ समसà¥à¤¯à¤¾à¤à¤ à¤à¥ à¤à¤¾à¤°à¤£ %s à¤à¤¾ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2931,8 +2942,8 @@
msgstr "%s मिà¤à¤¾à¤à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2940,79 +2951,79 @@
msgstr "%s सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ न à¤à¤°à¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s à¤à¥ पास à¤à¤¸à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾à¤à¤ हà¥à¤ à¤à¥ सà¤à¤¤à¥à¤·à¥à¤ नहà¥à¤ हà¥à¤ हà¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s à¤à¥ à¤à¥à¤à¥ हà¥à¤ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ हà¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s à¤à¥ à¤à¥à¤à¥ हà¥à¤ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¥ à¤à¤¾à¤°à¤£ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ सà¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s à¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ %s पà¥à¤°à¥ à¤à¤°à¤¤à¤¾ हॠलà¥à¤à¤¿à¤¨ à¤à¤¸à¥ à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤° दिया à¤à¤¾à¤à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s à¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ %s पà¥à¤°à¥ à¤à¤°à¤¤à¤¾ हॠलà¥à¤à¤¿à¤¨ à¤à¤¸à¥ à¤à¤ªà¤à¥ सिसà¥à¤à¤® पर रà¤à¤¾ à¤à¤¾à¤à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¨à¥ à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ नहà¥à¤ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s à¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¥ पà¥à¤°à¤¾ à¤à¤°à¤¨à¥ à¤à¥ लिठ%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s à¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¥ पà¥à¤°à¤¾ à¤à¤°à¤¨à¥ à¤à¥ लिठ%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s à¤à¥ à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤à¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤
ब à¤à¥ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s पà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° दà¥à¤¤à¤¾ हॠ%s à¤à¥à¥¤ लà¥à¤à¤¿à¤¨ %s à¤à¥ मिà¤à¤¾à¤¯à¤¾ नहà¥à¤ à¤à¤¾ सà¤à¤¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ यह लà¥à¤ हà¥à¥¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ यह à¤à¤à¤°à¤¾à¤µ पà¥à¤¦à¤¾ à¤à¤°à¤¤à¤¾ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¥à¤¯ हॠà¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¤¾ %s à¤à¥ साथ à¤à¤à¤°à¤¾à¤µ हà¥"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3075,7 +3086,7 @@
msgstr "सà¤à¤¬à¤à¤§à¤¿à¤¤ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤² à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ या मिà¤à¤¾à¤à¤ नहà¥à¤"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s à¤à¥ à¤
पà¤à¥à¤°à¥à¤¡ à¤à¤°à¤¤à¥ समय %s हà¥à¤¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ लिà¤"
@@ -3433,14 +3444,22 @@
msgid "Install missing resolvables"
msgstr "à¤à¥à¤à¥ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3491,6 +3510,14 @@
msgid "%s part of %s"
msgstr "%s à¤à¤¾ %s à¤à¤¾à¤"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "समसà¥à¤¤ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤à¥ à¤
नलà¥à¤ à¤à¤°à¥à¤"
@@ -4784,4 +4811,3 @@
"फाà¤à¤² %s मà¥à¤ à¤à¤ à¤
मानà¥à¤¯ à¤à¥à¤à¤¸à¤® हà¥à¥¤\n"
"%s à¤à¥ à¤à¤®à¥à¤®à¥à¤¦ थà¥, %s मिला\n"
"फिर à¤à¥ फाà¤à¤² à¤à¤¾ पà¥à¤°à¤¯à¥à¤ à¤à¤°à¥à¤?"
-
Modified: trunk/libzypp/po/hr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hr.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/hr.po (original)
+++ trunk/libzypp/po/hr.po Mon Sep 10 16:18:44 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2001-07-17 16:22+0200\n"
"Last-Translator: Vlatko Kosturjak <kost(a)iname.com>\n"
"Language-Team: Croatian <i18n(a)suse.de>\n"
@@ -112,36 +112,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -166,27 +166,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2968,19 +2969,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "Pohraniti postavke u datoteke"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2988,13 +2989,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -3003,46 +3004,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, fuzzy, c-format
msgid "%s install failed"
msgstr "Instaliraj &inetd"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, fuzzy, c-format
msgid "%s installed ok"
msgstr "Äe biti instaliran kao:"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr ""
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, fuzzy, c-format
msgid "created backup %s"
msgstr "Stvori Arhiv Pohrane Podataka"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -3060,64 +3061,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3125,7 +3136,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3134,14 +3145,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3149,31 +3160,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3181,68 +3192,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instaliram na:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Ovi paketi trebaju biti instalirani:"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3250,8 +3261,8 @@
msgstr "&Obriši"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3259,79 +3270,79 @@
msgstr "Instaliram na:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "Äe biti instaliran kao:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3393,7 +3404,7 @@
msgstr "Postaviti konfiguracijske vrijednosti."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3756,14 +3767,22 @@
msgid "Install missing resolvables"
msgstr "Instaliram upravljaÄki program..."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3814,6 +3833,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/hu.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hu.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/hu.po (original)
+++ trunk/libzypp/po/hu.po Mon Sep 10 16:18:44 2007
@@ -15,15 +15,15 @@
msgstr ""
"Project-Id-Version: zypp.hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
-"PO-Revision-Date: 2007-08-25 16:50+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
+"PO-Revision-Date: 2007-09-07 09:01+0200\n"
"Last-Translator: Kalman Kemenczy <kkemenczy(a)novell.com>\n"
"Language-Team: <hu(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../zypp/url/UrlBase.cc:154
#, c-format
@@ -120,36 +120,36 @@
msgid "History:"
msgstr "ElÅzmények:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "az applydeltarpm ellenÅrzés sikertelen."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "az applydeltarpm futtatása sikertelen."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "A(z) %s csomag integritásvizsgálata sikertelen. Megpróbálja újra?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "A telepÃtés forrás nem tartalmaz url-t."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "A(z) %s programkönyvtárat nem biztosÃtja a(z) %s telepÃtési forrás"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "A(z) '%s' telepÃtési forrás betöltése"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "FrissÃtés és különbség rpm beolvasása a(z) '%s' telepÃtési forrásból"
@@ -173,27 +173,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "A(z) '%s' telepÃtési forrás gyorsÃtótárának kiürÃtésének"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "A megadokt URL nem tartalmaz érvényes metaadatot"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "A(z) '%s' telepÃtési forrás gyorsÃtótárának felépÃtése"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "A(z) '%s' telepÃtési forrás gyorsÃtótárának beolvasása"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "A(z) '%s' telepÃtési forrás hozzáadása"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "A(z) '%s' telepÃtési forrás eltávolÃtása"
@@ -2771,19 +2772,19 @@
# menuentries/menuentry_lan_sendmail.ycp:14
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "%s módosÃtott konfigurációs fájljai:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, 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"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2793,13 +2794,13 @@
"A különbség elsŠ25 sora:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, 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"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2810,46 +2811,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s telepÃtése nem sikerült"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "Az rpm parancs kimenete:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s telepÃtése OK"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "További rpm kimenet:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s eltávolÃtása meghiúsult"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s eltávolÃtása OK"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "%s másolata létrehozva"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "A kérésnek megfelelÅen a telepÃtés megszakad."
@@ -2867,64 +2868,74 @@
msgstr "A(z) %s csomagot felváltja %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "A felhasználó törli a(z) %s csomagot.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "Egy alkalmazás törli a(z) %s csomagot. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "A felhasználó telepÃti a(z) %s csomagot.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "Egy alkalmazás telepÃti a(z) %s csomagot. (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Nem található érvényes megoldás %d másodpercen belül"
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr "A feloldásvizsgálat túllépte a megadott idÅt"
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Nem található érvényes megoldás kizárólag a legmegfelelÅbb architektúra feloldhatóinak használatával."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Ez a futtatás csak a legmegfelelÅbb architektúra feloldhatóit veszi figyelembe.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Az összes lehetséges feloldandó vizsgálata hosszabb ideig tart, de megbÃzhatóbb eredményt ad."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Ãrvénytelen információ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "A(z) %s csomagot más feloldhatók igénylik"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "A(z) %s csomagot igényli %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2934,7 +2945,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ütközik más feloldhatókkal"
@@ -2943,14 +2954,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s és %s ütközik"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2960,24 +2971,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s elavulttá tesz más feloldhatókat"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s elavulttá teszi a(z) %s csomagot"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s elavulttá teszi: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2986,7 +2997,7 @@
"Ezek a feloldhatók törlésre kerülnek a rendszerbÅl."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s függ más feloldhatóktól"
@@ -2994,39 +3005,39 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s függ a(z) %s csomagtól"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s függ ettÅl: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "SzülÅje "
# modules/inst_target_part.ycp:676
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "%s nem telepÃthetÅ"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "A(z) %s képességet semmi nem biztosÃtja"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -3034,31 +3045,31 @@
"\n"
"Nem áll rendelkezésre ezt a követelményt kielégÃtÅ erÅforrás."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "A fent/lent leÃrt problémák miatt ez a feloldás nem oldja fel az összes függÅséget"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s nem telepÃthetÅ, mert ütközik (%s)"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s nincs telepÃtve és nem telepÃthetÅnek lett megjelölve"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "%s nem telepÃthetÅ függÅségi problémák miatt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3067,8 +3078,8 @@
# modules/inst_target_part.ycp:676
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3076,79 +3087,79 @@
msgstr "%s nem telepÃthetÅ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s egyes követelményei nincsenek kielégÃtve"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s függÅségei hiányoznak"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s nem telepÃthetÅ hiányzó függÅségek miatt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s kielégÃti %s függÅségeit, de eltávolÃtásra kerül"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "A(z) %s kielégÃti a(z) %s függÅségeit, de a rendszeren marad"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Nincs szükség %s telepÃtésére"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s nem telepÃthetÅ %s függÅségeinek teljesÃtéséhez"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s nem telepÃthetÅ %s függÅségeinek teljesÃtéséhez"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s nem távolÃtható el, mert még mindig szükséges"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s miatt %s elavult, de %s zárolás miatt nem törölhetÅ."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "A(z) %s nem telepÃthetÅ, mert ütközik"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s nem telepÃthetÅ, mert ütközik (%s)"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "A(z) %s követelmény nem teljesÃthetÅ."
@@ -3209,7 +3220,7 @@
msgstr "Ne telepÃtse vagy törölje a vonatkozó feloldhatókat"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "mert %s szükséges %s esetén, %s frissÃtésekor"
@@ -3569,14 +3580,22 @@
msgid "Install missing resolvables"
msgstr "Hiányzó feloldhatók telepÃtése"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "Az összes lehetÅség bekapcsolása."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Minden feloldandó figyelembevétele a kompatibilis architektúrán."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr "Csak a legmegfelelÅbb architektúra használata."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr "Minden feloldandó figyelembevétele a legmegfelelÅbb architektúrán."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3627,6 +3646,14 @@
msgid "%s part of %s"
msgstr "%s %s része"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr "Kétszeres idÅtúllépés"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr "A következÅ feloldásvizsgálat indÃtása kétszeres idÅtúllépési értékkel."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "Ãsszes feloldhatók zárolásának feloldása"
Modified: trunk/libzypp/po/id.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/id.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/id.po (original)
+++ trunk/libzypp/po/id.po Mon Sep 10 16:18:44 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2002-10-08 13:38+0200\n"
"Last-Translator: I Made Wiryana <made(a)nakula.rvs.uni-bielefeld.de>\n"
"Language-Team: Indonesian <i18n(a)suse.de>\n"
@@ -122,36 +122,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -175,27 +175,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -3045,19 +3046,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -3065,13 +3066,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -3080,46 +3081,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr ""
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -3137,64 +3138,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3202,7 +3213,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3211,14 +3222,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3226,31 +3237,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3258,68 +3269,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Italia"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3327,8 +3338,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3336,79 +3347,79 @@
msgstr "Italia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3469,7 +3480,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3828,14 +3839,22 @@
msgid "Install missing resolvables"
msgstr "Italia"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3886,6 +3905,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/it.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/it.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/it.po (original)
+++ trunk/libzypp/po/it.po Mon Sep 10 16:18:44 2007
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
-"PO-Revision-Date: 2007-08-23 20:01+0100\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
+"PO-Revision-Date: 2007-09-06 19:44+0100\n"
"Last-Translator: Alberto Passalacqua <alberto.passalacqua(a)tin.it>\n"
"Language-Team: Novell Language <opensuse-translation(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
@@ -117,36 +117,36 @@
msgid "History:"
msgstr "Cronologia:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "Verifica di applydeltarpm non riuscita."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm non riuscito."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Controllo dell'integrità del pacchetto %s non riuscito. Provare di nuovo?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "Nessuna URL nella sorgente di installazione."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Impossibile fornire il file %s dalla sorgente di installazione %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "Lettura della cache del repository '%s'"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "Lettura degli rpm delle patch e dei delta dalla cache del repository '%s'"
@@ -172,27 +172,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "Pulizia della cache del repository '%s'"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Non sono stati trovati metadati validi all'URL specificato"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "Costruzione della cache del repository '%s'"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "Lettura della cache del repository '%s'"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "Sto aggiungendo il repository '%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "Rimozione della sorgente di installazione '%s'"
@@ -2673,19 +2674,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "File di configurazione modificati per %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm ha salvato %s come %s, tuttavia non è stato possibile determinare la differenza"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2695,13 +2696,13 @@
"Di seguito sono riportate le prime 25 righe di differenza:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm creato %s come %s, tuttavia non è stato possibile determinare la differenza"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2712,49 +2713,49 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Impossibile installare %s "
-#: ../zypp/target/rpm/RpmDb.cc:1927
-#: ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957
+#: ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "Output rpm:"
# TLABEL modules/inst_target_part.ycp:680
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "Installazione di %s completata"
-#: ../zypp/target/rpm/RpmDb.cc:1936
-#: ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966
+#: ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Output aggiuntivo di rpm:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Impossibile rimuovere %s"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "Rimozione di %s completata"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "Copia di backup di %s creata"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "L'installazione è stata interrotta come indicato."
@@ -2772,64 +2773,74 @@
msgstr "%s sostituito da %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s verrà cancellato dall'utente.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "'%s' verrà cancellato da un'altra applicazione. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s verrà installato dall'utente.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s verrà installato da un'altra applicazione. (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Non è stata trovata alcuna soluzione valida in %d secondi"
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr "Il risolutore ha raggiunto il timeout predefinito"
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Usando solo i risolubili per la migliore architettura compatibile non è stata trovata alcuna soluzione valida."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Con questo tentativo sono stati analizzati solo i risolubili con la migliore architettura.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Analizzare tutti i possibili risolvibili richiede del tempo ma può anche fornire un risultato valido."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Informazioni non valide"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s è richiesto da altri risolvibili"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s è richiesto da %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2839,7 +2850,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s è in conflitto con altri risolvibili"
@@ -2848,14 +2859,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s in conflitto con %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2865,24 +2876,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s non è più utilizzato dagli altri risolvibili"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s non più utilizzato %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s non più utilizzato:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2891,7 +2902,7 @@
"Questi risolvibili verranno eliminati dal sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s dipende da altri risolvibili"
@@ -2899,39 +2910,39 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s dipende da %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s dipende da:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Figlio di"
# TLABEL modules/inst_target_part.ycp:680
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Impossibile installare %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Nessun componente fornisce %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2939,31 +2950,31 @@
"\n"
"Nessuna risorsa disponibile che supporta questo requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "A causa dei problemi descritti in alto o di seguito, questa risoluzione non risolverà le dipendenze"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Impossibile installare %s perché in conflitto con %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s non è installato ed è stato contrassegnato come non installabile"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Impossibile installare %s a causa di problemi di dipendenze"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2972,8 +2983,8 @@
# TLABEL modules/inst_target_part.ycp:680
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2981,79 +2992,79 @@
msgstr "non installare %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s presenta requisiti non soddisfatti"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "Dipendenze mancanti in %s "
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Impossibile installare %s. Alcune dipendenze sono mancanti"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s soddisfa le dipendenze di %s ma verrà disinstallato"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s soddisfa le dipendenze di %s ma verrà mantenuto nel sistema"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Non è necessario installare %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Impossibile installare %s per soddisfare le dipendenze di %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Impossibile installare %s per soddisfare le dipendenze di %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s non sarà disinstallato perché ancora richiesto"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s rende obsoleto %s. Tuttavia, non è possibile eliminare %s perché bloccato."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Impossibile installare %s perché in conflitto"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s non può essere installato perché in conflitto con %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Il requisito %s non può essere soddisfatto."
@@ -3114,7 +3125,7 @@
msgstr "Non installare o eliminare i risolvibili di pertinenza"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "affinché %s richieda %s durante l'aggiornamento di %s"
@@ -3475,14 +3486,22 @@
msgid "Install missing resolvables"
msgstr "Installa risolvibili mancanti"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "Esegui un tentativo risolutore usando TUTTE le possibilità ."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Analisi di tutti i risolvibili con un'architettura compatibile."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr "Eseguire il solver solo con la miglior architettura."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr "Riguarda i risolubili solo la sola migliore architettura."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3533,6 +3552,14 @@
msgid "%s part of %s"
msgstr "%s parte di %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr "Doppio timeout"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr "Eseguire il prossimo risolutore con il timeout raddoppiato."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "sblocca tutti i risolvibili"
Modified: trunk/libzypp/po/ja.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ja.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/ja.po (original)
+++ trunk/libzypp/po/ja.po Mon Sep 10 16:18:44 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-06-16 14:06\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -113,37 +113,37 @@
msgid "History:"
msgstr "XF86History"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpmãã§ãã¯ã«å¤±æãã¾ããã"
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpmã失æãã¾ããã"
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "ããã±ã¼ã¸ %s ã®æ´åæ§ãã§ãã¯ã«å¤±æãã¾ããã ãã¦ã³ãã¼ããå試è¡ãã¾ãã?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "ãã¡ã¤ã« %1 ããªãã¸ããªå
ã§æ¤åºã§ãã¾ããã§ããã"
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "%s ãã %s ãæä¾ã§ãã¾ãã"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -168,27 +168,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "ãªã½ã¼ã¹ã追å ãã¦ãã¾ã"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "ãªã½ã¼ã¹ã追å ãã¦ãã¾ã"
@@ -2639,19 +2640,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "%s åãã®å¤æ´ãããè¨å®ãã¡ã¤ã«:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm㯠%s ã %s ã¨ãã¦ä¿åãã¾ããããå·®ç°ãå¤å¥ã§ãã¾ããã§ãã"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2661,13 +2662,13 @@
"以ä¸ã¯å·®ç°ã®ããæåã®25è¡ã§ãã\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm㯠%s ã %s ã¨ãã¦ä½æãã¾ããããå·®ç°ãå¤å¥ã§ãã¾ããã§ãã"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2678,46 +2679,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s ã®ã¤ã³ã¹ãã¼ã«ã失æãã¾ãã"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpmåºå:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s ã¯åé¡ãªãã¤ã³ã¹ãã¼ã«ããã¾ãã"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "追å ã®rpmåºå:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s ã®åé¤ã«å¤±æãã¾ãã"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s ã¯åé¡ãªãåé¤ããã¾ãã"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "ããã¯ã¢ãã %s ãä½æããã¾ãã"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "æ示éãã«ã¤ã³ã¹ãã¼ã«ãä¸æ¢ããã¾ããã"
@@ -2735,7 +2736,7 @@
msgstr "%s 㯠%s ã«ç½®ãæãããã¾ã"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2743,58 +2744,68 @@
"ãããã®resolvableã¯ã·ã¹ãã ããåé¤ããã¾ãã"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s ã¯ã¾ã å¿
è¦ãªã®ã§ãã¢ã³ã¤ã³ã¹ãã¼ã«ããã¾ãã"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "ç¡å¹ãªæ
å ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s ã¯ä»ã®resolvableãå¿
è¦ã¨ãã¦ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s 㯠%s ãå¿
è¦ã¨ãã¦ãã¾ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2804,7 +2815,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ã¯ä»ã®resolvableã¨ç«¶åãã¦ãã¾ã"
@@ -2813,14 +2824,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s %s ã¨ç«¶åãã¾ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2830,24 +2841,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s ã¯ä»ã®resolvableãå»æ¢ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s 㯠%s ãå»æ¢ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s å»æ¢:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2856,7 +2867,7 @@
"ãããã®resolvableã¯ã·ã¹ãã ããåé¤ããã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ã¯ä»ã®resolvableã«ä¾åãã¾ã"
@@ -2864,38 +2875,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s 㯠%s ã«ä¾åãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s ã¯ä»¥ä¸ã«ä¾åãã¾ã:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "ã®å"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "ãããã %s ãæä¾ãã¾ãã"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2904,32 +2915,32 @@
"\n"
"ãã®è¦æ±ããµãã¼ããã¦ãã使ç¨å¯è½ãªãªã½ã¼ã¹ãããã¾ããã"
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ä¸è¨/ä¸è¨ã®åé¡ã«ããããã®è©¦ã¿ã§ã¯ãã¹ã¦ã®ä¾åé¢ä¿ã解決ããã¾ããã"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s 㯠%s ã¨ç«¶åãã¦ããã®ã§ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ããã¦ããããã¢ã³ã¤ã³ã¹ãã¼ã«ä¸å¯è½ã¨ãã¼ã¯ããã¦ãã¾ã"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "ä¾åé¢ä¿ã®åé¡ã«ããã%s ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2937,8 +2948,8 @@
msgstr "%s ãåé¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2946,79 +2957,79 @@
msgstr "%s ãã¤ã³ã¹ãã¼ã«ããªã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s ã«ã¯æºãããã¦ããªãè¦ä»¶ãããã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s ã¯ä¾åé¢ä¿ãä¸è¶³ãã¦ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "ä¾åé¢ä¿ããªãããã%s ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s 㯠%s ã®ä¾åé¢ä¿ãæºããã¦ãã¾ãããã¢ã³ã¤ã³ã¹ãã¼ã«ããã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s ã¯ã%s ã®ä¾åé¢ä¿ãæºããã¦ãã¾ããããå©ç¨ã®ã·ã¹ãã ã«ä¿æããã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ããå¿
è¦ã¯ããã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ã㦠%s ã®ä¾åé¢ä¿ãæºãããã¨ãã§ãã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ã㦠%s ã®ä¾åé¢ä¿ãæºãããã¨ãã§ãã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ã¯ã¾ã å¿
è¦ãªã®ã§ãã¢ã³ã¤ã³ã¹ãã¼ã«ããã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s å»æ¢ %s. ããã¯ããã¦ãããã %s ãåé¤ã§ãã¾ããã"
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s ã¯ç«¶åãã¦ããã®ã§ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ã¯æ¬¡ã¨ç«¶åãã¦ãããããã¢ã³ã¤ã³ã¹ãã¼ã«ã§ãã¾ã: %s "
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3081,7 +3092,7 @@
msgstr "é¢é£ããresolavlesãã¤ã³ã¹ãã¼ã«ãã¾ãã¯åé¤ããªã"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s ã® %s åãã®ãã®ãè¦æ±ãããã(%s ãæ´æ°)"
@@ -3439,14 +3450,22 @@
msgid "Install missing resolvables"
msgstr "ä¸è¶³ãã¦ããresolvableãã¤ã³ã¹ãã¼ã«ãã¾ã"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3497,6 +3516,15 @@
msgid "%s part of %s"
msgstr "%s %s ã®ä¸é¨"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b>ããã«ã¯ãªãã¯ã¿ã¤ã ã¢ã¦ã </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "ãã¹ã¦ã®è§£æ±ºå¯¾è±¡ãã¢ã³ããã¯ãã"
Modified: trunk/libzypp/po/ka.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ka.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/ka.po (original)
+++ trunk/libzypp/po/ka.po Mon Sep 10 16:18:44 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2005-05-18 10:33+0200\n"
"Last-Translator: Aiet Kolkhi <aiet(a)qartuli.net>\n"
"Language-Team: Georgian <i18n(a)suse.de>\n"
@@ -111,36 +111,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -164,27 +164,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2635,19 +2636,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2655,13 +2656,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2670,46 +2671,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr ""
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2727,64 +2728,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2792,7 +2803,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2801,14 +2812,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2816,31 +2827,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2848,68 +2859,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2917,8 +2928,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2926,79 +2937,79 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3059,7 +3070,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3417,14 +3428,22 @@
msgid "Install missing resolvables"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3475,6 +3494,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr ""
Modified: trunk/libzypp/po/km.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/km.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/km.po (original)
+++ trunk/libzypp/po/km.po Mon Sep 10 16:18:44 2007
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: zypp.km\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
-"PO-Revision-Date: 2007-08-24 02:30+0700\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
+"PO-Revision-Date: 2007-09-07 08:39+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n"
"Language-Team: Khmer <support(a)khmeros.info>\n"
"MIME-Version: 1.0\n"
@@ -114,36 +114,36 @@
msgid "History:"
msgstr "áááááááá·Â á"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "áá¶áâáá·áá·ááá applydeltarpm áá¶áâááá¶ááá á"
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm áá¶áâááá¶ááá á"
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "áááá
áá %s ááá¶áááâáááá»áâáá¶áâáá·áá·áááâáá¶áâáááá¹ááááá¼á á áá¾á¢áááâá
ááâáááá¶áá¶áâáááááááâá¬áá ?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "áááá¶á url áá
âáááá»áâáááá¶áá á"
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "áá·áâá¢á¶á
âáááááâá¯ááá¶á %s áá¸âáááá¶áá %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "áááá»áâá¢á¶áâáááá¶áá '%s'"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "áááá»áâá¢á¶áâáááá áá·áâ rpms áááâáá¶âáá¸áááá¶áá '%s'"
@@ -167,27 +167,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "áááá»áâáááá¢á¶ááááá¶áá '%s'"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "ááâáá·áâáá¾áâáá·ááááááâáááá¶âáááâáááá¹ááááá¼áâáá
URL áááâáá¶áâááááá¶áá"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "áááá»áâáááá¶ááá¶âáááá¶áá '%s'"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "áááá»áâá¢á¶áââáááá¶áá '%s'"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "áááá»áâááááááâáááá¶áá '%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "ááâáááá¶áá '%s' á
áá"
@@ -2640,19 +2641,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "áá¶áâáááá¼áâá¯ááá¶áâáááááâáá
áá¶ááááááááâááááá¶áá %s á"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm áá¶ááâáááá¶âáá»á %s áᶠ%s ááá»ááááâáá¶âá¢á¶á
âáááááâáá¶áâáá»áâáááá¶"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2662,13 +2663,13 @@
"áááâáá¶âááááá¶áá á¢á¥ áá½áâáááá¼áâáá»ááááá¶á\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm áá¶áâááááá¾á %s áᶠ%s ááá»ááááâáá¶âáá·áâá¢á¶á
âáááááâáá¶áâáá»áâáááá¶"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2679,46 +2680,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "áá¶áâááá¡á¾á %s áá¶áâááá¶ááá"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "áááááá rpm á"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "áá¶áâááá¡á¾á %s áááâáááááá"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "áááááá rpm ááááááááá á"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "ááá¶áááâáááá»ááá¶áâáá %s á
áá"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "áá¶áâáá %s á
ááâáááâáááááá"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "áá¶áâááááá¾áâáááááá¶áâááááá»á %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "áá¶áâááá¡á¾á áááá¼ááá¶áâááááááâáááâáááá¶áá á"
@@ -2736,64 +2737,74 @@
msgstr "%s áá¶áâáááá½áâááá %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s áá¹áâáááá¼áâáá¶áâáá»áâáááâá¢áááâáááá¾Â á\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s áá¹áâáááá¼áâáá¶ááá»áâáááâáááááá·áá¸âááááá á (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s áá¹áâáááá¼áâáá¶áâááá¡á¾áâáááââá¢áááâáááá¾Â á\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s áá¹áâáááá¼áâáá¶áâááá¡á¾áâáááâáááááá·áá¸âááááá á (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "ááâáá·áâáá¾áâáááááâáááá¶áâáááá¹ááááá¼áâáááá»áâáááâááá %d áá·áá¶áá¸Â á"
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr "áááááá·áá¸âááááááá¶áâáá¶áâáá¶áâáááâáááâááááá¶áâáááâáá¶áâááááá"
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "ááâáá·áâáá¾áâáááááâáááá¶áâ áááâáá·áâá¢á¶á
âááááááá¶áâááâáááá¶ááááááááâááâááá¢âáááá»á á"
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "áááâá²áááá¶âáááâááááá¶ááâááâá¢ááá¸âá¢á¶á
âááááááá¶áâáá¶áâáá¶âáá½áâáááá¶ááááááááâááâááá¢âáááá»áâáááá¼áâáá¶áâááâáá·á
á¶ááá¶Â á\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "áááâáá¶ááááâáá
âáá¹áâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áâáá¶ááâá¢ááâáááá¼áâáá¶áâááááááá¶â ááá»ááááâá¢á¶á
âááá½áâáá¶áááááááâáááá¹ááááá¼á á"
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "áááááá¶áâáá·áâáááá¹ááááá¼á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s áááá¼ááá¶áâáááâáááá
ááâááááááá¶áâáááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s áááá¼ááá¶áâááá %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2803,7 +2814,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s áááááááá·á
âáá¶áá½áâáááá
ááááááááá¶áâáááááá"
@@ -2812,14 +2823,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s áááâááááá·á
âáá¶áá½áâáá¹á %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2829,24 +2840,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s áááâáááá¾âáááá
ááááááááá¶áâáááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s áááâáááá¾ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s áááâáááá¾Â  á %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2855,7 +2866,7 @@
"áááá
ááááááááá¶ááá¶áááááâáá¹áâáááá¼áâáá¶áâáá»áâá
ááâáá¸âáááááááá á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ááá¢ááâáá¾áááá
ááááááááá¶áâáááááá"
@@ -2863,38 +2874,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s ááá¢áááá¾ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s ááá¢áááá¾Â á %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "áá¼áâáááá"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "áááá¶áâáááá
ááâáá¶âááááá %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2902,31 +2913,31 @@
"\n"
"áá·ááá¶áâáááá¶áâáááâáá¶ááááâááááá¼áâáá¶áâááá á"
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "áááâáá¶áâááâáá¶áâáááá á¶ââáá¼á
âáá¶áâáá·ááááá¶âáá¶áâáá¾/áá¶áâááááá ááááááááá¶áâáááâáá¹áâáá·áâá¢á¶á
âááááááá¶áâáá¶áâá¢á¶áááááâáá¶ááá¢ááâáá¶áâáá"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸áááááâáá¶âáááááááá·á
âáá¶âáá½á %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "áá·áâáá¶áâááá¡á¾á %s á¡á¾á á á¾áâáá¶áâááááá¶ááâáá¶âáᶠá¢á¶á
âáá»áâáá¶á"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áááâáá¶áâáááá¶ááááá á¶âáá¶áâá¢á¶ááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2934,8 +2945,8 @@
msgstr "áá»á %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2943,79 +2954,79 @@
msgstr "áá»áâááá¡á¾á %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s áá¶áâááááá¼áâáá¶áâáááâáá·áâáá¶áâááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s áá¶áâáá¶áâá¢á¶áááááâáááâáá¶áá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¶ááá áááâáá¶áâáá¶ááâáá¶áâá¢á¶ááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s áááááâáá¶áâá¢á¶áááááâáááá %s ááá»ááááâáá¹áâáááá¼áâáá¶ááá»á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s áááááâáá¶áá¢á¶áááááâáááá %s ááá»ááááâáá¹áâáááá¼áâáá¶áâááááá¶áá»áâáá
âáááá»áâááááááááâááááâá¢ááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "áá·áâá
á¶ááá¶á
áâááá¡á¾á %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¾áááá¸âáááááâáá¶áâá¢á¶áááááâáááá %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¾áááá¸âááááááááá
ááâááááá¼ááá¶áâáááá %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s áá¹áâáá·áâáááá¼áâáá¶áâáá»áâáá áá¸áááááâáá¶âáá
âááâáááá¼áâáá¶á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s ááááááá¾ %s á ááá»áááá %s áá·áâá¢á¶á
âáááá¼áâáá¶ááá»á áá¸áááááâáá¶âáá¶áááá á"
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸áááááâáá¶âáááá»áâáááááááá·á
"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "áá·áâá¢á¶á
âáá»á %s áá¶áááâ áááááâáá¶âáááááááá·á
âáá¶âáá½áâáá¹á %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "áá·áâá¢á¶á
âáááááâááááá¼áâáá¶á %s"
@@ -3076,7 +3087,7 @@
msgstr "áá»áâááá¡á¾á á¬âáá»áâá¢ááá¸âáááá¢á¶á
âááááááá¶áâáá¶áâáááâáá¶áááá"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ááááá¶ááâáá¶ááá¶ááá¶á %s á
áááá %s ááááááâáááá¾âá²áá %s áá¶ááâáááá"
@@ -3434,14 +3445,22 @@
msgid "Install missing resolvables"
msgstr "ááá¡á¾áâáááá
ááâááááááá¶áâáááâáá¶áá"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "áááá¾á²ááâá¢áááâááááááá¶áâáááâáá¶áá½áâáááááá¶áâáá¶ááá¢áá á"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "áá¶ááááâáá¹áâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áâáá¶ááâá¢ááââáá¶âáá½áâáááá¶ááááâááááâáááâááâáááá¶Â á"
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr "áááá¾á²ááâáááááá·áá¸ââááááááá¶áâáááââááâáá¶âáá½áâáááá¶ááááááááâáááâááá¢âáááá»áâââááá»ááááá á"
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr "áá¶ááááâáá¹áâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áââááâââáá¶âáá½áâáááá¶ááááááááâáááâááá¢âáááá»áâááá»ááááá á"
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3492,6 +3511,14 @@
msgid "%s part of %s"
msgstr "%s áá¶âáááááâáá %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr "áááááááá¶áâáááááá"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr "á
á¶áááááá¾áâáááááá·áá¸âááááááá¶áâááááá¶ááââáááâáá¶âáá½áâáááâááááá¶áâáááááá á"
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "ááááááâáááá
ááâáááâáááá¶áâáá¶ááá¢áá"
Modified: trunk/libzypp/po/ko.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ko.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/ko.po (original)
+++ trunk/libzypp/po/ko.po Mon Sep 10 16:18:44 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2001-07-18 11:05+0200\n"
"Last-Translator: Hwang, Sang-Jin <violiet(a)suse.de>\n"
"Language-Team: Korean <i18n(a)suse.de>\n"
@@ -112,36 +112,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -165,27 +165,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -3049,19 +3050,19 @@
# progress stage
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "êµ¬ì± íì¼ ì ì¥"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -3069,13 +3070,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -3084,12 +3085,12 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, fuzzy, c-format
msgid "%s install failed"
msgstr "ì¤ì¹ ì¤í¨."
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
#, fuzzy
msgid "rpm output:"
msgstr ""
@@ -3098,37 +3099,37 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, fuzzy, c-format
msgid "%s installed ok"
msgstr "ì, ì¤ì¹ì§í(&Y)"
# dialog caption
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
#, fuzzy
msgid "Additional rpm output:"
msgstr "ì¶ê° 그룹 ì¤ì "
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, fuzzy, c-format
msgid "%s remove failed"
msgstr "rpmì´ ì¤í¨íìµëë¤."
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, fuzzy, c-format
msgid "created backup %s"
msgstr "ë°±ì
ì ìì±íì§ ìì"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -3146,64 +3147,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3211,7 +3222,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1ì %2ì 충ëí©ëë¤"
@@ -3220,14 +3231,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "%1ì %2ì 충ëí©ëë¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3235,31 +3246,31 @@
msgstr "%1ì %2ì 충ëí©ëë¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3267,69 +3278,69 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "ì¤ì¹ì¤:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%1ì %2ì 충ëí©ëë¤"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "ì´ í¨í¤ì§ë ì´ë¯¸ ì¤ì¹ëì´ ìì´ì ì¤ì¹ê° ëì§ ììµëë¤."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3338,8 +3349,8 @@
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3347,80 +3358,80 @@
msgstr "ì¤ì¹ì¤:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, fuzzy, c-format
msgid "%s has missing dependencies"
msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
# text is shown in a line of a package list
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "ë¤ì ì¤ì¹í´ì¼ í©ëë¤."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1ì %2ì 충ëí©ëë¤"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3486,7 +3497,7 @@
msgstr "%1ì %2ì 충ëí©ëë¤"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3851,14 +3862,22 @@
msgid "Install missing resolvables"
msgstr "ëë½ë í¨í¤ì§ ì¤ì¹"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3909,6 +3928,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/lo.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/lo.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/lo.po (original)
+++ trunk/libzypp/po/lo.po Mon Sep 10 16:18:44 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-01-04 08:58+0100\n"
"Last-Translator: i18n(a)suse.de\n"
"Language-Team: Lao <i18n(a)suse.de>\n"
@@ -109,36 +109,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -162,27 +162,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2633,19 +2634,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2653,13 +2654,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2668,46 +2669,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr ""
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2725,64 +2726,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2790,7 +2801,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2799,14 +2810,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2814,31 +2825,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2846,68 +2857,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2915,8 +2926,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2924,79 +2935,79 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3057,7 +3068,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3415,14 +3426,22 @@
msgid "Install missing resolvables"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3473,6 +3492,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr ""
Modified: trunk/libzypp/po/lt.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/lt.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/lt.po (original)
+++ trunk/libzypp/po/lt.po Mon Sep 10 16:18:44 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-05-01 15:00+0300\n"
"Last-Translator: Andrius Å tikonas <stikonas(a)gmail.com>\n"
"Language-Team: Lietuvių <komp_lt(a)konf.lt>\n"
@@ -116,37 +116,37 @@
msgid "History:"
msgstr "PeržiÅ«rÄti istorijÄ
"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm tikrinimas napavyko."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm nepavyko."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "Pridedami resursai"
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Niekas nepateikia %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -171,27 +171,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "Pridedami resursai"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Pridedami resursai"
@@ -2885,19 +2886,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Pakeistos %s konfigūracios bylos:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2905,13 +2906,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2920,46 +2921,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s įdiegimas nesÄkmingas"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm išvestis:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s įdiegtas sÄkmingai"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Papildoma rpm išvestis:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s Å¡alinimas nepavyko"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "padaryta %s atsarginÄ kopija"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2977,64 +2978,74 @@
msgstr "%s pakeistas %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s nebus pašalintas, nes jis vis dar reikalingas"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Klaidinga informacija"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s reikalingas %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3042,7 +3053,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 konfliktuoja su %2"
@@ -3051,14 +3062,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s konfliktuoja su %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3068,31 +3079,31 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3100,68 +3111,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s priklauso nuo %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s priklauso nuo:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Negaliu įdiegti %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Niekas nepateikia %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Nepavyksta įdiegti %s, nes jis konfliktuoja"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s neįdiegtas ir pažymÄtas kaip neįdiegiamas"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Nepavyksta įdiegti %s dÄl priklausomybių problemų"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3169,8 +3180,8 @@
msgstr "pašalinti %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3178,79 +3189,79 @@
msgstr "neįdiegti %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s turi neišpildytų reikalavimų"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s turi trūkstamų priklausomybių"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Netenkinami ryšiai:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Nebūtina įdiegti %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Nepavyksta įdiegti %s dÄl priklausomybių problemų"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s nebus pašalintas, nes jis vis dar reikalingas"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Nepavyksta įdiegti %s, nes jis konfliktuoja"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1 konfliktuoja su %2"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3314,7 +3325,7 @@
msgstr "%1 konfliktuoja su %2"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3675,14 +3686,22 @@
msgid "Install missing resolvables"
msgstr "Įdiegti trūkstamus paketus"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3733,6 +3752,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/mk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/mk.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/mk.po (original)
+++ trunk/libzypp/po/mk.po Mon Sep 10 16:18:44 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2001-07-17 16:12+0200\n"
"Last-Translator: ÐоÑан ÐимовÑки <zoki.dimovski(a)gmail.com>\n"
"Language-Team: Macedonian <i18n(a)suse.de>\n"
@@ -110,36 +110,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -163,27 +163,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2780,19 +2781,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2800,13 +2801,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2815,46 +2816,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr ""
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2872,64 +2873,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2937,7 +2948,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2946,14 +2957,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2961,31 +2972,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2993,70 +3004,70 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
# CL
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, fuzzy
msgid "Child of"
msgstr "Чиле"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3064,8 +3075,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3073,79 +3084,79 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3206,7 +3217,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3564,14 +3575,22 @@
msgid "Install missing resolvables"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3622,6 +3641,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr ""
Modified: trunk/libzypp/po/mr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/mr.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/mr.po (original)
+++ trunk/libzypp/po/mr.po Mon Sep 10 16:18:44 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Check hardware-2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-11-13 12:55+0530\n"
"Last-Translator: Priyavert Sharma <priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n"
@@ -107,37 +107,37 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm à¤à¥à¤ à¤
यशसà¥à¤µà¥"
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm à¤
यशसà¥à¤µà¥"
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "पà¥
à¤à¥à¤ %s à¤à¤à¤¤à¥à¤°à¤¿à¤¤ तपासणà¥à¤¤ à¤
यशसà¥à¤µà¥. à¤à¤ªà¤²à¥à¤¯à¤¾à¤²à¤¾ तॠपà¥à¤¨à¥à¤¹à¤¾ डाà¤à¤¨à¤²à¥à¤¡ à¤à¤°à¤£à¥à¤¯à¤¾à¤à¤¾ पà¥à¤°à¤¯à¤¤à¥à¤¨ à¤à¤°à¤¾à¤¯à¤à¤¾à¤à¤¹à¥?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "à¤à¤¾à¤à¤¡à¤¾à¤°à¤¾à¤¤ फाà¤à¤² %1 à¤à¤¢à¤³à¤²à¥ नाहà¥"
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "%s वरà¥à¤¨ %s पà¥à¤°à¤µà¥ शà¤à¤¤ नाहà¥"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -161,27 +161,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "रिसà¥à¤°à¥à¤¸à¥à¤¸ à¤à¤¤à¤¨ à¤à¤°à¤¤ à¤à¤¹à¥"
@@ -2632,19 +2633,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "%s साठॠबदललà¥à¤²à¥à¤¯à¤¾ à¤à¤à¥à¤¤à¥à¤¬à¤à¤§ फाà¤à¤²à¥à¤¸"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm नॠ%s हॠ%s मà¥à¤¹à¤£à¤¨ à¤à¤¤à¤¨ à¤à¥à¤²à¥, परà¤à¤¤à¥ फरठसाà¤à¤à¤£à¥ à¤
शà¤à¥à¤¯"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2652,13 +2653,13 @@
msgstr "rpm नॠ%s हॠ%s मà¥à¤¹à¤£à¥à¤¨ à¤à¤¤à¤¨ à¤à¥à¤²à¥/nफरà¤à¤¾à¤à¥à¤¯à¤¾ या पहिलà¥à¤¯à¤¾ 25 à¤à¤³à¥\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm नॠ%s हॠ%s मà¥à¤¹à¤£à¥à¤¨ à¤à¤¤à¤¨ à¤à¥à¤²à¥ फरà¤à¤¾à¤à¥à¤¯à¤¾ या पहिलà¥à¤¯à¤¾"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2667,46 +2668,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ à¤
यशसà¥à¤µà¥"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm à¤à¤à¤à¤ªà¥à¤"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ ठà¥à¤ à¤à¤¹à¥"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "à¤
तिरिà¤à¥à¤¤ rpm à¤à¤à¤à¤ªà¥à¤"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s à¤à¤¾à¤¢à¥à¤¨ à¤à¤¾à¤à¤£à¥ à¤
यशसà¥à¤µà¥"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s à¤à¤¾à¤à¤£à¥ ठà¥à¤ à¤à¤¹à¥"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "बà¥
à¤à¤
प %s निरà¥à¤®à¤¾à¤£ à¤à¥à¤²à¥"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "निरà¥à¤¦à¥à¤¶à¤¾à¤¨à¥à¤¸à¤¾à¤° सà¥à¤¥à¤¾à¤ªà¤¨à¤¾ मधà¥à¤ सà¥à¤¡à¤²à¥"
@@ -2724,7 +2725,7 @@
msgstr "%s à¤à¥à¤¯à¤¾ à¤à¤¾à¤à¥ %s "
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2732,58 +2733,68 @@
"हॠरिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ पà¥à¤°à¤£à¤¾à¤²à¥à¤¤à¥à¤¨ पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤²à¥ à¤à¤¾à¤¤à¥à¤²"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s à¤
सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤£à¤¾à¤° नाहॠà¤à¤¾à¤°à¤£ तॠà¤
à¤à¥à¤¨ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¤¹à¥"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "à¤
वà¥à¤§ माहितà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "à¤à¤¤à¤° रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸à¤¨à¤¾ %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s ला %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2791,7 +2802,7 @@
msgstr "%s ला %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥:/n"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s à¤à¥ à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤²à¥à¤¬à¤¶à¥ पà¤à¤¤ नाहà¥"
@@ -2800,14 +2811,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s à¤à¥ %s शॠपà¤à¤¤ नाहà¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2817,24 +2828,24 @@
"%s शॠपà¤à¤¤ नाहà¥:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸à¤¨à¤¾ बाà¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s %s ला बाà¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s :%s ला बाà¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2843,7 +2854,7 @@
"हॠरिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ पà¥à¤°à¤£à¤¾à¤²à¥à¤¤à¥à¤¨ पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤²à¥ à¤à¤¾à¤¤à¥à¤²"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s à¤à¤¤à¤° रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸à¤µà¤° à¤
वलà¤à¤¬à¥à¤¨"
@@ -2851,38 +2862,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s %s वर à¤
वलà¤à¤¬à¥à¤¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s :%s वर à¤
वलà¤à¤¬à¥à¤¨"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "à¤à¤¾à¤à¤²à¥à¤¡ à¤à¤«"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "à¤à¥à¤£à¤¤à¥à¤¹à¥ à¤à¥à¤·à¥à¤ %s पà¥à¤°à¤µà¤¤ नाहà¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2891,32 +2902,32 @@
"\n"
"à¤
सॠà¤à¥à¤£à¤¤à¥à¤¹à¥ साधन à¤à¤ªà¤²à¤¬à¥à¤§ नाहॠà¤à¥ या à¤à¤°à¤à¥à¤²à¤¾ समरà¥à¤¥à¤¨ दà¥à¤¤à¥."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "यà¥à¤ à¤à¤¾à¤¤à¤²à¥à¤²à¥à¤¯à¤¾ समसà¥à¤¯à¤¾, à¤à¥à¤¯à¤¾ या रिà¤à¥à¤²à¥à¤¯à¥à¤¶à¤¨à¤à¥à¤¯à¤¾ वर/à¤à¤¾à¤²à¥ नमà¥à¤¦ à¤à¥à¤²à¥à¤¯à¤¾ à¤à¤¹à¥à¤¤, तà¥à¤¯à¤¾à¤¸à¤°à¥à¤µ à¤
वलà¤à¤¬à¥à¤¨ à¤à¥à¤·à¥à¤à¥ सà¥à¤¡à¤µà¤£à¤¾à¤° नाहà¥à¤¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहॠà¤à¤¾à¤°à¤£ तà¥à¤¯à¤¾à¤à¤à¥ %s शॠपà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ नाहॠव तà¥à¤¯à¤¾à¤µà¤° सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ न à¤à¤°à¤¤à¤¾ यà¥à¤£à¤¾à¤°à¤¾ à¤
शॠà¤à¥à¤£ à¤à¤¹à¥"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "à¤
वलà¤à¤¬à¥à¤¨ à¤
सणà¥à¤¯à¤¾à¤à¥à¤¯à¤¾ (डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥) समसà¥à¤¯à¥à¤®à¥à¤³à¥ %s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2924,8 +2935,8 @@
msgstr "%s पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2933,79 +2944,79 @@
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ नà¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, fuzzy, c-format
msgid "%s has unfulfilled requirements"
msgstr "à¤à¥à¤¯à¤¾ à¤à¤°à¤à¤¾ पà¥à¤°à¥à¤£ न हà¥à¤£à¤¾à¤°à¥à¤¯à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%sà¤à¥à¤¯à¤¾ à¤à¤°à¤à¤¾ पà¥à¤°à¥à¤£ न हà¥à¤£à¤¾à¤°à¥à¤¯à¤¾ à¤à¤¹à¥à¤¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s मधॠà¤à¤¾à¤¯à¤¬ डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ à¤à¤¹à¥à¤¤."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "à¤à¤¾à¤¯à¤¬ डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤¡à¤®à¥à¤³à¥ %s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s %s à¤à¥à¤¯à¤¾ डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ पà¥à¤°à¥à¤£ à¤à¤°à¤¤à¥, परà¤à¤¤à¥ à¤à¤ªà¤²à¥à¤¯à¤¾ पà¥à¤°à¤£à¤¾à¤²à¥à¤µà¤° ठà¥à¤µà¤£à¥à¤¯à¤¾à¤¤ यà¥à¤à¤²"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤£à¥à¤¯à¤¾à¤à¥ à¤à¤°à¤ नाहà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s à¤à¥à¤¯à¤¾ डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ पà¥à¤°à¥à¤£ à¤à¤°à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ ॠ%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s à¤à¥à¤¯à¤¾ डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ पà¥à¤°à¥à¤£ à¤à¤°à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ ॠ%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s à¤
सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤£à¤¾à¤° नाहॠà¤à¤¾à¤°à¤£ तॠà¤
à¤à¥à¤¨ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¤¹à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s %s ला बाà¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥, परà¤à¤¤à¥ %s पà¥à¤¸à¤¤à¤¾ यà¥à¤¤ नाहॠà¤à¤¾à¤°à¤£ तॠलà¥à¤à¥à¤¡ à¤à¤¹à¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¤à¤¾ यà¥à¤ शà¤à¤¤ नाहॠà¤à¤¾à¤°à¤£ तॠविवादासà¥à¤ªà¤¦ à¤à¤¹à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¤à¤¾ यà¥à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤°à¤à¥ नाहॠà¤à¤¾à¤°à¤£ तà¥à¤¯à¤¾à¤à¥ %s शॠपà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3068,7 +3079,7 @@
msgstr "सà¤à¤¬à¤à¤§à¤¿à¤¤ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¿à¤à¤µà¤¾ पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¥ नà¤à¤¾"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s à¤à¥ à¤
पà¤à¥à¤°à¥à¤¡à¤¿à¤à¤ à¤à¤°à¤¤à¤¾à¤à¤¨à¤¾ %s साठॠ%s à¤à¥ à¤à¤°à¤"
@@ -3426,14 +3437,22 @@
msgid "Install missing resolvables"
msgstr "à¤à¤¾à¤¯à¤¬ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¾"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3484,6 +3503,14 @@
msgid "%s part of %s"
msgstr "%s हा %s à¤à¤¾ à¤à¤¾à¤ à¤à¤¹à¥"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "सरà¥à¤µ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ à¤
नलà¥à¤ à¤à¤°à¤¾"
Modified: trunk/libzypp/po/nb.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/nb.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/nb.po (original)
+++ trunk/libzypp/po/nb.po Mon Sep 10 16:18:44 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-08-23 13:41+0200\n"
"Last-Translator: Rune Nordbøe Skillingstad <rune(a)skillingstad.no>\n"
"Language-Team: Norwegian\n"
@@ -115,36 +115,36 @@
msgid "History:"
msgstr "Historie:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm-kontroll mislyktes."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm mislyktes."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Pakken %s består ikke integritetskontrollen. Vil du prøve å laste den ned på nytt?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "Ingen nettadresse i arkiv."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Kan ikke finne filen %s i arkivet %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "Leser arkivmellomlager '%s'"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "Leser oppdaterings- og delta-RPM-er fra arkivmellomlager '%s'"
@@ -168,27 +168,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "Vasker arkivmellomlager '%s'"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Ingen gyldige metadata funnet på spesifisert(e) nettadresse(r)"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "Bygger arkivmellomlager '%s'"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "Leser arkivmellomlager '%s'"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "Legger til arkiv '%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "Fjerner arkivet '%s'"
@@ -2679,19 +2680,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Endrede konfigurasjonsfiler for %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm lagret %s som %s, men det var umulig å finne noen forskjell"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2701,13 +2702,13 @@
"Her er de 25 første avvikende linjene:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm opprettet %s som %s, men det var umulig å finne noen forskjell"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2718,46 +2719,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s installasjon mislyktes"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm-resultat:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s installasjon ok"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Flere rpm-resultater:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s avinstallasjon mislyktes"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s avinstallasjon ok"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "opprettet sikkerhetskopi %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Installasjonen er avbrutt som angitt."
@@ -2775,64 +2776,74 @@
msgstr "%s erstattet av %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s blir fjernet av brukeren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s blir fjernet av et annet program. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s blir installert av brukeren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s blir installert av et annet program. (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, fuzzy, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Fant ingen gyldig løsning med ressurser basert på beste arktiektur."
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Fant ingen gyldig løsning med ressurser basert på beste arktiektur."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Benytter bare ressurser basert på beste arkitektur.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Analyse av alle mulige ressurser tar lang tid, men kan resultere i et gyldig resultat."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Ugyldig informasjon"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s kreves av andre nødvendige pakker"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s kreves av %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2842,7 +2853,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s er i konflikt med andre nødvendige pakker"
@@ -2851,14 +2862,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s er i konflikt med %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2868,24 +2879,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s gjør andre nødvendige pakker foreldet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s forelder %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s forelder:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2894,7 +2905,7 @@
"Disse nødvendige pakkene vil bli fjernet fra systemet."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s avhenger av andre nødvendige pakker"
@@ -2902,38 +2913,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s avhenger av %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s avhenger av:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Underordnet"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Kan ikke installere %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Ingen pakker inneholder %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2941,31 +2952,31 @@
"\n"
"Det er ingen tilgjengelig ressurs som støtter dette kravet."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "På grunn av problemene som er beskrevet over/under, vil ikke denne løsningen løse alle avhengigheter"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Kan ikke installere %s fordi den er i konflikt med %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s er ikke installert, og er merket som ikke installerbar"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Kan ikke installere %s på grunn av problemer med nødvendige pakker"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2973,8 +2984,8 @@
msgstr "slett %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2982,79 +2993,79 @@
msgstr "Ikke installer %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s har ressurskrav som ikke er oppfylt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s mangler nødvendige pakker"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s kan ikke installeres på grunn av manglende nødvendige pakker"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s kreves av %s, men vil bli avinstallert"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s oppfyller krav om nødvendige pakker for %s men beholdes på systemet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Det er ikke nødvendig å installere %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Kan ikke installere %s, som er nødvendig for %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Kan ikke installere %s, som er nødvendig for %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s vil ikke be avinstallert fordi den fremdeles er nødvendig"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s forelder %s. Men %s kan ikke fjernes fordi den er låst."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Kan ikke installere %s fordi den skaper en konflikt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s kan ikke avinstalleres på grunn av konflikter med %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Kravet %s kan ikke løses."
@@ -3115,7 +3126,7 @@
msgstr "Ikke installer eller slett berørte nødvendige ressurser"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "som krever %s for %s ved oppgradering av %s"
@@ -3473,14 +3484,24 @@
msgid "Install missing resolvables"
msgstr "Installer manglende nødvendige pakker"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "La avhengighetsløser kjøre med ALLE mulighetene."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Angående alle ressurser med sammenfallende arkitektur."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "La avhengighetsløser kjøre med ALLE mulighetene."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "Angående alle ressurser med sammenfallende arkitektur."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3531,6 +3552,16 @@
msgid "%s part of %s"
msgstr "%s del av %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b>Tidsavbrudd for dobbeltklikking </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+#, fuzzy
+msgid "Start the next solver run with doubled timeout."
+msgstr "La avhengighetsløser kjøre med ALLE mulighetene."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "fjern beskyttelse for alle nødvendige pakker"
@@ -4916,4 +4947,3 @@
"Filen %s har en ukjent kontrollsum \n"
".Forventet %s, men finner %s\n"
" Vil du bruke filen likevel?"
-
Modified: trunk/libzypp/po/nl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/nl.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/nl.po (original)
+++ trunk/libzypp/po/nl.po Mon Sep 10 16:18:44 2007
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-08-24 13:24+0200\n"
"Last-Translator: Rinse de Vries <rinsedevries(a)kde.nl>\n"
"Language-Team: Dutch <nl(a)li.org>\n"
@@ -119,36 +119,36 @@
msgid "History:"
msgstr "Geschiedenis:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "controle van applydeltarpm is mislukt."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm mislukt."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Pakket %s voldoet niet aan integriteitscontrole. Wilt u het opnieuw proberen?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "Geen url in bron."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Kan bestand %s niet leveren van bron %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "Broncache van '%s' lezen"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "Patch- en delta-prm's van broncache '%s' lezen"
@@ -172,27 +172,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "Cache van bron '%s' opschonen"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Geen geldige metadata gevonden op opgeven URL('s)"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "Cache van bron '%s' bouwen"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "Cache van bron '%s' lezen"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "Bron '%s' toevoegen"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "Bron '%s' verwijderen"
@@ -2645,19 +2646,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Configuratiebestanden gewijzigd voor %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm sloeg %s op als %s, maar het was niet mogelijk om het verschil te achterhalen"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2667,13 +2668,13 @@
"Dit zijn de eerste 25 regels die verschillend zijn:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm maakte %s aan als %s, maar het was niet mogelijk om het verschil te achterhalen"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2684,47 +2685,47 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Installeren van %s is mislukt"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm-uitvoer:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
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:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Aanvullende rpm-uitvoer:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Verwijderen van %s is mislukt"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s is met succes verwijderd"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "reservekopie %s aangemaakt"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Installatie is afgebroken volgens de instructies."
@@ -2742,64 +2743,74 @@
msgstr "%s vervangen door %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s zal worden verwijderd door de gebruiker.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s zal worden verwijderd door een ander programma (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s zal worden geïnstalleerd door de gebruiker.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s zal worden geïnstalleerd door een ander programma (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, fuzzy, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Geen geldige oplossing gevonden met alleen oplosbaren van de beste architectuur."
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Geen geldige oplossing gevonden met alleen oplosbaren van de beste architectuur."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Bij deze draai zijn alleen oplosbaren met de beste architectuur overwogen.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Het overwegen van alle mogelijke oplosbaren neemt enige tijd in beslag maar kan een bruikbaar resultaat opleveren."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Ongeldige informatie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s is nodig voor andere oplosbare"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s is nodig voor %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2809,7 +2820,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s is in conflict met andere oplosbaren"
@@ -2818,14 +2829,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s is in conflict met %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2835,24 +2846,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s vervangt andere oplosbaren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s vervangt %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s vervangt: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2861,7 +2872,7 @@
"Deze oplosbaren zullen worden verwijderd van het systeem."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s is afhankelijk van andere oplosbaren"
@@ -2869,38 +2880,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s is afhankelijk van %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s is afhankelijk van: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Subonderdeel van"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Kan %s niet installeren"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Niemand levert %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2908,31 +2919,31 @@
"\n"
"Er is momenteel geen gegevensbron beschikbaar die deze vereiste aanlevert."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Vanwege bovenstaande/onderstaande problemen zal deze oplossing niet alle afhankelijkheden verhelpen."
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Kan %s niet installeren omdat het in conflict is met %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s is niet geïnstalleerd en is gemarkeerd als deïnstalleerbaar"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "%s kan niet worden geïnstalleerd vanwege afhankelijkheidsproblemen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2940,8 +2951,8 @@
msgstr "%s verwijderen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2949,79 +2960,79 @@
msgstr "%s niet installeren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "er is niet voldaan aan de vereisten voor %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "afhankelijkheden voor %s ontbreken"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s kan niet worden geïnstalleerd omdat afhankelijkheden ontbreken"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s lost de afhankelijkheden van %s op, maar zal worden gedeïnstalleerd."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s lost de afhankelijkheden van %s op, maar zal op het systeem blijven staan"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "%s hoeft niet te worden geïnstalleerd"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Kan %s niet installeren om de afhankelijkheden van %s op te lossen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Kan %s niet installeren om de afhankelijkheden van %s op te lossen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s zal niet worden gedeïnstalleerd omdat het nog steeds vereist wordt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s vervangt %s. Maar %s kan niet worden verwijderd omdat het is vergrendeld."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Kan %s niet installeren omdat het conflicten geeft"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s kan niet worden geïnstalleerd vanwege conflicten met %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Aan vereiste %s kan niet worden voldaan."
@@ -3082,7 +3093,7 @@
msgstr "Installeer of verwijder de desbetreffende oplosbare pakketten niet"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "voor het verkrijgen van %s voor %s bij het upgraden van %s"
@@ -3440,14 +3451,24 @@
msgid "Install missing resolvables"
msgstr "Ontbrekende oplosbare pakketten installeren"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "Voer een oplosbaarheidsdraai uit met ALLE mogelijkheden."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Alle oplosbaren met geschikte architectuur worden overwogen."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "Voer een oplosbaarheidsdraai uit met ALLE mogelijkheden."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "Alle oplosbaren met geschikte architectuur worden overwogen."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3498,6 +3519,16 @@
msgid "%s part of %s"
msgstr "%s onderdeel van %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b>Time-out voor dubbelklikken </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+#, fuzzy
+msgid "Start the next solver run with doubled timeout."
+msgstr "Voer een oplosbaarheidsdraai uit met ALLE mogelijkheden."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "alle oplosbare pakketten ontgrendelen"
@@ -4792,4 +4823,3 @@
"Bestand %s heeft een ongeldige checksum.\n"
"%s verwacht, %s gevonden\n"
"Wilt u het toch gebruiken?"
-
Modified: trunk/libzypp/po/pa.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pa.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/pa.po (original)
+++ trunk/libzypp/po/pa.po Mon Sep 10 16:18:44 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp.pa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-08-23 19:28+0530\n"
"Last-Translator: A S Alam <aalam(a)users.sf.net>\n"
"Language-Team: Panjabi <punjabi-l10n(a)lists.sf.net>\n"
@@ -115,36 +115,36 @@
msgid "History:"
msgstr "à¨
ਤà©à¨¤:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm à¨à©à©±à¨ ਫà©à¨²à©à¨¹ ਹà©à¥¤"
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm ਫà©à¨²à©à¨¹ ਹà©à¨à¨à¥¤"
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "ਪà©à¨à©à¨ %s à¨à¨à¨à©à¨à¨°à©à¨à© à¨à©à¨ à¨à¨°à¨¨ ਲਠਫà©à¨²à©à¨¹ ਹà©à¥¤ à¨à© ਤà©à¨¸à©à¨ ਮà©à©-à¨à©à¨¸à¨¼à¨¿à¨¸à¨¼ à¨à¨°à¨¨à© à¨à¨¾à¨¹à©à©°à¨¦à© ਹà©?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© ਵਿੱਠà¨à©à¨ URL ਨਹà©à¨ ਹà©à¥¤"
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "'%s' ਰਿਪà©à¨à¨¼à¨à¨°à© à¨à©à¨à© ਪà©à©à¨¹à© à¨à¨¾ ਰਹ੠ਹà©"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -168,27 +168,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' à¨à©à¨à© ਸਾਫ਼ à¨à©à¨¤à© à¨à¨¾ ਰਹ੠ਹà©"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' à¨à©à¨à© ਬਿਲਡ à¨à©à¨¤à© à¨à¨¾ ਰਹ੠ਹà©"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' à¨à©à¨à© ਪà©à©à¨¹à© à¨à¨¾ ਰਹ੠ਹà©"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' ਸ਼ਾਮਲ à¨à©à¨¤à© à¨à¨¾ ਰਹ੠ਹà©"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "ਰਿਪà©à¨à¨¼à¨à¨°à© '%s' ਹà¨à¨¾à¨ à¨à¨¾ ਰਹ੠ਹà©à¥¤"
@@ -2639,19 +2640,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "%s ਲਠਸੰਰà¨à¨¨à¨¾ ਫਾà¨à¨²à¨¾à¨ ਬਦਲà©à¨à¨:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2659,13 +2660,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2674,46 +2675,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² ਫà©à¨²à©à¨¹ ਹà©"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm à¨à¨à¨à¨ªà©à©±à¨:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¨à¨"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "ਹà©à¨° rpm à¨à¨à¨à¨ªà©à©±à¨:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s ਹà¨à¨¾à¨à¨£à¨¾ ਫà©à¨²à©à¨¹"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s ਹà¨à¨¾à¨à¨"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "%s ਦਾ ਬà©à¨à¨
ੱਪ ਬਣਿà¨"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ ਹਦਾà¨à¨¤à¨¾à¨ ਮà©à¨¤à¨¾à¨¬à¨ à¨
ਧà©à¨°à© à¨à©±à¨¡à© à¨à¨ ਹà©à¥¤"
@@ -2731,64 +2732,74 @@
msgstr "%s ਨà©à©° %s ਨਾਲ ਬਦਲਿਠà¨à¨¿à¨"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s ਨà©à©° ਯà©à¨à¨¼à¨° ਵਲà©à¨ ਹà¨à¨¾à¨à¨ à¨à¨¾à¨µà©à¨à¨¾à¥¤\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s ਨà©à©° ਹà©à¨° à¨à¨¾à¨°à¨ ਵਲà©à¨ ਹà¨à¨¾à¨à¨ à¨à¨¾à¨µà©à¨à¨¾à¥¤ (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s ਨà©à©° ਯà©à¨à¨¼à¨° ਵਲà©à¨ à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾à¨µà©à¨à¨¾à¥¤\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "à¨à¨²à¨¤ à¨à¨¾à¨£à¨à¨¾à¨°à©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s %s ਰਾਹà©à¨ à¨à¨¾à¨¹à©à¨¦à¨¾ ਹà©"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2798,7 +2809,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2807,14 +2818,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s ਦਾ %s ਨਾਲ à¨
ਪਵਾਦ ਹà©"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2824,24 +2835,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2850,7 +2861,7 @@
"à¨à¨¹ ਹੱਲ-à¨à¨°à¨¨-ਯà©à¨ ਸਿਸà¨à¨® ਤà©à¨ ਹà¨à¨¾à¨ à¨à¨¾à¨£à¨à©à¥¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2858,38 +2869,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s %s à¨à©±à¨¤à© ਨਿਰà¨à¨° ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s ਨਿਰà¨à¨° ਹà©: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "à¨à¨¾à¨à¨²à¨¡"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "%s à¨à©à¨ ਨਹà©à¨ ਦਿੰਦਾ ਹà©"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2897,31 +2908,31 @@
"\n"
"à¨à¨¹ ਲà©à© ਨà©à©° ਪà©à¨°à© à¨à¨°à¨¨ ਲਠà¨à©à¨ ਸਰà©à¨¤ à¨à¨ªà¨²à©±à¨¬à¨§ ਨਹà©à¨ ਹà©à¥¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s ਨà©à©° à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾, à¨à¨¿à¨à¨à¨à¨¿ à¨à¨¸ ਦਾ %s ਨਾਲ à¨
ਪਵਾਦ ਹà©à¥¤"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ ਹ੠à¨
ਤ੠à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨²à¨¯à©à¨ ਮਾਰਠà¨à©à¨¤à¨¾ à¨à¨¿à¨"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "ਨਿਰà¨à¨°à¨¤à¨¾ ਸਮੱਸਿà¨à¨µà¨¾à¨ à¨à¨°à¨à© %s à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾ ਹà©à¥¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2929,8 +2940,8 @@
msgstr "%s ਹà¨à¨¾à¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2938,79 +2949,79 @@
msgstr "%s ਨà©à©° ਨਾ ਹà¨à¨¾à¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s ਲਠਨਿਰà¨à¨°à¨¤à¨¾ à¨
ਧà©à¨°à© ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s ਨà©à©° ਨਿਰà¨à¨°à¨¤à¨¾ à¨
ਧà©à¨°à© ਹà©à¨£ à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਦ੠ਲà©à© ਨਹà©à¨ ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s ਨà©à©° %s ਦ੠ਨਿਰà¨à¨°à¨¤à¨¾ ਪà©à¨°à© ਨਾ ਹà©à¨£ à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s ਨà©à©° %s ਦ੠ਨਿਰà¨à¨°à¨¤à¨¾ ਪà©à¨°à© ਨਾ ਹà©à¨£ à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ਨà©à©° à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾à¨µà©à¨à¨¾, à¨à¨¿à¨à¨à¨à¨¿ à¨à¨¹ ਹਾਲ੠ਵ੠ਲà©à©à©à¨¦à¨¾ ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s ਨà©à©° à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾, à¨à¨¿à¨à¨à¨à¨¿ à¨à¨¹ à¨
ਪਵਾਦ ਪà©à¨¦à¨¾ à¨à¨°à¨¦à¨¾ ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "%s ਲà©à© ਪà©à¨°à© ਨਹà©à¨ à¨à©à¨¤à© à¨à¨¾ ਸà¨à¨¦à© ਹà©à¥¤"
@@ -3071,7 +3082,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3429,14 +3440,23 @@
msgid "Install missing resolvables"
msgstr "à¨à©à©°à¨® ਹੱਲ-ਯà©à¨ à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à©"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "ਸà©à¨²à¨µà¨° ਨà©à©° _ਸà¨_ ਸੰà¨à¨µà¨¾à¨¨à¨¾à¨µà¨¾à¨ ਨਾਲ à¨à¨²à¨¾à¨"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "ਸà©à¨²à¨µà¨° ਨà©à©° _ਸà¨_ ਸੰà¨à¨µà¨¾à¨¨à¨¾à¨µà¨¾à¨ ਨਾਲ à¨à¨²à¨¾à¨"
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3487,6 +3507,15 @@
msgid "%s part of %s"
msgstr "%s %s ਦਾ à¨à¨¾à¨ ਹà©"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+#, fuzzy
+msgid "Start the next solver run with doubled timeout."
+msgstr "ਸà©à¨²à¨µà¨° ਨà©à©° _ਸà¨_ ਸੰà¨à¨µà¨¾à¨¨à¨¾à¨µà¨¾à¨ ਨਾਲ à¨à¨²à¨¾à¨"
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "ਸਠਹੱਲਯà©à¨ à¨
ਣਲਾਠà¨à¨°à©"
@@ -4780,4 +4809,3 @@
"ਫਾà¨à¨² %s ਦਾ à¨à©à¨à¨¸à¨® à¨à¨²à¨¤ ਹà©à¥¤\n"
"%s ਦ੠ਲà©à© ਸà©, ਮਿਲਿਠ%s\n"
"à¨à© ਫਾà¨à¨² à¨à©°à¨ ਹ੠ਵਰਤਣ੠ਹà©?"
-
Modified: trunk/libzypp/po/pl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pl.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/pl.po (original)
+++ trunk/libzypp/po/pl.po Mon Sep 10 16:18:44 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-08-24 08:53+0100\n"
"Last-Translator: wadim dziedzic <wdziedzic(a)aviary.pl>\n"
"Language-Team: <pl(a)li.org>\n"
@@ -114,36 +114,36 @@
msgid "History:"
msgstr "Historia:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "Sprawdzenie applydeltarpm zakoÅczone niepowodzeniem."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm zakoÅczone niepowodzeniem."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Pakiet %s nie speÅnia testu integralnoÅci. Czy spróbowaÄ ponownie?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "W repozytorium nie ma żadnego adresu URL."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr " Nie można pobraÄ pliku %s z repozytorium %s."
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "Wczytywanie pamiÄci podrÄcznej repozytorium \"%s\""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "Wczytywanie pakietów rpm z pamiÄci podrÄcznej repozytorium \"%s\""
@@ -167,27 +167,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "Czyszczenie pamiÄci podrÄcznej repozytorium \"%s\""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Pod podanymi adresami URL nie znaleiono poprawnych metadanych."
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "Budowanie pamiÄci podrÄcznej repozytorium \"%s\""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "Wczytywanie pamiÄci podrÄcznej repozytorium \"%s\""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "Dodawanie repozytorium \"%s\""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "Usuwanie repozytorium '%s'"
@@ -2660,19 +2661,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Zmienione pliki konfiguracyjne dla %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm zapisaÅ %s jako %s, ale można byÅo okreÅliÄ różnicy"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2682,13 +2683,13 @@
"Oto pierwszych 25 linii różnicy:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm utworzyÅ %s jako %s, ale można byÅo okreÅliÄ różnicy"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2699,46 +2700,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Instalacja %s nie powiodÅa siÄ"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "WyjÅcie rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "Pakiet %s poprawnie zainstalowany"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Dodatkowe wyjÅcie rpm:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "UsuniÄcie %s nie powiodÅo siÄ"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "UsuniÄcie %s powiodÅo siÄ"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "utworzono zapasowy %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Instalacja przerwana zgodnie z życzeniem."
@@ -2756,64 +2757,74 @@
msgstr "%s zastÄ
piony przez %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s zostanie usuniÄty przez użytkownika.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s zostanie usuniÄty przez innÄ
aplikacjÄ. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s zostanie zainstalowany przez użytkownika.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s zostanie zainstalowany przez innÄ
aplikacjÄ. (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, fuzzy, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Brak rozwiÄ
zania z tylko z obiektami z najlepszÄ
architekturÄ
."
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Brak rozwiÄ
zania z tylko z obiektami z najlepszÄ
architekturÄ
."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "W tym przebiegu pod uwagÄ wziÄto tylko obiekty z najlepszÄ
architekturÄ
.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "UwzglÄdnienie wszystkich obiektów może daÄ poprawne rozwiÄ
zanie, ale wymaga czasu."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "NieprawidÅowa informacja"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s jest wymagany przez inne pakiety"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s jest wymagany przez %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2823,7 +2834,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s jest w konflikcie z innymi pakietami"
@@ -2832,14 +2843,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s jest w konflikcie z %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2849,24 +2860,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s dezaktualizuje inne pakiety"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s dezaktualizuje %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s dezaktualizuje:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2875,7 +2886,7 @@
"Te pakiety zostanÄ
usuniÄte z systemu."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s zależy od innych pakietów"
@@ -2883,38 +2894,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s zależy od %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s zależy od:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Potomek"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Nie można zainstalowaÄ %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Żaden nie dostarcza %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2922,31 +2933,31 @@
"\n"
"Nie ma dostÄpnego zasobu, który speÅniaÅby te wymaganie."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Z powodu powyżej/poniżej opisanych problemów, rozwiÄ
zanie to nie bÄdzie mogÅo zaspokoiÄ wszystkich zależnoÅci"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Nie można zainstalowaÄ %s, ponieważ jest w konflikcie z %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s nie jest zainstalowany i zostaÅ oznaczony jako nie do odinstalowania"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Nie można zainstalowaÄ %s z powodu problemów z zależnoÅciami"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2954,8 +2965,8 @@
msgstr "usuÅ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2963,79 +2974,79 @@
msgstr "nie instaluj %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s ma niespeÅnione wymagania"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s ma brakujÄ
ce zależnoÅci"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s nie może zostaÄ zainstalowany z powodu brakujÄ
cych zależnoÅci"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s speÅnia zależnoÅci %s, ale zostanie odinstalowany"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s speÅnia zależnoÅci %s, ale bÄdzie pozostawiony"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Nie ma potrzeby instalowaÄ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Nie można zainstalowaÄ %s by speÅniÄ zależnoÅci %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Nie można zainstalowaÄ %s by speÅniÄ zależnoÅci %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s nie zostanie odinstalowany, ponieważ jest nadal wymagany"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s dezaktualizuje %s, ale %s nie może zostaÄ usuniÄty, ponieważ jest zablokowany."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Nie można zainstalowaÄ %s, ponieważ jest w konflikcie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s jest nie do odinstalowania z powodu konfliktu z %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Wymaganie %s nie może byÄ speÅnione."
@@ -3096,7 +3107,7 @@
msgstr "Nie instaluj ani nie usuwaj danych obiektów"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "dla wymagania %s dla %s, podczas aktualizacji %s"
@@ -3454,14 +3465,24 @@
msgid "Install missing resolvables"
msgstr "Zainstaluj brakujÄ
ce pakiety"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "Uruchom rozwiÄ
zywanie z WSZYSTKIMI możliwoÅciami"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Z uwzglÄdnieniem wszystkich obiektów o kompatybilnej architekturze."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "Uruchom rozwiÄ
zywanie z WSZYSTKIMI możliwoÅciami"
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "Z uwzglÄdnieniem wszystkich obiektów o kompatybilnej architekturze."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3512,6 +3533,15 @@
msgid "%s part of %s"
msgstr "%s jest czÄÅciÄ
%s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+#, fuzzy
+msgid "Start the next solver run with doubled timeout."
+msgstr "Uruchom rozwiÄ
zywanie z WSZYSTKIMI możliwoÅciami"
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "Odblokuj wszystkie pakiety rozwiÄ
zywalne"
Modified: trunk/libzypp/po/pt.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pt.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/pt.po (original)
+++ trunk/libzypp/po/pt.po Mon Sep 10 16:18:44 2007
@@ -12,8 +12,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
-"PO-Revision-Date: 2007-08-24 13:47+0100\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
+"PO-Revision-Date: 2007-09-06 12:45+0100\n"
"Last-Translator: Carlos Gonçalves <carlos(a)pinguix.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
@@ -117,36 +117,36 @@
msgid "History:"
msgstr "Histórico:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "falhou a verificação applydeltarpm."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "falhou o applydeltarpm."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "O pacote %s falhou a verificação de integridade. Pretende tentar novamente?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "Nenhum url no repositório."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Não é possÃvel fornecer o ficheiro %s do repositório %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "A ler cache do repositório '%s'"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "A ler as correcções e delta rpms da cache do repositório '%s'"
@@ -170,27 +170,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "A limpar a cache do repositório '%s'"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Não foi encontrada uma metadata válida no(s) URL(s) especificado(s)"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "A construir a cache do repositório '%s'"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "A ler a cache do repositório '%s'"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "A Adicionar repositório '%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "A remover o repositório '%s'"
@@ -2723,19 +2724,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Ficheiros de configuração modificados para %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "o rpm %s foi guardado como %s, mas foi impossÃvel determinar a diferença"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2745,13 +2746,13 @@
"Tem as primeiras 25 linhas diferentes:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "o rpm %s foi criado como %s, mas foi impossÃvel determinar a diferença"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2762,46 +2763,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Falhou a instalação de %s"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "Resultado do rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s instalado com sucesso"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Resultado adicional do rpm:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Falha ao remover %s "
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s removido com sucesso"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "Criar Cópia de Segurança %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "A instalação foi interrompida conforme indicado."
@@ -2819,64 +2820,74 @@
msgstr "%s é substituÃdo por %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s será apagado pelo utilizador.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s será apagado por outra aplicação. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s será instalado pelo utilizador.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s será instalado por outra aplicação (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Não foi encontrada uma solução válida em %d segundos"
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr "O solvente atingiu o tempo-limite definido"
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Não foi encontrada uma solução válida apenas com os resolúveis da melhor arquitectura."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Nesta execução apenas foram tomados em consideração os resolúveis com a melhor arquitectura.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Ter em conta todos os resolúveis leva tempo, mas pode alcançar um resultado válido."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Informação Inválida"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s é necessário por outros resolúveis"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s necessita o %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2886,7 +2897,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s conflitua com outros resolúveis"
@@ -2895,14 +2906,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s em conflicto com %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2912,24 +2923,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s torna obsoletos outros resolúveis"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s obsoleto %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s obsoleto:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2938,7 +2949,7 @@
"Estes resolúveis serão apagados do sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depende de outros resolúveis"
@@ -2946,38 +2957,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s depende de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s depende de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Filho de"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Não foi possÃvel instalar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Não fornece %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2985,31 +2996,31 @@
"\n"
"Não existe nenhum recurso disponÃvel com suporte para este requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Devido aos problemas descritos acima/abaixo, esta resolução não irá solucionar todas as dependências"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Não foi possÃvel instalar %s devido a um conflicto com %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "o %s não está instalado e foi marcado como possÃvel de desinstalar"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Não foi possÃvel instalar %s devido a problemas de dependências"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3017,8 +3028,8 @@
msgstr "apagar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3026,79 +3037,79 @@
msgstr "não instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s tem requisitos não satisfeitos"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s tem dependências em falta"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s não pode ser instalado devido a dependências em falta"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s satisfaz as dependências de %s mas vai ser desinstalado"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s satisfaz as dependências de %s mas vai ser mantido no seu sistema"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Não é necessário instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Não é possÃvel instalar %s para satisfazer as dependências de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Não é possÃvel instalar %s para satisfazer as dependências de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s não irá ser desinstalado porque ainda é requerido"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s torna %s obsoleto. Mas %s não pode ser apagado porque está trancado."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Não foi possÃvel instalar %s devido a estar em conflito"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "não é possÃvel desinstalar %s devido a conflitos com %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "O requisito %s não pôde ser satisfeito."
@@ -3159,7 +3170,7 @@
msgstr "Não instalar ou apagar os resolúveis em causa"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "por requerer %s para %s quando esta a actualizar %s"
@@ -3518,14 +3529,22 @@
msgid "Install missing resolvables"
msgstr "Instalar resolúveis em falta"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "Fazer o solvente executar com TODAS as possibilidades."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Tomar em consideração todos os resolúveis com uma arquitectura compatÃvel."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr "Fazer um solvente executar apenas com a melhor arquitectura."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr "Tomar em consideração todos os resolúveis apenas com a melhor arquitectura."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3576,6 +3595,14 @@
msgid "%s part of %s"
msgstr "%s faz parte de %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr "Tempo-limite duplo"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr "Iniciar a execução do próximo solvente com tempo-limite duplo."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "destrancar todos os resolúveis"
Modified: trunk/libzypp/po/pt_BR.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pt_BR.po?rev=7166&r1=…
==============================================================================
--- trunk/libzypp/po/pt_BR.po (original)
+++ trunk/libzypp/po/pt_BR.po Mon Sep 10 16:18:44 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-05-31 14:44\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -114,37 +114,37 @@
msgid "History:"
msgstr "XF86History"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "Falha na verificação de applydeltarpm."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "Falha de applydeltarpm."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Falha na verificação de integridade do pacote %s. Deseja repetir o download?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "Arquivo %1 não encontrado no repositório."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "ImpossÃvel fornecer %s a partir de %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -169,27 +169,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "Adicionando recursos"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Adicionando recursos"
@@ -2640,19 +2641,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Arquivos de configuração alterados para %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm gravou %s como %s, mas não foi possÃvel determinar a diferença"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2662,13 +2663,13 @@
"Aqui estão as 25 primeiras linhas de diferença:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm criou %s como %s, mas não foi possÃvel determinar a diferença"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2679,46 +2680,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Falha na instalação de %s"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "saÃda de rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s instalado com êxito"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "SaÃda de rpm adicional:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Falha na remoção de %s"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s removido com êxito"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "backup %s criado"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "A instalação foi interrompida conforme instruções."
@@ -2736,7 +2737,7 @@
msgstr "%s substituÃdo por %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2744,58 +2745,68 @@
"Esses resolvÃveis serão apagados do sistema."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s não será desinstalado porque ainda é necessário"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Informações inválidas"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s é necessário a outros resolvÃveis"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s é necessário a %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2805,7 +2816,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s está em conflito com outros resolvÃveis"
@@ -2814,14 +2825,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s conflitos com %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2831,24 +2842,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s torna outros resolvÃveis obsoletos"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s torna obsoleto %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s torna obsoleto:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2857,7 +2868,7 @@
"Esses resolvÃveis serão apagados do sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depende de outros resolvÃveis"
@@ -2865,38 +2876,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s depende de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s depende de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Filho de "
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Não é possÃvel instalar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Nenhum fornece %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2905,32 +2916,32 @@
"\n"
"Não há nenhum recurso disponÃvel que atenda a esse requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Devido aos problemas descritos acima/abaixo, essa solução não resolverá todas as dependências"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Não é possÃvel instalar %s porque ele entra em conflito com %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s não está instalado e foi marcado como não instalável"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Não é possÃvel instalar %s devido a problemas de dependência"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2938,8 +2949,8 @@
msgstr "apagar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2947,79 +2958,79 @@
msgstr "não instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s tem requisitos não atendidos"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s tem dependências ausentes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s não pode ser instalado devido à ausência de dependências"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s preenche as dependências de %s, mas será desinstalado"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s preenche as dependências de %s, mas será mantido no sistema"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Não é necessário instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Não é possÃvel instalar %s para preencher as dependências de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Não é possÃvel instalar %s para preencher as dependências de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s não será desinstalado porque ainda é necessário"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s torna %s obsoleto. Mas %s não pode ser apagado porque está bloqueado."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Não é possÃvel instalar %s porque ele está em conflito"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s não pode ser desinstalado devido a conflitos com %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3082,7 +3093,7 @@
msgstr "Não instalar ou apagar resolvÃveis de interesse"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "para exigir %s para %s ao fazer o upgrade de %s"
@@ -3440,14 +3451,22 @@
msgid "Install missing resolvables"
msgstr "Instalar resolvÃveis ausentes"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3498,6 +3517,15 @@
msgid "%s part of %s"
msgstr "%s parte de %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b>Tempo de Espera de Clique Duplo </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "desbloquear todos os resolvÃveis"
Modified: trunk/libzypp/po/ro.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ro.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/ro.po (original)
+++ trunk/libzypp/po/ro.po Mon Sep 10 16:18:44 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2003-02-25 15:04+0100\n"
"Last-Translator: <i18n(a)suse.de>\n"
"Language-Team: Romanian <i18n(a)suse.de>\n"
@@ -110,36 +110,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -163,27 +163,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2894,19 +2895,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "Salvez fiÅierele de configuraÅ£ie"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2914,13 +2915,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2929,12 +2930,12 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, fuzzy, c-format
msgid "%s install failed"
msgstr "InstaleazÄ &inetd"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
#, fuzzy
msgid "rpm output:"
msgstr ""
@@ -2943,36 +2944,36 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, fuzzy, c-format
msgid "%s installed ok"
msgstr "MÄrime instalatÄ:"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
#, fuzzy
msgid "Additional rpm output:"
msgstr "&Opţiuni ipppd adiţionale"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, fuzzy, c-format
msgid "created backup %s"
msgstr "CreeazÄ arhiva backup"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2990,64 +2991,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3055,7 +3066,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 intrÄ Ã®n conflict cu %2"
@@ -3064,14 +3075,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "%1 intrÄ Ã®n conflict cu %2"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3079,31 +3090,31 @@
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3111,68 +3122,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "InstaleazÄ %1"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Acest pachet nu este instalat Åi nici nu va fi instalat."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3180,8 +3191,8 @@
msgstr "Återge %1"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3189,79 +3200,79 @@
msgstr "InstaleazÄ %1"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, fuzzy, c-format
msgid "%s has missing dependencies"
msgstr "Verific dependenţele..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Verific dependenţele..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "Instalare automatÄ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Verific dependenţele..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "Verific dependenţele..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3325,7 +3336,7 @@
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3688,14 +3699,22 @@
msgid "Install missing resolvables"
msgstr "Instalez driver-ul..."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3746,6 +3765,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/ru.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ru.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/ru.po (original)
+++ trunk/libzypp/po/ru.po Mon Sep 10 16:18:44 2007
@@ -12,8 +12,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
-"PO-Revision-Date: 2007-08-24 14:01+0400\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
+"PO-Revision-Date: 2007-09-09 12:11+0400\n"
"Last-Translator: Nikolay Derkach <nderkach(a)gmail.com>\n"
"Language-Team: <opensuse-ru(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
@@ -121,36 +121,36 @@
msgid "History:"
msgstr "ÐÑÑоÑиÑ:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "Ñбой пÑи пÑовеÑке applydeltarpm."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "Ñбой в applydeltarpm."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Сбой пÑи пÑовеÑке ÑелоÑÑноÑÑи пакеÑа %s. ÐопÑобоваÑÑ Ð·Ð°Ð½Ð¾Ð²Ð¾?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "ÐÐµÑ url в ÑепозиÑаÑии."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Ðе ÑдаеÑÑÑ Ð¿ÑедоÑÑавиÑÑ Ñайл %s из ÑепозиÑаÑÐ¸Ñ %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "ЧиÑаеÑÑÑ ÐºÑÑ ÑепозиÑаÑÐ¸Ñ '%s'"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "ЧиÑаÑÑÑÑ Ð¸ÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ delta rpm из '%s' кÑÑа ÑепозиÑаÑиÑ"
@@ -174,27 +174,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "ÐÑиÑаеÑÑÑ ÐºÑÑ ÑепозиÑаÑÐ¸Ñ '%s'"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "ÐейÑÑвÑÑÑие меÑаданнÑе не Ð½Ð°Ð¹Ð´ÐµÐ½Ñ Ð¿Ð¾ ÑказаннÑм URL"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "СобиÑаеÑÑÑ ÐºÑÑ ÑепозиÑаÑÐ¸Ñ '%s'"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "ЧиÑаеÑÑÑ ÐºÑÑ ÑепозиÑаÑÐ¸Ñ '%s'"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "ÐобавлÑеÑÑÑ ÑепозиÑаÑий '%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "УдалÑеÑÑÑ ÑепозиÑаÑий '%s'"
@@ -2698,19 +2699,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "ÐзмененнÑе ÑÐ°Ð¹Ð»Ñ ÐºÐ¾Ð½ÑигÑÑаÑии Ð´Ð»Ñ %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm ÑоÑ
Ñанен %s как %s, но не возможно опÑеделиÑÑ ÑазлиÑиÑ"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2720,13 +2721,13 @@
"ÐеÑвÑе 25 ÑÑÑок ÑазлиÑий:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm Ñоздал %s как %s, но ÑÑо бÑло невозможно опÑеделиÑÑ ÑазлиÑиÑ"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2737,48 +2738,48 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Ñбой пÑи ÑÑÑановке %s"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "вÑÑ
од rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s ÑÑÑановлен ÑÑпеÑно"
# dialog caption
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "ÐополниÑелÑнÑй вÑвод rpm:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Ñбой пÑи Ñдалении %s "
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s Ñдален ÑÑпеÑно"
# Proposal for backup during update
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "ÑÐ¾Ð·Ð´Ð°Ð½Ð½Ð°Ñ ÑезеÑÐ²Ð½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "УÑÑановка пÑеÑвана ÑоглаÑно инÑÑÑÑкÑии."
@@ -2796,64 +2797,74 @@
msgstr "%s заменен на %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s бÑÐ´ÐµÑ Ñдален полÑзоваÑелем.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s бÑÐ´ÐµÑ Ñдален дÑÑгим пÑиложением. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s бÑÐ´ÐµÑ ÑÑÑановлен полÑзоваÑелем.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s бÑÐ´ÐµÑ ÑÑÑановлен дÑÑгим пÑиложением. (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Ðе найдено пÑавилÑного ÑеÑÐµÐ½Ð¸Ñ Ð·Ð° %d ÑекÑнд"
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr "РеÑаÑÑее ÑÑÑÑойÑÑво доÑÑигло опÑеделенного вÑемени ожиданиÑ"
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Ðе найдено пÑавилÑное ÑеÑÐµÐ½Ð¸Ñ Ñ Ð¾Ð±ÑекÑами ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей ÑолÑко Ñ Ð¿Ð¾Ð´Ñ
одÑÑей аÑÑ
иÑекÑÑÑой."
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Ð ÑÑом Ñикле ÑаÑÑмаÑÑивалиÑÑ ÑолÑко обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей Ñ Ð»ÑÑÑей аÑÑ
иÑекÑÑÑой.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "ЧÑение вÑеÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей Ð·Ð°Ð¹Ð¼ÐµÑ Ð½ÐµÐºÐ¾ÑоÑое вÑемÑ, но Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑивеÑÑи к пÑавилÑÐ½Ð¾Ð¼Ñ ÑезÑлÑÑаÑÑ."
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "ÐепÑавилÑÐ½Ð°Ñ Ð¸Ð½ÑоÑмаÑиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s необÑ
одим дÑÑгим обÑекÑам ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s необÑ
одим Ð´Ð»Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2863,7 +2874,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s конÑликÑÑÐµÑ Ñ Ð´ÑÑгими обÑекÑами ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
@@ -2872,14 +2883,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s конÑликÑÑÐµÑ Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2889,24 +2900,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑаÑевÑими дÑÑгие обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑаÑевÑим %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑаÑевÑим:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2915,7 +2926,7 @@
"ÐÑи обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей бÑдÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ñ Ð¸Ð· ÑиÑÑемÑ."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s завиÑÐ¸Ñ Ð¾Ñ Ð´ÑÑгиÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
@@ -2923,38 +2934,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s завиÑÐ¸Ñ Ð¾Ñ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s завиÑÐ¸Ñ Ð¾Ñ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "ÐоÑеÑнее"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Ðе ÑдалоÑÑ ÑÑÑановиÑÑ %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "ÐиÑÑо не пÑедоÑÑовлÑÐµÑ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2962,31 +2973,31 @@
"\n"
"ÐÐµÑ Ð´Ð¾ÑÑÑпнÑÑ
ÑеÑÑÑÑов, коÑоÑÑе ÑдовлеÑвоÑÑÑÑ ÑÑÐ¾Ð¼Ñ ÑÑебованиÑ."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Ðз-за пÑоблем, опиÑаннÑÑ
вÑÑе/ниже, ÑÑо ÑазÑеÑение не ÑеÑÐ¸Ñ Ð²Ñе завиÑимоÑÑи"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Ðевозможно ÑÑÑановиÑÑ %s, Ñак как конÑликÑÑÐµÑ Ñ %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s не ÑÑÑановлен и помеÑен как неÑÑÑанавливаемÑй"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Ðевозможно ÑÑÑановиÑÑ %s из-за пÑоблем Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑÑми"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2994,8 +3005,8 @@
msgstr "ÑдалиÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3003,79 +3014,79 @@
msgstr "не ÑÑÑанавливаÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s Ð¸Ð¼ÐµÐµÑ Ð½ÐµÑдовлеÑвоÑеннÑе ÑÑебованиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s Ð¸Ð¼ÐµÐµÑ Ð½ÐµÐ´Ð¾ÑÑаÑÑие завиÑимоÑÑи"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s: ÑÑÑановка невозможна из-за оÑÑÑÑÑÑÐ²Ð¸Ñ Ð½ÐµÐºÐ¾ÑоÑÑÑ
завиÑимоÑÑей"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s ÑдовлеÑвоÑÑÐµÑ Ð·Ð°Ð²Ð¸ÑимоÑÑи %s, однако бÑÐ´ÐµÑ Ñдален"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s ÑдовлеÑвоÑÑÐµÑ Ð·Ð°Ð²Ð¸ÑимоÑÑи %s, однако бÑÐ´ÐµÑ Ð¾ÑÑавлен в ÑиÑÑеме"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "ÐÐµÑ Ð½ÐµÐ¾Ð±Ñ
одимоÑÑи ÑÑÑанавливаÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Ðевозможно ÑÑÑановиÑÑ %s, ÑÑÐ¾Ð±Ñ ÑдовлеÑвоÑиÑÑ Ð·Ð°Ð²Ð¸ÑимоÑÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Ðевозможно ÑÑÑановиÑÑ %s, ÑÑÐ¾Ð±Ñ ÑдовлеÑвоÑиÑÑ Ð·Ð°Ð²Ð¸ÑимоÑÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s не бÑÐ´ÐµÑ Ñдален, Ñак как вÑе еÑе ÑÑебÑеÑÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑаÑевÑим %s. Ðо %s не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ñдален, Ñак как он заблокиÑован."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Ðевозможно ÑÑÑановиÑÑ %s Ñак как он конÑликÑÑеÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s помеÑен как неÑÑÑанавливаемÑй из-за конÑликÑа Ñ %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "ÐелÑÐ·Ñ ÑдовлеÑвоÑиÑÑ ÑÑебование %s."
@@ -3086,7 +3097,7 @@
#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
-msgstr "ÐгноÑиÑоваÑÑ ÑÑо ÑÑебование ÑолÑко здеÑÑ"
+msgstr "ÐгноÑиÑоваÑÑ ÑÑо ÑÑебование везде"
#. TranslatorExplanation %s = name of package, patch, selection ...
#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
@@ -3136,7 +3147,7 @@
msgstr "Ðе вÑполнÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ Ð¸Ð»Ð¸ Ñдаление заÑÑагиваемÑÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "из-за необÑ
одимоÑÑи %s Ð´Ð»Ñ %s пÑи обновлении %s"
@@ -3496,13 +3507,21 @@
msgid "Install missing resolvables"
msgstr "УÑÑановиÑÑ Ð¾ÑÑÑÑÑÑвÑÑÑие обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "ÐапÑÑÑиÑÑ ÑеÑаÑÑее ÑÑÑÑойÑÑво Ñо ÐСÐÐРвозможноÑÑÑми."
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
-msgstr "РаÑÑмоÑÑеÑÑ Ð²Ñе обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей Ñ ÑовмеÑÑимой аÑÑ
иÑекÑÑÑой."
+msgstr "РаÑÑмаÑÑиваÑÑÑÑ Ð²Ñе обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей Ñ ÑовмеÑÑимой аÑÑ
иÑекÑÑÑой."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr "ÐапÑÑÑиÑÑ ÑеÑаÑÑее ÑÑÑÑойÑÑво ÑолÑко Ð´Ð»Ñ Ð½Ð°Ð¸Ð»ÑÑÑей аÑÑ
иÑекÑÑÑÑ."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr "РаÑÑмаÑÑиваÑÑÑÑ Ð¾Ð±ÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей ÑолÑко Ñ Ð½Ð°Ð¸Ð»ÑÑÑей аÑÑ
иÑекÑÑÑой."
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
@@ -3554,6 +3573,14 @@
msgid "%s part of %s"
msgstr "%s ÑаÑÑÑ %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr "УдвоиÑÑ Ð²ÑÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr "ÐапÑÑÑиÑÑ Ð² ÑледÑÑÑий Ñаз ÑеÑаÑÑее ÑÑÑÑойÑÑво Ñ ÑдвоеннÑм вÑеменем ожиданиÑ."
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "ÑазблокиÑоваÑÑ Ð²Ñе обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
Modified: trunk/libzypp/po/si.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/si.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/si.po (original)
+++ trunk/libzypp/po/si.po Mon Sep 10 16:18:44 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: i18n(a)suse.de\n"
"Language-Team: Sinhala <i18n(a)suse.de>\n"
@@ -109,36 +109,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -162,27 +162,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2651,19 +2652,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2671,13 +2672,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2686,46 +2687,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr ""
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2743,64 +2744,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2808,7 +2819,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2817,14 +2828,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2832,31 +2843,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2864,68 +2875,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2933,8 +2944,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2942,79 +2953,79 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3075,7 +3086,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3433,14 +3444,22 @@
msgid "Install missing resolvables"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3491,6 +3510,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr ""
Modified: trunk/libzypp/po/sk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sk.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/sk.po (original)
+++ trunk/libzypp/po/sk.po Mon Sep 10 16:18:44 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp.sk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-03-05 10:26+0100\n"
"Last-Translator: Jan Kupec <jkupec(a)suse.cz>\n"
"Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n"
@@ -116,37 +116,37 @@
msgid "History:"
msgstr "História rýchlosti"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "Kontrola aplikovania delta rpm zlyhala."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "Aplikovanie delta rpm zlyhalo."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Kontrola integrity balÃÄka %s zlyhala. Chce sa znova pokúsiÅ¥ o jeho stiahnutie?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "Pridávam zdroje"
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Nepodarilo sa poskytnúť %s z %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -171,27 +171,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "Pridávam zdroje"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Pridávam zdroje"
@@ -2909,19 +2910,19 @@
# progress stage
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Zmenené konfiguraÄné súbory pre '%s':"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "PrÃkaz rpm uložil %s ako %s, ale nebolo možné urÄiÅ¥ rozdiel"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2931,13 +2932,13 @@
"Tu je prvých 25 riadkov rozdielov:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "PrÃkaz rpm vytvoril %s as %s, ale nebolo možné urÄiÅ¥ rozdiel"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2948,46 +2949,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Inštalácia %s zlyhala."
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "Výstup prÃkazu rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s bol úspešne nainštalovaný"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "ÄalÅ¡Ã výstup prÃkazu rpm:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Odstránenie %s zlyhalo"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s bol úspešne odstránený"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "Bola vytvorená záloha %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "InÅ¡talácia bola podľa prÃkazu zruÅ¡ená."
@@ -3005,7 +3006,7 @@
msgstr "%s nahradené %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -3013,58 +3014,68 @@
"Tieto balÃÄky budú zo systému odstánené."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s nie je možné odinÅ¡talovaÅ¥ pretože je stále vyžadovaný iným balÃÄkom"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Neplatná informácia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s je vyžadovaný inými balÃÄkami"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s je vyžadovaný balÃÄkom %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3074,7 +3085,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s je v konflikte s inými balÃÄkami"
@@ -3083,14 +3094,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s je v konflikte s %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3100,24 +3111,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s nahrádza iné balÃÄky"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s nahrádza %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s nahrádza: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -3126,7 +3137,7 @@
"Tieto balÃÄky budú zo systému odstánené."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s závisà na iných balÃÄkoch"
@@ -3134,38 +3145,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s závisà na %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s závisà na: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Potomok"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Nie je možné nainštalovať %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Žiaden balÃÄek neposkytuje %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -3174,32 +3185,32 @@
"\n"
"Nie je k dispozÃcii žiaden prostriedok, ktorý by mohol splniÅ¥ tento požiadavok"
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Kvôli vyÅ¡Å¡ie/nižšie popÃsaným problémom nie je možné vyrieÅ¡iÅ¥ vÅ¡etky závislosti"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Nie je možné nainštalovať %s pretože je v konflikte s %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "BalÃk %s nie je nainÅ¡talovaný a je oznaÄený ako nenainÅ¡talovateľný"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Nie je možné nainštalovať %s kvôli problémom so závislosťami"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3207,8 +3218,8 @@
msgstr "odstrániť %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3216,79 +3227,79 @@
msgstr "neinštaluj %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s má nesplnené požiadavky"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "BalÃku %s chýbajú závislé balÃky"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s nie je možné nainštalovať kvôli chýbajúcim závislostiam"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s spĺÅa závislosti %s ale má byÅ¥ odinÅ¡talovaný"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s spĺÅa závislosti %s ale má byÅ¥ ponechaný v systéme"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "nie je potrebné inštalovať %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Nie je možné nainÅ¡talovaÅ¥ %s aby splnil závislosti balÃka %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Nie je možné nainÅ¡talovaÅ¥ %s aby splnil závislosti balÃka %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s nie je možné odinÅ¡talovaÅ¥ pretože je stále vyžadovaný iným balÃÄkom"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s nahradzuje %s, ale %s nie je možné odstrániť pretože je zamknutý"
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Nie je možné nainÅ¡talovaÅ¥ %s lebo je v konflikte s iným balÃkom"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s nie je možné nainštalovať kvôli konfliktom s %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3351,7 +3362,7 @@
msgstr "NeinÅ¡taluj ani neodstraÅuj tieto balÃÄky"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "pre vyžadovanie %s pre %s kvôli aktualizácii %s"
@@ -3711,15 +3722,25 @@
msgid "Install missing resolvables"
msgstr "NainÅ¡taluj chýbajúce balÃÄky"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
#, fuzzy
msgid "Regarding all resolvables with a compatible architecture."
msgstr "PrednaÄÃtavam nainÅ¡talované balÃÄky vyhovujúce kritériam vyhľadávania... "
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "PrednaÄÃtavam nainÅ¡talované balÃÄky vyhovujúce kritériam vyhľadávania... "
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "PrednaÄÃtavam nainÅ¡talované balÃÄky vyhovujúce kritériam vyhľadávania... "
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3770,6 +3791,14 @@
msgid "%s part of %s"
msgstr "%s súÄasÅ¥ou %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "odomkni vÅ¡etky balÃÄky"
Modified: trunk/libzypp/po/sl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sl.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/sl.po (original)
+++ trunk/libzypp/po/sl.po Mon Sep 10 16:18:44 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2001-10-18 11:02+0200\n"
"Last-Translator: Janez Krek <janez.krek(a)euroteh.si>\n"
"Language-Team: Slovenian\n"
@@ -113,36 +113,36 @@
msgid "History:"
msgstr "Preglejte zgodovino"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -167,27 +167,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2966,19 +2967,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "Shrani nastavivene datoteke"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2986,13 +2987,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -3001,12 +3002,12 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, fuzzy, c-format
msgid "%s install failed"
msgstr "Namestitev ni uspela."
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
#, fuzzy
msgid "rpm output:"
msgstr ""
@@ -3015,36 +3016,36 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, fuzzy, c-format
msgid "%s installed ok"
msgstr "NameÅ¡Äena verzija"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
#, fuzzy
msgid "Additional rpm output:"
msgstr "Dodatne nastavitve skupine"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, fuzzy, c-format
msgid "%s remove failed"
msgstr "rpm neuspešen."
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, fuzzy, c-format
msgid "created backup %s"
msgstr "Ne Kreiraj Varnostnih Kopij"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -3062,64 +3063,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "Potrebno je namestiti %s "
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3127,7 +3138,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 je v sporu s/z %2"
@@ -3136,14 +3147,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "%1 je v sporu s/z %2"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3151,31 +3162,31 @@
msgstr "%1 je v sporu s/z %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3183,68 +3194,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "NameÅ¡Äam na:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%1 je v sporu s/z %2"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Ta paket ni nameÅ¡Äen in ne bo nameÅ¡Äen."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3252,8 +3263,8 @@
msgstr "Zbriši %1"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3261,79 +3272,79 @@
msgstr "NameÅ¡Äam na:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, fuzzy, c-format
msgid "%s has missing dependencies"
msgstr "NezadoÅ¡Äene odvisnosti:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "NezadoÅ¡Äene odvisnosti:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "potrebno je ponovno namestiti"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "NezadoÅ¡Äene odvisnosti:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "NezadoÅ¡Äene odvisnosti:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1 je v sporu s/z %2"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3397,7 +3408,7 @@
msgstr "%1 je v sporu s/z %2"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3760,14 +3771,22 @@
msgid "Install missing resolvables"
msgstr "Namesti manjkajoÄe pakete"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3818,6 +3837,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/sr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sr.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/sr.po (original)
+++ trunk/libzypp/po/sr.po Mon Sep 10 16:18:44 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2004-03-31 11:34+0200\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -113,36 +113,36 @@
msgid "History:"
msgstr "XF86History"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -166,27 +166,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2728,19 +2729,19 @@
# progress stage
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "Snimi konfiguracione fajlove"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2748,13 +2749,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2763,12 +2764,12 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, fuzzy, c-format
msgid "%s install failed"
msgstr "Instalacioni proces nije uspešno završen."
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
#, fuzzy
msgid "rpm output:"
msgstr ""
@@ -2779,38 +2780,38 @@
# PushButton: Allright, really start installation
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, fuzzy, c-format
msgid "%s installed ok"
msgstr "&Da, instaliraj"
# TextEntry label
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
#, fuzzy
msgid "Additional rpm output:"
msgstr "&Dodatne ipppd opcije"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, fuzzy, c-format
msgid "%s remove failed"
msgstr "rpm greška."
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
# Proposal for backup during update
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, fuzzy, c-format
msgid "created backup %s"
msgstr "Ne pravite sigurnosnu kopiju"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2828,64 +2829,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2893,7 +2904,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 je u konfliktu sa %2"
@@ -2902,14 +2913,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "%1 je u konfliktu sa %2"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -2917,31 +2928,31 @@
msgstr "%1 je u konfliktu sa %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2949,69 +2960,69 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instaliram na:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%1 je u konfliktu sa %2"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Ovaj paket nije i neÄe biti instaliran."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3020,8 +3031,8 @@
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3029,79 +3040,79 @@
msgstr "Instaliram na:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, fuzzy, c-format
msgid "%s has missing dependencies"
msgstr "Proveravam meÄuzavisnost..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Proveravam meÄuzavisnost..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "mora da se reinstalira"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Proveravam meÄuzavisnost..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "Proveravam meÄuzavisnost..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1 je u konfliktu sa %2"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3166,7 +3177,7 @@
msgstr "%1 je u konfliktu sa %2"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3533,14 +3544,22 @@
msgid "Install missing resolvables"
msgstr "Instaliranje nedostajuÄih paketa"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3591,6 +3610,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/sv.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sv.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/sv.po (original)
+++ trunk/libzypp/po/sv.po Mon Sep 10 16:18:44 2007
@@ -11,8 +11,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
-"PO-Revision-Date: 2007-08-25 11:00+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
+"PO-Revision-Date: 2007-09-08 11:23+0200\n"
"Last-Translator: Mattias Newzella <newzella(a)linux.se>\n"
"Language-Team: <sv(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -116,36 +116,36 @@
msgid "History:"
msgstr "Historik:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm-kontrollen misslyckades."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm misslyckades."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Integritetskontroll misslyckades för paket %s. Vill du försöka igen?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "Ingen URL i arkiv."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Kan inte tillhandahålla fil %s från arkiv %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "Läser \"%s\" arkivcache"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -169,27 +169,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "Rensar arkivcache \"%s\""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "Giltig metadata hittades inte på specificerad URL"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "Bygger cache för arkiv \"%s\""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "Läser cache för arkiv \"%s\""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "Lägger till arkiv \"%s\""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "Tar bort arkiv \"%s\""
@@ -2704,19 +2705,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Inställningsfiler har ändrats för %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm sparade %s som %s, men det gick inte att avgöra skillnaden"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2726,13 +2727,13 @@
"Här visas de första 25 raderna med skillnader:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm skapade %s som %s, men det gick inte att avgöra skillnaden"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2743,46 +2744,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "Det gick inte att installera %s"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm-utmatning:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s har installerats"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Ytterligare rpm-utmatning:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Det gick inte att ta bort %s"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s borttagen OK"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "skapade säkerhetskopian %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Installationen har avbrutits enligt instruktionerna."
@@ -2800,64 +2801,74 @@
msgstr "%s ersatt av %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s kommer att tas bort av användaren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s kommer att installeras av användaren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "Ingen giltig lösning hittades inom %d sekunder"
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Ogiltig information"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s behövs av andra resurser"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s behövs av %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2867,7 +2878,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s är i konflikt med andra resurser"
@@ -2876,14 +2887,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s är i konflikt med %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2893,24 +2904,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s gör andra resurser inaktuella"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s gör %s inaktuell"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s gör %s inaktuell"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2919,7 +2930,7 @@
"Dessa resurser tas bort från systemet."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s beror på andra resurser"
@@ -2927,38 +2938,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s är beroende av %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s är beroende av: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Barn till"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Det går inte att installera %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Ingen tillhandahåller %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2966,31 +2977,31 @@
"\n"
"Det finns ingen resurs tillgänglig vilken stödjer det här kravet."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "På grund av problemen som beskrivs ovan/nedan, löser inte den här resursen alla beroenden"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Kan inte installera %s eftersom den är i konflikt med %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s har inte installerats och har markerats som avinstallerbar"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Kan inte installera %s på grund av beroendeproblem"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2998,8 +3009,8 @@
msgstr "ta bort %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3007,79 +3018,79 @@
msgstr "installera inte %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s har ouppfyllda krav"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s har beroenden som saknas"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s kan inte installeras på grund av att beroenden saknas"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s uppfyller beroenden för %s men kommer att avinstalleras"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s uppfyller beroenden för %s men kommer att lämnas kvar på systemet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "%s behöver inte installeras"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Det går inte att installera %s så att beroendena för %s uppfylls"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Det går inte att installera %s så att beroendena för %s uppfylls"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s kommer inte att avinstalleras eftersom den fortfarande krävs"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s gör %s inaktuell. Det går dock inte att ta bort %s eftersom det är låst."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Kan inte installera %s eftersom det är i konflikt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s är avinstallerbart på grund av konflikter med %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Kravet %s kan inte uppfyllas."
@@ -3140,7 +3151,7 @@
msgstr "Installera inte och ta inte bort resurser som berörs"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "för krav av %s för %s när %s uppgraderas"
@@ -3498,14 +3509,22 @@
msgid "Install missing resolvables"
msgstr "Installera resurser som saknas"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3556,6 +3575,15 @@
msgid "%s part of %s"
msgstr "%s del av %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b>Tidsgräns för dubbelklick </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "lås upp alla resurser"
Modified: trunk/libzypp/po/ta.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ta.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/ta.po (original)
+++ trunk/libzypp/po/ta.po Mon Sep 10 16:18:44 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: NetworkManager-vpnc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2005-06-26 01:20+0200\n"
"Last-Translator: Priyavert Sharma <priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions <www.agreeya.com>\n"
@@ -106,37 +106,37 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "à®
பà¯à®³à¯à®à¯à®²à¯à®à®¾à®à®°à¯à®ªà®¿à®à®®à¯ à®à¯à®¾à®¤à®©à¯ தà¯à®¾à®²à¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯"
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "à®
பà¯à®³à¯à®à¯à®²à¯à®à®¾à®à®°à¯à®ªà®¿à®à®®à¯ தà¯à®¾à®²à¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "நà¯à®°à¯à®®à¯ à®à¯à®¾à®¤à®©à¯à®¯à®¿à®²à¯ %s பà¯à®à¯à®à¯à®à¯ தà¯à®¾à®²à¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯. à®
தன௠தà®à®µà®²à®¿à®±à®à¯à®à®®à¯ à®à¯à®¯à¯à®µà®¤à®±à¯à®à¯ நà¯à®à¯à®à®³à¯ à®®à¯à®£à¯à®à¯à®®à¯ à®®à¯à®¯à®±à¯à®à®¿à®à¯à®à®ªà¯ பà¯à®¾à®à®¿à®±à¯à®°à¯à®à®³à®¾?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "à®à¯à®®à®¿à®ªà¯à®ªà®¿à®à®¤à¯à®¤à®¿à®²à¯ à®à¯à®¾à®ªà¯à®ªà¯ %1 à®à®¾à®£à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "%sலிரà¯à®¨à¯à®¤à¯ %sà® à®
ளிà®à¯à® à®à®¯à®²à®¾à®¤à¯"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -161,27 +161,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "à®®à¯à®²à®à¯à®à®³à¯ à®à¯à®°à¯à®à¯à®à®ªà¯à®ªà®à¯à®à®¿à®©à¯à®±à®©"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "à®®à¯à®²à®à¯à®à®³à¯ à®à¯à®°à¯à®à¯à®à®ªà¯à®ªà®à¯à®à®¿à®©à¯à®±à®©"
@@ -2632,19 +2633,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "%s:à®à¯à®à®¾à® à®à®³à¯à®³à®®à¯à®¤à¯à®¤à®²à¯ à®à¯à®¾à®ªà¯à®ªà¯à®à®³à¯ மாறà¯à®±à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®©"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "%s à®à® à®à®°à¯à®ªà®¿à®à®®à¯ à®à¯à®®à®¿à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯, à®à®©à®¾à®²à¯ வà¯à®±à¯à®ªà®¾à®à¯à®à¯ நிரà¯à®£à®¯à®¿à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, fuzzy, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2654,13 +2655,13 @@
"வà¯à®±à¯à®ªà®¾à®à¯à®à®³à®¿à®©à¯ à®®à¯à®¤à®²à¯ 25 வரிà®à®³à¯ à®à®à¯à®à¯à®³à¯à®³à®©:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "%s à®à® à®à®°à¯à®ªà®¿à®à®®à¯ à®à®°à¯à®µà®¾f;à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯, à®à®©à®¾à®²à¯ வà¯à®±à¯à®ªà®¾à®à¯à®à¯ நிரà¯à®£à®¯à®¿à®à¯à® à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, fuzzy, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2671,46 +2672,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s நிறà¯à®µà¯à®¤à®²à¯ தà¯à®¾à®²à¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "à®à®°à¯à®ªà®¿à®à®®à¯ à®
வà¯à®à¯à®ªà¯à®à¯:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s நிறà¯à®µà¯à®¤à®²à¯ à®à®°à®¿à®¯à®¾à®©à®¤à¯"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "à®à¯à®à¯à®¤à®²à¯ à®à®°à¯à®ªà®¿à®à®®à¯ à®
வà¯à®à¯à®ªà¯à®à¯:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s நà¯à®à¯à®à¯à®¤à®²à¯ தà¯à®¾à®²à¯à®µà®¿à®¯à¯à®±à¯à®±à®¤à¯"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s நà¯à®à¯à®à¯à®¤à®²à¯ à®à®°à®¿à®¯à®¾à®©à®¤à¯"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "%s மறà¯à®ªà®¿à®°à®¤à®¿ à®à®°à¯à®µà®¾à®à¯à®à®ªà¯à®ªà®à¯à®à®¤à¯"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "à®à¯à®±à®¿à®ªà¯à®ªà®¿à®à¯à®à¯à®³à¯à®³à®ªà®à®¿ நிறà¯à®µà¯à®¤à®²à¯ à®à®à¯à®¯à®¿à®²à¯ நிறà¯à®¤à¯à®¤à®ªà¯à®ªà®à¯à®à®¤à¯."
@@ -2728,7 +2729,7 @@
msgstr "%s %sà®à®²à¯ மாறà¯à®±à®¿à®¯à®®à¯à®à¯à®à®ªà¯à®ªà®à¯à®à®¤à¯"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2736,58 +2737,68 @@
"à®à®¤à¯à®¤à¯à®°à¯à®µà¯à®à®³à¯ à®
à®®à¯à®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ நà¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "à®
த௠à®à®©à¯à®©à®®à¯à®®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®µà®¤à®¾à®²à¯, %s நà¯à®à¯à®à®ªà¯à®ªà® மாà®à¯à®à®¾à®¤à¯"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "à®à¯à®²à¯à®²à®¾à®¤ தà®à®µà®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "மறà¯à®± தà¯à®°à¯à®µà¯à®à®³à¯à®à¯à®à¯ %s தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s, %sà®à¯à®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2797,7 +2808,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s மறà¯à®± தà¯à®°à¯à®µà¯à®à®³à¯à®à®©à¯ à®®à¯à®°à®£à¯à®ªà®à¯à®à®¿à®±à®¤à¯"
@@ -2806,14 +2817,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s %sà®à®à®©à¯ à®®à¯à®°à®£à¯à®ªà®à¯à®à®¿à®±à®¤à¯"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2823,24 +2834,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s மறà¯à®± தà¯à®°à¯à®µà¯à®à®³à¯ வழà®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s %s஠வழà®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s %s஠வழà®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯:"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2849,7 +2860,7 @@
"à®à®¤à¯à®¤à¯à®°à¯à®µà¯à®à®³à¯ à®
à®®à¯à®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ நà¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s மறà¯à®± தà¯à®°à¯à®µà¯à®à®³à¯ à®à®¾à®°à¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯"
@@ -2857,38 +2868,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s %sà® à®à®¾à®°à¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s %sà® à®à®¾à®°à¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯:"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "à®à®¤à®©à¯ à®à®°à¯à®µà®¾à®à¯à®à®®à¯"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "%s஠நிறà¯à®µ à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "%s யாரà¯à®®à¯ à®
ளிபà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2897,32 +2908,32 @@
"\n"
"à®à®¤à¯à®¤à¯à®µà¯à®¯à¯ பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯à¯à®®à¯ à®à®¤à®¾à®°à®®à¯ à®à®¤à¯à®µà¯à®®à¯ à®à®²à¯à®²à¯"
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "à®à®¤à¯à®¤à¯à®°à¯à®µà®¿à®©à¯ à®®à¯à®²à¯ மறà¯à®±à¯à®®à¯ à®à¯à®´à¯ விளà®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ பிரà®à¯à®©à¯à®à®³à¯, à®
னà¯à®¤à¯à®¤à¯ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯à®¯à¯à®®à¯ தà¯à®°à¯à®à¯à®à®à¯à®à¯à®à®¿à®¯à®µà¯ à®
லà¯à®²"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s ஠நிறà¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯ à®à®©à¯à®©à®¿à®²à¯ à®
த௠%s à®à®à®©à¯ à®®à¯à®°à®£à¯à®ªà®à¯à®à®¿à®±à®¤à¯"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s நிறà¯à®µà®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯ மறà¯à®±à¯à®®à¯ à®
த௠நிறà¯à®µ à®à®¯à®²à®¾à®¤à®¤à®¾à® à®à¯à®±à®¿à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯ பிரà®à¯à®©à¯à®à®³à¯ à®à®¾à®°à®£à®®à®¾à® %s ஠நிறà¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2930,8 +2941,8 @@
msgstr "%s ஠நà¯à®à¯à®à®µà¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2939,79 +2950,79 @@
msgstr "%s஠நிறà¯à®µ வà¯à®£à¯à®à®¾à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s தà¯à®°à¯à®à¯à®à®ªà¯à®ªà®à®¾à®¤ தà¯à®µà¯à®à®³à¯à®à¯ à®à¯à®¾à®£à¯à®à¯à®³à¯à®³à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s à®à®¾à®£à®ªà¯à®ªà®à®¾à®¤ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯à®à¯ à®à¯à®¾à®£à¯à®à¯à®³à¯à®³à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "à®à®¾à®£à®ªà¯à®ªà®à®¾à®¤ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ %sà® à®à®¾à®°à®£à®®à®¾à® நிறà¯à®µ à®à®¯à®²à®¾à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ %s பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯à¯à®®à¯ à®à®©à®¾à®²à¯ நிறà¯à®µà¯à®¤à®²à¯ நà¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®µà®¿à®à¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ %s பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯à¯à®®à¯ à®à®©à®¾à®²à¯ à®à®à¯à®à®³à¯ à®
à®®à¯à®ªà¯à®ªà®¿à®²à¯ வà¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "%s஠நிறà¯à®µà®¤à¯ தà¯à®µà¯à®¯à®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%sன௠à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®µà®¤à®±à¯à®à¯ %s஠நிறà¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%sன௠à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®µà®¤à®±à¯à®à¯ %s஠நிறà¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "à®
த௠à®à®©à¯à®©à®®à¯à®®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®µà®¤à®¾à®²à¯, %s நà¯à®à¯à®à®ªà¯à®ªà® மாà®à¯à®à®¾à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%sà® %s வழà®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à®¿à®µà®¿à®à¯à®®à¯. à®à®©à®¾à®²à¯ %s஠நà¯à®à¯à® à®®à¯à®à®¿à®¯à®¾à®¤à¯ à®à®©à¯à®©à®¿à®²à¯ à®
த௠பà¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s஠நிறà¯à®µ à®®à¯à®à®¿à®¯à®¾à®¤à¯ à®à®©à¯à®©à®¿à®²à¯ à®
த௠மà¯à®°à®£à®¾à®©à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s à®à®à®©à¯ à®à®³à¯à®³ à®®à¯à®°à®£à¯à®ªà®¾à®à¯ à®à®¾à®°à®£à®®à®¾à® %sன௠நிறà¯à®µà¯à®¤à®²à¯ நà¯à®à¯à® à®®à¯à®à®¿à®¯à®¾à®¤à¯"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3074,7 +3085,7 @@
msgstr "தà¯à®¾à®à®°à¯à®ªà¯à®³à¯à®³ தà¯à®°à¯à®µà¯à®à®³à¯ நிறà¯à®µà®µà¯à®¾ à®
லà¯à®²à®¤à¯ நà¯à®à¯à®à®µà¯à®¾ வà¯à®£à¯à®à®¾à®®à¯"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s஠பà¯à®¤à¯à®ªà¯à®ªà®¿à®à¯à®à¯à®®à¯à®ªà¯à®¾à®¤à¯ %sà®à¯à®à®¾à® %s தà¯à®µà¯à®ªà¯âபà®à¯à®®à¯à®ªà¯à®¾à®¤à¯"
@@ -3434,14 +3445,22 @@
msgid "Install missing resolvables"
msgstr "Âò¾¡Ã¢Ãý"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3492,6 +3511,14 @@
msgid "%s part of %s"
msgstr "%s, %sன௠à®à®°à¯ பà®à¯à®¤à®¿à®¯à®¾à®à¯à®®à¯"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "Âò¾¡Ã¢Ãý"
Modified: trunk/libzypp/po/tr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/tr.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/tr.po (original)
+++ trunk/libzypp/po/tr.po Mon Sep 10 16:18:44 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2001-10-18 10:13+0200\n"
"Last-Translator: Görkem Ãetin <gorkem(a)gelecek.com.tr>\n"
"Language-Team: turkish <i18n(a)suse.de>\n"
@@ -118,36 +118,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -171,27 +171,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -3147,19 +3148,19 @@
# clients/sw_single.ycp:310
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "Yapılandırma dosyalarını kaydet"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -3167,13 +3168,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -3183,49 +3184,49 @@
# clients/online_update_start.ycp:171
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, fuzzy, c-format
msgid "%s install failed"
msgstr "Kurulum iÅlemi baÅarısız oldu."
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
#, fuzzy
msgid "rpm output:"
msgstr "Program çıktısı:\n"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, fuzzy, c-format
msgid "%s installed ok"
msgstr "&Evet, kur"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
#, fuzzy
msgid "Additional rpm output:"
msgstr "Ek grıp ayarları"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, fuzzy, c-format
msgid "%s remove failed"
msgstr "rpm baÅarısız oldu."
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
# clients/inst_sw_backup.ycp:260
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, fuzzy, c-format
msgid "created backup %s"
msgstr "Yedek oluÅturma"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -3243,64 +3244,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3308,7 +3319,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1, %2 ile çakıÅıyor"
@@ -3317,14 +3328,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "%1, %2 ile çakıÅıyor"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3332,31 +3343,31 @@
msgstr "%1, %2 ile çakıÅıyor"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3364,69 +3375,69 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
# include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Kurulan disk:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%1, %2 ile çakıÅıyor"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Bu paket kurulu deÄildir ve kurulmayacaktır."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3435,8 +3446,8 @@
# include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3444,84 +3455,84 @@
msgstr "Kurulan disk:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
# clients/inst_sw_single.ycp:742
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, fuzzy, c-format
msgid "%s has missing dependencies"
msgstr "Yetersiz baÄımlılıklar:"
# clients/inst_sw_single.ycp:742
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Yetersiz baÄımlılıklar:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
# clients/online_update_load.ycp:923
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "yeniden kurulmalı"
# clients/inst_sw_single.ycp:742
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Yetersiz baÄımlılıklar:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
# clients/inst_sw_single.ycp:742
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "Yetersiz baÄımlılıklar:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1, %2 ile çakıÅıyor"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3585,7 +3596,7 @@
msgstr "%1, %2 ile çakıÅıyor"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3953,14 +3964,22 @@
msgid "Install missing resolvables"
msgstr "Eksik paketleri kur"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -4011,6 +4030,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/uk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/uk.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/uk.po (original)
+++ trunk/libzypp/po/uk.po Mon Sep 10 16:18:44 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zypp.uk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-08-23 20:52-0700\n"
"Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>\n"
"Language-Team: Ukrainian <translation(a)linux.org.ua>\n"
@@ -114,36 +114,36 @@
msgid "History:"
msgstr "ÐÑÑоÑÑÑ:"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "пеÑевÑÑка applydeltarpm зазнала невдаÑÑ."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "заÑÑоÑÑÐ²Ð°Ð½Ð½Ñ Ð´ÐµÐ»ÑÑи rpm зазнало невдаÑÑ."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "ÐакÑнок %s не пÑоÑов пеÑевÑÑÐºÑ Ð´Ð¾ÑÑовÑÑноÑÑÑ. ÐовÑоÑиÑи ÑпÑобÑ?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "Ð ÑÑ
овиÑÑ Ð½ÐµÐ¼Ð°Ñ url."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Ðеможливо надаÑи Ñайл %s Ð·Ñ ÑÑ
овиÑа %s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "ЧиÑÐ°Ð½Ð½Ñ ÐºÐµÑÑ ÑÑ
овиÑа \"%s\""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "ЧиÑÐ°Ð½Ð½Ñ Ð»Ð°Ñок Ñ Ð´ÐµÐ»ÑÑ Ð¿Ð°ÐºÑнкÑв з кеÑÑ ÑÑ
овиÑа \"%s\""
@@ -167,27 +167,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "ÐÑиÑÐµÐ½Ð½Ñ ÐºÐµÑÑ ÑÑ
овиÑа \"%s\""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "У вказаниÑ
адÑеÑаÑ
URL не знайдено ÑинниÑ
меÑаданиÑ
"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "СÑвоÑÐµÐ½Ð½Ñ ÐºÐµÑÑ ÑÑ
овиÑа \"%s\""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "ЧиÑÐ°Ð½Ð½Ñ ÐºÐµÑÑ ÑÑ
овиÑа \"%s\""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "ÐÐ¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ ÑÑ
овиÑа \"%s\""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "ÐилÑÑÐµÐ½Ð½Ñ ÑÑ
овиÑа \"%s\""
@@ -2702,19 +2703,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "ÐмÑнено конÑÑгÑÑаÑÑÐ¹Ð½Ñ Ñайли Ð´Ð»Ñ %s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm збеÑегла %s Ñк %s, але бÑло неможливо виÑвиÑи ÑÑзниÑÑ"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2724,13 +2725,13 @@
"ÐÑÑ Ð¿ÐµÑÑÑ 25 ÑÑдкÑв вÑдмÑнноÑÑей:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm ÑÑвоÑила %s Ñк %s, але бÑло неможливо виÑвиÑи ÑÑзниÑÑ"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2741,46 +2742,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ %s зазнало невдаÑÑ"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "ÐивÑд rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s вÑÑановлено без помилок"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "ÐодаÑковий вивÑд rpm:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "ÐилÑÑÐµÐ½Ð½Ñ %s зазнало невдаÑÑ"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s вилÑÑено без помилок"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "ÑÑвоÑено ÑезеÑÐ²Ð½Ñ ÐºÐ¾Ð¿ÑÑ %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿ÐµÑеÑвано вÑдповÑдно до вказÑвки."
@@ -2798,64 +2799,74 @@
msgstr "%s замÑнено %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s бÑде вилÑÑено коÑиÑÑÑваÑем.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s бÑде вилÑÑено ÑнÑÐ¾Ñ Ð¿ÑогÑамоÑ. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s бÑде вÑÑановлено коÑиÑÑÑваÑем.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s бÑде вÑÑановлено ÑнÑÐ¾Ñ Ð¿ÑогамоÑ. (ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Ðе Ñинна ÑнÑоÑмаÑÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s поÑÑÑбний Ð´Ð»Ñ ÑнÑиÑ
пакÑнкÑв"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s поÑÑÑбний Ð´Ð»Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2865,7 +2876,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s конÑлÑкÑÑÑ Ð· ÑнÑими поÑÑÑбними"
@@ -2874,14 +2885,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s конÑлÑкÑÑÑ Ð· %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2891,24 +2902,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s ÑобиÑÑ Ð·Ð°ÑÑаÑÑлими ÑнÑÑ Ð¿Ð¾ÑÑÑбнÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s ÑобиÑÑ Ð·Ð°ÑÑаÑÑлим %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s ÑобиÑÑ Ð·Ð°ÑÑаÑÑлим: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2917,7 +2928,7 @@
"Ð¦Ñ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð¿Ð°ÐºÑнки бÑде вилÑÑено з ÑиÑÑеми."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s залежиÑÑ Ð²Ñд ÑнÑиÑ
поÑÑÑбниÑ
пакÑнкÑв"
@@ -2925,38 +2936,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s залежиÑÑ Ð²Ñд %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s залежиÑÑ Ð²Ñд: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "ÐаÑадок"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Ðеможливо вÑÑановиÑи %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "ÐÑÑо не Ð½Ð°Ð´Ð°Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2964,31 +2975,31 @@
"\n"
"Ðема наÑвного ÑеÑÑÑÑÑ, Ñкий пÑдÑÑимÑÑ ÑÑ Ð²Ð¸Ð¼Ð¾Ð³Ñ."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "У зв'ÑÐ·ÐºÑ Ð· пÑоблемами опиÑаними виÑе/нижÑе Ñе Ñозв'ÑÐ·Ð°Ð½Ð½Ñ Ð½Ðµ задоволÑниÑÑ Ð²ÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Ðеможливо вÑÑановиÑи %s, бо вÑн конÑлÑкÑÑÑ Ð· %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s не вÑÑановлений Ñ Ð¿Ð¾Ð·Ð½Ð°Ñений Ñк Ñакий, Ñо його неможливо вÑÑановиÑи"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Ðеможливо вÑÑановиÑи %s ÑеÑез пÑоблеми залежноÑÑей"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2996,8 +3007,8 @@
msgstr "вилÑÑиÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3005,79 +3016,79 @@
msgstr "не вÑÑановлÑваÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s Ð¼Ð°Ñ Ð²Ð¸Ð¼Ð¾Ð³Ð¸, ÑÐºÑ Ð½Ðµ задоволено"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s Ð¼Ð°Ñ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ, ÑÐºÑ Ð½Ðµ задоволено"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s неможливо вÑÑановиÑи ÑеÑез залежноÑÑÑ, ÑÐºÑ Ð½ÐµÐ·Ð°Ð´Ð¾Ð²Ð¾Ð»ÐµÐ½Ð¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s задоволÑнÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ %s, але його бÑде вилÑÑено"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s задоволÑнÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ %s, але його бÑде залиÑено в ÑиÑÑемÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Ðема поÑÑеби вÑÑановлÑваÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Ðеможливо вÑÑановиÑи %s, Ñоб задоволÑниÑи залежноÑÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Ðеможливо вÑÑановиÑи %s, Ñоб задоволÑниÑи залежноÑÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s не бÑде вилÑÑено, бо його Ñе поÑÑÑбно"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s ÑобиÑÑ Ð·Ð°ÑÑаÑÑлим %s. Ðле %s неможливо вилÑÑиÑи, бо вÑн заблокований."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Ðеможливо вÑÑановиÑи %s, бо вÑн конÑлÑкÑÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "Ðеможливо вÑÑановиÑи %s ÑеÑез конÑлÑÐºÑ Ð· %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Ðеможливо задоволÑниÑи Ð²Ð¸Ð¼Ð¾Ð³Ñ %s."
@@ -3138,7 +3149,7 @@
msgstr "Ðе вÑÑановлÑваÑи Ñ Ð½Ðµ вилÑÑаÑи Ð´Ð°Ð½Ñ Ð¿Ð°ÐºÑнки"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "поÑÑебÑÑ %s Ð´Ð»Ñ %s, коли оновлÑÑÑÑÑÑ %s"
@@ -3496,14 +3507,24 @@
msgid "Install missing resolvables"
msgstr "ÐÑÑановиÑи поÑÑÑÐ±Ð½Ñ Ð¿Ð°ÐºÑнки"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "ÐÑдноÑно вÑÑÑ
поÑÑÑбниÑ
пакÑнкÑв з ÑÑмÑÑÐ½Ð¾Ñ Ð°ÑÑ
ÑÑекÑÑÑоÑ."
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "ÐÑдноÑно вÑÑÑ
поÑÑÑбниÑ
пакÑнкÑв з ÑÑмÑÑÐ½Ð¾Ñ Ð°ÑÑ
ÑÑекÑÑÑоÑ."
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "ÐÑдноÑно вÑÑÑ
поÑÑÑбниÑ
пакÑнкÑв з ÑÑмÑÑÐ½Ð¾Ñ Ð°ÑÑ
ÑÑекÑÑÑоÑ."
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3554,6 +3575,14 @@
msgid "%s part of %s"
msgstr "%s ÑаÑÑина %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "ÑозблокÑваÑи ÑÑ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð¿Ð°ÐºÑнки"
@@ -4965,4 +4994,3 @@
"Файл %s Ð¼Ð°Ñ Ð½Ðµ ÑÐ¸Ð½Ð½Ñ ÐºÐ¾Ð½ÑÑолÑÐ½Ñ ÑÑмÑ.\n"
"ÐÑÑкÑвалаÑÑ %s, знайдено %s\n"
"ÐживаÑи попÑи вÑе?"
-
Modified: trunk/libzypp/po/vi.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/vi.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/vi.po (original)
+++ trunk/libzypp/po/vi.po Mon Sep 10 16:18:44 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan VÄ©nh Thá»nh <teppi82(a)gmail.com>\n"
"Language-Team: Vietnamese <i18n(a)suse.de>\n"
@@ -112,36 +112,36 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -165,27 +165,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2636,19 +2637,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2656,13 +2657,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2671,46 +2672,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr ""
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2728,64 +2729,74 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2793,7 +2804,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2802,14 +2813,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2817,31 +2828,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2849,68 +2860,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2918,8 +2929,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2927,79 +2938,79 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3060,7 +3071,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3418,14 +3429,22 @@
msgid "Install missing resolvables"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3476,6 +3495,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr ""
Modified: trunk/libzypp/po/wa.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/wa.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/wa.po (original)
+++ trunk/libzypp/po/wa.po Mon Sep 10 16:18:44 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lcn memory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2004-04-05 17:37+0200\n"
"Last-Translator: Jean Cayron <jean.cayron(a)gmail.com>\n"
"Language-Team: Walloon <i18n(a)suse.de>\n"
@@ -112,36 +112,36 @@
msgid "History:"
msgstr "Ridant: "
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr ""
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr ""
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr ""
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -166,27 +166,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr ""
@@ -2680,19 +2681,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "Racourti d' l' apontiaedje di lingaedje"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2700,13 +2701,13 @@
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2715,47 +2716,47 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr ""
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr ""
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
#, fuzzy
msgid "Additional rpm output:"
msgstr "Informåcion e pus"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr ""
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr ""
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr ""
@@ -2773,65 +2774,75 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
#, fuzzy
msgid "Invalid information"
msgstr "&Informåcion"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, fuzzy, c-format
msgid "%s is needed by other resolvables"
msgstr "Coridjaedjes ricomandés"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2839,7 +2850,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "Afrontmint etur les coridjaedjes"
@@ -2848,14 +2859,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "afrontmint avou..."
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -2863,31 +2874,31 @@
msgstr "afrontmint avou..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, fuzzy, c-format
msgid "%s obsoletes other resolvables"
msgstr "Coridjaedjes di radjoutés"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, fuzzy, c-format
msgid "%s obsoletes %s"
msgstr "trop vîs..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, fuzzy, c-format
msgid "%s obsoletes:%s"
msgstr "trop vîs..."
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, fuzzy, c-format
msgid "%s depends on other resolvables"
msgstr "Coridjaedjes ricomandés"
@@ -2895,70 +2906,70 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, fuzzy
msgid "Child of"
msgstr "Tchili"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "N' nén astaler"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr "Gn a pont d' eterface uzeu po ç' module."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Ãou paket n' est nén astalé et n' serè nén astalé."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -2966,8 +2977,8 @@
msgstr "Dis&facer"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -2975,79 +2986,79 @@
msgstr "N' nén astaler"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, fuzzy, c-format
msgid "%s has unfulfilled requirements"
msgstr "a des dmandes nén rezoudowes..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "Copyî les fitchîs sol sistinme d' astalé"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3109,7 +3120,7 @@
msgstr "Coridjaedjes di radjoutés"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3479,14 +3490,22 @@
msgid "Install missing resolvables"
msgstr "Afrontmint etur les coridjaedjes"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3537,6 +3556,14 @@
msgid "%s part of %s"
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
#, fuzzy
msgid "unlock all resolvables"
Modified: trunk/libzypp/po/xh.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/xh.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/xh.po (original)
+++ trunk/libzypp/po/xh.po Mon Sep 10 16:18:44 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-11-03 12:03\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -108,37 +108,37 @@
msgid "History:"
msgstr ""
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "kusilele ukukhangela ukusetyenziswa kwe-deltarpm. "
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "kusilele ukusetyenziswa kwe-deltarpm."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Umbekelo%s usilele ukukhangela imfezekiso. Ingaba usafuna ukuzama kwakhona ukuyikhuphela?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "Ifayili %1 ayifunyenwanga elugcinweni."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Ayikwazi kubonelela%s ukusuka ku%s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -163,27 +163,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Ibuyisela oovimba"
@@ -2634,19 +2635,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Iifayili zobumbeko ezitshintshileyo zika%s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "i-rpm igcine %s njenge %s kodwa kwakungenzeki ukumisela umahluko"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2656,13 +2657,13 @@
"Nantsi imigca eyi-25 yokuqala yomahluko:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "i-rpm idalwe %s njenge %s kodwa kwakungenzeki ukumisela umahluko"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2673,46 +2674,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s ukuhlohla kusilele"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "isivelisi se-rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s ukuhlohla kulungile"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Isivelisi se-rpm Esongezelelweyo:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s ukushenxisa kusilele"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s ukushenxisa kulungile"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "idale ugcino olukhuselekileyo %s "
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Ukuhlohla kuye kwalahlwa njengoko bekuyalelwe."
@@ -2730,7 +2731,7 @@
msgstr "%s ibuyiselwe ngo %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2738,58 +2739,68 @@
"Ezi ziconjululwa ziza kucinywa kwisixokelelwano."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s ayizukuhlohlwa kuba isafuneka"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "Ulwazi olungasebenzi"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s iyafunwa zezinye iziconjululwa"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s ifunwa ngu %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2799,7 +2810,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s iimpixano nezinye iziconjululwa"
@@ -2808,14 +2819,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s iimpixano ne %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2825,24 +2836,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s yenza ezinye iziconjululwa ziphelelwe lixesha"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s ziphelelwe lixehsa %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s ziphelelwe lixehsa:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2851,7 +2862,7 @@
"Ezi ziconjululwa ziza kucinywa kwisixokelelwano."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ixhomekeke kwezinye iziconjululwa"
@@ -2859,38 +2870,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s ixhomekeke kwi %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s ixhomekeke kwi:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Umntwana ka"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Ayikwazi kuhlohla%s "
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Akukho nanye ebonelela ngo%s "
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2899,32 +2910,32 @@
"\n"
"Akukho vimba ufumanekayo oxhasa le mfuneko."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Ngenxa yeengxaki ezichazwe ngentla/ngezantsi kwesi sigqibo akuyikusombulula zonke izixhomekeki."
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Ayikwazi kuhlohla u%s kuba kuyaphixana ne%s "
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s ayihlohlwanga kwaye iphawulwe njengengahlohleki"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Ayikwazi kuhlohla%s ngenxa yeengxaki zoxhomekeko"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2932,8 +2943,8 @@
msgstr "Cima %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2941,79 +2952,79 @@
msgstr "ungahlohli %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s inemfuneko ezingazalisekiswanga"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s inezixhomekeki ezilahlekileyo"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s ayikwazi kuhlohla ngenxa yezixhomekeki ezilahlekikeyo"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s zalisekisa izixhomekeki zika%s kodwa aziyi kuhlohlwa"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s zaliseka izixhomekeki zika%s kodwa ziza kugcinwa kwisixokelelwano sakho"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Akukho mfuno yokuhlohla%s "
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Ayikwazi kuhlohla%s ukuzalisekisa izixhomekeki zika%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Ayikwazi kuhlohla%s ukuzalisekisa izixhomekeki zika%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ayizukuhlohlwa kuba isafuneka"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s ziphelelwe lixehsa%s . Kodwa%s ayikwazi kucima kuba itshixiwe."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Ayikwazi kuhlohla u%s kuba kuyaphixana "
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ayihlohleki ngenxa yeempixano ne %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3076,7 +3087,7 @@
msgstr "Ungahlohli okanye cima izicombululi ezinxulumeneyo"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ukufuna%s ka%s xa ihlaziya%s"
@@ -3434,14 +3445,22 @@
msgid "Install missing resolvables"
msgstr "Hlohla izicombululi ezilahlekileyo"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3492,6 +3511,14 @@
msgid "%s part of %s"
msgstr "%s inxenye ka %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+msgid "Double timeout"
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "vula zonke izicombululi"
Modified: trunk/libzypp/po/zh_CN.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zh_CN.po?rev=7166&r1=…
==============================================================================
--- trunk/libzypp/po/zh_CN.po (original)
+++ trunk/libzypp/po/zh_CN.po Mon Sep 10 16:18:44 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2007-08-26 00:50+0800\n"
"Last-Translator: Thruth Wang <gubotruth(a)gmail.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -35,8 +35,7 @@
msgid "Path parameter parsing not supported for this URL"
msgstr "ä¸æ¯æå¯¹æ¤ URL çè·¯å¾åæ°è¿è¡è¯æ³åæ"
-#: ../zypp/url/UrlBase.cc:782
-#: ../zypp/url/UrlBase.cc:1229
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "ä¸æ¯æå¯¹æ¤ URL çæ¥è¯¢å符串è¿è¡è¯æ³åæ"
@@ -83,8 +82,7 @@
msgid "Url scheme requires path name"
msgstr "URL 纲è¦è¦æ±æè·¯å¾å"
-#: ../zypp/url/UrlBase.cc:1117
-#: ../zypp/url/UrlBase.cc:1131
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "å¦æåå¨è®¤è¯ï¼åä¸å
许ç¸å¯¹è·¯å¾"
@@ -113,37 +111,37 @@
msgid "History:"
msgstr "åå²ï¼"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "Applydeltarpm æ£æ¥å·²å¤±è´¥ã"
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "Applydeltarpm 已失败ã"
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "%s å
æªè½éè¿å®æ´æ§æ£æ¥ãæ¯å¦è¦éè¯ä¸è½½å®ï¼"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "æªå¨åå¨åºä¸æ¾å°æ件 %1ã"
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "æ æ³è·å¾ %s ç± %s æä¾"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "æ£å¨è¯»å '%s' å®è£
æºç¼å"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "æ£å¨ä» '%s' å®è£
æºç¼å读åè¡¥ä¸åå¢éå
"
@@ -153,13 +151,11 @@
msgid "Unsupported HTTP authentication method '%s'"
msgstr "ä¸æ¯æ HTTP 认è¯æ¹æ³ '%s'"
-#: ../zypp/media/MediaCurl.cc:715
-#: ../zypp/media/MediaCurl.cc:784
+#: ../zypp/media/MediaCurl.cc:715 ../zypp/media/MediaCurl.cc:784
msgid "Invalid user name or password."
msgstr "æ æç¨æ·åæå¯ç ã"
-#: ../zypp/media/MediaCurl.cc:718
-#: ../zypp/media/MediaCurl.cc:787
+#: ../zypp/media/MediaCurl.cc:718 ../zypp/media/MediaCurl.cc:787
#, c-format
msgid "Authentication required for '%s'"
msgstr "'%s' éè¦èº«ä»½éªè¯"
@@ -169,27 +165,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "æ£å¨æ¸
é¤ '%s' å®è£
æºç¼å"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "æ£å¨æ建 '%s' å®è£
æºç¼å"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "æ£å¨è¯»å '%s' å®è£
æºç¼å"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "æ£å¨æ·»å å®è£
æº '%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "æ£å¨ç§»é¤å®è£
æº '%s'"
@@ -211,8 +208,7 @@
msgid "Invalid empty Url object reference"
msgstr "æ æç空 URL 对象åç
§"
-#: ../zypp/Url.cc:321
-#: ../zypp/Url.cc:335
+#: ../zypp/Url.cc:321 ../zypp/Url.cc:335
msgid "Unable to parse Url components"
msgstr "æ æ³å¯¹ URL ç»ä»¶è¿è¡è¯æ³åæ"
@@ -222,8 +218,7 @@
#. Defined LanguageCode constants
#. Defined CountryCode constants
-#: ../zypp/LanguageCode.cc:225
-#: ../zypp/CountryCode.cc:215
+#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215
msgid "No Code"
msgstr "æ 代ç "
@@ -288,8 +283,7 @@
msgstr "é¿å¡å¾·è¯"
#. language code: alb sqi sq
-#: ../zypp/LanguageCode.cc:262
-#: ../zypp/LanguageCode.cc:264
+#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264
msgid "Albanian"
msgstr "é¿å°å·´å°¼äºè¯"
@@ -339,8 +333,7 @@
msgstr "é¿æè´¡è¯"
#. language code: arm hye hy
-#: ../zypp/LanguageCode.cc:284
-#: ../zypp/LanguageCode.cc:286
+#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286
msgid "Armenian"
msgstr "äºç¾å°¼äºè¯"
@@ -440,8 +433,7 @@
msgstr "å·´åè¯"
#. language code: baq eus eu
-#: ../zypp/LanguageCode.cc:326
-#: ../zypp/LanguageCode.cc:328
+#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328
msgid "Basque"
msgstr "å·´æ¯å
è¯"
@@ -551,8 +543,7 @@
msgstr "ä¿å å©äºè¯"
#. language code: bur mya my
-#: ../zypp/LanguageCode.cc:372
-#: ../zypp/LanguageCode.cc:374
+#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374
msgid "Burmese"
msgstr "ç¼
ç¸è¯"
@@ -617,8 +608,7 @@
msgstr "æ¥å è¯"
#. language code: chi zho zh
-#: ../zypp/LanguageCode.cc:400
-#: ../zypp/LanguageCode.cc:402
+#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402
msgid "Chinese"
msgstr "ä¸æ"
@@ -728,8 +718,7 @@
msgstr "åºæ½ç¹è¯¸è¯è¨ï¼å
¶å®ï¼"
#. language code: cze ces cs
-#: ../zypp/LanguageCode.cc:446
-#: ../zypp/LanguageCode.cc:448
+#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448
msgid "Czech"
msgstr "æ·å
è¯"
@@ -804,8 +793,7 @@
msgstr "ä¸å¤è·å
°è¯ï¼çº¦ 1050-1350ï¼"
#. language code: dut nld nl
-#: ../zypp/LanguageCode.cc:478
-#: ../zypp/LanguageCode.cc:480
+#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480
msgid "Dutch"
msgstr "è·å
°è¯"
@@ -910,8 +898,7 @@
msgstr "丰è¯"
#. language code: fre fra fr
-#: ../zypp/LanguageCode.cc:522
-#: ../zypp/LanguageCode.cc:524
+#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524
msgid "French"
msgstr "æ³è¯"
@@ -961,14 +948,12 @@
msgstr "æ¥å°æ¼è¯¸è¯è¨ï¼å
¶å®ï¼"
#. language code: geo kat ka
-#: ../zypp/LanguageCode.cc:544
-#: ../zypp/LanguageCode.cc:546
+#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546
msgid "Georgian"
msgstr "ä¹æ²»äºè¯"
#. language code: ger deu de
-#: ../zypp/LanguageCode.cc:548
-#: ../zypp/LanguageCode.cc:550
+#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550
msgid "German"
msgstr "å¾·è¯"
@@ -1038,8 +1023,7 @@
msgstr "å¤å¸è
è¯ï¼1453 以åï¼"
#. language code: gre ell el
-#: ../zypp/LanguageCode.cc:578
-#: ../zypp/LanguageCode.cc:580
+#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580
msgid "Greek, Modern (1453-)"
msgstr "ç°ä»£å¸è
è¯ (1453-)"
@@ -1144,8 +1128,7 @@
msgstr "ä¼åè¯"
#. language code: ice isl is
-#: ../zypp/LanguageCode.cc:622
-#: ../zypp/LanguageCode.cc:624
+#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624
msgid "Icelandic"
msgstr "å°å²è¯"
@@ -1515,8 +1498,7 @@
msgstr "å¢è¨è¯"
#. language code: mac mkd mk
-#: ../zypp/LanguageCode.cc:772
-#: ../zypp/LanguageCode.cc:774
+#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774
msgid "Macedonian"
msgstr "马å
¶é¡¿è¯"
@@ -1556,8 +1538,7 @@
msgstr "æ¼ä¸å¥è¯"
#. language code: mao mri mi
-#: ../zypp/LanguageCode.cc:790
-#: ../zypp/LanguageCode.cc:792
+#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792
msgid "Maori"
msgstr "æ¯å©è¯"
@@ -1577,8 +1558,7 @@
msgstr "马è¨ä¼è¯"
#. language code: may msa ms
-#: ../zypp/LanguageCode.cc:800
-#: ../zypp/LanguageCode.cc:802
+#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802
msgid "Malay"
msgstr "马æ¥è¯"
@@ -1719,8 +1699,7 @@
#. language code: nau na
#. :NPL:524:
-#: ../zypp/LanguageCode.cc:858
-#: ../zypp/CountryCode.cc:380
+#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:380
msgid "Nauru"
msgstr "çé²è¯"
@@ -1920,8 +1899,7 @@
msgstr "å¤æ³¢æ¯è¯ï¼çº¦å
Œ
å 600-400ï¼"
#. language code: per fas fa
-#: ../zypp/LanguageCode.cc:938
-#: ../zypp/LanguageCode.cc:940
+#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940
msgid "Persian"
msgstr "æ³¢æ¯è¯"
@@ -2006,8 +1984,7 @@
msgstr "åæ®èµè¯"
#. language code: rum ron ro
-#: ../zypp/LanguageCode.cc:974
-#: ../zypp/LanguageCode.cc:976
+#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976
msgid "Romanian"
msgstr "ç½é©¬å°¼äºè¯"
@@ -2067,8 +2044,7 @@
msgstr "æ¡å¡å©è¯"
#. language code: scc srp sr
-#: ../zypp/LanguageCode.cc:1000
-#: ../zypp/LanguageCode.cc:1002
+#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002
msgid "Serbian"
msgstr "å¡å°ç»´äºè¯"
@@ -2083,8 +2059,7 @@
msgstr "èæ ¼å
°è¯"
#. language code: scr hrv hr
-#: ../zypp/LanguageCode.cc:1008
-#: ../zypp/LanguageCode.cc:1010
+#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010
msgid "Croatian"
msgstr "å
ç½å°äºè¯"
@@ -2139,8 +2114,7 @@
msgstr "æ¯æ夫诸è¯è¨ï¼å
¶å®ï¼"
#. language code: slo slk sk
-#: ../zypp/LanguageCode.cc:1032
-#: ../zypp/LanguageCode.cc:1034
+#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034
msgid "Slovak"
msgstr "æ¯æ´ä¼å
è¯"
@@ -2335,8 +2309,7 @@
msgstr "æ³°å½è¯"
#. language code: tib bod bo
-#: ../zypp/LanguageCode.cc:1112
-#: ../zypp/LanguageCode.cc:1114
+#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114
msgid "Tibetan"
msgstr "西èè¯"
@@ -2357,8 +2330,7 @@
#. language code: tkl
#. :TJK:762:
-#: ../zypp/LanguageCode.cc:1122
-#: ../zypp/CountryCode.cc:428
+#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:428
msgid "Tokelau"
msgstr "æå
å³è¯"
@@ -2434,8 +2406,7 @@
#. language code: tvl
#. :TTO:780:
-#: ../zypp/LanguageCode.cc:1152
-#: ../zypp/CountryCode.cc:435
+#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:435
msgid "Tuvalu"
msgstr "å¾ç¦å¢è¯"
@@ -2535,8 +2506,7 @@
msgstr "ç¦èè¯"
#. language code: wel cym cy
-#: ../zypp/LanguageCode.cc:1192
-#: ../zypp/LanguageCode.cc:1194
+#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194
msgid "Welsh"
msgstr "å¨å°å£«è¯"
@@ -2620,8 +2590,7 @@
msgid "Zuni"
msgstr "ç¥å°¼è¯"
-#: ../zypp/ZYppFactory.cc:279
-#: ../zypp/ZYppFactory.cc:334
+#: ../zypp/ZYppFactory.cc:279 ../zypp/ZYppFactory.cc:334
msgid "Software management is already running."
msgstr "软件管çå·²å¤äºè¿è¡ç¶æã"
@@ -2661,27 +2630,26 @@
msgid "Not a CDROM drive"
msgstr "ä¸æ¯ CDROM 驱å¨å¨"
-#: ../zypp/target/hal/HalException.h:46
-#: ../zypp/target/hal/HalException.h:55
+#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55
#: ../zypp/target/hal/HalException.h:64
msgid "Hal Exception"
msgstr "Hal ä¾å¤"
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "%s çå·²æ´æ¹é
ç½®æ件ï¼"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm å·²å° %s å¦å为 %sï¼ä½æ¯æ æ³ç¡®å®ä¹é´çå·®å¼ã"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2691,13 +2659,13 @@
"以ä¸æ¯å 25 è¡å·®å¼ï¼\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm å·²å° %s å建为 %sï¼ä½æ¯æ æ³ç¡®å®ä¹é´çå·®å¼ã"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2708,48 +2676,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s å®è£
失败"
-#: ../zypp/target/rpm/RpmDb.cc:1927
-#: ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm è¾åºï¼"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s å®è£
æå"
-#: ../zypp/target/rpm/RpmDb.cc:1936
-#: ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "å
¶ä» rpm è¾åºï¼"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s å»é¤å¤±è´¥"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s å»é¤æå"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "å·²å建å¤ä»½ %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "å®è£
å·²ç»æç
§æ示被ä¸æ¢ã"
@@ -2767,67 +2733,77 @@
msgstr "%s æ¿æ¢ä¸º %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s å°è¢«ç¨æ·å é¤ã\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s å°è¢«å¦ä¸ä¸ªç¨åºå é¤ã(ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s å°è¢«ç¨æ·å®è£
ã\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s å°è¢«å¦ä¸ä¸ªç¨åºå®è£
ã(ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, fuzzy, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "ä»
使ç¨æä½³æ¶æ解æ项æªå¾å°æææ¹æ¡ã"
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy
msgid "No valid solution found with just resolvables of best architecture."
msgstr "ä»
使ç¨æä½³æ¶æ解æ项æªå¾å°æææ¹æ¡ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
#, fuzzy
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "æ¤è¯ä¾ä¸ä»
使ç¨æä½³æ¶æçå¯è§£æ项ã\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
#, fuzzy
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "使ç¨ææå¯è½çå¯è§£æ项ï¼è´¹æ¶ä½ææã"
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "æ æä¿¡æ¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s 对äºå
¶å®å¯è§£æ项æ¯å¿
éç"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s 对äºä»¥ä¸å¯¹è±¡æ¯å¿
éçï¼ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2837,7 +2813,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ä¸å
¶å®å¯è§£æ项å²çª"
@@ -2846,14 +2822,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s å²çª %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2863,24 +2839,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s å°åºå¼å
¶å®å¯è§£æ项"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s åºå¼ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s åºå¼ï¼%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2889,7 +2865,7 @@
"å°ä»ç³»ç»å é¤è¿äºå¯è§£æ项ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s åå³äºå
¶å®å¯è§£æ项"
@@ -2897,38 +2873,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s ä¾èµäº %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s ä¾èµäºï¼%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "åé"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "æ æ³å®è£
%s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "åä¸æä¾ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2937,32 +2913,32 @@
"\n"
"没ææ¯ææ¤éæ±çèµæºå¯ç¨ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ç±äºä¸ï¼ä¸æè¿°çé®é¢ï¼æ¤è§£æå°ä¸è§£æææä¾èµæ§ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "æ æ³å®è£
%sï¼å 为å®ä¸ %s å²çª"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s æªå®è£
ï¼ä¸å·²è¢«æ 记为ä¸å¯å®è£
"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "ç±äºä¾èµæ§é®é¢ï¼æ以æ æ³å®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2970,8 +2946,8 @@
msgstr "å é¤ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2979,79 +2955,79 @@
msgstr "ä¸å®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s å
·ææªæ»¡è¶³çéæ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s 缺å°ä¾èµæ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "ç±äºç¼ºå°ä¾èµæ§ï¼æ以æ æ³å®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s å°å®ç° %s çä¾èµæ§ï¼ä½æ¯å°ä¼è¢«å¸è£
"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s å°å®ç° %s çä¾èµæ§ï¼ä½æ¯å°ä¼è¢«ä¿çå¨ç³»ç»ä¸"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "æ éå®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "æ æ³å®è£
%s 以å®ç° %s çä¾èµæ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "æ æ³å®è£
%s 以å®ç° %s çä¾èµæ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s å°ä¸å¸è£
ï¼åå æ¯å®ä»è¢«éè¦"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s åºå¼ %sãä½ %s æ æ³å é¤ï¼å 为å®æ¯éå®çã"
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "æ æ³å®è£
%sï¼å 为å²çª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ç±äºä¸ä»¥ä¸å¯¹è±¡å²çªæ以ä¸å¯å¸è£
ï¼ %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3114,7 +3090,7 @@
msgstr "ä¸å®è£
æå é¤ç¸å
³çå¯è§£æ项"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "å 为éè¦ %sï¼å¯¹äº %sï¼ï¼ å¨å级 %s æ¶"
@@ -3472,15 +3448,25 @@
msgid "Install missing resolvables"
msgstr "å®è£
缺å°çå¯è§£æ项"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "为ææå¯è½çæ解å³è¯ä¾ã"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
#, fuzzy
msgid "Regarding all resolvables with a compatible architecture."
msgstr "使ç¨ææå
¼å®¹æ¶æçå¯è§£æ项"
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "为ææå¯è½çæ解å³è¯ä¾ã"
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "使ç¨ææå
¼å®¹æ¶æçå¯è§£æ项"
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3531,6 +3517,16 @@
msgid "%s part of %s"
msgstr "%s ä¸é¨å %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b>åå»è¶
æ¶ </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+#, fuzzy
+msgid "Start the next solver run with doubled timeout."
+msgstr "为ææå¯è½çæ解å³è¯ä¾ã"
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "解éææå¯è§£æ项"
@@ -3760,8 +3756,7 @@
#. :CCK:166:
#. :CAF:140:
-#: ../zypp/CountryCode.cc:255
-#: ../zypp/CountryCode.cc:257
+#: ../zypp/CountryCode.cc:255 ../zypp/CountryCode.cc:257
msgid "Congo"
msgstr "åæ"
@@ -4827,42 +4822,60 @@
#~ msgid "%s is freshened by %s"
#~ msgstr "%s 被以ä¸å¯¹è±¡å·æ°ï¼ %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "æ æ³å¯¹ URL ææè¿è¡è¯æ³åæ"
+
#~ msgid "Ignore this requirement generally"
#~ msgstr "é常忽ç¥æ¤éæ±"
+
#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
#~ msgstr "%s æ¯å
¶ä»å°å®è£
çå¯è§£æ项æéè¦çï¼å æ¤ä¸ä¼å°å
¶åæ¶é¾æ¥ã"
+
#~ msgid "Cannot create a file needed to perform update installation."
#~ msgstr "æ æ³å建æ§è¡æ´æ°å®è£
æéè¦çæ件ã"
+
#~ msgid "Unable to restore all sources."
#~ msgstr "æ æ³æ¢å¤æææº"
+
#~ msgid "At least one source already registered, stored sources cannot be restored."
#~ msgstr "è³å°å·²æ³¨åäºä¸ä¸ªæºï¼ä¿åçæºæ æ³æ¢å¤ã"
+
#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
#~ msgstr "æ æ³å®è£
%s 以å®ç° %s çä¾èµæ§"
+
#~ msgid "%s dependend on %s"
#~ msgstr "%s ä¾èµäº %s"
+
#~ msgid "Reading index files"
#~ msgstr "æ£å¨è¯»åç´¢å¼æ件"
+
#~ msgid "The signed repomd.xml file failed the signature check."
#~ msgstr "å·²ç¾åç repomd.xml æ件æªè½éè¿ç¾åæ£æ¥ã"
+
#~ msgid "Reading product from %s"
#~ msgstr "æ£å¨ä» %s 读å产å"
+
#~ msgid "Reading filelist from %s"
#~ msgstr "æ£å¨ä» %s 读åæ件å表"
+
#~ msgid "Reading packages from %s"
#~ msgstr "æ£å¨ä» %s 读åå
"
+
#~ msgid "Reading selection from %s"
#~ msgstr "æ£å¨ä» %s 读åéæ©"
+
#~ msgid "Reading pattern from %s"
#~ msgstr "æ£å¨ä» %s 读å模å¼"
+
#~ msgid "Reading patches index %s"
#~ msgstr "æ£å¨è¯»åå¢è¡¥ç¨åºç´¢å¼ %s"
+
#~ msgid "Reading patch %s"
#~ msgstr "æ£å¨è¯»åå¢è¡¥ç¨åº %s"
+
#~ msgid "The script file failed the checksum test."
#~ msgstr "èæ¬æ件æªè½éè¿æ ¡éªåæµè¯ã"
+
#~ msgid "Reading packages file"
#~ msgstr "æ£å¨è¯»åå
æ件"
-
Modified: trunk/libzypp/po/zh_TW.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zh_TW.po?rev=7166&r1=…
==============================================================================
--- trunk/libzypp/po/zh_TW.po (original)
+++ trunk/libzypp/po/zh_TW.po Mon Sep 10 16:18:44 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-05-31 13:41\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -111,36 +111,36 @@
msgid "History:"
msgstr "æ·å²è¨éï¼"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "applydeltarpm 檢æ¥å¤±æã"
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "applydeltarpm 失æã"
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "å¥ä»¶ %s å®æ´æ§æª¢æ¥å¤±æã æ¨è¦é試ä¸è¼åï¼"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
msgid "No url in repository."
msgstr "å¥ä»¶åº«ä¸æ²æ urlã"
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, c-format
msgid "Can't provide file %s from repository %s"
msgstr "æªæ¡ %s ç¡æ³ç±å¥ä»¶åº« %s æä¾"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr "æ£å¨è®å '%s' å¥ä»¶åº«å¿«å"
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr "æ£å¨ç± '%s' å¥ä»¶åº«å¿«åè®åè·¯å¾å delta rpm"
@@ -164,27 +164,28 @@
msgid "Cleaning repository '%s' cache"
msgstr "æ£å¨æ¸
é¤å¥ä»¶åº« '%s' çå¿«å"
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr "å¨æå®ç URL ä¸æ¾ä¸å°ææçä¸ç¹¼è³è¨"
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr "æ£å¨å»ºç«å¥ä»¶åº« '%s' çå¿«å"
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr "æ£å¨è®åå¥ä»¶åº« '%s' çå¿«å"
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr "æ£å¨æ°å¢å¥ä»¶åº« '%s'"
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, c-format
msgid "Removing repository '%s'"
msgstr "æ£å¨ç§»é¤å¥ä»¶åº« '%s'"
@@ -2635,19 +2636,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "%s çå·²è®æ´çµæ
æªï¼"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm å·²å° %s å²åçº %sï¼ä½çä¸åºå·®ç°"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2657,13 +2658,13 @@
"éæ¯å 25 è¡å·®ç°ï¼\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm å·²å° %s 建ç«çº %sï¼ä½çä¸åºå·®ç°"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2674,46 +2675,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "%s å®è£å¤±æ"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "rpm 輸åºï¼"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s å®è£æå"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "å
¶ä» rpm 輸åºï¼"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "%s 移é¤å¤±æ"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "%s 移é¤æå"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "已建ç«å份 %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "å®è£å·²å¦æ示ä¸æ¢ã"
@@ -2731,64 +2732,74 @@
msgstr "%s 已被 %s å代"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s å°è¢«ä½¿ç¨è
åªé¤ã\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s å°è¢«å
¶ä»æç¨ç¨å¼åªé¤ã(ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s å°è¢«ä½¿ç¨è
å®è£ã\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s å°è¢«å
¶ä»æç¨ç¨å¼å®è£ã(ApplLow/ApplHigh)\n"
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, fuzzy, c-format
+msgid "No valid solution found within %d seconds"
+msgstr "å¨æ¤å¯ä¸æä½³æ¶æ§ä¸æ²æå¯ç¨ç解決æ¹æ¡ã"
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr "å¨æ¤å¯ä¸æä½³æ¶æ§ä¸æ²æå¯ç¨ç解決æ¹æ¡ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "å¨é種å·è¡æ
æ³ä¸ï¼åªç½æ¶æ¤å¯ä¸æä½³æ¶æ§ç解決æ¹æ¡ã\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "ç½æ¶æææ¶æ§ç解決æ¹æ¡æè±è¼é·æéï¼ä½å¯è½æå¾å°å¯ç¨ççµæã"
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "ç¡æçè³è¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s æ¯å
¶ä»å¯è§£æ±ºæ¹æ¡çå¿
è¦é
ç®"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s æ¯ %s çå¿
è¦é
ç®"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2798,7 +2809,7 @@
"%s çå¿
è¦é
ç®ï¼"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s èå
¶ä»è§£æ±ºæ¹æ¡ç¼çè¡çª"
@@ -2807,14 +2818,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s è %s è¡çª"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2824,24 +2835,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s ææ±°æå
¶ä»è§£æ±ºæ¹æ¡"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s æ±°æ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s æ±°æï¼%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2850,7 +2861,7 @@
"éäºå¯è§£æ±ºæ¹æ¡å°å¾ç³»çµ±ä¸åªé¤ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ä¾è³´æ¼å
¶ä»è§£æ±ºæ¹æ¡"
@@ -2858,38 +2869,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s ä¾è³´æ¼ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s ä¾è³´æ¼ï¼%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "å件屬æ¼"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "ç¡æ³å®è£ %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "æ²æä»»ä½æä¾ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2897,31 +2908,31 @@
"\n"
"æ²ææ¯æ´æ¤éæ±çå¯ç¨è³æºã"
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "å çºå¦ä¸/ä¸ææè¿°çåé¡ï¼å°è´æ¤è§£æ±ºæ¹æ¡ç¡æ³è§£æ±ºææç¸ä¾æ§ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "ç¡æ³å®è£ %sï¼å çºå®è %s è¡çª"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "æªå®è£ %s ä¸å·²å°å
¶æ¨ç¤ºçºä¸å¯å®è£"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "å çºç¸ä¾æ§åé¡ï¼å°è´ç¡æ³å®è£ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2929,8 +2940,8 @@
msgstr "åªé¤ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2938,79 +2949,79 @@
msgstr "è«å¿å®è£ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s æç¡æ³æ»¿è¶³çéæ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s 缺å°ç¸ä¾æ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "å çºç¼ºå°ç¸ä¾æ§ï¼å°è´ç¡æ³å®è£ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s æ»¿è¶³å° %s çç¸ä¾ï¼ä½æ¯å°è¢«è§£é¤å®è£"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s æ»¿è¶³å° %s çç¸ä¾æ§ï¼ä½æä¿çå¨æ¨ç系統ä¸"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "ä¸éè¦å®è£ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "ç¡æ³å®è£ %s 以滿足å°æ¼ %s çç¸ä¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "ç¡æ³å®è£ %s 以滿足å°æ¼ %s çç¸ä¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "ä¸æ解é¤å®è£ %sï¼å çºä»é使ç¨å®"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s æ±°æ %sï¼ä½ç¡æ³åªé¤ %sï¼å çºå·²ç¶è¢«éå®ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "ç¡æ³å®è£ %sï¼å çºæè¡çª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ç¡æ³å®è£ï¼å çºè %s è¡çª"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "éæ± %s ç¡æ³è¢«æ»¿è¶³ã"
@@ -3037,11 +3048,13 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
msgid "Install %s although it would change the vendor"
msgstr "å®è£ %sï¼å³ä½¿å®æè®æ´å» å"
#. TranslatorExplanation %s = name of package, patch, selection ...
#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
msgid "%s provides this dependency, but would change the vendor of the installed item"
msgstr "%s å¯æä¾éé
ç¸ä¾æ§ï¼ä½æ¯å®æè®æ´å·²å®è£é
ç®çå» å"
@@ -3069,7 +3082,7 @@
msgstr "è«å¿å®è£æåªé¤ç¸é解決æ¹æ¡"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "å¿
é å
·å %s ç %sï¼æè½åç´ %s"
@@ -3322,6 +3335,7 @@
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, c-format
msgid "%s provides %s, but has another vendor (%s)."
msgstr "%s å¯æä¾ %sï¼ä½å®æ¯ä¸åå» å (%s) æä¾çã"
@@ -3426,14 +3440,24 @@
msgid "Install missing resolvables"
msgstr "å®è£ç¼ºå°ç解決æ¹æ¡"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr "建ç«ä¸åéå°ä»»ä½å¯è½ç解決æ¹æ¡"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr "éæ¼å°ç¸å®¹æ¶æ§çææ解決æ¹æ¡ã"
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+#, fuzzy
+msgid "Make a solver run with best architecture only."
+msgstr "建ç«ä¸åéå°ä»»ä½å¯è½ç解決æ¹æ¡"
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+#, fuzzy
+msgid "Regarding resolvables with best architecture only."
+msgstr "éæ¼å°ç¸å®¹æ¶æ§çææ解決æ¹æ¡ã"
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3484,6 +3508,16 @@
msgid "%s part of %s"
msgstr "%sï¼å
¨é¨ %s)"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b>é£æå
©ä¸é¾æ </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+#, fuzzy
+msgid "Start the next solver run with doubled timeout."
+msgstr "建ç«ä¸åéå°ä»»ä½å¯è½ç解決æ¹æ¡"
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "解é¤éå®ææ解決æ¹æ¡"
Modified: trunk/libzypp/po/zu.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zu.po?rev=7166&r1=716…
==============================================================================
--- trunk/libzypp/po/zu.po (original)
+++ trunk/libzypp/po/zu.po Mon Sep 10 16:18:44 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"POT-Creation-Date: 2007-09-03 13:53+0200\n"
"PO-Revision-Date: 2006-11-03 12:03\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -109,37 +109,37 @@
msgid "History:"
msgstr "Linganisa Umlando"
-#: ../zypp/repo/PackageProvider.cc:222
+#: ../zypp/repo/PackageProvider.cc:237
msgid "applydeltarpm check failed."
msgstr "ukuhlola i-applydeltarpm kuhlulekile."
-#: ../zypp/repo/PackageProvider.cc:236
+#: ../zypp/repo/PackageProvider.cc:251
msgid "applydeltarpm failed."
msgstr "i-applydeltarpm ihlulekile."
#. TranslatorExplanation %s = package being checked for integrity
-#: ../zypp/repo/PackageProvider.cc:303
+#: ../zypp/repo/PackageProvider.cc:318
#, fuzzy, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
msgstr "Iphakheji %s ihlulekile lapho ihlolwa ukuthembeka. Ufuna ukuphinde uzame ukuyilanda futhi?"
-#: ../zypp/repo/RepoProvideFile.cc:205
+#: ../zypp/repo/RepoProvideFile.cc:206
#, fuzzy
msgid "No url in repository."
msgstr "Ifayela %1 ayitholakali enqolobaneni yamafayela."
#. iteration over urls
-#: ../zypp/repo/RepoProvideFile.cc:267
+#: ../zypp/repo/RepoProvideFile.cc:278
#, fuzzy, c-format
msgid "Can't provide file %s from repository %s"
msgstr "Ayikwazi ukuhlinzeka nge-%s kwi-%s"
-#: ../zypp/repo/cached/RepoImpl.cc:78
+#: ../zypp/repo/cached/RepoImpl.cc:73
#, c-format
msgid "Reading '%s' repository cache"
msgstr ""
-#: ../zypp/repo/cached/RepoImpl.cc:199
+#: ../zypp/repo/cached/RepoImpl.cc:194
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
msgstr ""
@@ -164,27 +164,28 @@
msgid "Cleaning repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:614
+#. we will throw this later if no URL checks out fine
+#: ../zypp/RepoManager.cc:521
msgid "Valid metadata not found at specified URL(s)"
msgstr ""
-#: ../zypp/RepoManager.cc:664
+#: ../zypp/RepoManager.cc:677
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:809
+#: ../zypp/RepoManager.cc:822
#, c-format
msgid "Reading repository '%s' cache"
msgstr ""
-#: ../zypp/RepoManager.cc:899
+#: ../zypp/RepoManager.cc:912
#, c-format
msgid "Adding repository '%s'"
msgstr ""
-#: ../zypp/RepoManager.cc:1004
+#: ../zypp/RepoManager.cc:1017
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Ukubuyisela imithombo yokwaziswa"
@@ -2635,19 +2636,19 @@
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1749
+#: ../zypp/target/rpm/RpmDb.cc:1779
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Amafayela okuhlela ashintshile e-%s:"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1913
+#: ../zypp/target/rpm/RpmDb.cc:1943
#, fuzzy, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "I-rpm igcine %s njenge-%s kodwa bekungenakwenzeka ukubona umehluko"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1915
+#: ../zypp/target/rpm/RpmDb.cc:1945
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -2657,13 +2658,13 @@
"Nansi imigqa yokuqala engu-25 yomehluko:\n"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1918
+#: ../zypp/target/rpm/RpmDb.cc:1948
#, fuzzy, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "I-rpm yakhe %s njenge-%s kodwa bekungenakwenzeka ukubona umehluko"
#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:1920
+#: ../zypp/target/rpm/RpmDb.cc:1950
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -2674,46 +2675,46 @@
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1926
+#: ../zypp/target/rpm/RpmDb.cc:1956
#, c-format
msgid "%s install failed"
msgstr "ukufakwa kwe-%s akuphumelelanga"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075
msgid "rpm output:"
msgstr "okukhishiwe kwe-rpm:"
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:1933
+#: ../zypp/target/rpm/RpmDb.cc:1963
#, c-format
msgid "%s installed ok"
msgstr "%s efakiwe ilungile"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083
msgid "Additional rpm output:"
msgstr "Okunye okukhishiwe kwe-rpm:"
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2044
+#: ../zypp/target/rpm/RpmDb.cc:2074
#, c-format
msgid "%s remove failed"
msgstr "Ukususa i-%s akuphumelelanga"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2080
#, c-format
msgid "%s remove ok"
msgstr "ukususa i-%s kuphumelele"
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2195
+#: ../zypp/target/rpm/RpmDb.cc:2225
#, c-format
msgid "created backup %s"
msgstr "yakhe i-backup %s"
-#: ../zypp/target/TargetImpl.cc:730
+#: ../zypp/target/TargetImpl.cc:731
msgid "Installation has been aborted as directed."
msgstr "Ukufaka kuyekiwe njengoba kunikezwe isiqondiso."
@@ -2731,7 +2732,7 @@
msgstr "%s ingenelwe esikhundleni yi- %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:262
+#: ../zypp/solver/detail/Resolver_problems.cc:263
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2739,58 +2740,68 @@
"Lezi zixazululi zizosulwa kwisistimu."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:267
+#: ../zypp/solver/detail/Resolver_problems.cc:268
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:273
+#: ../zypp/solver/detail/Resolver_problems.cc:274
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s ayinakukhishwa ngoba isadingeka namanje"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:278
+#: ../zypp/solver/detail/Resolver_problems.cc:279
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
+#. This can be generated by a timout only
+#: ../zypp/solver/detail/Resolver_problems.cc:356
+#, c-format
+msgid "No valid solution found within %d seconds"
+msgstr ""
+
+#: ../zypp/solver/detail/Resolver_problems.cc:357
+msgid "The solver has reached a defined timout"
+msgstr ""
+
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:337
+#: ../zypp/solver/detail/Resolver_problems.cc:383
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:338
+#: ../zypp/solver/detail/Resolver_problems.cc:384
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:339
+#: ../zypp/solver/detail/Resolver_problems.cc:385
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:365
+#: ../zypp/solver/detail/Resolver_problems.cc:411
msgid "Invalid information"
msgstr "ukwaziswa okungasebenzi"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:372
+#: ../zypp/solver/detail/Resolver_problems.cc:418
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s idingwa ezinye izixazululi"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:375
+#: ../zypp/solver/detail/Resolver_problems.cc:421
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s idingwa yi- %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:376
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2800,7 +2811,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:383
+#: ../zypp/solver/detail/Resolver_problems.cc:429
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ixabana nezinye izixazululi"
@@ -2809,14 +2820,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:386
+#: ../zypp/solver/detail/Resolver_problems.cc:432
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s ixabana ne- %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:388
+#: ../zypp/solver/detail/Resolver_problems.cc:434
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2826,24 +2837,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:417
+#: ../zypp/solver/detail/Resolver_problems.cc:463
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s yenza ezinye izixazululi zingasebenzi"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:466
#, c-format
msgid "%s obsoletes %s"
msgstr "%s yenza zingasebenzi %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:422
+#: ../zypp/solver/detail/Resolver_problems.cc:468
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s yenza zingasebenzi:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:469
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2852,7 +2863,7 @@
"Lezi zixazululi zizosulwa kwisistimu."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:431
+#: ../zypp/solver/detail/Resolver_problems.cc:477
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s yenzike kwezinye izixazululi"
@@ -2860,38 +2871,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:435
+#: ../zypp/solver/detail/Resolver_problems.cc:481
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s yencike kwi- %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:484
#, c-format
msgid "%s depends on:%s"
msgstr "%s yencike kwi-:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:444
+#: ../zypp/solver/detail/Resolver_problems.cc:490
msgid "Child of"
msgstr "Ingane ka-"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:450
-#: ../zypp/solver/detail/Resolver_problems.cc:534
+#: ../zypp/solver/detail/Resolver_problems.cc:496
+#: ../zypp/solver/detail/Resolver_problems.cc:580
#, c-format
msgid "Cannot install %s"
msgstr "Ayikwazi ukufaka %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:452
+#: ../zypp/solver/detail/Resolver_problems.cc:498
#, c-format
msgid "None provides %s"
msgstr "Akukho okunikeza %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:453
+#: ../zypp/solver/detail/Resolver_problems.cc:499
#, fuzzy
msgid ""
"\n"
@@ -2900,32 +2911,32 @@
"\n"
"Awukho umthombo otholakalayo osekela lemfuneko."
-#: ../zypp/solver/detail/Resolver_problems.cc:461
+#: ../zypp/solver/detail/Resolver_problems.cc:507
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Izinkinga ezidlulelwe yisikhathi ezichazwe ngenhla/ngezansi kwalokhu ngeke zixazulule zonke izinhlelo okuncikwe kuzo."
-#: ../zypp/solver/detail/Resolver_problems.cc:472
-#: ../zypp/solver/detail/Resolver_problems.cc:854
+#: ../zypp/solver/detail/Resolver_problems.cc:518
+#: ../zypp/solver/detail/Resolver_problems.cc:900
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Ayikwazi ukufaka %s ngoba ixabana ne-%s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:490
+#: ../zypp/solver/detail/Resolver_problems.cc:536
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s ayifakwanga futhi iye yaphawulwa njengengafakeki"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:502
+#: ../zypp/solver/detail/Resolver_problems.cc:548
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Ayikwazi ukufaka %s ngenxa yezinkinga zohlelo oluncike kwezinye"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:544
-#: ../zypp/solver/detail/Resolver_problems.cc:554
+#: ../zypp/solver/detail/Resolver_problems.cc:590
+#: ../zypp/solver/detail/Resolver_problems.cc:600
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2933,8 +2944,8 @@
msgstr "Susa %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:547
-#: ../zypp/solver/detail/Resolver_problems.cc:557
+#: ../zypp/solver/detail/Resolver_problems.cc:593
+#: ../zypp/solver/detail/Resolver_problems.cc:603
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2942,79 +2953,79 @@
msgstr "ungafaki %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:570
+#: ../zypp/solver/detail/Resolver_problems.cc:616
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s inezimfuneko ezingagcwalisiwe"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:609
+#: ../zypp/solver/detail/Resolver_problems.cc:655
#, c-format
msgid "%s has missing dependencies"
msgstr "%s inezinhlelo encike kuzo ezilahlekile"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:657
+#: ../zypp/solver/detail/Resolver_problems.cc:703
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s ayikwazi ukufkwa ngenxa yezinhlelo encike kuzo ezilahlekile"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:714
+#: ../zypp/solver/detail/Resolver_problems.cc:760
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s igcwalisa izinhlelo okuncikwe kuzo ze-%s kodwa izokhishwa"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:724
+#: ../zypp/solver/detail/Resolver_problems.cc:770
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s igcwalisa izinhlelo okuncikwe kuzo ze-%s kodwa izogcinwa kwisistimu yakho"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:780
#, c-format
msgid "No need to install %s"
msgstr "Asikho isidingo sokuyifaka %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:742
+#: ../zypp/solver/detail/Resolver_problems.cc:788
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Ayikwazi ukufaka %s ukuze igcwalise izinhlelo okuncikwe kuzo ze-%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:757
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Ayikwazi ukufaka %s ukuze igcwalise izinhlelo okuncikwe kuzo ze-%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:795
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:841
+#: ../zypp/solver/detail/Resolver_problems.cc:849
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ayinakukhishwa ngoba isadingeka namanje"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:826
+#: ../zypp/solver/detail/Resolver_problems.cc:872
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s yenza ingasebenzi i-%s. Kodwa %s ayikwazi ukususwa ngoba ihluthulelwe."
-#: ../zypp/solver/detail/Resolver_problems.cc:858
+#: ../zypp/solver/detail/Resolver_problems.cc:904
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Ayikwazi ukufaka %s ngoba iyaxabana"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:880
+#: ../zypp/solver/detail/Resolver_problems.cc:926
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ayifakeki ngenxa yokuxabana ne- %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:894
+#: ../zypp/solver/detail/Resolver_problems.cc:940
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
@@ -3077,7 +3088,7 @@
msgstr "Ungafaki noma ususe maqondana nezixazululi"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:763
+#: ../zypp/solver/detail/QueueItemRequire.cc:791
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ngokudinga i-%s ye-%s lapho kuvuselelwa uhlelo %s"
@@ -3435,14 +3446,22 @@
msgid "Install missing resolvables"
msgstr "Faka izixazululi ezilahlekile"
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53
msgid "Make a solver run with ALL possibilities."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54
msgid "Regarding all resolvables with a compatible architecture."
msgstr ""
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57
+msgid "Make a solver run with best architecture only."
+msgstr ""
+
+#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58
+msgid "Regarding resolvables with best architecture only."
+msgstr ""
+
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
#, c-format
@@ -3493,6 +3512,15 @@
msgid "%s part of %s"
msgstr "%s ingxenye ye- %s"
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50
+#, fuzzy
+msgid "Double timeout"
+msgstr "<b>Ukuchofoza Kabili Kuphelelwe Isikhathi </b>"
+
+#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51
+msgid "Start the next solver run with doubled timeout."
+msgstr ""
+
#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70
msgid "unlock all resolvables"
msgstr "Vula izihluthulelo zezixazululi"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7165 - in /trunk/libzypp: package/libzypp.changes zypp/DiskUsageCounter.cc
by lslezak@svn.opensuse.org 10 Sep '07
by lslezak@svn.opensuse.org 10 Sep '07
10 Sep '07
Author: lslezak
Date: Mon Sep 10 15:53:08 2007
New Revision: 7165
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7165&view=rev
Log:
- fixed disk usage counting of updated packages (#308362)
Modified:
trunk/libzypp/package/libzypp.changes
trunk/libzypp/zypp/DiskUsageCounter.cc
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Mon Sep 10 15:53:08 2007
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Sep 10 15:50:49 CEST 2007 - lslezak(a)suse.cz
+
+- fixed disk usage counting of updated packages (#308362)
+
+-------------------------------------------------------------------
Mon Sep 10 14:17:29 CEST 2007 - schubi(a)suse.de
- Splitting packages: Take the package with the best
Modified: trunk/libzypp/zypp/DiskUsageCounter.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/DiskUsageCounter.cc…
==============================================================================
--- trunk/libzypp/zypp/DiskUsageCounter.cc (original)
+++ trunk/libzypp/zypp/DiskUsageCounter.cc Mon Sep 10 15:53:08 2007
@@ -95,7 +95,7 @@
{
if (inst)
{
- if (nameit->status().isInstalled())
+ if (nameit->status().isInstalled() && !nameit->status().isToBeUninstalled())
{
found_installed = true;
XXX << name << '-' << (*it)->edition() << ": found already installed package (" << (*nameit)->edition() << ")" << std::endl;
@@ -114,7 +114,7 @@
}
else
{
- if (inst && nameit->status().isInstalled())
+ if (inst && nameit->status().isInstalled() && !nameit->status().isToBeUninstalled())
{
// just freshen the package, don't change du statistics
found_installed = true;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7164 - in /trunk/zypper/src: zypper-callbacks.cc zypper-callbacks.h zypper.cc
by jkupec@svn.opensuse.org 10 Sep '07
by jkupec@svn.opensuse.org 10 Sep '07
10 Sep '07
Author: jkupec
Date: Mon Sep 10 15:29:34 2007
New Revision: 7164
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7164&view=rev
Log:
- report too many arguments (#307639)
Modified:
trunk/zypper/src/zypper-callbacks.cc
trunk/zypper/src/zypper-callbacks.h
trunk/zypper/src/zypper.cc
Modified: trunk/zypper/src/zypper-callbacks.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-callbacks.cc?r…
==============================================================================
--- trunk/zypper/src/zypper-callbacks.cc (original)
+++ trunk/zypper/src/zypper-callbacks.cc Mon Sep 10 15:29:34 2007
@@ -197,6 +197,8 @@
cerr << endl;
}
+// ----------------------------------------------------------------------------
+
void report_problem(const zypp::Exception & e,
const string & problem_desc,
const string & hint)
@@ -212,6 +214,16 @@
cerr << hint << endl;
}
+// ----------------------------------------------------------------------------
+
+void report_too_many_arguments(const string & specific_help)
+{
+ //! \todo make this more explanatory, e.g. "Ingoring arg1 arg2. This command does not take arguments. See %s for more information."
+ cerr << _("Too many arguments") << '.' << endl;
+ cout_n << _("Usage") << ':' << endl;
+ cout_n << specific_help;
+}
+
// Local Variables:
// c-basic-offset: 2
// End:
Modified: trunk/zypper/src/zypper-callbacks.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-callbacks.h?re…
==============================================================================
--- trunk/zypper/src/zypper-callbacks.h (original)
+++ trunk/zypper/src/zypper-callbacks.h Mon Sep 10 15:29:34 2007
@@ -97,4 +97,9 @@
const string & problem_desc,
const string & hint = "");
+/**
+ *
+ */
+void report_too_many_arguments(const string & specific_help);
+
#endif
Modified: trunk/zypper/src/zypper.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=7164&r1…
==============================================================================
--- trunk/zypper/src/zypper.cc (original)
+++ trunk/zypper/src/zypper.cc Mon Sep 10 15:29:34 2007
@@ -796,6 +796,13 @@
return ZYPPER_EXIT_ERR_PRIVILEGES;
}
+ // too many arguments
+ if (arguments.size() > 2)
+ {
+ report_too_many_arguments(specific_help);
+ return ZYPPER_EXIT_ERR_INVALID_ARGS;
+ }
+
// indeterminate indicates the user has not specified the values
tribool enabled(indeterminate);
tribool refresh(indeterminate);
@@ -878,10 +885,19 @@
{
cerr << _("Required argument missing.") << endl;
ERR << "Required argument missing." << endl;
+ cout_n << _("Usage") << ':' << endl;
cout_n << specific_help;
return ZYPPER_EXIT_ERR_INVALID_ARGS;
}
+ // too many arguments
+ //! \todo allow to specify multiple repos to delete
+ else if (arguments.size() > 1)
+ {
+ report_too_many_arguments(specific_help);
+ return ZYPPER_EXIT_ERR_INVALID_ARGS;
+ }
+
warn_if_zmd ();
bool found = remove_repo(arguments[0]);
@@ -952,6 +968,12 @@
cout_n << specific_help;
return ZYPPER_EXIT_ERR_INVALID_ARGS;
}
+ // too many arguments
+ else if (arguments.size() > 2)
+ {
+ report_too_many_arguments(specific_help);
+ return ZYPPER_EXIT_ERR_INVALID_ARGS;
+ }
// cond_init_target ();
warn_if_zmd ();
@@ -992,6 +1014,12 @@
cout_n << specific_help;
return ZYPPER_EXIT_ERR_INVALID_ARGS;
}
+ // too many arguments
+ if (arguments.size() > 1)
+ {
+ report_too_many_arguments(specific_help);
+ return ZYPPER_EXIT_ERR_INVALID_ARGS;
+ }
modify_repo(arguments[0]);
}
@@ -1145,9 +1173,10 @@
{
ZyppSearchOptions options;
- if (ghelp) {
+ if (ghelp)
+ {
cout << specific_help;
- return !ghelp;
+ return ZYPPER_EXIT_OK;
}
if (gSettings.disable_system_resolvables || copts.count("uninstalled-only"))
@@ -1220,9 +1249,17 @@
// TODO: rug summary
else if (command == ZypperCommand::PATCH_CHECK) {
- if (ghelp) {
+ if (ghelp)
+ {
cout << specific_help;
- return !ghelp;
+ return ZYPPER_EXIT_OK;
+ }
+
+ // too many arguments
+ if (arguments.size() > 0)
+ {
+ report_too_many_arguments(specific_help);
+ return ZYPPER_EXIT_ERR_INVALID_ARGS;
}
cond_init_target ();
@@ -1251,9 +1288,17 @@
// --------------------------( patches )------------------------------------
else if (command == ZypperCommand::SHOW_PATCHES) {
- if (ghelp) {
+ if (ghelp)
+ {
cout << specific_help;
- return !ghelp;
+ return ZYPPER_EXIT_OK;
+ }
+
+ // too many arguments
+ if (arguments.size() > 0)
+ {
+ report_too_many_arguments(specific_help);
+ return ZYPPER_EXIT_ERR_INVALID_ARGS;
}
cond_init_target ();
@@ -1269,10 +1314,17 @@
// --------------------------( list updates )-------------------------------
else if (command == ZypperCommand::LIST_UPDATES) {
- if (ghelp) {
- // FIXME catalog...
+ if (ghelp)
+ {
cout << specific_help;
- return !ghelp;
+ return ZYPPER_EXIT_OK;
+ }
+
+ // too many arguments
+ if (arguments.size() > 0)
+ {
+ report_too_many_arguments(specific_help);
+ return ZYPPER_EXIT_ERR_INVALID_ARGS;
}
string skind = copts.count("type")? copts["type"].front() :
@@ -1307,8 +1359,11 @@
// -----------------( xml list updates and patches )------------------------
else if (command == ZypperCommand::XML_LIST_UPDATES_PATCHES) {
-
- if (ghelp) { cout << specific_help << endl; return !ghelp; }
+ if (ghelp)
+ {
+ cout << specific_help;
+ return ZYPPER_EXIT_OK;
+ }
cond_init_target ();
int initret = init_repos();
@@ -1330,7 +1385,11 @@
// -----------------------------( update )----------------------------------
else if (command == ZypperCommand::UPDATE) {
- if (ghelp) { cout << specific_help; return !ghelp; }
+ if (ghelp)
+ {
+ cout << specific_help;
+ return ZYPPER_EXIT_OK;
+ }
// check root user
if (geteuid() != 0)
@@ -1339,6 +1398,13 @@
return ZYPPER_EXIT_ERR_PRIVILEGES;
}
+ // too many arguments
+ if (arguments.size() > 0)
+ {
+ report_too_many_arguments(specific_help);
+ return ZYPPER_EXIT_ERR_INVALID_ARGS;
+ }
+
// rug compatibility code
// switch on non-interactive mode if no-confirm specified
if (copts.count("no-confirm"))
@@ -1396,9 +1462,19 @@
else if (command == ZypperCommand::INFO ||
command == ZypperCommand::RUG_PATCH_INFO) {
- if (ghelp || arguments.size() == 0) {
- cerr << specific_help;
- return !ghelp;
+ if (ghelp)
+ {
+ cout << specific_help;
+ return ZYPPER_EXIT_OK;
+ }
+
+ if (arguments.size() < 1)
+ {
+ cerr << _("Required argument missing.") << endl;
+ ERR << "Required argument missing." << endl;
+ cout_n << _("Usage") << ':' << endl;
+ cout_n << specific_help;
+ return ZYPPER_EXIT_ERR_INVALID_ARGS;
}
cond_init_target ();
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7163 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher@svn.opensuse.org 10 Sep '07
by tgoettlicher@svn.opensuse.org 10 Sep '07
10 Sep '07
Author: tgoettlicher
Date: Mon Sep 10 15:14:15 2007
New Revision: 7163
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7163&view=rev
Log:
changes
Modified:
trunk/updater-kde/package/opensuse-updater-kde.changes
Modified: trunk/updater-kde/package/opensuse-updater-kde.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.changes (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.changes Mon Sep 10 15:14:15 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 10 15:10:37 CEST 2007 - tgoettlicher(a)suse.de
+
+- fixed declining license does not abort (#308985)
+- r7162
+
+-------------------------------------------------------------------
Fri Sep 7 14:58:25 CEST 2007 - tgoettlicher(a)suse.de
- updated translations
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7162 - /trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
by tgoettlicher@svn.opensuse.org 10 Sep '07
by tgoettlicher@svn.opensuse.org 10 Sep '07
10 Sep '07
Author: tgoettlicher
Date: Mon Sep 10 15:13:15 2007
New Revision: 7162
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7162&view=rev
Log:
fixed declining license does not abort (#308985)
Modified:
trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpd…
==============================================================================
--- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original)
+++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Mon Sep 10 15:13:15 2007
@@ -443,6 +443,10 @@
item = (QCheckListItem*)item->nextSibling();
}
+ if ( installPatchList.isEmpty() && installPackageList.isEmpty() )
+ return;
+
+
resetXmlStream();
_error=false;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
10 Sep '07
Author: schubi2
Date: Mon Sep 10 14:18:23 2007
New Revision: 7161
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7161&view=rev
Log:
r 7160
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Mon Sep 10 14:18:23 2007
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Mon Sep 10 14:17:29 CEST 2007 - schubi(a)suse.de
+
+- Splitting packages: Take the package with the best
+ architecture,edition ONLY; Bug 308591
+- r 7160
+
+-------------------------------------------------------------------
Mon Sep 10 10:55:45 CEST 2007 - lslezak(a)suse.cz
- properly report fallback disk usage size (in kB instead of bytes)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7160 - /trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
by schubi2@svn.opensuse.org 10 Sep '07
by schubi2@svn.opensuse.org 10 Sep '07
10 Sep '07
Author: schubi2
Date: Mon Sep 10 14:16:36 2007
New Revision: 7160
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7160&view=rev
Log:
- Splitting packages: Take the package with the best
architecture,edition ONLY; Bug 308591
Modified:
trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original)
+++ trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Mon Sep 10 14:16:36 2007
@@ -612,17 +612,61 @@
if ( !toadd.size() ) {
INT << "Empty SplitPkgMap entry for " << installed << endl;
} else {
+ FindMap candidate;
for ( PoolItemOrderSet::iterator ait = toadd.begin(); ait != toadd.end(); ++ait ) {
- PoolItem_Ref split_candidate = *ait;
- MIL << " ==> ADD (splitted): " << split_candidate << endl;
- if ( probably_dropped
- && split_candidate.status().staysUninstalled()
- && doesObsoleteItem (split_candidate, installed))
- {
- probably_dropped = false;
- }
+ PoolItem_Ref split_candidate = *ait;
+ if ( probably_dropped
+ && split_candidate.status().staysUninstalled()
+ && doesObsoleteItem (split_candidate, installed))
+ {
+ probably_dropped = false;
+ }
+
+ FindMap::iterator itcandidate = candidate.find( split_candidate->name() );
+
+ if (itcandidate != candidate.end()) { // split canidate with the same name found
+ if (split_candidate.status().isToBeInstalled()
+ || itcandidate->second.status().isToBeInstalled()) {
+
+ if (split_candidate.status().isToBeInstalled()
+ && itcandidate->second.status().isToBeInstalled()) {
+ ERR << "only one should be set for installation: " << itcandidate->second << "; " << split_candidate << endl;
+ } else {
+ if (split_candidate.status().isToBeInstalled()) {
+ itcandidate->second = split_candidate; // take thatone which is already set for installation
+ }
+ }
+ } else {
+ // not the same --> find better provider
+ if (itcandidate->second->arch() != installed->arch()
+ && split_candidate->arch() == installed->arch() ) {
+ // prefer candidate which the same architecture as the installed item
+ itcandidate->second = split_candidate;
+ } else {
+ int cmp = itcandidate->second->arch().compare( split_candidate->arch() );
+ if (cmp < 0) { // new provider has better arch
+ itcandidate->second = split_candidate;
+ }
+ else if (cmp == 0) { // new provider has equal arch
+ if (itcandidate->second->edition().compare( split_candidate->edition() ) < 0) {
+ itcandidate->second = split_candidate; // new provider has better edition
+ }
+ }
+ }
+ }
+ }
+ else {
+ candidate[split_candidate->name()] = split_candidate;
+ }
+ }
+
+ PoolItemOrderSet addcandidate;
+ for (FindMap::iterator itcandidate = candidate.begin() ; itcandidate != candidate.end(); itcandidate++) {
+ addcandidate.insert(itcandidate->second);
+ MIL << " ==> ADD (splitted): " << itcandidate->second << endl;
}
- addSplitted[installed] = toadd;
+
+ addSplitted[installed] = addcandidate;
}
// count stats later
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
Author: jkupec
Date: Mon Sep 10 13:51:57 2007
New Revision: 7159
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7159&view=rev
Log:
- --keyword=_PL:1,2 added (plural forms were not extracted without it
:O(
Modified:
trunk/zypper/po/createPot
Modified: trunk/zypper/po/createPot
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/po/createPot?rev=7159&r1=…
==============================================================================
--- trunk/zypper/po/createPot (original)
+++ trunk/zypper/po/createPot Mon Sep 10 13:51:57 2007
@@ -4,4 +4,4 @@
SRCFILES=$(cat POTFILES.in | grep -v -P '#.+')
#calling xgettext with the sourcefiles
-xgettext --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --foreign-user --copyright-holder="SuSE Linux Products GmbH, Nuernberg" --default-domain=zypper --output=zypper.pot $SRCFILES
+xgettext --no-wrap --add-comments --add-location --keyword=_ --keyword=_:1,2 --keyword=__ --keyword=N_ --keyword=_PL:1,2 --foreign-user --copyright-holder="SuSE Linux Products GmbH, Nuernberg" --default-domain=zypper --output=zypper.pot $SRCFILES
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
Author: jkupec
Date: Mon Sep 10 11:28:03 2007
New Revision: 7158
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7158&view=rev
Log:
- zypper repos description updated (#309041)
Modified:
trunk/zypper/doc/zypper.8
Modified: trunk/zypper/doc/zypper.8
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=7158&r1=…
==============================================================================
--- trunk/zypper/doc/zypper.8 (original)
+++ trunk/zypper/doc/zypper.8 Mon Sep 10 11:28:03 2007
@@ -264,7 +264,10 @@
.B repos (lr)
List all defined repositories.
.IP
-Following data are printed for each repository found: Enabled (whether the repository is enabled), Refresh (whether autorefresh is enabled for the repository), Type (YaST, YUM, Plaindir), Name, and URI.
+The following data are printed for each repository found: # (repository number), Enabled (whether the repository is enabled), Refresh (whether autorefresh is enabled for the repository), Type (rpm-md, yast2, plaindir), Alias (shorthand for Name), and Name. If -v global option is used, an additional URI column will be displayed containing the base URI of the repository.
+
+Repository number is a unique identifier of the repository in current repository set. If you add, remove or change a repository, the numbers may change. Beware of that when using the numbers with the repository handling commands (although not possible right now, the feature will be reimplmented soon). On the other hand, using the alias instead of the number is always safe.
+
.TP
.I \-e, \-\-export <FILE|->
This option causes zypper to write repository definition of all defined
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7157 - in /trunk/libzypp-bindings: examples/perl/list_target_resolvables.pl examples/perl/test.pl swig/CapSet.i swig/ResPool.i swig/ResStore.i swig/perl5/perl.i swig/zypp.i
by haass@svn.opensuse.org 10 Sep '07
by haass@svn.opensuse.org 10 Sep '07
10 Sep '07
Author: haass
Date: Mon Sep 10 11:07:21 2007
New Revision: 7157
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7157&view=rev
Log:
Changes for perl-bindings and examples
Modified:
trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl
trunk/libzypp-bindings/examples/perl/test.pl
trunk/libzypp-bindings/swig/CapSet.i
trunk/libzypp-bindings/swig/ResPool.i
trunk/libzypp-bindings/swig/ResStore.i
trunk/libzypp-bindings/swig/perl5/perl.i
trunk/libzypp-bindings/swig/zypp.i
Modified: trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/perl/l…
==============================================================================
--- trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl (original)
+++ trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl Mon Sep 10 11:07:21 2007
@@ -8,9 +8,9 @@
$repo = $zypp->target;
$store = $repo->resolvables;
-$it_b = $store->begin;
+$it_b = $store->cBegin;
-while ($store->iterator_equal($it_b, $store->end) ne 1){
+while ($store->iterator_equal($it_b, $store->cEnd) ne 1){
$pkg = $store->iterator_value($it_b);
print $pkg->kindToS, " ", $pkg->name, " ", $pkg->edition->asString;
print $pkg->arch->asString, "\n";
@@ -19,4 +19,16 @@
print " Vendor: ", $pkg->vendor, "\n";
print " BuildTime: ", $pkg->buildtime->asString, "\n";
$it_b = $store->iterator_incr($it_b);
+
+ $deps = $pkg->dep($zyppc::Dep_PROVIDES);
+
+ $it_b2 = $deps->cBegin;
+
+ while($deps->iterator_equal($it_b2, $deps->cEnd) ne 1){
+ $dep = $deps->iterator_value($it_b2);
+ print "Provides: ", $dep->asString, "\n";
+ $it_b2 = $deps->iterator_incr($it_b2);
+ }
+ print "\n";
+
}
Modified: trunk/libzypp-bindings/examples/perl/test.pl
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/perl/t…
==============================================================================
--- trunk/libzypp-bindings/examples/perl/test.pl (original)
+++ trunk/libzypp-bindings/examples/perl/test.pl Mon Sep 10 11:07:21 2007
@@ -9,18 +9,20 @@
chomp($ipkg);
print "Importing packages from pdb!\n\n";
print "This may take a while, please be patient!\n";
-$pdb->readOut;
+if($pdb->readOut ne 1){
+ exit;
+}
$store = $pdb->getStore;
$zypp->addResolvables($store);
$pool = $zypp->pool;
-$it_b = $pool->begin;
-$it_e = $pool->end;
+$it_b = $pool->cBegin;
+$it_e = $pool->cEnd;
$checker = 0;
print "Looking for package...!\n";
-while ($pool->iterator_equal($it_b, $pool->end) ne 1){
+while ($pool->iterator_equal($it_b, $pool->cEnd) ne 1){
$pkg = $pool->iterator_value($it_b);
$test = $pkg->resolvable;
$it_b = $pool->iterator_incr($it_b);
@@ -40,7 +42,7 @@
$resolver = zypp::Resolver->new($pool);
-$it_b = $pool->begin;
+$it_b = $pool->cBegin;
if($resolver->resolvePool ne 1){
print "Unable to solve the pool!!!\n";
print "Problem Description: ";
@@ -51,7 +53,7 @@
}else{
print "These packages has to be installed: \n";
# while ($it_b ne $pool->end){
- while ($pool->iterator_equal($it_b, $pool->end) ne 1){
+ while ($pool->iterator_equal($it_b, $pool->cEnd) ne 1){
$pkg = $pool->iterator_value($it_b);
$it_b = $pool->iterator_incr($it_b);
$test = $pkg->resolvable;
Modified: trunk/libzypp-bindings/swig/CapSet.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/CapSet.i?r…
==============================================================================
--- trunk/libzypp-bindings/swig/CapSet.i (original)
+++ trunk/libzypp-bindings/swig/CapSet.i Mon Sep 10 11:07:21 2007
@@ -31,3 +31,7 @@
}
}
#endif
+
+#ifdef SWIGPERL5
+iter2(CapSet, Capability);
+#endif
Modified: trunk/libzypp-bindings/swig/ResPool.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResPool.i?…
==============================================================================
--- trunk/libzypp-bindings/swig/ResPool.i (original)
+++ trunk/libzypp-bindings/swig/ResPool.i Mon Sep 10 11:07:21 2007
@@ -152,23 +152,7 @@
#ifdef SWIGPERL5
-%extend ResPool {
-
- pool::PoolTraits::const_iterator iterator_incr(pool::PoolTraits::const_iterator *it ) {
- (*it)++;
- return *it;
- }
- pool::PoolTraits::const_iterator iterator_decr(pool::PoolTraits::const_iterator it) {
- (it)--;
- return it;
- }
- bool iterator_equal(pool::PoolTraits::const_iterator it1, pool::PoolTraits::const_iterator it2) {
- return (it1 == it2);
- }
- PoolItem_Ref iterator_value(pool::PoolTraits::const_iterator it) {
- return (*it);
- }
-};
+iter2(ResPool, PoolItem_Ref);
#endif
Modified: trunk/libzypp-bindings/swig/ResStore.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResStore.i…
==============================================================================
--- trunk/libzypp-bindings/swig/ResStore.i (original)
+++ trunk/libzypp-bindings/swig/ResStore.i Mon Sep 10 11:07:21 2007
@@ -37,24 +37,6 @@
#ifdef SWIGPERL5
-%extend ResStore {
-
- ResStore::iterator begin() {
- return self->begin();
- }
- ResStore::iterator end() {
- return self->end();
- }
- ResStore::iterator iterator_incr(ResStore::iterator *it) {
- (*it)++;
- return *it;
- }
- const ResObject* iterator_value(ResStore::iterator it) {
- return (&**it);
- }
- bool iterator_equal(ResStore::iterator it1, ResStore::iterator it2) {
- return (it1 == it2);
- }
-};
+iter(ResStore, ResObject*);
#endif
Modified: trunk/libzypp-bindings/swig/perl5/perl.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/perl5/perl…
==============================================================================
--- trunk/libzypp-bindings/swig/perl5/perl.i (original)
+++ trunk/libzypp-bindings/swig/perl5/perl.i Mon Sep 10 11:07:21 2007
@@ -0,0 +1,49 @@
+%define iter(cls, storetype)
+%extend cls {
+ cls::const_iterator iterator_incr(cls::const_iterator *it){
+ (*it)++;
+ return *it;
+ }
+ cls::const_iterator iterator_decr(cls::const_iterator *it){
+ (*it)--;
+ return *it;
+ }
+ bool iterator_equal(cls::const_iterator it1, cls::const_iterator it2) {
+ return (it1 == it2);
+ }
+ storetype iterator_value(cls::const_iterator it) {
+ return (&**it);
+ }
+ cls::const_iterator cBegin() {
+ return self->begin();
+ }
+ cls::const_iterator cEnd() {
+ return self->end();
+ }
+};
+%enddef
+
+%define iter2(cls, storetype)
+%extend cls {
+ cls::const_iterator iterator_incr(cls::const_iterator *it){
+ (*it)++;
+ return *it;
+ }
+ cls::const_iterator iterator_decr(cls::const_iterator *it){
+ (*it)--;
+ return *it;
+ }
+ bool iterator_equal(cls::const_iterator it1, cls::const_iterator it2) {
+ return (it1 == it2);
+ }
+ storetype iterator_value(cls::const_iterator it) {
+ return (*it);
+ }
+ cls::const_iterator cBegin() {
+ return self->begin();
+ }
+ cls::const_iterator cEnd() {
+ return self->end();
+ }
+};
+%enddef
Modified: trunk/libzypp-bindings/swig/zypp.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev…
==============================================================================
--- trunk/libzypp-bindings/swig/zypp.i (original)
+++ trunk/libzypp-bindings/swig/zypp.i Mon Sep 10 11:07:21 2007
@@ -77,6 +77,7 @@
#ifdef SWIGPERL5
%include "std_list.i"
+%include "perl5/perl.i"
#endif
%include "Pathname.i"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7156 - in /trunk/libzypp: package/libzypp.changes zypp/repo/cached/PackageImpl.cc zypp/repo/cached/SrcPackageImpl.cc
by lslezak@svn.opensuse.org 10 Sep '07
by lslezak@svn.opensuse.org 10 Sep '07
10 Sep '07
Author: lslezak
Date: Mon Sep 10 11:05:47 2007
New Revision: 7156
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7156&view=rev
Log:
- properly report fallback disk usage size (in kB instead of bytes)
when disk usage is not known (YUM repos) (#308475)
Modified:
trunk/libzypp/package/libzypp.changes
trunk/libzypp/zypp/repo/cached/PackageImpl.cc
trunk/libzypp/zypp/repo/cached/SrcPackageImpl.cc
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Mon Sep 10 11:05:47 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 10 10:55:45 CEST 2007 - lslezak(a)suse.cz
+
+- properly report fallback disk usage size (in kB instead of bytes)
+ when disk usage is not known (YUM repos) (#308475)
+
+-------------------------------------------------------------------
Fri Sep 7 13:27:26 CEST 2007 - ma(a)suse.de
- Install a sample /etc/zypp.conf. (#306615)
Modified: trunk/libzypp/zypp/repo/cached/PackageImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/Package…
==============================================================================
--- trunk/libzypp/zypp/repo/cached/PackageImpl.cc (original)
+++ trunk/libzypp/zypp/repo/cached/PackageImpl.cc Mon Sep 10 11:05:47 2007
@@ -201,12 +201,13 @@
{
// No info: Creating a faked entry distributing the
// total package size in assumed 200 files to "/ZYPP_NO_DU_INFO"
+ // The reported size is in kB.
//
// Note: Less likely that some system has a mountpoint named
// ZYPP_NO_DU_INFO, so the size will be accounted to '/'.
// but adding a faked mountpoint entry an application is able
// to spot and handle these faked data in a different manner.
- _diskusage->add( "/ZYPP_NO_DU_INFO", size(), 200 );
+ _diskusage->add( "/ZYPP_NO_DU_INFO", size() / 1024, 200 );
}
}
return *_diskusage;
Modified: trunk/libzypp/zypp/repo/cached/SrcPackageImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/cached/SrcPack…
==============================================================================
--- trunk/libzypp/zypp/repo/cached/SrcPackageImpl.cc (original)
+++ trunk/libzypp/zypp/repo/cached/SrcPackageImpl.cc Mon Sep 10 11:05:47 2007
@@ -122,7 +122,8 @@
{
// No info: Creating a faked entry distributing the
// total source package size in assumed 20 files to "/usr/src/packages"
- _diskusage->add( "/usr/src/packages", size(), 20 );
+ // The reported size is in kB
+ _diskusage->add( "/usr/src/packages", size() / 1024, 20 );
}
}
return *_diskusage;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7155 - in /trunk/libzypp-bindings: libzypp-bindings.spec.cmake package/libzypp-bindings.changes
by aschnell@svn.opensuse.org 10 Sep '07
by aschnell@svn.opensuse.org 10 Sep '07
10 Sep '07
Author: aschnell
Date: Mon Sep 10 10:30:49 2007
New Revision: 7155
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7155&view=rev
Log:
- changes from schwab in autobuild
Modified:
trunk/libzypp-bindings/libzypp-bindings.spec.cmake
trunk/libzypp-bindings/package/libzypp-bindings.changes
Modified: trunk/libzypp-bindings/libzypp-bindings.spec.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/libzypp-binding…
==============================================================================
--- trunk/libzypp-bindings/libzypp-bindings.spec.cmake (original)
+++ trunk/libzypp-bindings/libzypp-bindings.spec.cmake Mon Sep 10 10:30:49 2007
@@ -30,8 +30,9 @@
cd build
cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
-DLIB=%{_lib} \
- -DCMAKE_C_FLAGS="%{optflags}" \
- -DCMAKE_CXX_FLAGS="%{optflags}" \
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=1 \
..
Modified: trunk/libzypp-bindings/package/libzypp-bindings.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/package/libzypp…
==============================================================================
--- trunk/libzypp-bindings/package/libzypp-bindings.changes (original)
+++ trunk/libzypp-bindings/package/libzypp-bindings.changes Mon Sep 10 10:30:49 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 3 16:49:07 CEST 2007 - schwab(a)suse.de
+
+- Fix broken compiler flags.
+
+-------------------------------------------------------------------
+
Thu Aug 30 16:31:16 CEST 2007 - aschnell(a)suse.de
- some work on python bindings
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7154 - in /branches/SuSE-Linux-10_2-Branch/libzypp: VERSION libzypp.spec.in package/libzypp.changes
by jkupec@svn.opensuse.org 07 Sep '07
by jkupec@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: jkupec
Date: Fri Sep 7 17:46:11 2007
New Revision: 7154
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7154&view=rev
Log:
- require gpg (#308235)
Modified:
branches/SuSE-Linux-10_2-Branch/libzypp/VERSION
branches/SuSE-Linux-10_2-Branch/libzypp/libzypp.spec.in
branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes
Modified: branches/SuSE-Linux-10_2-Branch/libzypp/VERSION
URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp…
==============================================================================
--- branches/SuSE-Linux-10_2-Branch/libzypp/VERSION (original)
+++ branches/SuSE-Linux-10_2-Branch/libzypp/VERSION Fri Sep 7 17:46:11 2007
@@ -49,5 +49,5 @@
m4_define([LIBZYPP_MINOR], [16])
m4_define([LIBZYPP_COMPATMINOR], [15])
dnl ==================================================
-m4_define([LIBZYPP_PATCH], [1])
+m4_define([LIBZYPP_PATCH], [2])
dnl ==================================================
Modified: branches/SuSE-Linux-10_2-Branch/libzypp/libzypp.spec.in
URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp…
==============================================================================
--- branches/SuSE-Linux-10_2-Branch/libzypp/libzypp.spec.in (original)
+++ branches/SuSE-Linux-10_2-Branch/libzypp/libzypp.spec.in Fri Sep 7 17:46:11 2007
@@ -29,6 +29,7 @@
%endif
BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ graphviz hal-devel libxml2-devel rpm-devel gettext-devel
BuildRequires: update-desktop-files
+Requires: gpg
%description
Modified: branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzyp…
==============================================================================
--- branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes (original)
+++ branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes Fri Sep 7 17:46:11 2007
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Sep 7 17:42:55 CEST 2007 - jkupec(a)suse.cz
+
+- Require gpg (#308235)
+- revision 7154
+- version 2.16.2
+
+-------------------------------------------------------------------
Fri Aug 10 14:41:51 CEST 2007 - jkupec(a)suse.cz
- Fix restoring of Sources if root prefix is used. (#238165)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
07 Sep '07
Author: haass
Date: Fri Sep 7 16:45:11 2007
New Revision: 7153
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7153&view=rev
Log:
added perl-typemap for ByteCount
Modified:
trunk/libzypp-bindings/swig/ByteCount.i
Modified: trunk/libzypp-bindings/swig/ByteCount.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ByteCount.…
==============================================================================
--- trunk/libzypp-bindings/swig/ByteCount.i (original)
+++ trunk/libzypp-bindings/swig/ByteCount.i Fri Sep 7 16:45:11 2007
@@ -13,3 +13,12 @@
#endif
+#ifdef SWIGPERL5
+
+%typemap(out) ByteCount {
+ $result = sv_newmortal();
+ sv_setiv($result, (IV) (ByteCount::SizeType) $1 );
+ argvi++;
+}
+
+#endif
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7152 - in /trunk/libzypp-bindings: examples/perl/list_target_resolvables.pl swig/ResStore.i swig/zypp.i
by haass@svn.opensuse.org 07 Sep '07
by haass@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: haass
Date: Fri Sep 7 16:25:46 2007
New Revision: 7152
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7152&view=rev
Log:
changes for perl-bindings
Added:
trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl
Modified:
trunk/libzypp-bindings/swig/ResStore.i
trunk/libzypp-bindings/swig/zypp.i
Added: trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/perl/l…
==============================================================================
--- trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl (added)
+++ trunk/libzypp-bindings/examples/perl/list_target_resolvables.pl Fri Sep 7 16:25:46 2007
@@ -0,0 +1,22 @@
+use zypp;
+
+$z = zyppc::ZYppFactory_instance();
+$zypp = $z->getZYpp;
+
+$t = $zypp->initializeTarget(zypp::Pathname->new("/"));
+
+$repo = $zypp->target;
+$store = $repo->resolvables;
+
+$it_b = $store->begin;
+
+while ($store->iterator_equal($it_b, $store->end) ne 1){
+ $pkg = $store->iterator_value($it_b);
+ print $pkg->kindToS, " ", $pkg->name, " ", $pkg->edition->asString;
+ print $pkg->arch->asString, "\n";
+ print " Summary: ", $pkg->summary, "\n";
+ print " Size: ", $pkg->size, "\n";
+ print " Vendor: ", $pkg->vendor, "\n";
+ print " BuildTime: ", $pkg->buildtime->asString, "\n";
+ $it_b = $store->iterator_incr($it_b);
+}
Modified: trunk/libzypp-bindings/swig/ResStore.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResStore.i…
==============================================================================
--- trunk/libzypp-bindings/swig/ResStore.i (original)
+++ trunk/libzypp-bindings/swig/ResStore.i Fri Sep 7 16:25:46 2007
@@ -34,3 +34,27 @@
}
}
#endif
+
+#ifdef SWIGPERL5
+
+%extend ResStore {
+
+ ResStore::iterator begin() {
+ return self->begin();
+ }
+ ResStore::iterator end() {
+ return self->end();
+ }
+ ResStore::iterator iterator_incr(ResStore::iterator *it) {
+ (*it)++;
+ return *it;
+ }
+ const ResObject* iterator_value(ResStore::iterator it) {
+ return (&**it);
+ }
+ bool iterator_equal(ResStore::iterator it1, ResStore::iterator it2) {
+ return (it1 == it2);
+ }
+};
+
+#endif
Modified: trunk/libzypp-bindings/swig/zypp.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev…
==============================================================================
--- trunk/libzypp-bindings/swig/zypp.i (original)
+++ trunk/libzypp-bindings/swig/zypp.i Fri Sep 7 16:25:46 2007
@@ -110,10 +110,8 @@
%include "Package.i"
%include "PublicKey.i"
%include "KeyRing.i"
-#ifndef SWIGPERL5
- %include "Target.i"
- %include "MediaSetAccess.i"
-#endif
+%include "Target.i"
+%include "MediaSetAccess.i"
%include "PoolItem.i"
%include "ResPool.i"
%include "ResPoolManager.i"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7151 - /trunk/libzypp/package/libzypp.changes
by mlandres@svn.opensuse.org 07 Sep '07
by mlandres@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: mlandres
Date: Fri Sep 7 15:26:56 2007
New Revision: 7151
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7151&view=rev
Log:
changes
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Fri Sep 7 15:26:56 2007
@@ -4,6 +4,7 @@
- Install a sample /etc/zypp.conf. (#306615)
- Fixed missing soversion symlink in package.
- version 3.22.5
+- revision 7150
-------------------------------------------------------------------
Fri Sep 7 13:03:48 CEST 2007 - schubi(a)suse.de
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7150 - in /trunk/libzypp: CMakeLists.txt VERSION.cmake devel/devel.ma/Parse.cc libzypp.spec.cmake package/libzypp.changes zypp.conf zypp/CMakeLists.txt
by mlandres@svn.opensuse.org 07 Sep '07
by mlandres@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: mlandres
Date: Fri Sep 7 15:26:40 2007
New Revision: 7150
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7150&view=rev
Log:
- Install a sample /etc/zypp.conf. (#306615)
- Fixed missing soversion symlink in package.
Added:
trunk/libzypp/zypp.conf
Modified:
trunk/libzypp/CMakeLists.txt
trunk/libzypp/VERSION.cmake
trunk/libzypp/devel/devel.ma/Parse.cc
trunk/libzypp/libzypp.spec.cmake
trunk/libzypp/package/libzypp.changes
trunk/libzypp/zypp/CMakeLists.txt
Modified: trunk/libzypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=7150&…
==============================================================================
--- trunk/libzypp/CMakeLists.txt (original)
+++ trunk/libzypp/CMakeLists.txt Fri Sep 7 15:26:40 2007
@@ -32,7 +32,7 @@
ADD_DEFINITIONS( -D_FILE_OFFSET_BITS=64 )
ADD_DEFINITIONS( -DVERSION=\\\"${VERSION}\\\" )
SET( LIBZYPP_VERSION_INFO "${LIBZYPP_SO_FIRST}.${LIBZYPP_AGE}.${LIBZYPP_PATCH}" )
-
+SET( LIBZYPP_SOVERSION_INFO "${LIBZYPP_SO_FIRST}" )
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Novell's package management core engine.")
SET(CPACK_PACKAGE_VENDOR "Novell Inc.")
@@ -206,6 +206,9 @@
MESSAGE(STATUS "FindZypp.cmake will be installed in ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules")
INSTALL( FILES ${CMAKE_SOURCE_DIR}/cmake/modules/FindZypp.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules )
+MESSAGE(STATUS "zypp.conf will be installed in /etc/zypp")
+INSTALL( FILES ${CMAKE_SOURCE_DIR}/zypp.conf DESTINATION /etc/zypp )
+
####################################################################
# SUBDIRECTORIES #
####################################################################
Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7150&r…
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Fri Sep 7 15:26:40 2007
@@ -47,4 +47,4 @@
SET(LIBZYPP_MAJOR "3")
SET(LIBZYPP_MINOR "22")
SET(LIBZYPP_COMPATMINOR "21")
-SET(LIBZYPP_PATCH "4")
+SET(LIBZYPP_PATCH "5")
Modified: trunk/libzypp/devel/devel.ma/Parse.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?…
==============================================================================
--- trunk/libzypp/devel/devel.ma/Parse.cc (original)
+++ trunk/libzypp/devel/devel.ma/Parse.cc Fri Sep 7 15:26:40 2007
@@ -351,23 +351,6 @@
INT << "===[START]==========================================" << endl;
setenv( "ZYPP_CONF", "/Local/ROOT/zypp.conf", 1 );
- Vtst( "", "" );
- Vtst( "", "a" );
- Vtst( "", "suse lkgjhdl" );
- Vtst( "", "opensuse" );
- Vtst( "a", "" );
- Vtst( "a", "a" );
- Vtst( "a", "suse lkgjhdl" );
- Vtst( "a", "opensuse" );
- Vtst( "suse", "" );
- Vtst( "suse", "a" );
- Vtst( "suse", "suse lkgjhdl" );
- Vtst( "suse", "opensuse" );
- Vtst( "opensuse fdhgdd", "" );
- Vtst( "opensuse fdhgdd", "a" );
- Vtst( "opensuse fdhgdd", "suse lkgjhdl" );
- Vtst( "opensuse fdhgdd", "opensuse" );
- throw;
DigestReceive foo;
KeyRingSignalsReceive baa;
Modified: trunk/libzypp/libzypp.spec.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=7…
==============================================================================
--- trunk/libzypp/libzypp.spec.cmake (original)
+++ trunk/libzypp/libzypp.spec.cmake Fri Sep 7 15:26:40 2007
@@ -90,9 +90,10 @@
cd build
make install DESTDIR=$RPM_BUILD_ROOT
make -C doc/autodoc install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/zypp/repos.d
%suse_update_desktop_file -G "" -C "" package-manager
make -C po install DESTDIR=$RPM_BUILD_ROOT
-# Create filelist with translatins
+# Create filelist with translations
cd ..
%{find_lang} zypp
@@ -108,13 +109,16 @@
%files -f zypp.lang
%defattr(-,root,root)
+%dir /etc/zypp
+%dir /etc/zypp/repos.d
+%config(noreplace) /etc/zypp/zypp.conf
%{prefix}/lib/zypp
%{prefix}/share/zypp
-%{_libdir}/libzypp*so.*
%{prefix}/share/applications/package-manager.desktop
%{prefix}/share/pixmaps/package-manager-icon.png
%{prefix}/bin/package-manager
%{prefix}/bin/package-manager-su
+%{_libdir}/libzypp*so.*
%files devel
%defattr(-,root,root)
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Fri Sep 7 15:26:40 2007
@@ -1,9 +1,16 @@
-------------------------------------------------------------------
+Fri Sep 7 13:27:26 CEST 2007 - ma(a)suse.de
+
+- Install a sample /etc/zypp.conf. (#306615)
+- Fixed missing soversion symlink in package.
+- version 3.22.5
+
+-------------------------------------------------------------------
Fri Sep 7 13:03:48 CEST 2007 - schubi(a)suse.de
- RequirementIsMet: return true only if ALL Atoms are NOT incomplete; Bug
308252
-- r 7143
+- r 7143
-------------------------------------------------------------------
Thu Sep 6 18:22:36 CEST 2007 - schubi(a)suse.de
Added: trunk/libzypp/zypp.conf
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp.conf?rev=7150&view=…
==============================================================================
--- trunk/libzypp/zypp.conf (added)
+++ trunk/libzypp/zypp.conf Fri Sep 7 15:26:40 2007
@@ -0,0 +1,129 @@
+## Configuration file for software management
+## /etc/zypp/zypp.conf
+##
+## Boolean values are 0 1 yes no on off true false
+
+
+[main]
+
+
+##
+## Override the detected architecture
+##
+## Valid values: i586, i686, x86_64, ppc, ppc64, ia64, s390, s390x, ..
+## Default value: Autodetected
+##
+## ** CAUTION: Only set if you know what you're doing !
+## ** Changing this needs a full refresh (incl. download)
+## ** of all repository data.
+##
+# arch = s390
+
+
+##
+## Path where the repo metadata is downloaded and kept.
+##
+## Valid values: A directory
+## Default value: /var/cache/zypp/raw
+##
+## Changing this needs a full refresh (incl. download) of all repository data
+##
+# metadatadir = /var/cache/zypp/raw
+
+
+##
+## Path where the known repositories .repo files are kept
+##
+## Valid values: A directory
+## Default value: /etc/zypp/repos.d
+##
+## Changing this invalidates all known repositories
+##
+# reposdir = /etc/zypp/repos.d
+
+
+##
+## Path where the processed cache is kept (this is where zypp.db is located)
+##
+## Valid values: A directory
+## Default value: /var/cache/zypp
+##
+## Changing this needs a full refresh (except download) of all repository data
+##
+# cachedir = /var/cache/zypp
+
+
+##
+## Whether repository urls should be probed when added
+##
+## Valid values: boolean
+## Default value: false
+##
+## If true, accessability of repositories is checked immediately (when added)
+## (e.g. 'zypper ar' will check immediately)
+## If false, accessability of repositories is checked when refreshed
+## (e.g. 'zypper ar' will delay the check until the next refresh)
+##
+# repo.add.probe = false
+
+
+##
+## Amount of time in minutes that must pass before another refresh.
+##
+## Valid values: Integer
+## Default value: 10
+##
+## If you have autorefresh enabled for a repository, it is checked for
+## up-to-date metadata not more often than every <repo.refresh.delay>
+## minutes. If an automatic request for refresh comes before <repo.refresh.delay>
+## minutes passed since the last check, the request is ignored.
+##
+## A value of 0 means the repository will always be checked. To get the oposite
+## effect, disable autorefresh for your repositories.
+##
+## This option has no effect for repositories with autorefresh disabled, nor for
+## user-requested refresh.
+##
+# repo.refresh.delay = 10
+
+
+##
+## Whether to consider using a .patch.rpm when downloading a package
+##
+## Valid values: boolean
+## Default value: true
+##
+## Using a patch rpm will decrease the download size for package updates
+## since it does not contain all files of the package but only the changed
+## ones. The .patch.rpm is ready to be installed immediately after download.
+## There is no further processing needed, as it is for a .delta.rpm.
+##
+# download.use_patchrpm = true
+
+
+##
+## Whether to consider using a .delta.rpm when downloading a package
+##
+## Valid values: boolean
+## Default value: true
+##
+## Using a delta rpm will decrease the download size for package updates
+## since it does not contain all files of the package but only the binary
+## diff of changed ones. Recreating the rpm package on the local machine
+## is an expensive operation (memory,CPU). If your network connection is
+## not too slow, you benefit from disabling .delta.rpm.
+##
+# download.use_deltarpm = true
+
+
+[locking]
+
+
+## DEPRECATED
+## Mimic old-fashioned behavior of locking all foreign vendor packages.
+##
+## Valid values: boolean
+## Default value: false
+##
+# autolock_untrustedvendor = false
+
Modified: trunk/libzypp/zypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/CMakeLists.txt?rev=…
==============================================================================
--- trunk/libzypp/zypp/CMakeLists.txt (original)
+++ trunk/libzypp/zypp/CMakeLists.txt Fri Sep 7 15:26:40 2007
@@ -1143,6 +1143,7 @@
ADD_LIBRARY(zypp SHARED ${zypp_lib_SRCS})
SET_TARGET_PROPERTIES( zypp PROPERTIES VERSION "${LIBZYPP_VERSION_INFO}" )
+SET_TARGET_PROPERTIES( zypp PROPERTIES SOVERSION "${LIBZYPP_SOVERSION_INFO}" )
ADD_DEPENDENCIES(zypp schema_header)
# System libraries
TARGET_LINK_LIBRARIES(zypp boost_filesystem util )
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7149 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher@svn.opensuse.org 07 Sep '07
by tgoettlicher@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: tgoettlicher
Date: Fri Sep 7 15:01:24 2007
New Revision: 7149
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7149&view=rev
Log:
changes
Modified:
trunk/updater-kde/package/opensuse-updater-kde.changes
Modified: trunk/updater-kde/package/opensuse-updater-kde.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.changes (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.changes Fri Sep 7 15:01:24 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Sep 7 14:58:25 CEST 2007 - tgoettlicher(a)suse.de
+
+- updated translations
+- r7148
+
+-------------------------------------------------------------------
Fri Sep 7 12:30:40 CEST 2007 - tgoettlicher(a)suse.de
- fixed opensuse-updater should also offer Recommend updates by default (#308550)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
07 Sep '07
Author: tgoettlicher
Date: Fri Sep 7 15:00:31 2007
New Revision: 7148
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7148&view=rev
Log:
updated translations
Modified:
trunk/updater-kde/po/cs.po
Modified: trunk/updater-kde/po/cs.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/cs.po?rev=7148&r1…
==============================================================================
--- trunk/updater-kde/po/cs.po (original)
+++ trunk/updater-kde/po/cs.po Fri Sep 7 15:00:31 2007
@@ -1,3 +1,4 @@
+# translation of opensuseupdater.cs.po to Czech
# translation of opensuseupdater.po to
# @TITLE@
# Copyright (C) 2006, SUSE Linux GmbH, Nuremberg
@@ -9,12 +10,12 @@
# Jakub Hegenbart <jhegenbart(a)suse.cz>, 2007.
msgid ""
msgstr ""
-"Project-Id-Version: opensuseupdater\n"
+"Project-Id-Version: opensuseupdater.cs\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-08-27 16:28+0200\n"
-"PO-Revision-Date: 2007-08-23 16:44+0200\n"
-"Last-Translator: Jakub Hegenbart <jhegenbart(a)suse.cz>\n"
-"Language-Team: <cs(a)li.org>\n"
+"PO-Revision-Date: 2007-09-06 16:21+0200\n"
+"Last-Translator: Klára CihláÅová <koty(a)seznam.cz>\n"
+"Language-Team: Czech <cs(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,7 @@
#: ../po/rc.cpp:3
#, no-c-format
msgid "Check for updates every:"
-msgstr "Kontrolovat aktualizace pravidelnÄ po "
+msgstr "Kontrolovat aktualizace pravidelnÄ po:"
#: ../po/rc.cpp:6
#, no-c-format
@@ -103,12 +104,12 @@
#: ../updater/simpleview.cpp:50 ../updater/simpleview.cpp:55
#: ../updater/simpleview.cpp:225
-#, fuzzy, c-format
+#, c-format
msgid "Install %n recommended update additionally"
msgid_plural "Install %n recommended updates additionally"
-msgstr[0] "Instalovat navÃc doporuÄené aktualizace: %1"
-msgstr[1] "Instalovat navÃc doporuÄené aktualizace: %1"
-msgstr[2] "Instalovat navÃc doporuÄené aktualizace: %1"
+msgstr[0] "Instalovat navÃc %n doporuÄenou aktualizaci"
+msgstr[1] "Instalovat navÃc %n doporuÄené aktualizace"
+msgstr[2] "Instalovat navÃc %n doporuÄených aktualizacÃ"
#: ../updater/simpleview.cpp:58
msgid "Don't install updates that require a restart"
@@ -141,23 +142,23 @@
msgstr "Jsou k dispozici aktualizace, které se týkajà samotného aktualizaÄnÃho nástroje."
#: ../updater/simpleview.cpp:218
-#, fuzzy, c-format
+#, c-format
msgid "%n security update is available"
msgid_plural "%n security updates are available"
-msgstr[0] "Dostupné bezpeÄnostnà aktualizace: %1"
-msgstr[1] "Dostupné bezpeÄnostnà aktualizace: %1"
-msgstr[2] "Dostupné bezpeÄnostnà aktualizace: %1"
+msgstr[0] "Dostupná %n bezpeÄnostnà aktualizace"
+msgstr[1] "Dostupné %n bezpeÄnostnà aktualizace"
+msgstr[2] "Dostupných %n bezpeÄnostnÃch aktualizacÃ"
#: ../updater/simpleview.cpp:232
-#, fuzzy, c-format
+#, c-format
msgid "%n recommended update is available"
msgid_plural "%n recommended updates are available"
-msgstr[0] "Dostupné doporuÄené aktualizace: %1"
-msgstr[1] "Dostupné doporuÄené aktualizace: %1"
-msgstr[2] "Dostupné doporuÄené aktualizace: %1"
+msgstr[0] "Dostupná %n doporuÄená aktualizace"
+msgstr[1] "Dostupné %n doporuÄené aktualizace"
+msgstr[2] "Dostupných %n doporuÄených aktualizacÃ"
#: ../updater/simpleview.cpp:261
-#, fuzzy, c-format
+#, c-format
msgid ""
"%n optional update is available.\n"
"You can select optional updates in the detailed dialog."
@@ -165,13 +166,13 @@
"%n optional updates are available.\n"
"You can select optional updates in the detailed dialog."
msgstr[0] ""
-"Dostupné volitelné aktualizace: %1\n"
+"Dostupná %n volitelná aktualizace.\n"
"Volitelné aktualizace můžete vybrat v dialogu s podrobnostmi."
msgstr[1] ""
-"Dostupné volitelné aktualizace: %1\n"
+"Dostupné %n volitelné aktualizace.\n"
"Volitelné aktualizace můžete vybrat v dialogu s podrobnostmi."
msgstr[2] ""
-"Dostupné volitelné aktualizace: %1\n"
+"Dostupných %n volitelných aktualizacÃ.\n"
"Volitelné aktualizace můžete vybrat v dialogu s podrobnostmi."
#: ../updater/simpleview.cpp:268
@@ -183,13 +184,12 @@
msgstr "<b>Nelze zkontrolovat, zda jsou dostupné aktualizace.</b>"
#: ../updater/simpleview.cpp:280
-#, fuzzy
msgid ""
"Please use \"Add/Remove Update Sources...\"\n"
"from the tray icon menu to define an update repository."
msgstr ""
-"Definujte aktualizaÄnà repozitáŠpomocà pÅÃkazu\n"
-"\"PÅidat/odebrat aktualizaÄnà zdroje...\" v nabÃdce aktualizaÄnÃho nástroje."
+"Definujte aktualizaÄnà repozitáŠpomocà nebÃdky\n"
+"\"PÅidat/odebrat aktualizaÄnà zdroje...\" v nabÃdce appletu."
#: ../updater/UpdaterApplication.cpp:83
msgid ""
@@ -342,9 +342,8 @@
msgstr "PÅekontrolovat"
#: ../updater/MainWindow.cpp:126
-#, fuzzy
msgid "The following official patches for openSUSE either fix security holes or errors in the software."
-msgstr "NásledujÃcà oficiálnà opravy systému openSUSE opravujà bezpeÄnostnà problémy nebo závažné softwarové chyby.<br>Jejich instalaci důraznÄ doporuÄujeme."
+msgstr "NásledujÃcà oficiálnà opravy systému openSUSE opravujà bezpeÄnostnà problémy nebo závažné softwarové chyby."
#: ../updater/MainWindow.cpp:128 ../updater/MainWindow.cpp:166
msgid "Name"
@@ -753,5 +752,3 @@
msgid "Unknown type of XML markup received"
msgstr "Obdržen neznámý typ XML"
-#~ msgid "Close"
-#~ msgstr "ZavÅÃt"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
07 Sep '07
Author: haass
Date: Fri Sep 7 14:01:15 2007
New Revision: 7147
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7147&view=rev
Log:
Changes for perl-bindings
Modified:
trunk/libzypp-bindings/swig/zypp.i
Modified: trunk/libzypp-bindings/swig/zypp.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev…
==============================================================================
--- trunk/libzypp-bindings/swig/zypp.i (original)
+++ trunk/libzypp-bindings/swig/zypp.i Fri Sep 7 14:01:15 2007
@@ -2,8 +2,10 @@
#ifdef SWIGPERL5
%{
- #define SWIGPERLHACK
#undef NORMAL
+ #undef readdir
+ #undef Fflush
+ #undef Mkdir
%}
#endif
@@ -20,10 +22,8 @@
#include "zypp/ResObject.h"
#include "zypp/ResPoolManager.h"
#include "zypp/Target.h"
-#ifndef SWIGPERLHACK
- #include "zypp/target/TargetImpl.h"
- #include "zypp/MediaSetAccess.h"
-#endif
+#include "zypp/target/TargetImpl.h"
+#include "zypp/MediaSetAccess.h"
#include "zypp/TranslatedText.h"
#include "zypp/CapFactory.h"
#include "zypp/Package.h"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7146 - /trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
by haass@svn.opensuse.org 07 Sep '07
by haass@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: haass
Date: Fri Sep 7 13:59:14 2007
New Revision: 7146
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7146&view=rev
Log:
return was on the wrong place
Modified:
trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
Modified: trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc (original)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc Fri Sep 7 13:59:14 2007
@@ -192,12 +192,12 @@
}*/
store.insert(p);
- return 1;
}
dbDeps->close();
dbPackages->close();
+ return 1;
}
ResStore PdbToZypp::getStore(){
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7145 - in /trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests: bug308252-3-package.xml.gz bug308252-system.xml.gz bug308252-test.solution bug308252-test.xml
by schubi2@svn.opensuse.org 07 Sep '07
by schubi2@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: schubi2
Date: Fri Sep 7 13:07:18 2007
New Revision: 7145
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7145&view=rev
Log:
bug308252
Added:
trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-3-package.xml.gz (with props)
trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-system.xml.gz (with props)
trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-test.solution
trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-test.xml
Added: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-3-package.xml.gz
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
Binary file - no diff available.
Added: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-system.xml.gz
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
Binary file - no diff available.
Added: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-test.solution
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-test.solution (added)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-test.solution Fri Sep 7 13:07:18 2007
@@ -0,0 +1,1179 @@
+>!> Requesting locale en_US
+>!> Requesting locale en
+>!> Establishing state ...
+>!> Established context
+>!> atom:acx-kmp-bigsmp-20070101_2.6.22.2_3-6.i586[3] UU_s_
+>!> atom:acx-kmp-default-20070101_2.6.22.2_3-6.i586[3] UU_s_
+>!> atom:acx-kmp-default-20070101_2.6.22.2_3-6.ppc[3] UU_s_
+>!> atom:acx-kmp-default-20070101_2.6.22.2_3-6.x86_64[3] UU_s_
+>!> atom:acx-kmp-ppc64-20070101_2.6.22.2_3-6.ppc[3] UU_s_
+>!> atom:acx-kmp-xen-20070101_2.6.22.2_3-6.i586[3] UU_s_
+>!> atom:acx-kmp-xen-20070101_2.6.22.2_3-6.x86_64[3] UU_s_
+>!> atom:acx-kmp-xenpae-20070101_2.6.22.2_3-6.i586[3] UU_s_
+>!> atom:adm8211-kmp-bigsmp-20070720_2.6.22.2_3-3.i586[3] UU_s_
+>!> atom:adm8211-kmp-default-20070720_2.6.22.2_3-3.i586[3] UU_s_
+>!> atom:adm8211-kmp-default-20070720_2.6.22.2_3-3.ppc[3] UU_s_
+>!> atom:adm8211-kmp-default-20070720_2.6.22.2_3-3.x86_64[3] UU_s_
+>!> atom:adm8211-kmp-ppc64-20070720_2.6.22.2_3-3.ppc[3] UU_s_
+>!> atom:adm8211-kmp-xen-20070720_2.6.22.2_3-3.i586[3] UU_s_
+>!> atom:adm8211-kmp-xen-20070720_2.6.22.2_3-3.x86_64[3] UU_s_
+>!> atom:adm8211-kmp-xenpae-20070720_2.6.22.2_3-3.i586[3] UU_s_
+>!> atom:at76_usb-kmp-bigsmp-0.14beta1_2.6.22.2_3-5.i586[3] UU_s_
+>!> atom:at76_usb-kmp-default-0.14beta1_2.6.22.2_3-5.i586[3] UU_s_
+>!> atom:at76_usb-kmp-default-0.14beta1_2.6.22.2_3-5.ppc[3] UU_s_
+>!> atom:at76_usb-kmp-default-0.14beta1_2.6.22.2_3-5.x86_64[3] UU_s_
+>!> atom:at76_usb-kmp-ppc64-0.14beta1_2.6.22.2_3-5.ppc[3] UU_s_
+>!> atom:at76_usb-kmp-xen-0.14beta1_2.6.22.2_3-5.i586[3] UU_s_
+>!> atom:at76_usb-kmp-xen-0.14beta1_2.6.22.2_3-5.x86_64[3] UU_s_
+>!> atom:at76_usb-kmp-xenpae-0.14beta1_2.6.22.2_3-5.i586[3] UU_s_
+>!> atom:cloop-kmp-bigsmp-2.04_2.6.22.2_3-94.i586[3] UU_s_
+>!> atom:cloop-kmp-default-2.04_2.6.22.2_3-94.i586[3] UU_s_
+>!> atom:cloop-kmp-default-2.04_2.6.22.2_3-94.x86_64[3] UU_s_
+>!> atom:cloop-kmp-default-2.04_2.6.22.2_3-95.ppc[3] UU_s_
+>!> atom:cloop-kmp-ppc64-2.04_2.6.22.2_3-95.ppc[3] UU_s_
+>!> atom:cloop-kmp-xen-2.04_2.6.22.2_3-94.i586[3] UU_s_
+>!> atom:cloop-kmp-xen-2.04_2.6.22.2_3-94.x86_64[3] UU_s_
+>!> atom:cloop-kmp-xenpae-2.04_2.6.22.2_3-94.i586[3] UU_s_
+>!> atom:dazuko-kmp-bigsmp-2.3.3.4_2.6.22.2_3-36.i586[3] UU_s_
+>!> atom:dazuko-kmp-default-2.3.3.4_2.6.22.2_3-36.i586[3] UU_s_
+>!> atom:dazuko-kmp-default-2.3.3.4_2.6.22.2_3-36.x86_64[3] UU_s_
+>!> atom:dazuko-kmp-xen-2.3.3.4_2.6.22.2_3-36.i586[3] UU_s_
+>!> atom:dazuko-kmp-xen-2.3.3.4_2.6.22.2_3-36.x86_64[3] UU_s_
+>!> atom:drbd-kmp-bigsmp-0.7.23_2.6.22.2_3-52.i586[3] UU_s_
+>!> atom:drbd-kmp-default-0.7.23_2.6.22.2_3-52.i586[3] UU_s_
+>!> atom:drbd-kmp-default-0.7.23_2.6.22.2_3-52.x86_64[3] UU_s_
+>!> atom:drbd-kmp-default-0.7.23_2.6.22.2_3-53.ppc[3] UU_s_
+>!> atom:drbd-kmp-ppc64-0.7.23_2.6.22.2_3-53.ppc[3] UU_s_
+>!> atom:drbd-kmp-xen-0.7.23_2.6.22.2_3-52.i586[3] UU_s_
+>!> atom:drbd-kmp-xen-0.7.23_2.6.22.2_3-52.x86_64[3] UU_s_
+>!> atom:gspcav-kmp-bigsmp-01.00.12_2.6.22.2_3-4.i586[3] UU_s_
+>!> atom:gspcav-kmp-default-01.00.12_2.6.22.2_3-4.i586[3] UU_s_
+>!> atom:gspcav-kmp-default-01.00.12_2.6.22.2_3-4.ppc[3] UU_s_
+>!> atom:gspcav-kmp-default-01.00.12_2.6.22.2_3-4.x86_64[3] UU_s_
+>!> atom:gspcav-kmp-ppc64-01.00.12_2.6.22.2_3-4.ppc[3] UU_s_
+>!> atom:ivtv-kmp-bigsmp-0.10.3_2.6.22.2_3-18.i586[3] UU_s_
+>!> atom:ivtv-kmp-default-0.10.3_2.6.22.2_3-18.i586[3] UU_s_
+>!> atom:ivtv-kmp-default-0.10.3_2.6.22.2_3-18.x86_64[3] UU_s_
+>!> atom:ivtv-kmp-xen-0.10.3_2.6.22.2_3-18.i586[3] UU_s_
+>!> atom:ivtv-kmp-xen-0.10.3_2.6.22.2_3-18.x86_64[3] UU_s_
+>!> atom:ivtv-kmp-xenpae-0.10.3_2.6.22.2_3-18.i586[3] UU_s_
+>!> atom:iwlwifi-kmp-bigsmp-0.1.8_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:iwlwifi-kmp-default-0.1.8_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:iwlwifi-kmp-default-0.1.8_2.6.22.2_3-2.x86_64[3] UU_s_
+>!> atom:iwlwifi-kmp-xen-0.1.8_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:iwlwifi-kmp-xen-0.1.8_2.6.22.2_3-2.x86_64[3] UU_s_
+>!> atom:iwlwifi-kmp-xenpae-0.1.8_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:kdepim3-3.5.7.enterprise.0.20070831.706868-8.i586[3] UU_s_
+>!> atom:kdepim3-3.5.7.enterprise.0.20070831.706868-8.ppc[3] UU_s_
+>!> atom:kdepim3-3.5.7.enterprise.0.20070831.706868-8.x86_64[3] UU_s_
+>!> atom:kdepim3-devel-3.5.7.enterprise.0.20070831.706868-8.i586[3] UU_s_
+>!> atom:kdepim3-devel-3.5.7.enterprise.0.20070831.706868-8.ppc[3] UU_s_
+>!> atom:kdepim3-devel-3.5.7.enterprise.0.20070831.706868-8.x86_64[3] UU_s_
+>!> atom:kdepim3-kpilot-3.5.7.enterprise.0.20070831.706868-8.i586[3] UU_s_
+>!> atom:kdepim3-kpilot-3.5.7.enterprise.0.20070831.706868-8.ppc[3] UU_s_
+>!> atom:kdepim3-kpilot-3.5.7.enterprise.0.20070831.706868-8.x86_64[3] UU_s_
+>!> atom:kdepim3-mobile-3.5.7.enterprise.0.20070831.706868-8.i586[3] UU_s_
+>!> atom:kdepim3-mobile-3.5.7.enterprise.0.20070831.706868-8.ppc[3] UU_s_
+>!> atom:kdepim3-mobile-3.5.7.enterprise.0.20070831.706868-8.x86_64[3] UU_s_
+>!> atom:kdepim3-notes-3.5.7.enterprise.0.20070831.706868-8.i586[3] UU_s_
+>!> atom:kdepim3-notes-3.5.7.enterprise.0.20070831.706868-8.ppc[3] UU_s_
+>!> atom:kdepim3-notes-3.5.7.enterprise.0.20070831.706868-8.x86_64[3] UU_s_
+>!> atom:kdepim3-time-management-3.5.7.enterprise.0.20070831.706868-8.i586[3] UU_s_
+>!> atom:kdepim3-time-management-3.5.7.enterprise.0.20070831.706868-8.ppc[3] UU_s_
+>!> atom:kdepim3-time-management-3.5.7.enterprise.0.20070831.706868-8.x86_64[3] UU_s_
+>!> atom:kernel-bigsmp-2.6.22.2-3.i586[3] US_s_
+>!> atom:kernel-bigsmp-2.6.22.5-12.i586 IS_s_
+>!> atom:kernel-bigsmp-2.6.22.5-12.i586[3] US_s_
+>!> atom:kernel-default-2.6.22.2-3.i586[3] UU_s_
+>!> atom:kernel-default-2.6.22.2-3.ppc[3] UU_s_
+>!> atom:kernel-default-2.6.22.2-3.x86_64[3] UU_s_
+>!> atom:kernel-default-2.6.22.5-12.i586 UU_s_
+>!> atom:kernel-default-2.6.22.5-12.i586[3] UU_s_
+>!> atom:kernel-default-2.6.22.5-12.ppc UU_s_
+>!> atom:kernel-default-2.6.22.5-12.ppc[3] UU_s_
+>!> atom:kernel-default-2.6.22.5-12.x86_64 UU_s_
+>!> atom:kernel-default-2.6.22.5-12.x86_64[3] UU_s_
+>!> atom:kernel-ppc64-2.6.22.2-3.ppc[3] UU_s_
+>!> atom:kernel-ppc64-2.6.22.5-12.ppc UU_s_
+>!> atom:kernel-ppc64-2.6.22.5-12.ppc[3] UU_s_
+>!> atom:kernel-source-2.6.22.2-3.i586[3] UU_s_
+>!> atom:kernel-source-2.6.22.2-3.ppc[3] UU_s_
+>!> atom:kernel-source-2.6.22.2-3.x86_64[3] UU_s_
+>!> atom:kernel-source-2.6.22.5-12.i586 UU_s_
+>!> atom:kernel-source-2.6.22.5-12.i586[3] UU_s_
+>!> atom:kernel-source-2.6.22.5-12.ppc UU_s_
+>!> atom:kernel-source-2.6.22.5-12.ppc[3] UU_s_
+>!> atom:kernel-source-2.6.22.5-12.x86_64 UU_s_
+>!> atom:kernel-source-2.6.22.5-12.x86_64[3] UU_s_
+>!> atom:kernel-syms-2.6.22.2-3.i586[3] UU_s_
+>!> atom:kernel-syms-2.6.22.2-3.ppc[3] UU_s_
+>!> atom:kernel-syms-2.6.22.2-3.x86_64[3] UU_s_
+>!> atom:kernel-syms-2.6.22.5-12.i586 UU_s_
+>!> atom:kernel-syms-2.6.22.5-12.i586[3] UU_s_
+>!> atom:kernel-syms-2.6.22.5-12.ppc UU_s_
+>!> atom:kernel-syms-2.6.22.5-12.ppc[3] UU_s_
+>!> atom:kernel-syms-2.6.22.5-12.x86_64 UU_s_
+>!> atom:kernel-syms-2.6.22.5-12.x86_64[3] UU_s_
+>!> atom:kernel-xen-2.6.22.2-3.i586[3] UU_s_
+>!> atom:kernel-xen-2.6.22.2-3.x86_64[3] UU_s_
+>!> atom:kernel-xen-2.6.22.5-12.i586 UU_s_
+>!> atom:kernel-xen-2.6.22.5-12.i586[3] UU_s_
+>!> atom:kernel-xen-2.6.22.5-12.x86_64 UU_s_
+>!> atom:kernel-xen-2.6.22.5-12.x86_64[3] UU_s_
+>!> atom:kernel-xenpae-2.6.22.2-3.i586[3] UU_s_
+>!> atom:kernel-xenpae-2.6.22.5-12.i586 UU_s_
+>!> atom:kernel-xenpae-2.6.22.5-12.i586[3] UU_s_
+>!> atom:kitchensync-3.5.7.enterprise.0.20070831.706868-8.i586[3] UU_s_
+>!> atom:kitchensync-3.5.7.enterprise.0.20070831.706868-8.ppc[3] UU_s_
+>!> atom:kitchensync-3.5.7.enterprise.0.20070831.706868-8.x86_64[3] UU_s_
+>!> atom:libzypp-3.13.13-4.i586[3] US_s_
+>!> atom:libzypp-3.13.13-4.ppc[3] UU_s_
+>!> atom:libzypp-3.13.13-4.x86_64[3] UU_s_
+>!> atom:libzypp-3.22.1-5.i586[3] UI_s_
+>!> atom:libzypp-3.22.1-5.ppc[3] UU_s_
+>!> atom:libzypp-3.22.1-5.x86_64[3] UU_s_
+>!> atom:libzypp-devel-3.13.13-4.i586[3] UU_s_
+>!> atom:libzypp-devel-3.13.13-4.ppc[3] UU_s_
+>!> atom:libzypp-devel-3.13.13-4.x86_64[3] UU_s_
+>!> atom:libzypp-devel-3.22.1-5.i586[3] UU_s_
+>!> atom:libzypp-devel-3.22.1-5.ppc[3] UU_s_
+>!> atom:libzypp-devel-3.22.1-5.x86_64[3] UU_s_
+>!> atom:lirc-kmp-bigsmp-0.8.2_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:lirc-kmp-default-0.8.2_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:lirc-kmp-default-0.8.2_2.6.22.2_3-2.ppc[3] UU_s_
+>!> atom:lirc-kmp-default-0.8.2_2.6.22.2_3-2.x86_64[3] UU_s_
+>!> atom:lirc-kmp-ppc64-0.8.2_2.6.22.2_3-2.ppc[3] UU_s_
+>!> atom:lirc-kmp-xenpae-0.8.2_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:ndiswrapper-kmp-bigsmp-1.47_2.6.22.2_3-12.i586[3] UU_s_
+>!> atom:ndiswrapper-kmp-default-1.47_2.6.22.2_3-12.i586[3] UU_s_
+>!> atom:ndiswrapper-kmp-default-1.47_2.6.22.2_3-12.x86_64[3] UU_s_
+>!> atom:ndiswrapper-kmp-xen-1.47_2.6.22.2_3-12.i586[3] UU_s_
+>!> atom:ndiswrapper-kmp-xen-1.47_2.6.22.2_3-12.x86_64[3] UU_s_
+>!> atom:novfs-kmp-bigsmp-2.0.0_2.6.22.2_3-22.i586[3] UU_s_
+>!> atom:novfs-kmp-default-2.0.0_2.6.22.2_3-22.i586[3] UU_s_
+>!> atom:novfs-kmp-default-2.0.0_2.6.22.2_3-22.x86_64[3] UU_s_
+>!> atom:novfs-kmp-xen-2.0.0_2.6.22.2_3-22.i586[3] UU_s_
+>!> atom:novfs-kmp-xen-2.0.0_2.6.22.2_3-22.x86_64[3] UU_s_
+>!> atom:omnibook-kmp-bigsmp-20070530_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:omnibook-kmp-default-20070530_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:omnibook-kmp-default-20070530_2.6.22.2_3-2.x86_64[3] UU_s_
+>!> atom:omnibook-kmp-xen-20070530_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:omnibook-kmp-xen-20070530_2.6.22.2_3-2.x86_64[3] UU_s_
+>!> atom:omnibook-kmp-xenpae-20070530_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:rfswitch-kmp-bigsmp-1.1_2.6.22.2_3-4.i586[3] UU_s_
+>!> atom:rfswitch-kmp-default-1.1_2.6.22.2_3-4.i586[3] UU_s_
+>!> atom:rfswitch-kmp-default-1.1_2.6.22.2_3-4.ppc[3] UU_s_
+>!> atom:rfswitch-kmp-default-1.1_2.6.22.2_3-4.x86_64[3] UU_s_
+>!> atom:rfswitch-kmp-ppc64-1.1_2.6.22.2_3-4.ppc[3] UU_s_
+>!> atom:rfswitch-kmp-xen-1.1_2.6.22.2_3-4.i586[3] UU_s_
+>!> atom:rfswitch-kmp-xen-1.1_2.6.22.2_3-4.x86_64[3] UU_s_
+>!> atom:rfswitch-kmp-xenpae-1.1_2.6.22.2_3-4.i586[3] UU_s_
+>!> atom:rt2x00-kmp-bigsmp-2.0.6_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:rt2x00-kmp-default-2.0.6_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:rt2x00-kmp-default-2.0.6_2.6.22.2_3-2.ppc[3] UU_s_
+>!> atom:rt2x00-kmp-default-2.0.6_2.6.22.2_3-2.x86_64[3] UU_s_
+>!> atom:rt2x00-kmp-xen-2.0.6_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:rt2x00-kmp-xen-2.0.6_2.6.22.2_3-2.x86_64[3] UU_s_
+>!> atom:rt2x00-kmp-xenpae-2.0.6_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:sax2-8.1-212.i586[3] US_s_
+>!> atom:sax2-8.1-212.ppc[3] UU_s_
+>!> atom:sax2-8.1-212.x86_64[3] UU_s_
+>!> atom:sax2-gui-8.1-212.i586[3] US_s_
+>!> atom:sax2-gui-8.1-212.ppc[3] UU_s_
+>!> atom:sax2-gui-8.1-212.x86_64[3] UU_s_
+>!> atom:sax2-ident-8.1-212.i586[3] US_s_
+>!> atom:sax2-ident-8.1-212.ppc[3] UU_s_
+>!> atom:sax2-ident-8.1-212.x86_64[3] UU_s_
+>!> atom:sax2-libsax-8.1-212.i586[3] US_s_
+>!> atom:sax2-libsax-8.1-212.ppc[3] UU_s_
+>!> atom:sax2-libsax-8.1-212.x86_64[3] UU_s_
+>!> atom:sax2-libsax-devel-8.1-212.i586[3] UU_s_
+>!> atom:sax2-libsax-devel-8.1-212.ppc[3] UU_s_
+>!> atom:sax2-libsax-devel-8.1-212.x86_64[3] UU_s_
+>!> atom:sax2-libsax-perl-8.1-212.i586[3] US_s_
+>!> atom:sax2-libsax-perl-8.1-212.ppc[3] UU_s_
+>!> atom:sax2-libsax-perl-8.1-212.x86_64[3] UU_s_
+>!> atom:sax2-libsax-python-8.1-212.i586[3] UU_s_
+>!> atom:sax2-libsax-python-8.1-212.ppc[3] UU_s_
+>!> atom:sax2-libsax-python-8.1-212.x86_64[3] UU_s_
+>!> atom:sax2-tools-8.1-212.i586[3] US_s_
+>!> atom:sax2-tools-8.1-212.ppc[3] UU_s_
+>!> atom:sax2-tools-8.1-212.x86_64[3] UU_s_
+>!> atom:smartlink-softmodem-kmp-bigsmp-2.9.10_2.6.22.2_3-127.i586[3] UU_s_
+>!> atom:smartlink-softmodem-kmp-default-2.9.10_2.6.22.2_3-127.i586[3] UU_s_
+>!> atom:tpctl-kmp-bigsmp-4.17_2.6.22.2_3-111.i586[3] UU_s_
+>!> atom:tpctl-kmp-default-4.17_2.6.22.2_3-111.i586[3] UU_s_
+>!> atom:update-test-affects-package-manager-99-99.noarch IS_s_
+>!> atom:update-test-affects-package-manager-99-99.noarch[3] US_s_
+>!> atom:update-test-interactive-99.99-99.99.noarch IS_s_
+>!> atom:update-test-interactive-99.99-99.99.noarch[3] US_s_
+>!> atom:update-test-optional-99.99-99.99.noarch IS_s_
+>!> atom:update-test-optional-99.99-99.99.noarch[3] US_s_
+>!> atom:update-test-reboot-needed-99.99-99.99.noarch IS_s_
+>!> atom:update-test-reboot-needed-99.99-99.99.noarch[3] US_s_
+>!> atom:update-test-security-99.99-99.99.noarch IS_s_
+>!> atom:update-test-security-99.99-99.99.noarch[3] US_s_
+>!> atom:update-test-trival-99.99-99.99.noarch IS_s_
+>!> atom:update-test-trival-99.99-99.99.noarch[3] US_s_
+>!> atom:uvcvideo-kmp-bigsmp-r117_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:uvcvideo-kmp-default-r117_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:uvcvideo-kmp-default-r117_2.6.22.2_3-2.ppc[3] UU_s_
+>!> atom:uvcvideo-kmp-default-r117_2.6.22.2_3-2.x86_64[3] UU_s_
+>!> atom:uvcvideo-kmp-ppc64-r117_2.6.22.2_3-2.ppc[3] UU_s_
+>!> atom:uvcvideo-kmp-xen-r117_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:uvcvideo-kmp-xen-r117_2.6.22.2_3-2.x86_64[3] UU_s_
+>!> atom:uvcvideo-kmp-xenpae-r117_2.6.22.2_3-2.i586[3] UU_s_
+>!> atom:wlan-ng-kmp-bigsmp-0.2.8_2.6.22.2_3-17.i586[3] UU_s_
+>!> atom:wlan-ng-kmp-default-0.2.8_2.6.22.2_3-17.i586[3] UU_s_
+>!> atom:wlan-ng-kmp-default-0.2.8_2.6.22.2_3-17.x86_64[3] UU_s_
+>!> atom:wlan-ng-kmp-xen-0.2.8_2.6.22.2_3-17.i586[3] UU_s_
+>!> atom:wlan-ng-kmp-xen-0.2.8_2.6.22.2_3-17.x86_64[3] UU_s_
+>!> atom:wlan-ng-kmp-xenpae-0.2.8_2.6.22.2_3-17.i586[3] UU_s_
+>!> patch:kdepim3-4231-0.noarch[3] UU_s_
+>!> patch:kernel-4078-0.noarch[3] US_s_
+>!> patch:kernel-4233-0.noarch IS_s_
+>!> patch:kernel-4233-0.noarch[3] US_s_
+>!> patch:kmps-4077-0.noarch[3] UU_s_
+>!> patch:libzypp-4047-0.noarch[3] UU_s_
+>!> patch:libzypp-4232-0.noarch[3] UI_s_
+>!> patch:sax2-4134-0.noarch[3] UU_s_
+>!> patch:update-test-affects-package-manager-2609-0.noarch IS_s_
+>!> patch:update-test-affects-package-manager-2609-0.noarch[3] US_s_
+>!> patch:update-test-interactive-2625-0.noarch IS_s_
+>!> patch:update-test-interactive-2625-0.noarch[3] US_s_
+>!> patch:update-test-optional-2627-0.noarch IS_s_
+>!> patch:update-test-optional-2627-0.noarch[3] US_s_
+>!> patch:update-test-reboot-needed-2628-0.noarch IS_s_
+>!> patch:update-test-reboot-needed-2628-0.noarch[3] US_s_
+>!> patch:update-test-security-2629-0.noarch IS_s_
+>!> patch:update-test-security-2629-0.noarch[3] US_s_
+>!> patch:update-test-trival-2626-0.noarch IS_s_
+>!> patch:update-test-trival-2626-0.noarch[3] US_s_
+>!> pattern:base-10.3-133.i586 IS_s_
+>!> pattern:enhanced_base-10.3-133.i586 IS_s_
+>!> pattern:enhanced_base_opt-10.3-133.i586 IS_s_
+>!> pattern:fonts-10.3-133.i586 IS_s_
+>!> pattern:fonts_opt-10.3-133.i586 IS_s_
+>!> pattern:sw_management-10.3-133.i586 IS_s_
+>!> pattern:update_test-10.3-133.i586 IS_s_
+>!> pattern:x11-10.3-133.i586 IS_s_
+>!> pattern:x11_opt-10.3-133.i586 IS_s_
+>!> pattern:yast2_basis-10.3-133.i586 IS_s_
+>!> pattern:yast2_install_wf-10.3-133.i586 IS_s_
+>!> product:openSUSE-DVD5-download-10.3.i686 IS_s_
+>!> product:openSUSE-extra-10.3.i686 IS_s_
+>!> product:openSUSE-factory-10.3.i686 IS_s_
+>!> ESTABLISHED:1: I__s_[S1:0][package]3ddiag-0.740-73.i586
+>!> ESTABLISHED:2: I__s_[S1:0][package]915resolution-0.5.3-28.i586
+>!> ESTABLISHED:3: I__s_[S1:0][package]CheckHardware-0.1-1080.i586
+>!> ESTABLISHED:4: I__s_[S1:0][package]ConsoleKit-0.2.1-48.i586
+>!> ESTABLISHED:5: I__s_[S1:0][package]DirectFB-1.0.0-57.i586
+>!> ESTABLISHED:6: I__s_[S1:0][package]Mesa-7.0.1-12.i586
+>!> ESTABLISHED:7: I__s_[S1:0][package]MozillaFirefox-2.0.0.6-9.i586
+>!> ESTABLISHED:8: I__s_[S1:0][package]MozillaFirefox-translations-2.0.0.6-9.i586
+>!> ESTABLISHED:9: I__s_[S1:0][package]PolicyKit-0.4-15.i586
+>!> ESTABLISHED:10: I__s_[S1:0][package]SDL-1.2.12-16.i586
+>!> ESTABLISHED:11: I__s_[S1:0][package]SuSEfirewall2-3.6_SVNr183-7.noarch
+>!> ESTABLISHED:12: I__s_[S1:0][package]a2ps-4.13-1175.i586
+>!> ESTABLISHED:13: I__s_[S1:0][package]aaa_base-10.3-78.i586
+>!> ESTABLISHED:14: I__s_[S1:0][package]aaa_skel-2007.3.7-33.i586
+>!> ESTABLISHED:15: I__s_[S1:0][package]aalib-1.4.0-379.i586
+>!> ESTABLISHED:16: I__s_[S1:0][package]acl-2.2.34-72.i586
+>!> ESTABLISHED:17: I__s_[S1:0][package]acpid-1.0.6-18.i586
+>!> ESTABLISHED:18: U__s_[S2:0][package]acx-kmp-bigsmp-20070101_2.6.22.2_3-6.i586
+>!> ESTABLISHED:19: U__s_[S2:0][package]acx-kmp-default-20070101_2.6.22.2_3-6.i586
+>!> ESTABLISHED:20: U__s_[S2:0][package]acx-kmp-xen-20070101_2.6.22.2_3-6.i586
+>!> ESTABLISHED:21: U__s_[S2:0][package]acx-kmp-xenpae-20070101_2.6.22.2_3-6.i586
+>!> ESTABLISHED:22: U__s_[S2:0][package]adm8211-kmp-bigsmp-20070720_2.6.22.2_3-3.i586
+>!> ESTABLISHED:23: U__s_[S2:0][package]adm8211-kmp-default-20070720_2.6.22.2_3-3.i586
+>!> ESTABLISHED:24: U__s_[S2:0][package]adm8211-kmp-xen-20070720_2.6.22.2_3-3.i586
+>!> ESTABLISHED:25: U__s_[S2:0][package]adm8211-kmp-xenpae-20070720_2.6.22.2_3-3.i586
+>!> ESTABLISHED:26: I__s_[S1:0][package]agfa-fonts-2003.03.19-91.noarch
+>!> ESTABLISHED:27: I__s_[S1:0][package]alsa-1.0.14-27.i586
+>!> ESTABLISHED:28: I__s_[S1:0][package]alsa-oss-1.0.14-20.i586
+>!> ESTABLISHED:29: I__s_[S1:0][package]alsa-plugins-1.0.14-33.i586
+>!> ESTABLISHED:30: I__s_[S1:0][package]alsa-utils-1.0.14-22.i586
+>!> ESTABLISHED:31: I__s_[S1:0][package]apparmor-admin_en-10.3-7.noarch
+>!> ESTABLISHED:32: I__s_[S1:0][package]apparmor-admin_en-pdf-10.3-7.noarch
+>!> ESTABLISHED:33: I__s_[S1:0][package]at-3.1.8-996.i586
+>!> ESTABLISHED:34: U__s_[S2:0][package]at76_usb-kmp-bigsmp-0.14beta1_2.6.22.2_3-5.i586
+>!> ESTABLISHED:35: U__s_[S2:0][package]at76_usb-kmp-default-0.14beta1_2.6.22.2_3-5.i586
+>!> ESTABLISHED:36: U__s_[S2:0][package]at76_usb-kmp-xen-0.14beta1_2.6.22.2_3-5.i586
+>!> ESTABLISHED:37: U__s_[S2:0][package]at76_usb-kmp-xenpae-0.14beta1_2.6.22.2_3-5.i586
+>!> ESTABLISHED:38: I__s_[S1:0][package]atk-1.19.6-14.i586
+>!> ESTABLISHED:39: UU_s_[S2:0][atom]acx-kmp-bigsmp-20070101_2.6.22.2_3-6.i586
+>!> ESTABLISHED:40: UU_s_[S2:0][atom]acx-kmp-default-20070101_2.6.22.2_3-6.i586
+>!> ESTABLISHED:41: UU_s_[S2:0][atom]acx-kmp-default-20070101_2.6.22.2_3-6.ppc
+>!> ESTABLISHED:42: UU_s_[S2:0][atom]acx-kmp-default-20070101_2.6.22.2_3-6.x86_64
+>!> ESTABLISHED:43: UU_s_[S2:0][atom]acx-kmp-ppc64-20070101_2.6.22.2_3-6.ppc
+>!> ESTABLISHED:44: UU_s_[S2:0][atom]acx-kmp-xen-20070101_2.6.22.2_3-6.i586
+>!> ESTABLISHED:45: UU_s_[S2:0][atom]acx-kmp-xen-20070101_2.6.22.2_3-6.x86_64
+>!> ESTABLISHED:46: UU_s_[S2:0][atom]acx-kmp-xenpae-20070101_2.6.22.2_3-6.i586
+>!> ESTABLISHED:47: UU_s_[S2:0][atom]adm8211-kmp-bigsmp-20070720_2.6.22.2_3-3.i586
+>!> ESTABLISHED:48: UU_s_[S2:0][atom]adm8211-kmp-default-20070720_2.6.22.2_3-3.i586
+>!> ESTABLISHED:49: UU_s_[S2:0][atom]adm8211-kmp-default-20070720_2.6.22.2_3-3.ppc
+>!> ESTABLISHED:50: UU_s_[S2:0][atom]adm8211-kmp-default-20070720_2.6.22.2_3-3.x86_64
+>!> ESTABLISHED:51: UU_s_[S2:0][atom]adm8211-kmp-ppc64-20070720_2.6.22.2_3-3.ppc
+>!> ESTABLISHED:52: UU_s_[S2:0][atom]adm8211-kmp-xen-20070720_2.6.22.2_3-3.i586
+>!> ESTABLISHED:53: UU_s_[S2:0][atom]adm8211-kmp-xen-20070720_2.6.22.2_3-3.x86_64
+>!> ESTABLISHED:54: UU_s_[S2:0][atom]adm8211-kmp-xenpae-20070720_2.6.22.2_3-3.i586
+>!> ESTABLISHED:55: UU_s_[S2:0][atom]at76_usb-kmp-bigsmp-0.14beta1_2.6.22.2_3-5.i586
+>!> ESTABLISHED:56: UU_s_[S2:0][atom]at76_usb-kmp-default-0.14beta1_2.6.22.2_3-5.i586
+>!> ESTABLISHED:57: UU_s_[S2:0][atom]at76_usb-kmp-default-0.14beta1_2.6.22.2_3-5.ppc
+>!> ESTABLISHED:58: UU_s_[S2:0][atom]at76_usb-kmp-default-0.14beta1_2.6.22.2_3-5.x86_64
+>!> ESTABLISHED:59: UU_s_[S2:0][atom]at76_usb-kmp-ppc64-0.14beta1_2.6.22.2_3-5.ppc
+>!> ESTABLISHED:60: UU_s_[S2:0][atom]at76_usb-kmp-xen-0.14beta1_2.6.22.2_3-5.i586
+>!> ESTABLISHED:61: UU_s_[S2:0][atom]at76_usb-kmp-xen-0.14beta1_2.6.22.2_3-5.x86_64
+>!> ESTABLISHED:62: UU_s_[S2:0][atom]at76_usb-kmp-xenpae-0.14beta1_2.6.22.2_3-5.i586
+>!> ESTABLISHED:63: UU_s_[S2:0][atom]cloop-kmp-bigsmp-2.04_2.6.22.2_3-94.i586
+>!> ESTABLISHED:64: UU_s_[S2:0][atom]cloop-kmp-default-2.04_2.6.22.2_3-94.i586
+>!> ESTABLISHED:65: UU_s_[S2:0][atom]cloop-kmp-default-2.04_2.6.22.2_3-94.x86_64
+>!> ESTABLISHED:66: UU_s_[S2:0][atom]cloop-kmp-default-2.04_2.6.22.2_3-95.ppc
+>!> ESTABLISHED:67: UU_s_[S2:0][atom]cloop-kmp-ppc64-2.04_2.6.22.2_3-95.ppc
+>!> ESTABLISHED:68: UU_s_[S2:0][atom]cloop-kmp-xen-2.04_2.6.22.2_3-94.i586
+>!> ESTABLISHED:69: UU_s_[S2:0][atom]cloop-kmp-xen-2.04_2.6.22.2_3-94.x86_64
+>!> ESTABLISHED:70: UU_s_[S2:0][atom]cloop-kmp-xenpae-2.04_2.6.22.2_3-94.i586
+>!> ESTABLISHED:71: UU_s_[S2:0][atom]dazuko-kmp-bigsmp-2.3.3.4_2.6.22.2_3-36.i586
+>!> ESTABLISHED:72: UU_s_[S2:0][atom]dazuko-kmp-default-2.3.3.4_2.6.22.2_3-36.i586
+>!> ESTABLISHED:73: UU_s_[S2:0][atom]dazuko-kmp-default-2.3.3.4_2.6.22.2_3-36.x86_64
+>!> ESTABLISHED:74: UU_s_[S2:0][atom]dazuko-kmp-xen-2.3.3.4_2.6.22.2_3-36.i586
+>!> ESTABLISHED:75: UU_s_[S2:0][atom]dazuko-kmp-xen-2.3.3.4_2.6.22.2_3-36.x86_64
+>!> ESTABLISHED:76: UU_s_[S2:0][atom]drbd-kmp-bigsmp-0.7.23_2.6.22.2_3-52.i586
+>!> ESTABLISHED:77: UU_s_[S2:0][atom]drbd-kmp-default-0.7.23_2.6.22.2_3-52.i586
+>!> ESTABLISHED:78: UU_s_[S2:0][atom]drbd-kmp-default-0.7.23_2.6.22.2_3-52.x86_64
+>!> ESTABLISHED:79: UU_s_[S2:0][atom]drbd-kmp-default-0.7.23_2.6.22.2_3-53.ppc
+>!> ESTABLISHED:80: UU_s_[S2:0][atom]drbd-kmp-ppc64-0.7.23_2.6.22.2_3-53.ppc
+>!> ESTABLISHED:81: UU_s_[S2:0][atom]drbd-kmp-xen-0.7.23_2.6.22.2_3-52.i586
+>!> ESTABLISHED:82: UU_s_[S2:0][atom]drbd-kmp-xen-0.7.23_2.6.22.2_3-52.x86_64
+>!> ESTABLISHED:83: UU_s_[S2:0][atom]gspcav-kmp-bigsmp-01.00.12_2.6.22.2_3-4.i586
+>!> ESTABLISHED:84: UU_s_[S2:0][atom]gspcav-kmp-default-01.00.12_2.6.22.2_3-4.i586
+>!> ESTABLISHED:85: UU_s_[S2:0][atom]gspcav-kmp-default-01.00.12_2.6.22.2_3-4.ppc
+>!> ESTABLISHED:86: UU_s_[S2:0][atom]gspcav-kmp-default-01.00.12_2.6.22.2_3-4.x86_64
+>!> ESTABLISHED:87: UU_s_[S2:0][atom]gspcav-kmp-ppc64-01.00.12_2.6.22.2_3-4.ppc
+>!> ESTABLISHED:88: UU_s_[S2:0][atom]ivtv-kmp-bigsmp-0.10.3_2.6.22.2_3-18.i586
+>!> ESTABLISHED:89: UU_s_[S2:0][atom]ivtv-kmp-default-0.10.3_2.6.22.2_3-18.i586
+>!> ESTABLISHED:90: UU_s_[S2:0][atom]ivtv-kmp-default-0.10.3_2.6.22.2_3-18.x86_64
+>!> ESTABLISHED:91: UU_s_[S2:0][atom]ivtv-kmp-xen-0.10.3_2.6.22.2_3-18.i586
+>!> ESTABLISHED:92: UU_s_[S2:0][atom]ivtv-kmp-xen-0.10.3_2.6.22.2_3-18.x86_64
+>!> ESTABLISHED:93: UU_s_[S2:0][atom]ivtv-kmp-xenpae-0.10.3_2.6.22.2_3-18.i586
+>!> ESTABLISHED:94: UU_s_[S2:0][atom]iwlwifi-kmp-bigsmp-0.1.8_2.6.22.2_3-2.i586
+>!> ESTABLISHED:95: UU_s_[S2:0][atom]iwlwifi-kmp-default-0.1.8_2.6.22.2_3-2.i586
+>!> ESTABLISHED:96: UU_s_[S2:0][atom]iwlwifi-kmp-default-0.1.8_2.6.22.2_3-2.x86_64
+>!> ESTABLISHED:97: UU_s_[S2:0][atom]iwlwifi-kmp-xen-0.1.8_2.6.22.2_3-2.i586
+>!> ESTABLISHED:98: UU_s_[S2:0][atom]iwlwifi-kmp-xen-0.1.8_2.6.22.2_3-2.x86_64
+>!> ESTABLISHED:99: UU_s_[S2:0][atom]iwlwifi-kmp-xenpae-0.1.8_2.6.22.2_3-2.i586
+>!> ESTABLISHED:100: UU_s_[S2:0][atom]kdepim3-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:101: UU_s_[S2:0][atom]kdepim3-3.5.7.enterprise.0.20070831.706868-8.ppc
+>!> ESTABLISHED:102: UU_s_[S2:0][atom]kdepim3-3.5.7.enterprise.0.20070831.706868-8.x86_64
+>!> ESTABLISHED:103: UU_s_[S2:0][atom]kdepim3-devel-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:104: UU_s_[S2:0][atom]kdepim3-devel-3.5.7.enterprise.0.20070831.706868-8.ppc
+>!> ESTABLISHED:105: UU_s_[S2:0][atom]kdepim3-devel-3.5.7.enterprise.0.20070831.706868-8.x86_64
+>!> ESTABLISHED:106: UU_s_[S2:0][atom]kdepim3-kpilot-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:107: UU_s_[S2:0][atom]kdepim3-kpilot-3.5.7.enterprise.0.20070831.706868-8.ppc
+>!> ESTABLISHED:108: UU_s_[S2:0][atom]kdepim3-kpilot-3.5.7.enterprise.0.20070831.706868-8.x86_64
+>!> ESTABLISHED:109: UU_s_[S2:0][atom]kdepim3-mobile-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:110: UU_s_[S2:0][atom]kdepim3-mobile-3.5.7.enterprise.0.20070831.706868-8.ppc
+>!> ESTABLISHED:111: UU_s_[S2:0][atom]kdepim3-mobile-3.5.7.enterprise.0.20070831.706868-8.x86_64
+>!> ESTABLISHED:112: UU_s_[S2:0][atom]kdepim3-notes-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:113: UU_s_[S2:0][atom]kdepim3-notes-3.5.7.enterprise.0.20070831.706868-8.ppc
+>!> ESTABLISHED:114: UU_s_[S2:0][atom]kdepim3-notes-3.5.7.enterprise.0.20070831.706868-8.x86_64
+>!> ESTABLISHED:115: UU_s_[S2:0][atom]kdepim3-time-management-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:116: UU_s_[S2:0][atom]kdepim3-time-management-3.5.7.enterprise.0.20070831.706868-8.ppc
+>!> ESTABLISHED:117: UU_s_[S2:0][atom]kdepim3-time-management-3.5.7.enterprise.0.20070831.706868-8.x86_64
+>!> ESTABLISHED:118: US_s_[S2:0][atom]kernel-bigsmp-2.6.22.2-3.i586
+>!> ESTABLISHED:119: I__s_[S1:0][atom]kernel-bigsmp-2.6.22.5-12.i586
+>!> ESTABLISHED:120: US_s_[S2:0][atom]kernel-bigsmp-2.6.22.5-12.i586
+>!> ESTABLISHED:121: UU_s_[S2:0][atom]kernel-default-2.6.22.2-3.i586
+>!> ESTABLISHED:122: UU_s_[S2:0][atom]kernel-default-2.6.22.2-3.ppc
+>!> ESTABLISHED:123: UU_s_[S2:0][atom]kernel-default-2.6.22.2-3.x86_64
+>!> ESTABLISHED:124: IU_s_[S1:0][atom]kernel-default-2.6.22.5-12.i586
+>!> ESTABLISHED:125: UU_s_[S2:0][atom]kernel-default-2.6.22.5-12.i586
+>!> ESTABLISHED:126: IU_s_[S1:0][atom]kernel-default-2.6.22.5-12.ppc
+>!> ESTABLISHED:127: UU_s_[S2:0][atom]kernel-default-2.6.22.5-12.ppc
+>!> ESTABLISHED:128: IU_s_[S1:0][atom]kernel-default-2.6.22.5-12.x86_64
+>!> ESTABLISHED:129: UU_s_[S2:0][atom]kernel-default-2.6.22.5-12.x86_64
+>!> ESTABLISHED:130: UU_s_[S2:0][atom]kernel-ppc64-2.6.22.2-3.ppc
+>!> ESTABLISHED:131: IU_s_[S1:0][atom]kernel-ppc64-2.6.22.5-12.ppc
+>!> ESTABLISHED:132: UU_s_[S2:0][atom]kernel-ppc64-2.6.22.5-12.ppc
+>!> ESTABLISHED:133: UU_s_[S2:0][atom]kernel-source-2.6.22.2-3.i586
+>!> ESTABLISHED:134: UU_s_[S2:0][atom]kernel-source-2.6.22.2-3.ppc
+>!> ESTABLISHED:135: UU_s_[S2:0][atom]kernel-source-2.6.22.2-3.x86_64
+>!> ESTABLISHED:136: IU_s_[S1:0][atom]kernel-source-2.6.22.5-12.i586
+>!> ESTABLISHED:137: UU_s_[S2:0][atom]kernel-source-2.6.22.5-12.i586
+>!> ESTABLISHED:138: IU_s_[S1:0][atom]kernel-source-2.6.22.5-12.ppc
+>!> ESTABLISHED:139: UU_s_[S2:0][atom]kernel-source-2.6.22.5-12.ppc
+>!> ESTABLISHED:140: IU_s_[S1:0][atom]kernel-source-2.6.22.5-12.x86_64
+>!> ESTABLISHED:141: UU_s_[S2:0][atom]kernel-source-2.6.22.5-12.x86_64
+>!> ESTABLISHED:142: UU_s_[S2:0][atom]kernel-syms-2.6.22.2-3.i586
+>!> ESTABLISHED:143: UU_s_[S2:0][atom]kernel-syms-2.6.22.2-3.ppc
+>!> ESTABLISHED:144: UU_s_[S2:0][atom]kernel-syms-2.6.22.2-3.x86_64
+>!> ESTABLISHED:145: IU_s_[S1:0][atom]kernel-syms-2.6.22.5-12.i586
+>!> ESTABLISHED:146: UU_s_[S2:0][atom]kernel-syms-2.6.22.5-12.i586
+>!> ESTABLISHED:147: IU_s_[S1:0][atom]kernel-syms-2.6.22.5-12.ppc
+>!> ESTABLISHED:148: UU_s_[S2:0][atom]kernel-syms-2.6.22.5-12.ppc
+>!> ESTABLISHED:149: IU_s_[S1:0][atom]kernel-syms-2.6.22.5-12.x86_64
+>!> ESTABLISHED:150: UU_s_[S2:0][atom]kernel-syms-2.6.22.5-12.x86_64
+>!> ESTABLISHED:151: UU_s_[S2:0][atom]kernel-xen-2.6.22.2-3.i586
+>!> ESTABLISHED:152: UU_s_[S2:0][atom]kernel-xen-2.6.22.2-3.x86_64
+>!> ESTABLISHED:153: IU_s_[S1:0][atom]kernel-xen-2.6.22.5-12.i586
+>!> ESTABLISHED:154: UU_s_[S2:0][atom]kernel-xen-2.6.22.5-12.i586
+>!> ESTABLISHED:155: IU_s_[S1:0][atom]kernel-xen-2.6.22.5-12.x86_64
+>!> ESTABLISHED:156: UU_s_[S2:0][atom]kernel-xen-2.6.22.5-12.x86_64
+>!> ESTABLISHED:157: UU_s_[S2:0][atom]kernel-xenpae-2.6.22.2-3.i586
+>!> ESTABLISHED:158: IU_s_[S1:0][atom]kernel-xenpae-2.6.22.5-12.i586
+>!> ESTABLISHED:159: UU_s_[S2:0][atom]kernel-xenpae-2.6.22.5-12.i586
+>!> ESTABLISHED:160: UU_s_[S2:0][atom]kitchensync-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:161: UU_s_[S2:0][atom]kitchensync-3.5.7.enterprise.0.20070831.706868-8.ppc
+>!> ESTABLISHED:162: UU_s_[S2:0][atom]kitchensync-3.5.7.enterprise.0.20070831.706868-8.x86_64
+>!> ESTABLISHED:163: US_s_[S2:0][atom]libzypp-3.13.13-4.i586
+>!> ESTABLISHED:164: UU_s_[S2:0][atom]libzypp-3.13.13-4.ppc
+>!> ESTABLISHED:165: UU_s_[S2:0][atom]libzypp-3.13.13-4.x86_64
+>!> ESTABLISHED:166: UI_s_[S2:0][atom]libzypp-3.22.1-5.i586
+>!> ESTABLISHED:167: UU_s_[S2:0][atom]libzypp-3.22.1-5.ppc
+>!> ESTABLISHED:168: UU_s_[S2:0][atom]libzypp-3.22.1-5.x86_64
+>!> ESTABLISHED:169: UU_s_[S2:0][atom]libzypp-devel-3.13.13-4.i586
+>!> ESTABLISHED:170: UU_s_[S2:0][atom]libzypp-devel-3.13.13-4.ppc
+>!> ESTABLISHED:171: UU_s_[S2:0][atom]libzypp-devel-3.13.13-4.x86_64
+>!> ESTABLISHED:172: UU_s_[S2:0][atom]libzypp-devel-3.22.1-5.i586
+>!> ESTABLISHED:173: UU_s_[S2:0][atom]libzypp-devel-3.22.1-5.ppc
+>!> ESTABLISHED:174: UU_s_[S2:0][atom]libzypp-devel-3.22.1-5.x86_64
+>!> ESTABLISHED:175: UU_s_[S2:0][atom]lirc-kmp-bigsmp-0.8.2_2.6.22.2_3-2.i586
+>!> ESTABLISHED:176: UU_s_[S2:0][atom]lirc-kmp-default-0.8.2_2.6.22.2_3-2.i586
+>!> ESTABLISHED:177: UU_s_[S2:0][atom]lirc-kmp-default-0.8.2_2.6.22.2_3-2.ppc
+>!> ESTABLISHED:178: UU_s_[S2:0][atom]lirc-kmp-default-0.8.2_2.6.22.2_3-2.x86_64
+>!> ESTABLISHED:179: UU_s_[S2:0][atom]lirc-kmp-ppc64-0.8.2_2.6.22.2_3-2.ppc
+>!> ESTABLISHED:180: UU_s_[S2:0][atom]lirc-kmp-xenpae-0.8.2_2.6.22.2_3-2.i586
+>!> ESTABLISHED:181: UU_s_[S2:0][atom]ndiswrapper-kmp-bigsmp-1.47_2.6.22.2_3-12.i586
+>!> ESTABLISHED:182: UU_s_[S2:0][atom]ndiswrapper-kmp-default-1.47_2.6.22.2_3-12.i586
+>!> ESTABLISHED:183: UU_s_[S2:0][atom]ndiswrapper-kmp-default-1.47_2.6.22.2_3-12.x86_64
+>!> ESTABLISHED:184: UU_s_[S2:0][atom]ndiswrapper-kmp-xen-1.47_2.6.22.2_3-12.i586
+>!> ESTABLISHED:185: UU_s_[S2:0][atom]ndiswrapper-kmp-xen-1.47_2.6.22.2_3-12.x86_64
+>!> ESTABLISHED:186: UU_s_[S2:0][atom]novfs-kmp-bigsmp-2.0.0_2.6.22.2_3-22.i586
+>!> ESTABLISHED:187: UU_s_[S2:0][atom]novfs-kmp-default-2.0.0_2.6.22.2_3-22.i586
+>!> ESTABLISHED:188: UU_s_[S2:0][atom]novfs-kmp-default-2.0.0_2.6.22.2_3-22.x86_64
+>!> ESTABLISHED:189: UU_s_[S2:0][atom]novfs-kmp-xen-2.0.0_2.6.22.2_3-22.i586
+>!> ESTABLISHED:190: UU_s_[S2:0][atom]novfs-kmp-xen-2.0.0_2.6.22.2_3-22.x86_64
+>!> ESTABLISHED:191: UU_s_[S2:0][atom]omnibook-kmp-bigsmp-20070530_2.6.22.2_3-2.i586
+>!> ESTABLISHED:192: UU_s_[S2:0][atom]omnibook-kmp-default-20070530_2.6.22.2_3-2.i586
+>!> ESTABLISHED:193: UU_s_[S2:0][atom]omnibook-kmp-default-20070530_2.6.22.2_3-2.x86_64
+>!> ESTABLISHED:194: UU_s_[S2:0][atom]omnibook-kmp-xen-20070530_2.6.22.2_3-2.i586
+>!> ESTABLISHED:195: UU_s_[S2:0][atom]omnibook-kmp-xen-20070530_2.6.22.2_3-2.x86_64
+>!> ESTABLISHED:196: UU_s_[S2:0][atom]omnibook-kmp-xenpae-20070530_2.6.22.2_3-2.i586
+>!> ESTABLISHED:197: UU_s_[S2:0][atom]rfswitch-kmp-bigsmp-1.1_2.6.22.2_3-4.i586
+>!> ESTABLISHED:198: UU_s_[S2:0][atom]rfswitch-kmp-default-1.1_2.6.22.2_3-4.i586
+>!> ESTABLISHED:199: UU_s_[S2:0][atom]rfswitch-kmp-default-1.1_2.6.22.2_3-4.ppc
+>!> ESTABLISHED:200: UU_s_[S2:0][atom]rfswitch-kmp-default-1.1_2.6.22.2_3-4.x86_64
+>!> ESTABLISHED:201: UU_s_[S2:0][atom]rfswitch-kmp-ppc64-1.1_2.6.22.2_3-4.ppc
+>!> ESTABLISHED:202: UU_s_[S2:0][atom]rfswitch-kmp-xen-1.1_2.6.22.2_3-4.i586
+>!> ESTABLISHED:203: UU_s_[S2:0][atom]rfswitch-kmp-xen-1.1_2.6.22.2_3-4.x86_64
+>!> ESTABLISHED:204: UU_s_[S2:0][atom]rfswitch-kmp-xenpae-1.1_2.6.22.2_3-4.i586
+>!> ESTABLISHED:205: UU_s_[S2:0][atom]rt2x00-kmp-bigsmp-2.0.6_2.6.22.2_3-2.i586
+>!> ESTABLISHED:206: UU_s_[S2:0][atom]rt2x00-kmp-default-2.0.6_2.6.22.2_3-2.i586
+>!> ESTABLISHED:207: UU_s_[S2:0][atom]rt2x00-kmp-default-2.0.6_2.6.22.2_3-2.ppc
+>!> ESTABLISHED:208: UU_s_[S2:0][atom]rt2x00-kmp-default-2.0.6_2.6.22.2_3-2.x86_64
+>!> ESTABLISHED:209: UU_s_[S2:0][atom]rt2x00-kmp-xen-2.0.6_2.6.22.2_3-2.i586
+>!> ESTABLISHED:210: UU_s_[S2:0][atom]rt2x00-kmp-xen-2.0.6_2.6.22.2_3-2.x86_64
+>!> ESTABLISHED:211: UU_s_[S2:0][atom]rt2x00-kmp-xenpae-2.0.6_2.6.22.2_3-2.i586
+>!> ESTABLISHED:212: US_s_[S2:0][atom]sax2-8.1-212.i586
+>!> ESTABLISHED:213: UU_s_[S2:0][atom]sax2-8.1-212.ppc
+>!> ESTABLISHED:214: UU_s_[S2:0][atom]sax2-8.1-212.x86_64
+>!> ESTABLISHED:215: US_s_[S2:0][atom]sax2-gui-8.1-212.i586
+>!> ESTABLISHED:216: UU_s_[S2:0][atom]sax2-gui-8.1-212.ppc
+>!> ESTABLISHED:217: UU_s_[S2:0][atom]sax2-gui-8.1-212.x86_64
+>!> ESTABLISHED:218: US_s_[S2:0][atom]sax2-ident-8.1-212.i586
+>!> ESTABLISHED:219: UU_s_[S2:0][atom]sax2-ident-8.1-212.ppc
+>!> ESTABLISHED:220: UU_s_[S2:0][atom]sax2-ident-8.1-212.x86_64
+>!> ESTABLISHED:221: US_s_[S2:0][atom]sax2-libsax-8.1-212.i586
+>!> ESTABLISHED:222: UU_s_[S2:0][atom]sax2-libsax-8.1-212.ppc
+>!> ESTABLISHED:223: UU_s_[S2:0][atom]sax2-libsax-8.1-212.x86_64
+>!> ESTABLISHED:224: UU_s_[S2:0][atom]sax2-libsax-devel-8.1-212.i586
+>!> ESTABLISHED:225: UU_s_[S2:0][atom]sax2-libsax-devel-8.1-212.ppc
+>!> ESTABLISHED:226: UU_s_[S2:0][atom]sax2-libsax-devel-8.1-212.x86_64
+>!> ESTABLISHED:227: US_s_[S2:0][atom]sax2-libsax-perl-8.1-212.i586
+>!> ESTABLISHED:228: UU_s_[S2:0][atom]sax2-libsax-perl-8.1-212.ppc
+>!> ESTABLISHED:229: UU_s_[S2:0][atom]sax2-libsax-perl-8.1-212.x86_64
+>!> ESTABLISHED:230: UU_s_[S2:0][atom]sax2-libsax-python-8.1-212.i586
+>!> ESTABLISHED:231: UU_s_[S2:0][atom]sax2-libsax-python-8.1-212.ppc
+>!> ESTABLISHED:232: UU_s_[S2:0][atom]sax2-libsax-python-8.1-212.x86_64
+>!> ESTABLISHED:233: US_s_[S2:0][atom]sax2-tools-8.1-212.i586
+>!> ESTABLISHED:234: UU_s_[S2:0][atom]sax2-tools-8.1-212.ppc
+>!> ESTABLISHED:235: UU_s_[S2:0][atom]sax2-tools-8.1-212.x86_64
+>!> ESTABLISHED:236: UU_s_[S2:0][atom]smartlink-softmodem-kmp-bigsmp-2.9.10_2.6.22.2_3-127.i586
+>!> ESTABLISHED:237: UU_s_[S2:0][atom]smartlink-softmodem-kmp-default-2.9.10_2.6.22.2_3-127.i586
+>!> ESTABLISHED:238: UU_s_[S2:0][atom]tpctl-kmp-bigsmp-4.17_2.6.22.2_3-111.i586
+>!> ESTABLISHED:239: UU_s_[S2:0][atom]tpctl-kmp-default-4.17_2.6.22.2_3-111.i586
+>!> ESTABLISHED:240: I__s_[S1:0][atom]update-test-affects-package-manager-99-99.noarch
+>!> ESTABLISHED:241: US_s_[S2:0][atom]update-test-affects-package-manager-99-99.noarch
+>!> ESTABLISHED:242: I__s_[S1:0][atom]update-test-interactive-99.99-99.99.noarch
+>!> ESTABLISHED:243: US_s_[S2:0][atom]update-test-interactive-99.99-99.99.noarch
+>!> ESTABLISHED:244: I__s_[S1:0][atom]update-test-optional-99.99-99.99.noarch
+>!> ESTABLISHED:245: US_s_[S2:0][atom]update-test-optional-99.99-99.99.noarch
+>!> ESTABLISHED:246: I__s_[S1:0][atom]update-test-reboot-needed-99.99-99.99.noarch
+>!> ESTABLISHED:247: US_s_[S2:0][atom]update-test-reboot-needed-99.99-99.99.noarch
+>!> ESTABLISHED:248: I__s_[S1:0][atom]update-test-security-99.99-99.99.noarch
+>!> ESTABLISHED:249: US_s_[S2:0][atom]update-test-security-99.99-99.99.noarch
+>!> ESTABLISHED:250: I__s_[S1:0][atom]update-test-trival-99.99-99.99.noarch
+>!> ESTABLISHED:251: US_s_[S2:0][atom]update-test-trival-99.99-99.99.noarch
+>!> ESTABLISHED:252: UU_s_[S2:0][atom]uvcvideo-kmp-bigsmp-r117_2.6.22.2_3-2.i586
+>!> ESTABLISHED:253: UU_s_[S2:0][atom]uvcvideo-kmp-default-r117_2.6.22.2_3-2.i586
+>!> ESTABLISHED:254: UU_s_[S2:0][atom]uvcvideo-kmp-default-r117_2.6.22.2_3-2.ppc
+>!> ESTABLISHED:255: UU_s_[S2:0][atom]uvcvideo-kmp-default-r117_2.6.22.2_3-2.x86_64
+>!> ESTABLISHED:256: UU_s_[S2:0][atom]uvcvideo-kmp-ppc64-r117_2.6.22.2_3-2.ppc
+>!> ESTABLISHED:257: UU_s_[S2:0][atom]uvcvideo-kmp-xen-r117_2.6.22.2_3-2.i586
+>!> ESTABLISHED:258: UU_s_[S2:0][atom]uvcvideo-kmp-xen-r117_2.6.22.2_3-2.x86_64
+>!> ESTABLISHED:259: UU_s_[S2:0][atom]uvcvideo-kmp-xenpae-r117_2.6.22.2_3-2.i586
+>!> ESTABLISHED:260: UU_s_[S2:0][atom]wlan-ng-kmp-bigsmp-0.2.8_2.6.22.2_3-17.i586
+>!> ESTABLISHED:261: UU_s_[S2:0][atom]wlan-ng-kmp-default-0.2.8_2.6.22.2_3-17.i586
+>!> ESTABLISHED:262: UU_s_[S2:0][atom]wlan-ng-kmp-default-0.2.8_2.6.22.2_3-17.x86_64
+>!> ESTABLISHED:263: UU_s_[S2:0][atom]wlan-ng-kmp-xen-0.2.8_2.6.22.2_3-17.i586
+>!> ESTABLISHED:264: UU_s_[S2:0][atom]wlan-ng-kmp-xen-0.2.8_2.6.22.2_3-17.x86_64
+>!> ESTABLISHED:265: UU_s_[S2:0][atom]wlan-ng-kmp-xenpae-0.2.8_2.6.22.2_3-17.i586
+>!> ESTABLISHED:266: I__s_[S1:0][package]attr-2.4.28-78.i586
+>!> ESTABLISHED:267: I__s_[S1:0][package]audiofile-0.2.6-74.i586
+>!> ESTABLISHED:268: I__s_[S1:0][package]audit-libs-1.5.5-10.i586
+>!> ESTABLISHED:269: I__s_[S1:0][package]autofs-5.0.2-20.i586
+>!> ESTABLISHED:270: I__s_[S1:0][package]autoyast2-2.15.16-2.noarch
+>!> ESTABLISHED:271: I__s_[S1:0][package]autoyast2-installation-2.15.16-2.noarch
+>!> ESTABLISHED:272: I__s_[S1:0][package]avahi-0.6.20-31.i586
+>!> ESTABLISHED:273: I__s_[S1:0][package]avahi-glib-0.6.20-31.i586
+>!> ESTABLISHED:274: I__s_[S1:0][package]bash-3.2-56.i586
+>!> ESTABLISHED:275: I__s_[S1:0][package]bash-doc-3.2-15.i586
+>!> ESTABLISHED:276: I__s_[S1:0][package]bc-1.06-823.i586
+>!> ESTABLISHED:277: I__s_[S1:0][package]bind-libs-9.4.1.P1-8.i586
+>!> ESTABLISHED:278: I__s_[S1:0][package]bind-utils-9.4.1.P1-8.i586
+>!> ESTABLISHED:279: I__s_[S1:0][package]binutils-2.17.50.20070726-10.i586
+>!> ESTABLISHED:280: I__s_[S1:0][package]blktrace-0.99.3-3.i586
+>!> ESTABLISHED:281: I__s_[S1:0][package]blocxx-1.0.0-76.i586
+>!> ESTABLISHED:282: I__s_[S1:0][package]boost-1.33.1-102.i586
+>!> ESTABLISHED:283: I__s_[S1:0][package]bootcycle-0.3-166.i586
+>!> ESTABLISHED:284: I__s_[S1:0][package]bootsplash-3.3-78.i586
+>!> ESTABLISHED:285: I__s_[S1:0][package]bootsplash-theme-SuSE-3.1-166.i586
+>!> ESTABLISHED:286: I__s_[S1:0][package]bundle-lang-common-en-10.3-21.noarch
+>!> ESTABLISHED:287: I__s_[S1:0][package]bzip2-1.0.4-39.i586
+>!> ESTABLISHED:288: I__s_[S1:0][package]cabextract-1.2-54.i586
+>!> ESTABLISHED:289: I__s_[S1:0][package]cairo-1.4.10-19.i586
+>!> ESTABLISHED:290: I__s_[S1:0][package]cdrkit-cdrtools-compat-1.1.6-18.i586
+>!> ESTABLISHED:291: I__s_[S1:0][package]classpath-0.95-62.i586
+>!> ESTABLISHED:292: I__s_[S1:0][package]classpath-webplugin-0.95-62.i586
+>!> ESTABLISHED:293: U__s_[S2:0][package]cloop-kmp-bigsmp-2.04_2.6.22.2_3-94.i586
+>!> ESTABLISHED:294: U__s_[S2:0][package]cloop-kmp-default-2.04_2.6.22.2_3-94.i586
+>!> ESTABLISHED:295: U__s_[S2:0][package]cloop-kmp-xen-2.04_2.6.22.2_3-94.i586
+>!> ESTABLISHED:296: U__s_[S2:0][package]cloop-kmp-xenpae-2.04_2.6.22.2_3-94.i586
+>!> ESTABLISHED:297: I__s_[S1:0][package]compat-2007.4.18-28.i586
+>!> ESTABLISHED:298: I__s_[S1:0][package]compat-libstdc++-5.0.7-83.i586
+>!> ESTABLISHED:299: I__s_[S1:0][package]compat-openssl097g-0.9.7g-71.i586
+>!> ESTABLISHED:300: I__s_[S1:0][package]coreutils-6.9-40.i586
+>!> ESTABLISHED:301: I__s_[S1:0][package]cpio-2.9-14.i586
+>!> ESTABLISHED:302: I__s_[S1:0][package]cpp-4.2-21.i586
+>!> ESTABLISHED:303: I__s_[S1:0][package]cpp42-4.2.1_20070724-12.i586
+>!> ESTABLISHED:304: I__s_[S1:0][package]cracklib-2.8.10-34.i586
+>!> ESTABLISHED:305: I__s_[S1:0][package]cracklib-dict-full-2.8.10-28.i586
+>!> ESTABLISHED:306: I__s_[S1:0][package]cron-4.1-119.i586
+>!> ESTABLISHED:307: I__s_[S1:0][package]cryptsetup-1.0.5-26.i586
+>!> ESTABLISHED:308: I__s_[S1:0][package]cups-1.2.12-13.i586
+>!> ESTABLISHED:309: I__s_[S1:0][package]cups-autoconfig-0.1.0-19.i586
+>!> ESTABLISHED:310: I__s_[S1:0][package]cups-client-1.2.12-13.i586
+>!> ESTABLISHED:311: I__s_[S1:0][package]cups-drivers-1.2.12-17.i586
+>!> ESTABLISHED:312: I__s_[S1:0][package]cups-libs-1.2.12-13.i586
+>!> ESTABLISHED:313: I__s_[S1:0][package]curl-7.16.4-10.i586
+>!> ESTABLISHED:314: I__s_[S1:0][package]curl-ca-bundle-7.16.4-10.i586
+>!> ESTABLISHED:315: I__s_[S1:0][package]cyrus-sasl-2.1.22-76.i586
+>!> ESTABLISHED:316: I__s_[S1:0][package]cyrus-sasl-saslauthd-2.1.22-78.i586
+>!> ESTABLISHED:317: U__s_[S2:0][package]dazuko-kmp-bigsmp-2.3.3.4_2.6.22.2_3-36.i586
+>!> ESTABLISHED:318: U__s_[S2:0][package]dazuko-kmp-default-2.3.3.4_2.6.22.2_3-36.i586
+>!> ESTABLISHED:319: U__s_[S2:0][package]dazuko-kmp-xen-2.3.3.4_2.6.22.2_3-36.i586
+>!> ESTABLISHED:320: I__s_[S1:0][package]db-utils-4.5.20-26.i586
+>!> ESTABLISHED:321: I__s_[S1:0][package]dbus-1-1.0.2-56.i586
+>!> ESTABLISHED:322: I__s_[S1:0][package]dbus-1-glib-0.74-19.i586
+>!> ESTABLISHED:323: I__s_[S1:0][package]dbus-1-x11-1.0.2-61.i586
+>!> ESTABLISHED:324: I__s_[S1:0][package]dejavu-2.19-8.noarch
+>!> ESTABLISHED:325: I__s_[S1:0][package]deltarpm-3.4-33.i586
+>!> ESTABLISHED:326: I__s_[S1:0][package]desktop-data-SuSE-10.3-77.noarch
+>!> ESTABLISHED:327: I__s_[S1:0][package]desktop-file-utils-0.13-29.i586
+>!> ESTABLISHED:328: I__s_[S1:0][package]desktop-translations-10.3-59.noarch
+>!> ESTABLISHED:329: I__s_[S1:0][package]device-mapper-1.02.19-25.i586
+>!> ESTABLISHED:330: I__s_[S1:0][package]dhcpcd-1.3.22pl4-284.i586
+>!> ESTABLISHED:331: I__s_[S1:0][package]dialog-1.0-60.i586
+>!> ESTABLISHED:332: I__s_[S1:0][package]diffutils-2.8.7-77.i586
+>!> ESTABLISHED:333: I__s_[S1:0][package]dirmngr-1.0.0-11.i586
+>!> ESTABLISHED:334: I__s_[S1:0][package]dmraid-1.0.0.rc14-17.i586
+>!> ESTABLISHED:335: I__s_[S1:0][package]dos2unix-3.1-373.i586
+>!> ESTABLISHED:336: I__s_[S1:0][package]dosfstools-2.11-77.i586
+>!> ESTABLISHED:337: U__s_[S2:0][package]drbd-kmp-bigsmp-0.7.23_2.6.22.2_3-52.i586
+>!> ESTABLISHED:338: U__s_[S2:0][package]drbd-kmp-default-0.7.23_2.6.22.2_3-52.i586
+>!> ESTABLISHED:339: U__s_[S2:0][package]drbd-kmp-xen-0.7.23_2.6.22.2_3-52.i586
+>!> ESTABLISHED:340: I__s_[S1:0][package]e2fsprogs-1.40.2-15.i586
+>!> ESTABLISHED:341: I__s_[S1:0][package]ed-0.2-935.i586
+>!> ESTABLISHED:342: I__s_[S1:0][package]efont-unicode-0.4.2-106.noarch
+>!> ESTABLISHED:343: I__s_[S1:0][package]eject-2.1.0-68.i586
+>!> ESTABLISHED:344: I__s_[S1:0][package]esound-0.2.38-14.i586
+>!> ESTABLISHED:345: I__s_[S1:0][package]ethtool-6-10.i586
+>!> ESTABLISHED:346: I__s_[S1:0][package]expat-2.0.1-21.i586
+>!> ESTABLISHED:347: I__s_[S1:0][package]fam-2.7.0-67.i586
+>!> ESTABLISHED:348: I__s_[S1:0][package]fbset-2.1-852.i586
+>!> ESTABLISHED:349: I__s_[S1:0][package]file-4.21-4.i586
+>!> ESTABLISHED:350: I__s_[S1:0][package]filesystem-10.3-47.i586
+>!> ESTABLISHED:351: I__s_[S1:0][package]fillup-1.42-176.i586
+>!> ESTABLISHED:352: I__s_[S1:0][package]filters-2007.8.9-15.i586
+>!> ESTABLISHED:353: I__s_[S1:0][package]findutils-4.2.31-21.i586
+>!> ESTABLISHED:354: I__s_[S1:0][package]finger-1.3-75.i586
+>!> ESTABLISHED:355: I__s_[S1:0][package]fontconfig-2.4.2-40.i586
+>!> ESTABLISHED:356: I__s_[S1:0][package]fonts-config-20061025-51.noarch
+>!> ESTABLISHED:357: I__s_[S1:0][package]foomatic-filters-3.0.2-120.i586
+>!> ESTABLISHED:358: I__s_[S1:0][package]freeglut-060903-73.i586
+>!> ESTABLISHED:359: I__s_[S1:0][package]freetype-1.3.1-1259.i586
+>!> ESTABLISHED:360: I__s_[S1:0][package]freetype2-2.3.5-15.i586
+>!> ESTABLISHED:361: I__s_[S1:0][package]fribidi-0.10.4-574.i586
+>!> ESTABLISHED:362: I__s_[S1:0][package]ft2demos-2.3.5-16.i586
+>!> ESTABLISHED:363: I__s_[S1:0][package]ftgl-2.1.2-87.i586
+>!> ESTABLISHED:364: I__s_[S1:0][package]fvwm2-2.5.21-62.i586
+>!> ESTABLISHED:365: I__s_[S1:0][package]gail-1.19.6-16.i586
+>!> ESTABLISHED:366: I__s_[S1:0][package]gawk-3.1.5g-22.i586
+>!> ESTABLISHED:367: I__s_[S1:0][package]gconf2-2.19.1-21.i586
+>!> ESTABLISHED:368: I__s_[S1:0][package]gdb-6.6.50.20070726-16.i586
+>!> ESTABLISHED:369: I__s_[S1:0][package]gdbm-1.8.3-299.i586
+>!> ESTABLISHED:370: I__s_[S1:0][package]genisoimage-1.1.6-18.i586
+>!> ESTABLISHED:371: I__s_[S1:0][package]gettext-0.16-43.i586
+>!> ESTABLISHED:372: I__s_[S1:0][package]ghostscript-fonts-other-8.15.3-90.i586
+>!> ESTABLISHED:373: I__s_[S1:0][package]ghostscript-fonts-std-8.15.3-90.i586
+>!> ESTABLISHED:374: I__s_[S1:0][package]ghostscript-library-8.15.3-90.i586
+>!> ESTABLISHED:375: I__s_[S1:0][package]ghostscript-x11-8.15.3-90.i586
+>!> ESTABLISHED:376: I__s_[S1:0][package]glib2-2.14.0-3.i586
+>!> ESTABLISHED:377: I__s_[S1:0][package]glibc-2.6.1-12.i686
+>!> ESTABLISHED:378: I__s_[S1:0][package]glibc-i18ndata-2.6.1-12.i586
+>!> ESTABLISHED:379: I__s_[S1:0][package]glibc-locale-2.6.1-12.i586
+>!> ESTABLISHED:380: I__s_[S1:0][package]glitz-0.5.6-80.i586
+>!> ESTABLISHED:381: I__s_[S1:0][package]gltt-2.5.2-572.i586
+>!> ESTABLISHED:382: I__s_[S1:0][package]gnome-icon-theme-2.19.91-4.noarch
+>!> ESTABLISHED:383: I__s_[S1:0][package]gnome-keyring-2.19.91-5.i586
+>!> ESTABLISHED:384: I__s_[S1:0][package]gnome-vfs2-2.19.91-3.i586
+>!> ESTABLISHED:385: I__s_[S1:0][package]gnutls-1.6.1-33.i586
+>!> ESTABLISHED:386: I__s_[S1:0][package]gpart-0.1h-553.i586
+>!> ESTABLISHED:387: I__s_[S1:0][package]gpg2-2.0.4-38.i586
+>!> ESTABLISHED:388: I__s_[S1:0][package]gpm-1.20.1-385.i586
+>!> ESTABLISHED:389: I__s_[S1:0][package]grep-2.5.2-25.i586
+>!> ESTABLISHED:390: I__s_[S1:0][package]groff-1.18.1.1-96.i586
+>!> ESTABLISHED:391: I__s_[S1:0][package]grub-0.97-79.i586
+>!> ESTABLISHED:392: U__s_[S2:0][package]gspcav-kmp-bigsmp-01.00.12_2.6.22.2_3-4.i586
+>!> ESTABLISHED:393: U__s_[S2:0][package]gspcav-kmp-default-01.00.12_2.6.22.2_3-4.i586
+>!> ESTABLISHED:394: I__s_[S1:0][package]gtk2-2.11.6-20.i586
+>!> ESTABLISHED:395: I__s_[S1:0][package]gutenprint-5.0.1-1.i586
+>!> ESTABLISHED:396: I__s_[S1:0][package]gzip-1.3.12-31.i586
+>!> ESTABLISHED:397: I__s_[S1:0][package]hal-0.5.9_git20070831-2.i586
+>!> ESTABLISHED:398: I__s_[S1:0][package]hal-resmgr-0.1_SVNr141-21.i586
+>!> ESTABLISHED:399: I__s_[S1:0][package]hdparm-7.7-7.i586
+>!> ESTABLISHED:400: I__s_[S1:0][package]hicolor-icon-theme-0.10-34.noarch
+>!> ESTABLISHED:401: I__s_[S1:0][package]hplip-2.7.7-22.i586
+>!> ESTABLISHED:402: I__s_[S1:0][package]hplip-hpijs-2.7.7-22.i586
+>!> ESTABLISHED:403: I__s_[S1:0][package]hwinfo-13.49-2.i586
+>!> ESTABLISHED:404: I__s_[S1:0][package]icedax-1.1.6-18.i586
+>!> ESTABLISHED:405: I__s_[S1:0][package]ifnteuro-1.2.1-296.noarch
+>!> ESTABLISHED:406: I__s_[S1:0][package]ifplugd-0.28-100.i586
+>!> ESTABLISHED:407: I__s_[S1:0][package]info-4.9-12.i586
+>!> ESTABLISHED:408: I__s_[S1:0][package]initviocons-0.5-12.i586
+>!> ESTABLISHED:409: I__s_[S1:0][package]insserv-1.09.0-43.i586
+>!> ESTABLISHED:410: I__s_[S1:0][package]inst-source-utils-2007.9.2-1.noarch
+>!> ESTABLISHED:411: I__s_[S1:0][package]intlfnts-1.2.1-296.noarch
+>!> ESTABLISHED:412: I__s_[S1:0][package]iproute2-2.6.22-22.i586
+>!> ESTABLISHED:413: I__s_[S1:0][package]iptables-1.3.8-17.i586
+>!> ESTABLISHED:414: I__s_[S1:0][package]iputils-ss021109-230.i586
+>!> ESTABLISHED:415: I__s_[S1:0][package]irqbalance-0.55-36.i586
+>!> ESTABLISHED:416: U__s_[S2:0][package]ivtv-kmp-bigsmp-0.10.3_2.6.22.2_3-18.i586
+>!> ESTABLISHED:417: U__s_[S2:0][package]ivtv-kmp-default-0.10.3_2.6.22.2_3-18.i586
+>!> ESTABLISHED:418: U__s_[S2:0][package]ivtv-kmp-xen-0.10.3_2.6.22.2_3-18.i586
+>!> ESTABLISHED:419: U__s_[S2:0][package]ivtv-kmp-xenpae-0.10.3_2.6.22.2_3-18.i586
+>!> ESTABLISHED:420: U__s_[S2:0][package]iwl3945-ucode-2.14.1.5-3.noarch
+>!> ESTABLISHED:421: U__s_[S2:0][package]iwl4965-ucode-4.44.1.18-3.noarch
+>!> ESTABLISHED:422: U__s_[S2:0][package]iwlwifi-kmp-bigsmp-0.1.8_2.6.22.1_16-2.i586
+>!> ESTABLISHED:423: U__s_[S2:0][package]iwlwifi-kmp-bigsmp-0.1.8_2.6.22.2_3-2.i586
+>!> ESTABLISHED:424: U__s_[S2:0][package]iwlwifi-kmp-debug-0.1.8_2.6.22.1_16-2.i586
+>!> ESTABLISHED:425: U__s_[S2:0][package]iwlwifi-kmp-default-0.1.8_2.6.22.1_16-2.i586
+>!> ESTABLISHED:426: U__s_[S2:0][package]iwlwifi-kmp-default-0.1.8_2.6.22.2_3-2.i586
+>!> ESTABLISHED:427: U__s_[S2:0][package]iwlwifi-kmp-xen-0.1.8_2.6.22.1_16-2.i586
+>!> ESTABLISHED:428: U__s_[S2:0][package]iwlwifi-kmp-xen-0.1.8_2.6.22.2_3-2.i586
+>!> ESTABLISHED:429: U__s_[S2:0][package]iwlwifi-kmp-xenpae-0.1.8_2.6.22.1_16-2.i586
+>!> ESTABLISHED:430: U__s_[S2:0][package]iwlwifi-kmp-xenpae-0.1.8_2.6.22.2_3-2.i586
+>!> ESTABLISHED:431: I__s_[S1:0][package]joe-3.5-61.i586
+>!> ESTABLISHED:432: I__s_[S1:0][package]kbd-1.12-135.i586
+>!> ESTABLISHED:433: I__s_[S1:0][package]kdelibs3-default-style-3.5.7-58.i586
+>!> ESTABLISHED:434: U__s_[S2:0][package]kdepim3-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:435: U__s_[S2:0][package]kdepim3-devel-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:436: U__s_[S2:0][package]kdepim3-kpilot-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:437: U__s_[S2:0][package]kdepim3-mobile-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:438: U__s_[S2:0][package]kdepim3-notes-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:439: U__s_[S2:0][package]kdepim3-time-management-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:440: U__s_[S2:0][package]kernel-bigsmp-2.6.22.2-3.i586
+>!> ESTABLISHED:441: I__s_[S1:0][package]kernel-bigsmp-2.6.22.5-12.i586
+>!> ESTABLISHED:442: U__s_[S2:0][package]kernel-bigsmp-2.6.22.5-12.i586
+>!> ESTABLISHED:443: U__s_[S2:0][package]kernel-default-2.6.22.2-3.i586
+>!> ESTABLISHED:444: U__s_[S2:0][package]kernel-default-2.6.22.5-12.i586
+>!> ESTABLISHED:445: U__s_[S2:0][package]kernel-source-2.6.22.2-3.i586
+>!> ESTABLISHED:446: U__s_[S2:0][package]kernel-source-2.6.22.5-12.i586
+>!> ESTABLISHED:447: U__s_[S2:0][package]kernel-syms-2.6.22.2-3.i586
+>!> ESTABLISHED:448: U__s_[S2:0][package]kernel-syms-2.6.22.5-12.i586
+>!> ESTABLISHED:449: U__s_[S2:0][package]kernel-xen-2.6.22.2-3.i586
+>!> ESTABLISHED:450: U__s_[S2:0][package]kernel-xen-2.6.22.5-12.i586
+>!> ESTABLISHED:451: U__s_[S2:0][package]kernel-xenpae-2.6.22.2-3.i586
+>!> ESTABLISHED:452: U__s_[S2:0][package]kernel-xenpae-2.6.22.5-12.i586
+>!> ESTABLISHED:453: I__s_[S1:0][package]keyutils-libs-1.2-39.i586
+>!> ESTABLISHED:454: U__s_[S2:0][package]kitchensync-3.5.7.enterprise.0.20070831.706868-8.i586
+>!> ESTABLISHED:455: I__s_[S1:0][package]klogd-1.4.1-629.i586
+>!> ESTABLISHED:456: I__s_[S1:0][package]kpartx-0.4.7-75.i586
+>!> ESTABLISHED:457: I__s_[S1:0][package]krb5-1.6.2-15.i586
+>!> ESTABLISHED:458: I__s_[S1:0][package]ksh-93s-41.i586
+>!> ESTABLISHED:459: I__s_[S1:0][package]ksymoops-2.4.11-73.i586
+>!> ESTABLISHED:460: U_Tu_[S0:0][language]en-.noarch
+>!> ESTABLISHED:461: U_Tu_[S0:0][language]en_US-.noarch
+>!> ESTABLISHED:462: I__s_[S1:0][package]ldapcpplib-0.0.4-88.i586
+>!> ESTABLISHED:463: I__s_[S1:0][package]less-406-11.i586
+>!> ESTABLISHED:464: I__s_[S1:0][package]libacl-2.2.34-72.i586
+>!> ESTABLISHED:465: I__s_[S1:0][package]libart_lgpl-2.3.19-32.i586
+>!> ESTABLISHED:466: I__s_[S1:0][package]libasound2-1.0.14-27.i586
+>!> ESTABLISHED:467: I__s_[S1:0][package]libattr-2.4.28-78.i586
+>!> ESTABLISHED:468: I__s_[S1:0][package]libblkid1-1.40.2-15.i586
+>!> ESTABLISHED:469: I__s_[S1:0][package]libbonobo-2.19.6-13.i586
+>!> ESTABLISHED:470: I__s_[S1:0][package]libbonoboui-2.19.6-17.i586
+>!> ESTABLISHED:471: I__s_[S1:0][package]libbz2-1-1.0.4-39.i586
+>!> ESTABLISHED:472: I__s_[S1:0][package]libcap-1.10-40.i586
+>!> ESTABLISHED:473: I__s_[S1:0][package]libcom_err2-1.40.2-15.i586
+>!> ESTABLISHED:474: I__s_[S1:0][package]libcurl4-7.16.4-10.i586
+>!> ESTABLISHED:475: I__s_[S1:0][package]libdaemon-0.12-14.i586
+>!> ESTABLISHED:476: I__s_[S1:0][package]libdb-4_5-4.5.20-26.i586
+>!> ESTABLISHED:477: I__s_[S1:0][package]libdrm-2.3.0-40.i586
+>!> ESTABLISHED:478: I__s_[S1:0][package]libevent-1.3b-33.i586
+>!> ESTABLISHED:479: I__s_[S1:0][package]libexif-0.6.16-18.i586
+>!> ESTABLISHED:480: I__s_[S1:0][package]libexpat1-2.0.1-21.i586
+>!> ESTABLISHED:481: I__s_[S1:0][package]libext2fs2-1.40.2-15.i586
+>!> ESTABLISHED:482: I__s_[S1:0][package]libfuse2-2.7.0-19.i586
+>!> ESTABLISHED:483: I__s_[S1:0][package]libgcc42-4.2.1_20070724-12.i586
+>!> ESTABLISHED:484: I__s_[S1:0][package]libgcrypt-1.2.4-35.i586
+>!> ESTABLISHED:485: I__s_[S1:0][package]libgimpprint-4.2.7-168.i586
+>!> ESTABLISHED:486: I__s_[S1:0][package]libglade2-2.6.2-12.i586
+>!> ESTABLISHED:487: I__s_[S1:0][package]libgnome-2.19.1-17.i586
+>!> ESTABLISHED:488: I__s_[S1:0][package]libgnomecanvas-2.19.2-4.i586
+>!> ESTABLISHED:489: I__s_[S1:0][package]libgnomeui-2.19.1-17.i586
+>!> ESTABLISHED:490: I__s_[S1:0][package]libgpg-error-1.4-56.i586
+>!> ESTABLISHED:491: I__s_[S1:0][package]libgphoto2-2.4.0-16.i586
+>!> ESTABLISHED:492: I__s_[S1:0][package]libgssapi-0.11-27.i586
+>!> ESTABLISHED:493: I__s_[S1:0][package]libicu-3.6-10.i586
+>!> ESTABLISHED:494: I__s_[S1:0][package]libidl-0.8.8-37.i586
+>!> ESTABLISHED:495: I__s_[S1:0][package]libidn-1.0-8.i586
+>!> ESTABLISHED:496: I__s_[S1:0][package]libieee1284-0.2.10-99.i586
+>!> ESTABLISHED:497: I__s_[S1:0][package]libjpeg-6.2.0-809.i586
+>!> ESTABLISHED:498: I__s_[S1:0][package]libksba-1.0.2-8.i586
+>!> ESTABLISHED:499: I__s_[S1:0][package]liblazy-0.2-8.i586
+>!> ESTABLISHED:500: I__s_[S1:0][package]liblcms-1.16-36.i586
+>!> ESTABLISHED:501: I__s_[S1:0][package]libltdl-3-1.5.24-14.i586
+>!> ESTABLISHED:502: I__s_[S1:0][package]libmng-1.0.10-11.i586
+>!> ESTABLISHED:503: I__s_[S1:0][package]libnetpbm10-10.26.44-7.i586
+>!> ESTABLISHED:504: I__s_[S1:0][package]libnscd-2.0.2-40.i586
+>!> ESTABLISHED:505: I__s_[S1:0][package]libopencdk-0.5.11-37.i586
+>!> ESTABLISHED:506: I__s_[S1:0][package]libopenct1-0.6.13-4.i586
+>!> ESTABLISHED:507: I__s_[S1:0][package]libopensc2-0.11.3-13.i586
+>!> ESTABLISHED:508: I__s_[S1:0][package]libopenssl0_9_8-0.9.8e-40.i586
+>!> ESTABLISHED:509: I__s_[S1:0][package]libpcap-0.9.7-10.i586
+>!> ESTABLISHED:510: I__s_[S1:0][package]libpng-1.2.18-12.i586
+>!> ESTABLISHED:511: I__s_[S1:0][package]libreadline5-5.2-15.i586
+>!> ESTABLISHED:512: I__s_[S1:0][package]librpcsecgss-0.14-66.i586
+>!> ESTABLISHED:513: I__s_[S1:0][package]libsmbclient-3.0.25c-3.i586
+>!> ESTABLISHED:514: I__s_[S1:0][package]libsmbios-libs-0.13.6-2.i586
+>!> ESTABLISHED:515: I__s_[S1:0][package]libsnmp15-5.4.1-11.i586
+>!> ESTABLISHED:516: I__s_[S1:0][package]libstdc++42-4.2.1_20070724-12.i586
+>!> ESTABLISHED:517: I__s_[S1:0][package]libstroke-0.5.1-99.i586
+>!> ESTABLISHED:518: I__s_[S1:0][package]libthinkfinger-0.3-2.i586
+>!> ESTABLISHED:519: I__s_[S1:0][package]libtiff3-3.8.2-65.i586
+>!> ESTABLISHED:520: I__s_[S1:0][package]libusb-0.1.12-69.i586
+>!> ESTABLISHED:521: I__s_[S1:0][package]libuuid1-1.40.2-15.i586
+>!> ESTABLISHED:522: I__s_[S1:0][package]libvolume_id-114-10.i586
+>!> ESTABLISHED:523: I__s_[S1:0][package]libx86-0.99-33.i586
+>!> ESTABLISHED:524: I__s_[S1:0][package]libxcrypt-2.4-68.i586
+>!> ESTABLISHED:525: I__s_[S1:0][package]libxml2-2.6.29-17.i586
+>!> ESTABLISHED:526: I__s_[S1:0][package]libxslt-1.1.20-37.i586
+>!> ESTABLISHED:527: I__s_[S1:0][package]liby2util-2.14.0-60.i586
+>!> ESTABLISHED:528: I__s_[S1:0][package]libzio-0.4-40.i586
+>!> ESTABLISHED:529: U__s_[S2:0][package]libzypp-3.13.13-4.i586
+>!> ESTABLISHED:530: I__s_[S1:0][package]libzypp-3.22.1-3.i586
+>!> ESTABLISHED:531: U__s_[S2:0][package]libzypp-3.22.1-5.i586
+>!> ESTABLISHED:532: U__s_[S2:0][package]libzypp-devel-3.13.13-4.i586
+>!> ESTABLISHED:533: U__s_[S2:0][package]libzypp-devel-3.22.1-5.i586
+>!> ESTABLISHED:534: I__s_[S1:0][package]licenses-20070810-9.noarch
+>!> ESTABLISHED:535: I__s_[S1:0][package]lilo-22.7-111.i586
+>!> ESTABLISHED:536: I__s_[S1:0][package]limal-1.3.1-6.i586
+>!> ESTABLISHED:537: I__s_[S1:0][package]limal-perl-1.3.1-6.i586
+>!> ESTABLISHED:538: I__s_[S1:0][package]linux-atm-lib-2.5.0-70.i586
+>!> ESTABLISHED:539: U__s_[S2:0][package]lirc-kmp-bigsmp-0.8.2_2.6.22.2_3-2.i586
+>!> ESTABLISHED:540: U__s_[S2:0][package]lirc-kmp-default-0.8.2_2.6.22.2_3-2.i586
+>!> ESTABLISHED:541: U__s_[S2:0][package]lirc-kmp-xenpae-0.8.2_2.6.22.2_3-2.i586
+>!> ESTABLISHED:542: I__s_[S1:0][package]logrotate-3.7.5-6.i586
+>!> ESTABLISHED:543: I__s_[S1:0][package]lsb-3.1-60.i586
+>!> ESTABLISHED:544: I__s_[S1:0][package]lsof-4.78-8.i586
+>!> ESTABLISHED:545: I__s_[S1:0][package]lukemftp-1.5-657.i586
+>!> ESTABLISHED:546: I__s_[S1:0][package]lvm2-2.02.25-25.i586
+>!> ESTABLISHED:547: I__s_[S1:0][package]lzo-2.02-71.i586
+>!> ESTABLISHED:548: I__s_[S1:0][package]m4-1.4.10-14.i586
+>!> ESTABLISHED:549: I__s_[S1:0][package]mailx-12.2-39.i586
+>!> ESTABLISHED:550: I__s_[S1:0][package]make-3.81-62.i586
+>!> ESTABLISHED:551: I__s_[S1:0][package]man-2.4.3-81.i586
+>!> ESTABLISHED:552: I__s_[S1:0][package]man-pages-2.64-7.noarch
+>!> ESTABLISHED:553: I__s_[S1:0][package]manufacturer-PPDs-10.2-92.noarch
+>!> ESTABLISHED:554: I__s_[S1:0][package]master-boot-code-1.14-21.i586
+>!> ESTABLISHED:555: I__s_[S1:0][package]mdadm-2.6.2-13.i586
+>!> ESTABLISHED:556: I__s_[S1:0][package]metamail-2.7.19-1134.i586
+>!> ESTABLISHED:557: I__s_[S1:0][package]microcode_ctl-1.17-29.i586
+>!> ESTABLISHED:558: I__s_[S1:0][package]mingetty-1.0.7s-22.i586
+>!> ESTABLISHED:559: I__s_[S1:0][package]mkinitrd-2.1-28.i586
+>!> ESTABLISHED:560: I__s_[S1:0][package]mktemp-1.5-801.i586
+>!> ESTABLISHED:561: I__s_[S1:0][package]module-init-tools-3.2.99.pre11-19.i586
+>!> ESTABLISHED:562: I__s_[S1:0][package]mozilla-nspr-4.6.7-17.i586
+>!> ESTABLISHED:563: I__s_[S1:0][package]mozilla-nss-3.11.7-9.i586
+>!> ESTABLISHED:564: I__s_[S1:0][package]mozilla-xulrunner181-1.8.1.4-19.i586
+>!> ESTABLISHED:565: I__s_[S1:0][package]mpt-status-1.2.0-61.i586
+>!> ESTABLISHED:566: I__s_[S1:0][package]ncurses-5.6-37.i586
+>!> ESTABLISHED:567: U__s_[S2:0][package]ndiswrapper-kmp-bigsmp-1.47_2.6.22.2_3-12.i586
+>!> ESTABLISHED:568: U__s_[S2:0][package]ndiswrapper-kmp-default-1.47_2.6.22.2_3-12.i586
+>!> ESTABLISHED:569: U__s_[S2:0][package]ndiswrapper-kmp-xen-1.47_2.6.22.2_3-12.i586
+>!> ESTABLISHED:570: I__s_[S1:0][package]net-tools-1.60-647.i586
+>!> ESTABLISHED:571: I__s_[S1:0][package]netcat-1.10-940.i586
+>!> ESTABLISHED:572: I__s_[S1:0][package]netcfg-10.3-36.noarch
+>!> ESTABLISHED:573: I__s_[S1:0][package]netpbm-10.26.44-7.i586
+>!> ESTABLISHED:574: I__s_[S1:0][package]nfs-client-1.1.0-6.i586
+>!> ESTABLISHED:575: I__s_[S1:0][package]nfsidmap-0.20-14.i586
+>!> ESTABLISHED:576: U__s_[S2:0][package]novfs-kmp-bigsmp-2.0.0_2.6.22.2_3-22.i586
+>!> ESTABLISHED:577: U__s_[S2:0][package]novfs-kmp-default-2.0.0_2.6.22.2_3-22.i586
+>!> ESTABLISHED:578: U__s_[S2:0][package]novfs-kmp-xen-2.0.0_2.6.22.2_3-22.i586
+>!> ESTABLISHED:579: I__s_[S1:0][package]nscd-2.6.1-12.i586
+>!> ESTABLISHED:580: I__s_[S1:0][package]nspluginwrapper-0.9.91.4-49.i586
+>!> ESTABLISHED:581: I__s_[S1:0][package]nss-mdns-0.9-36.i586
+>!> ESTABLISHED:582: I__s_[S1:0][package]ntfs-3g-1.826-3.i586
+>!> ESTABLISHED:583: I__s_[S1:0][package]ntfsprogs-1.13.1-46.i586
+>!> ESTABLISHED:584: I__s_[S1:0][package]numlockx-1.1-75.i586
+>!> ESTABLISHED:585: U__s_[S2:0][package]omnibook-kmp-bigsmp-20070530_2.6.22.2_3-2.i586
+>!> ESTABLISHED:586: U__s_[S2:0][package]omnibook-kmp-default-20070530_2.6.22.2_3-2.i586
+>!> ESTABLISHED:587: U__s_[S2:0][package]omnibook-kmp-xen-20070530_2.6.22.2_3-2.i586
+>!> ESTABLISHED:588: U__s_[S2:0][package]omnibook-kmp-xenpae-20070530_2.6.22.2_3-2.i586
+>!> ESTABLISHED:589: I__s_[S1:0][package]openSUSE-release-10.3-65.i586
+>!> ESTABLISHED:590: I__s_[S1:0][package]openct-0.6.13-4.i586
+>!> ESTABLISHED:591: I__s_[S1:0][package]openldap2-client-2.3.37-13.i586
+>!> ESTABLISHED:592: I__s_[S1:0][package]opensc-0.11.3-13.i586
+>!> ESTABLISHED:593: I__s_[S1:0][package]openslp-1.2.0-90.i586
+>!> ESTABLISHED:594: I__s_[S1:0][package]openssh-4.6p1-49.i586
+>!> ESTABLISHED:595: I__s_[S1:0][package]openssh-askpass-4.6p1-49.i586
+>!> ESTABLISHED:596: I__s_[S1:0][package]openssl-0.9.8e-40.i586
+>!> ESTABLISHED:597: I__s_[S1:0][package]openssl-certs-0.9.8e-40.i586
+>!> ESTABLISHED:598: I__s_[S1:0][package]opensuse-manual_en-10.3-23.noarch
+>!> ESTABLISHED:599: I__s_[S1:0][package]opensuse-manual_en-pdf-10.3-23.noarch
+>!> ESTABLISHED:600: I__s_[S1:0][package]orbit2-2.14.8-10.i586
+>!> ESTABLISHED:601: I__s_[S1:0][package]pam-0.99.8.1-12.i586
+>!> ESTABLISHED:602: I__s_[S1:0][package]pam-config-0.23-6.i586
+>!> ESTABLISHED:603: I__s_[S1:0][package]pam-modules-10.3-44.i586
+>!> ESTABLISHED:604: I__s_[S1:0][package]pango-1.18.1-2.i586
+>!> ESTABLISHED:605: I__s_[S1:0][package]parted-1.8.7-34.i586
+>!> ESTABLISHED:606: I__s_[S1:0][package]patch-2.5.9-216.i586
+>!> ESTABLISHED:607: UU_s_[S2:0][patch]kdepim3-4231-0.noarch
+>!> ESTABLISHED:608: US_s_[S2:0][patch]kernel-4078-0.noarch
+>!> ESTABLISHED:609: I__s_[S1:0][patch]kernel-4233-0.noarch
+>!> ESTABLISHED:610: US_s_[S2:0][patch]kernel-4233-0.noarch
+>!> ESTABLISHED:611: UU_s_[S2:0][patch]kmps-4077-0.noarch
+>!> ESTABLISHED:612: UU_s_[S2:0][patch]libzypp-4047-0.noarch
+>!> ESTABLISHED:613: UI_s_[S2:0][patch]libzypp-4232-0.noarch
+>!> ESTABLISHED:614: UU_s_[S2:0][patch]sax2-4134-0.noarch
+>!> ESTABLISHED:615: I__s_[S1:0][patch]update-test-affects-package-manager-2609-0.noarch
+>!> ESTABLISHED:616: US_s_[S2:0][patch]update-test-affects-package-manager-2609-0.noarch
+>!> ESTABLISHED:617: I__s_[S1:0][patch]update-test-interactive-2625-0.noarch
+>!> ESTABLISHED:618: US_s_[S2:0][patch]update-test-interactive-2625-0.noarch
+>!> ESTABLISHED:619: I__s_[S1:0][patch]update-test-optional-2627-0.noarch
+>!> ESTABLISHED:620: US_s_[S2:0][patch]update-test-optional-2627-0.noarch
+>!> ESTABLISHED:621: I__s_[S1:0][patch]update-test-reboot-needed-2628-0.noarch
+>!> ESTABLISHED:622: US_s_[S2:0][patch]update-test-reboot-needed-2628-0.noarch
+>!> ESTABLISHED:623: I__s_[S1:0][patch]update-test-security-2629-0.noarch
+>!> ESTABLISHED:624: US_s_[S2:0][patch]update-test-security-2629-0.noarch
+>!> ESTABLISHED:625: I__s_[S1:0][patch]update-test-trival-2626-0.noarch
+>!> ESTABLISHED:626: US_s_[S2:0][patch]update-test-trival-2626-0.noarch
+>!> ESTABLISHED:627: I__s_[S1:0][pattern]base-10.3-133.i586
+>!> ESTABLISHED:628: I__s_[S1:0][pattern]enhanced_base-10.3-133.i586
+>!> ESTABLISHED:629: I__s_[S1:0][pattern]enhanced_base_opt-10.3-133.i586
+>!> ESTABLISHED:630: I__s_[S1:0][pattern]fonts-10.3-133.i586
+>!> ESTABLISHED:631: I__s_[S1:0][pattern]fonts_opt-10.3-133.i586
+>!> ESTABLISHED:632: I__s_[S1:0][pattern]sw_management-10.3-133.i586
+>!> ESTABLISHED:633: I__s_[S1:0][pattern]update_test-10.3-133.i586
+>!> ESTABLISHED:634: I__s_[S1:0][pattern]x11-10.3-133.i586
+>!> ESTABLISHED:635: I__s_[S1:0][pattern]x11_opt-10.3-133.i586
+>!> ESTABLISHED:636: I__s_[S1:0][pattern]yast2_basis-10.3-133.i586
+>!> ESTABLISHED:637: I__s_[S1:0][pattern]yast2_install_wf-10.3-133.i586
+>!> ESTABLISHED:638: I__s_[S1:0][package]pax-3.4-70.i586
+>!> ESTABLISHED:639: I__s_[S1:0][package]pciutils-2.2.6-14.i586
+>!> ESTABLISHED:640: I__s_[S1:0][package]pciutils-ids-2007.9.1-1.noarch
+>!> ESTABLISHED:641: I__s_[S1:0][package]pcre-7.2-11.i586
+>!> ESTABLISHED:642: I__s_[S1:0][package]pcsc-lite-1.4.3-12.i586
+>!> ESTABLISHED:643: I__s_[S1:0][package]perl-5.8.8-73.i586
+>!> ESTABLISHED:644: I__s_[S1:0][package]perl-Bootloader-0.4.23-8.i586
+>!> ESTABLISHED:645: I__s_[S1:0][package]perl-Compress-Raw-Zlib-2.005-14.i586
+>!> ESTABLISHED:646: I__s_[S1:0][package]perl-Compress-Zlib-2.005-10.i586
+>!> ESTABLISHED:647: I__s_[S1:0][package]perl-Config-Crontab-1.21-8.i586
+>!> ESTABLISHED:648: I__s_[S1:0][package]perl-Crypt-SmbHash-0.12-69.i586
+>!> ESTABLISHED:649: I__s_[S1:0][package]perl-Digest-MD4-1.5-68.i586
+>!> ESTABLISHED:650: I__s_[S1:0][package]perl-Digest-SHA1-2.11-58.i586
+>!> ESTABLISHED:651: I__s_[S1:0][package]perl-IO-Compress-Base-2.005-14.i586
+>!> ESTABLISHED:652: I__s_[S1:0][package]perl-IO-Compress-Zlib-2.005-13.i586
+>!> ESTABLISHED:653: I__s_[S1:0][package]perl-Parse-RecDescent-1.80-315.i586
+>!> ESTABLISHED:654: I__s_[S1:0][package]perl-TermReadLine-Gnu-1.16-35.i586
+>!> ESTABLISHED:655: I__s_[S1:0][package]perl-URI-1.35-71.i586
+>!> ESTABLISHED:656: I__s_[S1:0][package]perl-X500-DN-0.29-12.i586
+>!> ESTABLISHED:657: I__s_[S1:0][package]perl-XML-Bare-0.11-12.i586
+>!> ESTABLISHED:658: I__s_[S1:0][package]perl-XML-Parser-2.34-104.i586
+>!> ESTABLISHED:659: I__s_[S1:0][package]perl-XML-Writer-0.603-14.i586
+>!> ESTABLISHED:660: I__s_[S1:0][package]perl-XML-XPath-1.13-9.i586
+>!> ESTABLISHED:661: I__s_[S1:0][package]perl-base-5.8.8-73.i586
+>!> ESTABLISHED:662: I__s_[S1:0][package]perl-gettext-1.05-70.i586
+>!> ESTABLISHED:663: I__s_[S1:0][package]permissions-2007.8.10-8.i586
+>!> ESTABLISHED:664: I__s_[S1:0][package]pinentry-0.7.2-111.i586
+>!> ESTABLISHED:665: I__s_[S1:0][package]pkg-config-0.21-35.i586
+>!> ESTABLISHED:666: I__s_[S1:0][package]pm-utils-0.99.3.20070618-13.i586
+>!> ESTABLISHED:667: I__s_[S1:0][package]pmtools-20061026-41.i586
+>!> ESTABLISHED:668: I__s_[S1:0][package]popt-1.7-364.i586
+>!> ESTABLISHED:669: I__s_[S1:0][package]portmap-6.0+git20070513-22.i586
+>!> ESTABLISHED:670: I__s_[S1:0][package]postfix-2.4.5-12.i586
+>!> ESTABLISHED:671: I__s_[S1:0][package]powersave-0.15.17-2.i586
+>!> ESTABLISHED:672: I__s_[S1:0][package]powersave-libs-0.15.17-2.i586
+>!> ESTABLISHED:673: I__s_[S1:0][package]ppp-2.4.4-67.i586
+>!> ESTABLISHED:674: I__s_[S1:0][package]pptp-1.7.1-48.i586
+>!> ESTABLISHED:675: I__s_[S1:0][package]prctl-1.3-424.i586
+>!> ESTABLISHED:676: I__s_[S1:0][package]preload-0.2-101.i586
+>!> ESTABLISHED:677: I__s_[S1:0][package]procinfo-18-125.i586
+>!> ESTABLISHED:678: I__s_[S1:0][package]procmail-3.22-132.i586
+>!> ESTABLISHED:679: I__s_[S1:0][package]procps-3.2.7-64.i586
+>!> ESTABLISHED:680: I__s_[S1:0][product]openSUSE-DVD5-download-10.3.i686
+>!> ESTABLISHED:681: I__s_[S1:0][product]openSUSE-extra-10.3.i686
+>!> ESTABLISHED:682: I__s_[S1:0][product]openSUSE-factory-10.3.i686
+>!> ESTABLISHED:683: I__s_[S1:0][package]providers-2006.11.21-41.noarch
+>!> ESTABLISHED:684: I__s_[S1:0][package]psmisc-22.5-27.i586
+>!> ESTABLISHED:685: I__s_[S1:0][package]pth-2.0.7-40.i586
+>!> ESTABLISHED:686: I__s_[S1:0][package]pwdutils-3.1.4-20.i586
+>!> ESTABLISHED:687: I__s_[S1:0][package]python-2.5.1-32.i586
+>!> ESTABLISHED:688: I__s_[S1:0][package]python-qt-3.17.3-10.i586
+>!> ESTABLISHED:689: I__s_[S1:0][package]python-sip-4.7-14.i586
+>!> ESTABLISHED:690: I__s_[S1:0][package]python-xml-2.5.1-32.i586
+>!> ESTABLISHED:691: I__s_[S1:0][package]qt3-3.3.8-67.i586
+>!> ESTABLISHED:692: I__s_[S1:0][package]readline-doc-5.2-15.i586
+>!> ESTABLISHED:693: I__s_[S1:0][package]recode-3.6-560.i586
+>!> ESTABLISHED:694: I__s_[S1:0][package]reiserfs-3.6.19-87.i586
+>!> ESTABLISHED:695: I__s_[S1:0][package]release-notes-10.3.8-2.noarch
+>!> ESTABLISHED:696: I__s_[S1:0][package]resmgr-1.1.0_SVNr143-8.i586
+>!> ESTABLISHED:697: U__s_[S2:0][package]rfswitch-kmp-bigsmp-1.1_2.6.22.2_3-4.i586
+>!> ESTABLISHED:698: U__s_[S2:0][package]rfswitch-kmp-default-1.1_2.6.22.2_3-4.i586
+>!> ESTABLISHED:699: U__s_[S2:0][package]rfswitch-kmp-xen-1.1_2.6.22.2_3-4.i586
+>!> ESTABLISHED:700: U__s_[S2:0][package]rfswitch-kmp-xenpae-1.1_2.6.22.2_3-4.i586
+>!> ESTABLISHED:701: I__s_[S1:0][package]rpm-4.4.2-136.i586
+>!> ESTABLISHED:702: I__s_[S1:0][package]rrdtool-1.2.23-41.i586
+>!> ESTABLISHED:703: I__s_[S1:0][package]rsync-2.6.9-41.i586
+>!> ESTABLISHED:704: U__s_[S2:0][package]rt2x00-kmp-bigsmp-2.0.6_2.6.22.2_3-2.i586
+>!> ESTABLISHED:705: U__s_[S2:0][package]rt2x00-kmp-default-2.0.6_2.6.22.2_3-2.i586
+>!> ESTABLISHED:706: U__s_[S2:0][package]rt2x00-kmp-xen-2.0.6_2.6.22.2_3-2.i586
+>!> ESTABLISHED:707: U__s_[S2:0][package]rt2x00-kmp-xenpae-2.0.6_2.6.22.2_3-2.i586
+>!> ESTABLISHED:708: I__s_[S1:0][package]sane-backends-1.0.18-71.i586
+>!> ESTABLISHED:709: I__s_[S1:0][package]sash-3.7-105.i586
+>!> ESTABLISHED:710: U__s_[S2:0][package]sax2-8.1-212.i586
+>!> ESTABLISHED:711: I__s_[S1:0][package]sax2-8.1-235.i586
+>!> ESTABLISHED:712: U__s_[S2:0][package]sax2-gui-8.1-212.i586
+>!> ESTABLISHED:713: I__s_[S1:0][package]sax2-gui-8.1-235.i586
+>!> ESTABLISHED:714: U__s_[S2:0][package]sax2-ident-8.1-212.i586
+>!> ESTABLISHED:715: I__s_[S1:0][package]sax2-ident-8.1-235.i586
+>!> ESTABLISHED:716: U__s_[S2:0][package]sax2-libsax-8.1-212.i586
+>!> ESTABLISHED:717: I__s_[S1:0][package]sax2-libsax-8.1-235.i586
+>!> ESTABLISHED:718: U__s_[S2:0][package]sax2-libsax-devel-8.1-212.i586
+>!> ESTABLISHED:719: U__s_[S2:0][package]sax2-libsax-perl-8.1-212.i586
+>!> ESTABLISHED:720: I__s_[S1:0][package]sax2-libsax-perl-8.1-235.i586
+>!> ESTABLISHED:721: U__s_[S2:0][package]sax2-libsax-python-8.1-212.i586
+>!> ESTABLISHED:722: U__s_[S2:0][package]sax2-tools-8.1-212.i586
+>!> ESTABLISHED:723: I__s_[S1:0][package]sax2-tools-8.1-235.i586
+>!> ESTABLISHED:724: I__s_[S1:0][package]scpm-1.1.6pre2-6.i586
+>!> ESTABLISHED:725: I__s_[S1:0][package]screen-4.0.2-124.i586
+>!> ESTABLISHED:726: I__s_[S1:0][package]scsi-1.7_2.37_1.25_0.19_1.02_0.93-13.i586
+>!> ESTABLISHED:727: I__s_[S1:0][package]sed-4.1.5-61.i586
+>!> ESTABLISHED:728: I__s_[S1:0][package]sensors-2.10.4-15.i586
+>!> ESTABLISHED:729: I__s_[S1:0][package]setserial-2.17-651.i586
+>!> ESTABLISHED:730: I__s_[S1:0][package]shared-mime-info-0.22-10.i586
+>!> ESTABLISHED:731: I__s_[S1:0][package]sharutils-4.6.2-74.i586
+>!> ESTABLISHED:732: I__s_[S1:0][package]siga-10.101-70.noarch
+>!> ESTABLISHED:733: U__s_[S2:0][package]smartlink-softmodem-kmp-bigsmp-2.9.10_2.6.22.2_3-127.i586
+>!> ESTABLISHED:734: U__s_[S2:0][package]smartlink-softmodem-kmp-default-2.9.10_2.6.22.2_3-127.i586
+>!> ESTABLISHED:735: I__s_[S1:0][package]smartmontools-5.37-12.i586
+>!> ESTABLISHED:736: I__s_[S1:0][package]snmp-mibs-5.4.1-11.i586
+>!> ESTABLISHED:737: I__s_[S1:0][package]splashy-0.3.3-32.i586
+>!> ESTABLISHED:738: I__s_[S1:0][package]sqlite-3.4.1-10.i586
+>!> ESTABLISHED:739: I__s_[S1:0][package]startup-notification-0.9-9.i586
+>!> ESTABLISHED:740: I__s_[S1:0][package]strace-4.5.16-8.i586
+>!> ESTABLISHED:741: I__s_[S1:0][package]sudo-1.6.9p2-16.i586
+>!> ESTABLISHED:742: I__s_[S1:0][package]suse-build-key-1.0-762.noarch
+>!> ESTABLISHED:743: I__s_[S1:0][package]suseRegister-1.2-73.noarch
+>!> ESTABLISHED:744: I__s_[S1:0][package]suspend-0.69.9-2.i586
+>!> ESTABLISHED:745: I__s_[S1:0][package]sysconfig-0.70.0-10.i586
+>!> ESTABLISHED:746: I__s_[S1:0][package]sysfsutils-2.1.0-58.i586
+>!> ESTABLISHED:747: I__s_[S1:0][package]syslog-ng-1.6.12-30.i586
+>!> ESTABLISHED:748: I_Lu_[S0:0][system]system-.noarch
+>!> ESTABLISHED:749: I__s_[S1:0][package]sysvinit-2.86-99.i586
+>!> ESTABLISHED:750: I__s_[S1:0][package]tar-1.17-18.i586
+>!> ESTABLISHED:751: I__s_[S1:0][package]tcl-8.4.15-19.i586
+>!> ESTABLISHED:752: I__s_[S1:0][package]tcpd-7.6-788.i586
+>!> ESTABLISHED:753: I__s_[S1:0][package]tcpdump-3.9.7-11.i586
+>!> ESTABLISHED:754: I__s_[S1:0][package]tcsh-6.15.00-17.i586
+>!> ESTABLISHED:755: I__s_[S1:0][package]telnet-1.2-74.i586
+>!> ESTABLISHED:756: I__s_[S1:0][package]terminfo-5.6-37.i586
+>!> ESTABLISHED:757: I__s_[S1:0][package]tightvnc-1.3.9-9.i586
+>!> ESTABLISHED:758: I__s_[S1:0][package]timezone-2007g-4.i586
+>!> ESTABLISHED:759: I__s_[S1:0][package]tk-8.4.15-19.i586
+>!> ESTABLISHED:760: U__s_[S2:0][package]tpctl-kmp-bigsmp-4.17_2.6.22.2_3-111.i586
+>!> ESTABLISHED:761: U__s_[S2:0][package]tpctl-kmp-default-4.17_2.6.22.2_3-111.i586
+>!> ESTABLISHED:762: I__s_[S1:0][package]udev-114-10.i586
+>!> ESTABLISHED:763: I__s_[S1:0][package]ulimit-1.1-205.noarch
+>!> ESTABLISHED:764: I__s_[S1:0][package]unclutter-8-936.i586
+>!> ESTABLISHED:765: I__s_[S1:0][package]unzip-5.52-74.i586
+>!> ESTABLISHED:766: I__s_[S1:0][package]update-alternatives-1.8.3-72.noarch
+>!> ESTABLISHED:767: I__s_[S1:0][package]update-test-affects-package-manager-99-99.noarch
+>!> ESTABLISHED:768: U__s_[S2:0][package]update-test-affects-package-manager-99-99.noarch
+>!> ESTABLISHED:769: I__s_[S1:0][package]update-test-interactive-99.99-99.99.noarch
+>!> ESTABLISHED:770: U__s_[S2:0][package]update-test-interactive-99.99-99.99.noarch
+>!> ESTABLISHED:771: I__s_[S1:0][package]update-test-optional-99.99-99.99.noarch
+>!> ESTABLISHED:772: U__s_[S2:0][package]update-test-optional-99.99-99.99.noarch
+>!> ESTABLISHED:773: I__s_[S1:0][package]update-test-reboot-needed-99.99-99.99.noarch
+>!> ESTABLISHED:774: U__s_[S2:0][package]update-test-reboot-needed-99.99-99.99.noarch
+>!> ESTABLISHED:775: I__s_[S1:0][package]update-test-security-99.99-99.99.noarch
+>!> ESTABLISHED:776: U__s_[S2:0][package]update-test-security-99.99-99.99.noarch
+>!> ESTABLISHED:777: I__s_[S1:0][package]update-test-trival-99.99-99.99.noarch
+>!> ESTABLISHED:778: U__s_[S2:0][package]update-test-trival-99.99-99.99.noarch
+>!> ESTABLISHED:779: I__s_[S1:0][package]usbutils-0.72-60.i586
+>!> ESTABLISHED:780: I__s_[S1:0][package]utempter-0.5.5-73.i586
+>!> ESTABLISHED:781: I__s_[S1:0][package]util-linux-2.12r+2.13rc2+git20070725-18.i586
+>!> ESTABLISHED:782: U__s_[S2:0][package]uvcvideo-kmp-bigsmp-r117_2.6.22.2_3-2.i586
+>!> ESTABLISHED:783: U__s_[S2:0][package]uvcvideo-kmp-default-r117_2.6.22.2_3-2.i586
+>!> ESTABLISHED:784: U__s_[S2:0][package]uvcvideo-kmp-xen-r117_2.6.22.2_3-2.i586
+>!> ESTABLISHED:785: U__s_[S2:0][package]uvcvideo-kmp-xenpae-r117_2.6.22.2_3-2.i586
+>!> ESTABLISHED:786: I__s_[S1:0][package]vacation-1.2.6.2-59.i586
+>!> ESTABLISHED:787: I__s_[S1:0][package]vim-7.1-37.i586
+>!> ESTABLISHED:788: I__s_[S1:0][package]vim-base-7.1-37.i586
+>!> ESTABLISHED:789: I__s_[S1:0][package]vim-data-7.1-37.i586
+>!> ESTABLISHED:790: I__s_[S1:0][package]vlan-1.9-48.i586
+>!> ESTABLISHED:791: I__s_[S1:0][package]w3m-0.5.2-25.i586
+>!> ESTABLISHED:792: I__s_[S1:0][package]wdiff-0.5.2-731.i586
+>!> ESTABLISHED:793: I__s_[S1:0][package]wget-1.10.2-74.i586
+>!> ESTABLISHED:794: I__s_[S1:0][package]wireless-tools-29pre22-10.i586
+>!> ESTABLISHED:795: U__s_[S2:0][package]wlan-ng-kmp-bigsmp-0.2.8_2.6.22.2_3-17.i586
+>!> ESTABLISHED:796: U__s_[S2:0][package]wlan-ng-kmp-default-0.2.8_2.6.22.2_3-17.i586
+>!> ESTABLISHED:797: U__s_[S2:0][package]wlan-ng-kmp-xen-0.2.8_2.6.22.2_3-17.i586
+>!> ESTABLISHED:798: U__s_[S2:0][package]wlan-ng-kmp-xenpae-0.2.8_2.6.22.2_3-17.i586
+>!> ESTABLISHED:799: I__s_[S1:0][package]wodim-1.1.6-18.i586
+>!> ESTABLISHED:800: I__s_[S1:0][package]wol-0.7.1-71.i586
+>!> ESTABLISHED:801: I__s_[S1:0][package]wvdial-1.56-18.i586
+>!> ESTABLISHED:802: I__s_[S1:0][package]wvstreams-4.2.2-56.i586
+>!> ESTABLISHED:803: I__s_[S1:0][package]x11-input-synaptics-0.14.6-94.i586
+>!> ESTABLISHED:804: I__s_[S1:0][package]x11-input-wacom-0.7.8-28.i586
+>!> ESTABLISHED:805: I__s_[S1:0][package]x11-tools-0.1-97.i586
+>!> ESTABLISHED:806: I__s_[S1:0][package]xdg-menu-0.2-125.i586
+>!> ESTABLISHED:807: I__s_[S1:0][package]xdg-utils-1.0.1-75.noarch
+>!> ESTABLISHED:808: I__s_[S1:0][package]xdmbgrd-0.6-83.i586
+>!> ESTABLISHED:809: I__s_[S1:0][package]xinetd-2.3.14-74.i586
+>!> ESTABLISHED:810: I__s_[S1:0][package]xkeyboard-config-1.0-22.noarch
+>!> ESTABLISHED:811: I__s_[S1:0][package]xli-20061110-34.i586
+>!> ESTABLISHED:812: I__s_[S1:0][package]xlockmore-5.24-12.i586
+>!> ESTABLISHED:813: I__s_[S1:0][package]xntp-4.2.4p3-18.i586
+>!> ESTABLISHED:814: I__s_[S1:0][package]xorg-x11-7.2-126.i586
+>!> ESTABLISHED:815: I__s_[S1:0][package]xorg-x11-Xvnc-7.1-85.i586
+>!> ESTABLISHED:816: I__s_[S1:0][package]xorg-x11-driver-input-7.2-98.i586
+>!> ESTABLISHED:817: I__s_[S1:0][package]xorg-x11-driver-video-7.2-171.i586
+>!> ESTABLISHED:818: I__s_[S1:0][package]xorg-x11-fonts-7.2-78.noarch
+>!> ESTABLISHED:819: I__s_[S1:0][package]xorg-x11-fonts-core-7.2-78.noarch
+>!> ESTABLISHED:820: I__s_[S1:0][package]xorg-x11-libICE-7.2-57.i586
+>!> ESTABLISHED:821: I__s_[S1:0][package]xorg-x11-libSM-7.2-54.i586
+>!> ESTABLISHED:822: I__s_[S1:0][package]xorg-x11-libX11-7.2-70.i586
+>!> ESTABLISHED:823: I__s_[S1:0][package]xorg-x11-libX11-ccache-7.2-79.i586
+>!> ESTABLISHED:824: I__s_[S1:0][package]xorg-x11-libXau-7.2-50.i586
+>!> ESTABLISHED:825: I__s_[S1:0][package]xorg-x11-libXdmcp-7.2-49.i586
+>!> ESTABLISHED:826: I__s_[S1:0][package]xorg-x11-libXext-7.2-59.i586
+>!> ESTABLISHED:827: I__s_[S1:0][package]xorg-x11-libXfixes-7.2-59.i586
+>!> ESTABLISHED:828: I__s_[S1:0][package]xorg-x11-libXmu-7.2-59.i586
+>!> ESTABLISHED:829: I__s_[S1:0][package]xorg-x11-libXp-7.2-54.i586
+>!> ESTABLISHED:830: I__s_[S1:0][package]xorg-x11-libXpm-7.2-59.i586
+>!> ESTABLISHED:831: I__s_[S1:0][package]xorg-x11-libXprintUtil-7.2-54.i586
+>!> ESTABLISHED:832: I__s_[S1:0][package]xorg-x11-libXrender-7.2-59.i586
+>!> ESTABLISHED:833: I__s_[S1:0][package]xorg-x11-libXt-7.2-60.i586
+>!> ESTABLISHED:834: I__s_[S1:0][package]xorg-x11-libXv-7.2-55.i586
+>!> ESTABLISHED:835: I__s_[S1:0][package]xorg-x11-libfontenc-7.2-55.i586
+>!> ESTABLISHED:836: I__s_[S1:0][package]xorg-x11-libs-7.2-96.i586
+>!> ESTABLISHED:837: I__s_[S1:0][package]xorg-x11-libxcb-7.2-46.i586
+>!> ESTABLISHED:838: I__s_[S1:0][package]xorg-x11-libxkbfile-7.2-58.i586
+>!> ESTABLISHED:839: I__s_[S1:0][package]xorg-x11-server-7.2-130.i586
+>!> ESTABLISHED:840: I__s_[S1:0][package]xterm-229-9.i586
+>!> ESTABLISHED:841: I__s_[S1:0][package]xtermset-0.5.2-191.i586
+>!> ESTABLISHED:842: I__s_[S1:0][package]yast2-2.15.54-2.i586
+>!> ESTABLISHED:843: I__s_[S1:0][package]yast2-add-on-2.15.14-4.noarch
+>!> ESTABLISHED:844: I__s_[S1:0][package]yast2-backup-2.15.4-32.noarch
+>!> ESTABLISHED:845: I__s_[S1:0][package]yast2-bluetooth-2.15.4-2.noarch
+>!> ESTABLISHED:846: I__s_[S1:0][package]yast2-bootloader-2.15.19-3.i586
+>!> ESTABLISHED:847: I__s_[S1:0][package]yast2-control-center-2.15.4-3.i586
+>!> ESTABLISHED:848: I__s_[S1:0][package]yast2-control-center-qt-2.15.4-3.i586
+>!> ESTABLISHED:849: I__s_[S1:0][package]yast2-core-2.15.10-2.i586
+>!> ESTABLISHED:850: I__s_[S1:0][package]yast2-country-2.15.18-12.i586
+>!> ESTABLISHED:851: I__s_[S1:0][package]yast2-fingerprint-reader-2.15.2-12.i586
+>!> ESTABLISHED:852: I__s_[S1:0][package]yast2-firewall-2.15.7-23.noarch
+>!> ESTABLISHED:853: I__s_[S1:0][package]yast2-hardware-detection-2.15.8-22.i586
+>!> ESTABLISHED:854: I__s_[S1:0][package]yast2-inetd-2.15.1-24.noarch
+>!> ESTABLISHED:855: I__s_[S1:0][package]yast2-installation-2.15.46-2.noarch
+>!> ESTABLISHED:856: I__s_[S1:0][package]yast2-irda-2.15.1-79.noarch
+>!> ESTABLISHED:857: I__s_[S1:0][package]yast2-iscsi-client-2.15.2-24.noarch
+>!> ESTABLISHED:858: I__s_[S1:0][package]yast2-kerberos-client-2.15.7-17.noarch
+>!> ESTABLISHED:859: I__s_[S1:0][package]yast2-ldap-2.15.1-68.i586
+>!> ESTABLISHED:860: I__s_[S1:0][package]yast2-ldap-client-2.15.12-20.noarch
+>!> ESTABLISHED:861: I__s_[S1:0][package]yast2-mail-2.15.20-18.noarch
+>!> ESTABLISHED:862: I__s_[S1:0][package]yast2-metapackage-handler-0.7.0-3.noarch
+>!> ESTABLISHED:863: I__s_[S1:0][package]yast2-mouse-2.15.1-66.i586
+>!> ESTABLISHED:864: I__s_[S1:0][package]yast2-ncurses-2.15.26-7.i586
+>!> ESTABLISHED:865: I__s_[S1:0][package]yast2-network-2.15.72-2.i586
+>!> ESTABLISHED:866: I__s_[S1:0][package]yast2-nfs-client-2.15.0-10.noarch
+>!> ESTABLISHED:867: I__s_[S1:0][package]yast2-nis-client-2.15.3-6.i586
+>!> ESTABLISHED:868: I__s_[S1:0][package]yast2-ntp-client-2.15.8-2.noarch
+>!> ESTABLISHED:869: I__s_[S1:0][package]yast2-online-update-2.15.20-20.noarch
+>!> ESTABLISHED:870: I__s_[S1:0][package]yast2-online-update-frontend-2.15.20-20.noarch
+>!> ESTABLISHED:871: I__s_[S1:0][package]yast2-packager-2.15.74-2.i586
+>!> ESTABLISHED:872: I__s_[S1:0][package]yast2-pam-2.14.0-113.noarch
+>!> ESTABLISHED:873: I__s_[S1:0][package]yast2-perl-bindings-2.15.3-12.i586
+>!> ESTABLISHED:874: I__s_[S1:0][package]yast2-pkg-bindings-2.15.49-2.i586
+>!> ESTABLISHED:875: I__s_[S1:0][package]yast2-printer-2.15.5-2.i586
+>!> ESTABLISHED:876: I__s_[S1:0][package]yast2-profile-manager-2.15.0-35.i586
+>!> ESTABLISHED:877: I__s_[S1:0][package]yast2-qt-2.15.16-2.i586
+>!> ESTABLISHED:878: I__s_[S1:0][package]yast2-registration-2.15.2-3.noarch
+>!> ESTABLISHED:879: I__s_[S1:0][package]yast2-repair-2.15.7-41.noarch
+>!> ESTABLISHED:880: I__s_[S1:0][package]yast2-restore-2.15.4-4.noarch
+>!> ESTABLISHED:881: I__s_[S1:0][package]yast2-runlevel-2.15.3-4.noarch
+>!> ESTABLISHED:882: I__s_[S1:0][package]yast2-samba-client-2.15.11-18.noarch
+>!> ESTABLISHED:883: I__s_[S1:0][package]yast2-samba-server-2.15.7-40.noarch
+>!> ESTABLISHED:884: I__s_[S1:0][package]yast2-scanner-2.15.5-27.noarch
+>!> ESTABLISHED:885: I__s_[S1:0][package]yast2-schema-2.15.0-102.noarch
+>!> ESTABLISHED:886: I__s_[S1:0][package]yast2-security-2.15.1-8.noarch
+>!> ESTABLISHED:887: I__s_[S1:0][package]yast2-slp-2.15.0-16.i586
+>!> ESTABLISHED:888: I__s_[S1:0][package]yast2-sound-2.15.11-3.i586
+>!> ESTABLISHED:889: I__s_[S1:0][package]yast2-storage-2.15.24-2.i586
+>!> ESTABLISHED:890: I__s_[S1:0][package]yast2-storage-lib-2.15.24-2.i586
+>!> ESTABLISHED:891: I__s_[S1:0][package]yast2-sudo-2.15.3-69.noarch
+>!> ESTABLISHED:892: I__s_[S1:0][package]yast2-support-2.15.2-57.noarch
+>!> ESTABLISHED:893: I__s_[S1:0][package]yast2-sysconfig-2.15.3-43.noarch
+>!> ESTABLISHED:894: I__s_[S1:0][package]yast2-theme-openSUSE-2.15.13-2.noarch
+>!> ESTABLISHED:895: I__s_[S1:0][package]yast2-trans-en_US-2.15.4-4.noarch
+>!> ESTABLISHED:896: I__s_[S1:0][package]yast2-trans-stats-2.15.0-22.noarch
+>!> ESTABLISHED:897: I__s_[S1:0][package]yast2-transfer-2.14.0-92.i586
+>!> ESTABLISHED:898: I__s_[S1:0][package]yast2-tune-2.15.7-2.i586
+>!> ESTABLISHED:899: I__s_[S1:0][package]yast2-tv-2.15.7-8.noarch
+>!> ESTABLISHED:900: I__s_[S1:0][package]yast2-update-2.15.23-4.i586
+>!> ESTABLISHED:901: I__s_[S1:0][package]yast2-users-2.15.36-13.i586
+>!> ESTABLISHED:902: I__s_[S1:0][package]yast2-x11-2.15.11-5.noarch
+>!> ESTABLISHED:903: I__s_[S1:0][package]yast2-xml-2.15.0-47.i586
+>!> ESTABLISHED:904: I__s_[S1:0][package]yp-tools-2.9-73.i586
+>!> ESTABLISHED:905: I__s_[S1:0][package]ypbind-1.20.5-46.i586
+>!> ESTABLISHED:906: I__s_[S1:0][package]zip-2.32-8.i586
+>!> ESTABLISHED:907: I__s_[S1:0][package]zisofs-tools-1.0.6-72.i586
+>!> ESTABLISHED:908: I__s_[S1:0][package]zlib-1.2.3-72.i586
+>!> ESTABLISHED:909: I__s_[S1:0][package]zsh-4.3.4-25.i586
+>!> ESTABLISHED:910: I__s_[S1:0][package]zypper-0.8.19-2.i586
+>!> Solution #1:
+>!> install language:en-.noarch
+>!> install language:en_US-.noarch
+>!> installs=2, upgrades=0, uninstalls=0
Added: trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-test.xml
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-test.xml (added)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/bugzilla-tests/bug308252-test.xml Fri Sep 7 13:07:18 2007
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- testcase for bug308252 -->
+<test>
+<setup arch="i686">
+ <system file="bug308252-system.xml.gz"/>
+ <channel file="bug308252-3-package.xml.gz" name="3" />
+ <locale name="en_US" />
+ <locale name="en" />
+</setup>
+<trial>
+<establish/>
+<showpool all="true" prefix=">!> ESTABLISHED:"/>
+</trial>
+</test>
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
07 Sep '07
Author: schubi2
Date: Fri Sep 7 13:04:24 2007
New Revision: 7144
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7144&view=rev
Log:
RequirementIsMet: return true only if ALL Atoms are NOT incomplete; Bug
308252
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Fri Sep 7 13:04:24 2007
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Sep 7 13:03:48 CEST 2007 - schubi(a)suse.de
+
+- RequirementIsMet: return true only if ALL Atoms are NOT incomplete; Bug
+ 308252
+- r 7143
+
+-------------------------------------------------------------------
Thu Sep 6 18:22:36 CEST 2007 - schubi(a)suse.de
- Error: Select two candidate with the same name while update.
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7143 - /trunk/libzypp/zypp/solver/detail/ResolverContext.cc
by schubi2@svn.opensuse.org 07 Sep '07
by schubi2@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: schubi2
Date: Fri Sep 7 13:03:17 2007
New Revision: 7143
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7143&view=rev
Log:
RequirementIsMet: return true only if ALL Atoms are NOT incomplete; Bug
308252
Modified:
trunk/libzypp/zypp/solver/detail/ResolverContext.cc
Modified: trunk/libzypp/zypp/solver/detail/ResolverContext.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/ResolverContext.cc (original)
+++ trunk/libzypp/zypp/solver/detail/ResolverContext.cc Fri Sep 7 13:03:17 2007
@@ -1507,6 +1507,7 @@
const PoolItem_Ref whoNeeds;
const Dep cap;
const bool installInfoFlag;
+ bool allAtomsSatisfied;
RequirementMet (ResolverContext_Ptr ctx, bool *inst, const PoolItem_Ref who, const Dep & capKind, const bool instFlag)
: context (ctx)
@@ -1516,6 +1517,7 @@
, whoNeeds( who )
, cap( capKind )
, installInfoFlag( instFlag )
+ , allAtomsSatisfied(true)
{ }
@@ -1548,13 +1550,18 @@
}
info->setCapability (match, cap);
context->addInfo (info);
+ } else {
+ if (isKind<Atom>(provider.resolvable()) ) {
+ allAtomsSatisfied = false;
+ }
}
// ERR << "RequirementMet(" << provider << ", " << match << ") [capability " <<
// capability << "] -> " << (flag ? "true" : "false") << endl;
- if ( installed // Checking as long as we have found an installed item
- && !*installed )
+ if ( (installed // Checking as long as we have found an installed item
+ && !*installed)
+ || isKind<Atom>(provider.resolvable())) // checking all Atoms
return true;
return ! flag;
@@ -1584,7 +1591,7 @@
_XDEBUG( "ResolverContext::requirementIsMet(" << capability << ") " << (info.flag?"Y":"N") );
if (unneeded) *unneeded = info.unneeded;
- return info.flag;
+ return info.flag && info.allAtomsSatisfied;
}
//---------------------------------------------------------------------------
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7142 - in /trunk/libzypp/devel/devel.shaas/PdbToZypp: CMakeLists.txt pdbtozypp.cc pdbtozypp.h swig/CMakeLists.txt swig/PdbToZypp.i
by haass@svn.opensuse.org 07 Sep '07
by haass@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: haass
Date: Fri Sep 7 13:00:32 2007
New Revision: 7142
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7142&view=rev
Log:
stop if no db connection
Modified:
trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt
trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h
trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt
trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i
Modified: trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt (original)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt Fri Sep 7 13:00:32 2007
@@ -4,17 +4,6 @@
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -O2 -Wall -W -fpic -D_REENTRANT" )
-FIND_PROGRAM(SWIG_EXECUTABLE
- NAMES swig-1.3 swig
- PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin
-)
-
-IF ( NOT SWIG_EXECUTABLE )
- MESSAGE( FATAL_ERROR " swig not found" )
-ELSE ( NOT SWIG_EXECUTABLE )
- MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" )
-ENDIF ( NOT SWIG_EXECUTABLE )
-
FIND_PACKAGE(Zypp REQUIRED)
IF ( NOT ZYPP_LIBRARY )
MESSAGE( FATAL_ERROR " zypp not found" )
@@ -42,4 +31,4 @@
INSTALL(TARGETS pdbtozypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
-ADD_SUBDIRECTORY(swig)
+#ADD_SUBDIRECTORY(swig)
Modified: trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc (original)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc Fri Sep 7 13:00:32 2007
@@ -12,7 +12,7 @@
}
-void PdbToZypp::readOut(){
+int PdbToZypp::readOut(){
//store = new ResStore;
@@ -20,16 +20,15 @@
database *dbPackages = new database("lorien.suse.de", "rpmread", "rrrrrrr", "package");
if(dbPackages->connect() != 1){
- //std::cout << "NO DB CONNECTION!!!\n";
- //return 1;
+ std::cout << "NO DB CONNECTION!!!\n";
+ return 0;
}
if(dbDeps->connect() != 1){
- //std::cout << "NO DB CONNECTION!!!\n";
- //return 1;
+ std::cout << "NO DB CONNECTION!!!\n";
+ return 0;
}
- //dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID = 10 AND PackStatus IN (0, 6, 7, 8) AND BasedOnID IS NULL");
dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID IN (10, 64) AND PackStatus IN (0, 6, 7, 8) OR PackStatus IS NULL AND BasedOnID IS NULL");
std::vector< std::vector<string> > packIDs = dbPackages->getResult();
@@ -193,6 +192,7 @@
}*/
store.insert(p);
+ return 1;
}
dbDeps->close();
Modified: trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h (original)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h Fri Sep 7 13:00:32 2007
@@ -15,7 +15,7 @@
//PdbToZypp(zypp::ResStore & _store);
PdbToZypp();
~PdbToZypp();
- void readOut();
+ int readOut();
zypp::ResStore getStore();
private:
zypp::ResStore store;
Modified: trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt (original)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt Fri Sep 7 13:00:32 2007
@@ -1,5 +1,19 @@
+PROJECT(swigpdbtozypp)
+
FIND_PACKAGE(Perl REQUIRED)
+FIND_PROGRAM(SWIG_EXECUTABLE
+ NAMES swig-1.3 swig
+ PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin
+)
+
+IF ( NOT SWIG_EXECUTABLE )
+ MESSAGE( FATAL_ERROR " swig not found" )
+ELSE ( NOT SWIG_EXECUTABLE )
+ MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" )
+ENDIF ( NOT SWIG_EXECUTABLE )
+
+
EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{cppflags}" OUTPUT_VARIABLE PERL_CXX_FLAGS)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PERL_CXX_FLAGS}")
Modified: trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i (original)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i Fri Sep 7 13:00:32 2007
@@ -11,7 +11,7 @@
//PdbToZypp(zypp::ResStore & _store);
PdbToZypp();
~PdbToZypp();
- void readOut();
+ int readOut();
ResStore getStore();
private:
ResStore store;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7141 - /trunk/updater-kde/updater/simpleview.cpp
by tgoettlicher@svn.opensuse.org 07 Sep '07
by tgoettlicher@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: tgoettlicher
Date: Fri Sep 7 12:41:22 2007
New Revision: 7141
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7141&view=rev
Log:
cleanup
Modified:
trunk/updater-kde/updater/simpleview.cpp
Modified: trunk/updater-kde/updater/simpleview.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.c…
==============================================================================
--- trunk/updater-kde/updater/simpleview.cpp (original)
+++ trunk/updater-kde/updater/simpleview.cpp Fri Sep 7 12:41:22 2007
@@ -342,7 +342,6 @@
void SimpleView::setSecurityCount(int count)
{
- kdDebug() << count << " == sec" << endl;
securityCount=count;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7140 - /trunk/updater-kde/package/opensuse-updater-kde.spec
by tgoettlicher@svn.opensuse.org 07 Sep '07
by tgoettlicher@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: tgoettlicher
Date: Fri Sep 7 12:38:19 2007
New Revision: 7140
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7140&view=rev
Log:
spec
Modified:
trunk/updater-kde/package/opensuse-updater-kde.spec
Modified: trunk/updater-kde/package/opensuse-updater-kde.spec
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.spec (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.spec Fri Sep 7 12:38:19 2007
@@ -90,6 +90,9 @@
%changelog -n opensuse-updater-kde
-------------------------------------------------------------------
+* Fri Sep 7 2007 - tgoettlicher(a)suse.de
+- fixed opensuse-updater should also offer Recommend updates by default (#308550)
+- fixed duplicated text in error message (#308125)
* Thu Sep 6 2007 - tgoettlicher(a)suse.de
- fixed notification area of opensuse-updater-kde goes out of the display boundaries (#307661)
- fixed bug in internal states
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7139 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher@svn.opensuse.org 07 Sep '07
by tgoettlicher@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: tgoettlicher
Date: Fri Sep 7 12:33:56 2007
New Revision: 7139
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7139&view=rev
Log:
changes
Modified:
trunk/updater-kde/package/opensuse-updater-kde.changes
Modified: trunk/updater-kde/package/opensuse-updater-kde.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.changes (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.changes Fri Sep 7 12:33:56 2007
@@ -1,8 +1,14 @@
-------------------------------------------------------------------
+Fri Sep 7 12:30:40 CEST 2007 - tgoettlicher(a)suse.de
+
+- fixed opensuse-updater should also offer Recommend updates by default (#308550)
+- r7138
+
+-------------------------------------------------------------------
Thu Sep 6 17:03:20 CEST 2007 - tgoettlicher(a)suse.de
-- r7130
- fixed duplicated text in error message (#308125)
+- r7130
-------------------------------------------------------------------
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7138 - /trunk/updater-kde/updater/simpleview.cpp
by tgoettlicher@svn.opensuse.org 07 Sep '07
by tgoettlicher@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: tgoettlicher
Date: Fri Sep 7 12:32:38 2007
New Revision: 7138
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7138&view=rev
Log:
fixed opensuse-updater should also offer Recommend updates by default (#308550)
Modified:
trunk/updater-kde/updater/simpleview.cpp
Modified: trunk/updater-kde/updater/simpleview.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.c…
==============================================================================
--- trunk/updater-kde/updater/simpleview.cpp (original)
+++ trunk/updater-kde/updater/simpleview.cpp Fri Sep 7 12:32:38 2007
@@ -53,6 +53,8 @@
recommended = new QCheckBox(i18n("Install %n recommended update additionally",
"Install %n recommended updates additionally", 0), centralWidget);
+ recommended->setChecked(true);
+
additionalText = new QLabel(centralWidget);
additionalText->setText(i18n( "Install %n recommended update additionally",
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7137 - in /trunk/libzypp/devel/devel.shaas/PdbToZypp: pdbtozypp.cc swig/CMakeLists.txt
by haass@svn.opensuse.org 07 Sep '07
by haass@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: haass
Date: Fri Sep 7 12:17:31 2007
New Revision: 7137
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7137&view=rev
Log:
changed CMakeLists.txt
Modified:
trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt
Modified: trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc (original)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc Fri Sep 7 12:17:31 2007
@@ -16,8 +16,8 @@
//store = new ResStore;
- database *dbDeps = new database("lorien.suse.de", "rpmread", "Salahm1", "rpm");
- database *dbPackages = new database("lorien.suse.de", "rpmread", "Salahm1", "package");
+ database *dbDeps = new database("lorien.suse.de", "rpmread", "rrrrrrr", "rpm");
+ database *dbPackages = new database("lorien.suse.de", "rpmread", "rrrrrrr", "package");
if(dbPackages->connect() != 1){
//std::cout << "NO DB CONNECTION!!!\n";
Modified: trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt (original)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt Fri Sep 7 12:17:31 2007
@@ -34,7 +34,7 @@
INCLUDE_DIRECTORIES( ${PERL_LIB_PATH} )
INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} )
-INCLUDE_DIRECTORIES( /usr/include/pdbtozypp )
+INCLUDE_DIRECTORIES( ${CMAKE_INSTALL_PREFIX}/include/pdbtozypp )
TARGET_LINK_LIBRARIES( rpdbtozypp ${ZYPP_LIBRARY} )
TARGET_LINK_LIBRARIES( rpdbtozypp -lpdbtozypp )
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7136 - in /trunk/libzypp/devel/devel.shaas: PdbToZypp/ PdbToZypp/swig/ old/ src/
by haass@svn.opensuse.org 07 Sep '07
by haass@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: haass
Date: Fri Sep 7 12:14:47 2007
New Revision: 7136
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7136&view=rev
Log:
changed to cmake
Added:
trunk/libzypp/devel/devel.shaas/PdbToZypp/
trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt
trunk/libzypp/devel/devel.shaas/PdbToZypp/db.cc
trunk/libzypp/devel/devel.shaas/PdbToZypp/db.h
trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h
trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.cc
trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.h
trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/
trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt
trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i
Removed:
trunk/libzypp/devel/devel.shaas/src/
Modified:
trunk/libzypp/devel/devel.shaas/old/Makefile
trunk/libzypp/devel/devel.shaas/old/main.cc
Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt (added)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/CMakeLists.txt Fri Sep 7 12:14:47 2007
@@ -0,0 +1,45 @@
+PROJECT(pdbtozypp)
+
+SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" )
+
+SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -O2 -Wall -W -fpic -D_REENTRANT" )
+
+FIND_PROGRAM(SWIG_EXECUTABLE
+ NAMES swig-1.3 swig
+ PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin
+)
+
+IF ( NOT SWIG_EXECUTABLE )
+ MESSAGE( FATAL_ERROR " swig not found" )
+ELSE ( NOT SWIG_EXECUTABLE )
+ MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" )
+ENDIF ( NOT SWIG_EXECUTABLE )
+
+FIND_PACKAGE(Zypp REQUIRED)
+IF ( NOT ZYPP_LIBRARY )
+ MESSAGE( FATAL_ERROR " zypp not found" )
+ELSE ( NOT ZYPP_LIBRARY )
+ MESSAGE( STATUS "zypp found" )
+ENDIF ( NOT ZYPP_LIBRARY )
+
+SET( pdbtozypp_SRCS
+ db.cc
+ pdbtozypp.cc
+ resolvable.cc
+ )
+
+SET( pdbtozypp_HEADERS
+ db.h
+ pdbtozypp.h
+ resolvable.h
+ )
+
+INSTALL( FILES ${pdbtozypp_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/pdbtozypp" )
+
+ADD_LIBRARY(pdbtozypp SHARED ${pdbtozypp_SRCS})
+TARGET_LINK_LIBRARIES(pdbtozypp ${ZYPP_LIBRARY} )
+TARGET_LINK_LIBRARIES(pdbtozypp -lmysqlclient )
+
+INSTALL(TARGETS pdbtozypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
+
+ADD_SUBDIRECTORY(swig)
Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/db.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/db.cc (added)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/db.cc Fri Sep 7 12:14:47 2007
@@ -0,0 +1,91 @@
+#include "db.h"
+#include <iostream>
+
+using std::string;
+
+//Constructor
+
+database::database(string nHost, string nUsername, string nPassword, string nDatabase, unsigned int nPort, string nSocket, unsigned long nClient_flag){
+ host = nHost;
+ username = nUsername;
+ password = nPassword;
+ db = nDatabase;
+ port = nPort;
+ socket = nSocket;
+ client_flag = nClient_flag;
+
+ conn = mysql_init(NULL);
+}
+
+//Destructor
+
+database::~database(){
+}
+
+//Connect to db
+
+unsigned int database::connect(){
+ if(mysql_real_connect(conn, host.c_str(), username.c_str(), password.c_str(), db.c_str(), port, socket.c_str(), client_flag) == NULL){
+
+ if(mysql_error(conn) != "")
+ std::cout << mysql_error(conn) << std::endl;
+ return mysql_errno(conn);
+ }
+
+ return 1;
+}
+
+//Close db connection
+
+void database::close(){
+ mysql_close(conn);
+}
+
+//Execute given SQL-Statement
+
+unsigned int database::sqlexecute(string sqlcom){
+
+ if(mysql_query(conn, sqlcom.c_str())){
+ if(mysql_error(conn) != "")
+ std::cout << mysql_error(conn) << std::endl;
+ return mysql_errno(conn);
+ }
+
+ if((result = mysql_store_result(conn)) == NULL){
+ if(mysql_error(conn) != "")
+ std::cout << mysql_error(conn) << std::endl;
+ return mysql_errno(conn);
+ }
+
+ unsigned int numrows = mysql_num_rows(result);
+ unsigned int numfields = mysql_num_fields(result);
+
+ //std::cout << "Zeilen: " << numrows << " Spalten: " << numfields << std::endl;
+
+ return 1;
+
+}
+
+//Pushes the fetchbuffer in a vector
+
+std::vector< std::vector<string> > database::getResult(){
+
+ std::vector< std::vector<string> > outResult;
+ int vecCtr = 0;
+ unsigned int numfields = mysql_num_fields(result);
+
+ while ((fetchbuffer = mysql_fetch_row(result)) != NULL){
+ //if(mysql_error(conn) != "")
+ // std::cout << mysql_error(conn) << "\n";
+ std::vector<string> temp;
+ outResult.push_back(temp);
+
+ for(unsigned int i = 0; i < numfields; i++){
+ outResult[vecCtr].push_back(fetchbuffer[i] ? fetchbuffer[i] : "NULL");
+ }
+ vecCtr++;
+
+ }
+
+ return outResult;
+}
Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/db.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/db.h (added)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/db.h Fri Sep 7 12:14:47 2007
@@ -0,0 +1,33 @@
+#include <mysql/mysql.h>
+#include <string>
+#include <vector>
+
+#ifndef DB_H
+#define DB_H
+
+using std::string;
+
+class database{
+ private:
+ string host;
+ string username;
+ string password;
+ string db;
+ unsigned int port;
+ string socket;
+ unsigned long client_flag;
+ MYSQL* conn;
+ MYSQL_ROW fetchbuffer;
+ MYSQL_RES* result;
+
+ public:
+ database(string host, string username, string password, string db, unsigned int port = 0, string socket = "", unsigned long client_flag = 0);
+ ~database();
+ unsigned int connect();
+ void close();
+ unsigned int sqlexecute(string sqlcom);
+ std::vector< std::vector<string> > getResult();
+};
+
+
+#endif
Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc (added)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.cc Fri Sep 7 12:14:47 2007
@@ -0,0 +1,205 @@
+#include "pdbtozypp.h"
+#include <iostream>
+
+using namespace zypp;
+
+//Constructor
+PdbToZypp::PdbToZypp(){
+ //store = _store;
+}
+
+PdbToZypp::~PdbToZypp(){
+
+}
+
+void PdbToZypp::readOut(){
+
+ //store = new ResStore;
+
+ database *dbDeps = new database("lorien.suse.de", "rpmread", "Salahm1", "rpm");
+ database *dbPackages = new database("lorien.suse.de", "rpmread", "Salahm1", "package");
+
+ if(dbPackages->connect() != 1){
+ //std::cout << "NO DB CONNECTION!!!\n";
+ //return 1;
+ }
+
+ if(dbDeps->connect() != 1){
+ //std::cout << "NO DB CONNECTION!!!\n";
+ //return 1;
+ }
+
+ //dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID = 10 AND PackStatus IN (0, 6, 7, 8) AND BasedOnID IS NULL");
+ dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID IN (10, 64) AND PackStatus IN (0, 6, 7, 8) OR PackStatus IS NULL AND BasedOnID IS NULL");
+
+ std::vector< std::vector<string> > packIDs = dbPackages->getResult();
+
+ Resolvable::Kind kind = ResTraits<Package>::kind;
+ CapFactory factory;
+
+ for(unsigned int i = 0; i < packIDs.size(); i++){
+
+ string sqlcom("SELECT PackID FROM Packages WHERE BasedOnID=");
+ sqlcom.append(packIDs[i].at(0));
+ dbPackages->sqlexecute(sqlcom);
+ std::vector< std::vector<string> > basedIDs = dbPackages->getResult();
+
+ std::vector< std::vector<string> > binPack;
+
+ for(unsigned int j = 0; j < basedIDs.size(); j++){
+
+ sqlcom = "SELECT BinPackID, Version FROM BinaryPackages WHERE PackID=";
+ sqlcom.append(basedIDs[j].at(0));
+ dbDeps->sqlexecute(sqlcom);
+ std::vector< std::vector<string> > tempVec = dbDeps->getResult();
+ for(unsigned int x = 0; x < tempVec.size(); x++)
+ binPack.push_back(tempVec.at(x));
+ }
+
+ intrusive_ptr<resolvZypp> pkg;
+ CapSet prov;
+ CapSet preq;
+ CapSet req;
+ CapSet conf;
+ CapSet obs;
+ CapSet rec;
+ CapSet sug;
+ CapSet fre;
+ CapSet enh;
+ CapSet sup;
+
+ string edition = "";
+
+ // If Deps
+ if(binPack.size() != 0){
+
+ std::vector< std::vector<string> > packDeps;
+
+ for(unsigned int k = 0; k < binPack.size(); k++){
+ sqlcom = "SELECT Symbol, Kind, Compare, Version FROM PackReqProv WHERE BinPackID=";
+ sqlcom.append(binPack[k].at(0));
+ dbDeps->sqlexecute(sqlcom);
+ std::vector< std::vector<string> > tempVec = dbDeps->getResult();
+ for(unsigned int l = 0; l < tempVec.size(); l++)
+ packDeps.push_back(tempVec.at(l));
+
+ sqlcom = "SELECT name, DirID FROM PackFilelist WHERE DirID IN(1, 22, 24, 96, 178, 756, 1981) AND BinPackID=";
+ sqlcom.append(binPack[k].at(0));
+ dbDeps->sqlexecute(sqlcom);
+ tempVec = dbDeps->getResult();
+
+ for(unsigned int m = 0; m < tempVec.size(); m++){
+ sqlcom = "SELECT dir FROM PackFileDirs WHERE DirID=";
+ sqlcom.append(tempVec[m].at(1));
+ dbDeps->sqlexecute(sqlcom);
+ std::vector< std::vector<string> > tempVec2 = dbDeps->getResult();
+ for(unsigned int n = 0; n < tempVec2.size(); n++){
+ string fileprov = tempVec2[n].at(0) + "/" + tempVec[m].at(0);
+ prov.insert(factory.parse(kind, fileprov, Rel::ANY, Edition("")));
+ }
+
+ }
+ }
+
+ for(unsigned int y = 0; y < packDeps.size(); y++){
+
+ string ed = "";
+ string symbol = packDeps[y].at(0);
+ Rel rel = Rel::ANY;
+
+ if(packDeps[y].at(0) == "(none)")
+ continue;
+
+ if(packDeps[y].at(2) != "NULL"){
+ rel = Rel(packDeps[y].at(2));
+ ed = packDeps[y].at(3);
+ }
+
+
+ if(packDeps[y].at(1) == "provides"){
+ if(symbol.find(" = ")){
+ prov.insert(factory.parse(kind, packDeps[y].at(0)));
+ }else{
+ prov.insert(factory.parse(kind, packDeps[y].at(0)
+ , rel, Edition(ed)));
+ }
+
+ }else if(packDeps[y].at(1) == "prerequires"){
+ preq.insert(factory.parse(kind, packDeps[y].at(0)
+ , rel, Edition(ed)));
+ }else if(packDeps[y].at(1) == "requires"){
+ req.insert(factory.parse(kind, packDeps[y].at(0)
+ , rel, Edition(ed)));
+ }else if(packDeps[y].at(1) == "conflicts"){
+ conf.insert(factory.parse(kind, packDeps[y].at(0)
+ , rel, Edition(ed)));
+ }else if(packDeps[y].at(1) == "obsoletes"){
+ obs.insert(factory.parse(kind, packDeps[y].at(0)
+ , rel, Edition(ed)));
+ }else if(packDeps[y].at(1) == "recommends"){
+ rec.insert(factory.parse(kind, packDeps[y].at(0)
+ , rel, Edition(ed)));
+ }else if(packDeps[y].at(1) == "suggests"){
+ sug.insert(factory.parse(kind, packDeps[y].at(0)
+ , rel, Edition(ed)));
+ }else if(packDeps[y].at(1) == "freshens"){
+ fre.insert(factory.parse(kind, packDeps[y].at(0)
+ , rel, Edition(ed)));
+ }else if(packDeps[y].at(1) == "enhances"){
+ enh.insert(factory.parse(kind, packDeps[y].at(0)
+ , rel, Edition(ed)));
+ }else if(packDeps[y].at(1) == "supplements"){
+ sup.insert(factory.parse(kind, packDeps[y].at(0)
+ , rel, Edition(ed)));
+ }
+ }
+
+ edition = binPack[0].at(1);
+
+ }
+
+ Dependencies deps;
+ if(prov.size() > 0)
+ deps[Dep::PROVIDES] = prov;
+ if(preq.size() > 0)
+ deps[Dep::PREREQUIRES] = preq;
+ if(req.size() > 0)
+ deps[Dep::REQUIRES] = req;
+ if(conf.size() > 0)
+ deps[Dep::CONFLICTS] = conf;
+ if(obs.size() > 0)
+ deps[Dep::OBSOLETES] = obs;
+ if(rec.size() > 0)
+ deps[Dep::RECOMMENDS] = rec;
+ if(sug.size() > 0)
+ deps[Dep::SUGGESTS] = sug;
+ if(fre.size() > 0)
+ deps[Dep::FRESHENS] = fre;
+ if(enh.size() > 0)
+ deps[Dep::ENHANCES] = enh;
+ if(sup.size() > 0)
+ deps[Dep::SUPPLEMENTS] = sup;
+
+ NVRAD nvPkg(packIDs[i].at(1), Edition(edition), Arch("i386"), deps);
+
+ Package::Ptr p( detail::makeResolvableAndImpl(nvPkg, pkg));
+
+ //set Status to install
+ /*for(unsigned int ii = 0; ii < pToInst.size(); ii++){
+ if(pToInst.at(ii) == packIDs[i].at(1)){
+ PoolItem_Ref poolItem(p);
+ poolItem.status().setToBeInstalled(ResStatus::USER);
+ }
+ }*/
+
+ store.insert(p);
+ }
+
+ dbDeps->close();
+ dbPackages->close();
+
+}
+
+ResStore PdbToZypp::getStore(){
+ return store;
+}
Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h (added)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/pdbtozypp.h Fri Sep 7 12:14:47 2007
@@ -0,0 +1,22 @@
+#include <vector>
+#include "db.h"
+#include "resolvable.h"
+
+#include <zypp/ZYpp.h>
+#include <zypp/ZYppFactory.h>
+#include <zypp/ResStore.h>
+#include <zypp/Package.h>
+//#include <zypp/Source.h>
+#include <zypp/CapFactory.h>
+
+class PdbToZypp{
+ public:
+ //typedef zypp::ResStore ResStore;
+ //PdbToZypp(zypp::ResStore & _store);
+ PdbToZypp();
+ ~PdbToZypp();
+ void readOut();
+ zypp::ResStore getStore();
+ private:
+ zypp::ResStore store;
+};
Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.cc (added)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.cc Fri Sep 7 12:14:47 2007
@@ -0,0 +1,25 @@
+#include "resolvable.h"
+
+resolvable::resolvable(string _name, string _kind, string _arch, string _version, string _release){
+ name = _name;
+ kind = _kind;
+ arch = _arch;
+ version = _version;
+ release = _release;
+}
+
+resolvable::~resolvable(){
+}
+
+/*
+void resolvable::addDep(depType _type, string _dep){
+
+ if(deps.find(_type) == deps.end()){
+ std::vector<string> temp;
+ deps[_type] = temp;
+ }
+
+ deps[_type].push_back(_dep);
+
+}
+*/
Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.h (added)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/resolvable.h Fri Sep 7 12:14:47 2007
@@ -0,0 +1,34 @@
+#include <string>
+#include <vector>
+#include <map>
+#include <zypp/detail/PackageImplIf.h>
+
+#ifndef RESOLVABLE_H
+#define RESOLVABLE_H
+
+using std::string;
+
+enum depType{
+ REQUIRES,
+ PROVIDES,
+ OBSOLETES,
+ CONFLICTS
+};
+
+class resolvable{
+ private:
+ string name;
+ string kind;
+ string arch;
+ string version;
+ string release;
+ std::map < depType, std::vector<string> > deps;
+
+ public:
+ resolvable(string name, string version, string kind = "package", string arch = "i386", string release ="0");
+ ~resolvable();
+ //void addDep(depType type, string dep, string compare, string version);
+};
+
+class resolvZypp : public zypp::detail::PackageImplIf {};
+#endif
Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt (added)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt Fri Sep 7 12:14:47 2007
@@ -0,0 +1,43 @@
+FIND_PACKAGE(Perl REQUIRED)
+
+EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{cppflags}" OUTPUT_VARIABLE PERL_CXX_FLAGS)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PERL_CXX_FLAGS}")
+
+EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{archlibexp}" OUTPUT_VARIABLE PERL_LIB_PATH)
+SET( PERL_INS_PATH "${PERL_LIB_PATH}" )
+SET( PERL_LIB_PATH "${PERL_LIB_PATH}/CORE" )
+
+MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}")
+MESSAGE(STATUS "Perl cpp-flags: ${PERL_CXX_FLAGS}")
+MESSAGE(STATUS "Perl lib path: ${PERL_LIB_PATH}")
+
+SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/PdbToZypp_wrap.cxx" )
+SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/PdbToZypp.i" )
+
+ADD_CUSTOM_COMMAND (
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/PdbToZypp_wrap.cxx
+ COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for perl..."
+ COMMAND ${SWIG_EXECUTABLE} -c++ -perl5 -xmlout ${CMAKE_CURRENT_BINARY_DIR}/parse.xml -o ${CMAKE_CURRENT_BINARY_DIR}/PdbToZypp_wrap.cxx -I${ZYPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/PdbToZypp.i
+ COMMAND ${CMAKE_COMMAND} -E echo "Done."
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i
+)
+
+ADD_CUSTOM_TARGET( glue
+ DEPENDS ${SWIG_OUTPUT}
+)
+
+ADD_LIBRARY( rpdbtozypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/PdbToZypp_wrap.cxx" )
+SET_TARGET_PROPERTIES( rpdbtozypp PROPERTIES PREFIX "" )
+ADD_DEPENDENCIES( rpdbtozypp glue )
+
+INCLUDE_DIRECTORIES( ${PERL_LIB_PATH} )
+INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} )
+INCLUDE_DIRECTORIES( /usr/include/pdbtozypp )
+TARGET_LINK_LIBRARIES( rpdbtozypp ${ZYPP_LIBRARY} )
+TARGET_LINK_LIBRARIES( rpdbtozypp -lpdbtozypp )
+
+INSTALL(TARGETS rpdbtozypp LIBRARY DESTINATION ${PERL_INS_PATH})
+INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/rpdbtozypp.pm DESTINATION ${PERL_INS_PATH})
+
Added: trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/PdbToZ…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i (added)
+++ trunk/libzypp/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i Fri Sep 7 12:14:47 2007
@@ -0,0 +1,18 @@
+%module rpdbtozypp
+%{
+#undef NORMAL
+#include "pdbtozypp.h"
+using namespace zypp;
+%}
+
+class PdbToZypp{
+ public:
+ //typedef zypp::ResStore ResStore;
+ //PdbToZypp(zypp::ResStore & _store);
+ PdbToZypp();
+ ~PdbToZypp();
+ void readOut();
+ ResStore getStore();
+ private:
+ ResStore store;
+};
Modified: trunk/libzypp/devel/devel.shaas/old/Makefile
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/old/Ma…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/old/Makefile (original)
+++ trunk/libzypp/devel/devel.shaas/old/Makefile Fri Sep 7 12:14:47 2007
@@ -8,7 +8,7 @@
INCPATH = -I/usr/include -I. -I. -I.
LINK = g++
LFLAGS = -lpdbtozypp
-LIBS = $(SUBLIBS) -L/usr/local/lib
+LIBS = $(SUBLIBS) -L/usr/lib
####### Output directory
Modified: trunk/libzypp/devel/devel.shaas/old/main.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/old/ma…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/old/main.cc (original)
+++ trunk/libzypp/devel/devel.shaas/old/main.cc Fri Sep 7 12:14:47 2007
@@ -1,13 +1,45 @@
#include <pdbtozypp/pdbtozypp.h>
+#include <zypp/ResPool.h>
+#include <zypp/RepoManager.h>
+#include <zypp/TmpPath.h>
+#include <zypp/base/Iterator.h>
using namespace zypp;
using namespace std;
int main(){
static ZYpp::Ptr God;
- ResStore store = pdbToZypp();
- try {
+ PdbToZypp pdb;
+ pdb.readOut();
+
+ ResStore store = pdb.getStore();
+
+ /*RepoInfo repo_info;
+ repo_info.setAlias("test");
+ repo_info.setName("Test Repo");
+ repo_info.setEnabled(true);
+ repo_info.setAutorefresh(false);
+ repo_info.addBaseUrl(Url("ftp://dist.suse.de/install/stable-x86/"));
+
+ RepoManagerOptions opts;
+ filesystem::TmpDir cachePath;
+ filesystem::TmpDir rawPath;
+ filesystem::TmpDir reposPath;
+
+ opts.repoCachePath = cachePath.path();
+ opts.repoRawCachePath = rawPath.path();
+ opts.knownReposPath = reposPath.path();
+
+ RepoManager repo_man(opts);
+
+ repo_man.addRepository(repo_info);
+ repo_man.refreshMetadata(repo_info);
+ repo_man.buildCache(repo_info);
+ Repository repo = repo_man.createFromCache(repo_info);
+ ResStore store = repo.resolvables();*/
+
+ try {
God = zypp::getZYpp();
}
catch (const Exception & excpt_r ) {
@@ -18,5 +50,30 @@
God->addResolvables(store);
cout << "Elements in pool: " << God->pool().size() << endl;
+
+ for(pool::PoolTraits::const_iterator iter = God->pool().begin(); iter != God->pool().end(); iter++){
+
+ ResObject::constPtr r = iter->resolvable();
+ if(r->name() == "glibc"){
+ cout << "Package found!" << endl;
+ iter->status().setToBeInstalled(ResStatus::USER);
+ }
+
+ }
+
+ Resolver res(God->pool());
+
+ if(res.resolvePool() == false){
+ cout << "It was not possible to solve the pool" << endl;
+ list<string> problems = res.problemDescription();
+
+ for(list<string>::iterator iter = problems.begin(); iter != problems.end(); iter++){
+ cout << *iter << endl;
+ }
+
+ }else{
+ cout << "The pool was solved corectly" << endl;
+ }
+
return 0;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7135 - /trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
by schubi2@svn.opensuse.org 07 Sep '07
by schubi2@svn.opensuse.org 07 Sep '07
07 Sep '07
Author: schubi2
Date: Fri Sep 7 12:02:12 2007
New Revision: 7135
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7135&view=rev
Log:
logging additional vendor
Modified:
trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
Modified: trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Queue…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc (original)
+++ trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc Fri Sep 7 12:02:12 2007
@@ -224,7 +224,7 @@
&& !VendorAttr::instance().equivalent(provider->vendor(), upgrades->vendor())) {
// checking if there is already an ignore
MIL << "provider " << provider << " has ANOTHER vendor '" << provider->vendor() << "' than the updated item "
- << upgrades << endl;
+ << upgrades << "(vendor: " << upgrades->vendor() << ")" << endl;
PoolItemList ignore = _context->getIgnoreVendorItem();
PoolItemList::iterator it;
for (it = ignore.begin(); it != ignore.end(); ++it) {
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7134 - in /trunk/libzypp-testsuite/solver/data.deptestomatic: basic-exercises/ yast-tests/
by schubi2@svn.opensuse.org 06 Sep '07
by schubi2@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: schubi2
Date: Thu Sep 6 18:23:41 2007
New Revision: 7134
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7134&view=rev
Log:
other valid solutions
Modified:
trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution
trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml
trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1
trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2
trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution (original)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution Thu Sep 6 18:23:41 2007
@@ -11,19 +11,3 @@
>!> Solution:
>!> Ignore this requirement just here
>!>
->!> Taking solution: 0
->!> For problem: 1
->!> No problems so far
->!> No problems so far
->!> Solution #1:
->!> install A-2.0-1.noarch[test]
->!> install B-1.0-1.noarch[test]
->!> install D-1.0-1.noarch[test]
->!> |unflag E-1.0-1.noarch[test]
->!> installs=3, upgrades=0, uninstalls=0
->!> Solution #2:
->!> install A-2.0-1.noarch[test]
->!> install B-1.0-1.noarch[test]
->!> install C-1.0-1.noarch[test]
->!> |unflag E-1.0-1.noarch[test]
->!> installs=3, upgrades=0, uninstalls=0
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml (original)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml Thu Sep 6 18:23:41 2007
@@ -8,7 +8,5 @@
<addRequire kind="package" name="notavailable"/>
<addRequire kind="package" name="A"/>
<reportproblems/>
- <takesolution problem="1" solution="0"/>
- <reportproblems/>
</trial>
</test>
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 (original)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 Thu Sep 6 18:23:41 2007
@@ -4041,7 +4041,7 @@
>!> Generally ignore this requirement
>!>
>!> Problem:
->!> subversion cannot be installed due to missing dependencies
+>!> subversion has missing dependencies
>!> There are no installable providers of libaprutil-0.so.0 for subversion-1.3.0_rc1-0.1.i586
>!> Solution:
>!> delete subversion
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 (original)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 Thu Sep 6 18:23:41 2007
@@ -4041,7 +4041,7 @@
>!> Generally ignore this requirement
>!>
>!> Problem:
->!> subversion cannot be installed due to missing dependencies
+>!> subversion has missing dependencies
>!> There are no installable providers of libapr-0.so.0 for subversion-1.3.0_rc1-0.1.i586
>!> Solution:
>!> delete subversion
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 (original)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 Thu Sep 6 18:23:41 2007
@@ -4041,7 +4041,7 @@
>!> Generally ignore this requirement
>!>
>!> Problem:
->!> subversion cannot be installed due to missing dependencies
+>!> subversion has missing dependencies
>!> There are no installable providers of libaprutil-0.so.0 for subversion-1.3.0_rc1-0.1.i586
>!> Solution:
>!> delete subversion
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
06 Sep '07
Author: schubi2
Date: Thu Sep 6 18:22:56 2007
New Revision: 7133
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7133&view=rev
Log:
7132
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Thu Sep 6 18:22:56 2007
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Thu Sep 6 18:22:36 CEST 2007 - schubi(a)suse.de
+
+- Error: Select two candidate with the same name while update.
+ Solution: If there is a candidate which is already selected for installation -->
+ take thatone #308082
+- r 7132
+
+-------------------------------------------------------------------
Thu Sep 6 14:11:58 CEST 2007 - ma(a)suse.de
- Work arround installed patterns providing an empty vendor string. (#307743)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7132 - /trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
by schubi2@svn.opensuse.org 06 Sep '07
by schubi2@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: schubi2
Date: Thu Sep 6 18:19:52 2007
New Revision: 7132
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7132&view=rev
Log:
if there is a candidate which is already selected for installation -->
take thatone #308082
Modified:
trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original)
+++ trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Thu Sep 6 18:19:52 2007
@@ -226,13 +226,27 @@
FindMap::iterator it = providers.find( provider->name() );
if (it != providers.end()) { // provider with same name found
- int cmp = it->second->arch().compare( provider->arch() );
- if (cmp < 0) { // new provider has better arch
- it->second = provider;
- }
- else if (cmp == 0) { // new provider has equal arch
- if (it->second->edition().compare( provider->edition() ) < 0) {
- it->second = provider; // new provider has better edition
+ if (provider.status().isToBeInstalled()
+ || it->second.status().isToBeInstalled()) {
+
+ if (provider.status().isToBeInstalled()
+ && it->second.status().isToBeInstalled()) {
+ ERR << "only one should be set for installation: " << it->second << "; " << provider << endl;
+ } else {
+ if (provider.status().isToBeInstalled()) {
+ it->second = provider; // take thatone which is already set for installation
+ }
+ }
+ } else {
+ // not the same --> find better provider
+ int cmp = it->second->arch().compare( provider->arch() );
+ if (cmp < 0) { // new provider has better arch
+ it->second = provider;
+ }
+ else if (cmp == 0) { // new provider has equal arch
+ if (it->second->edition().compare( provider->edition() ) < 0) {
+ it->second = provider; // new provider has better edition
+ }
}
}
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7131 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher@svn.opensuse.org 06 Sep '07
by tgoettlicher@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: tgoettlicher
Date: Thu Sep 6 17:06:30 2007
New Revision: 7131
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7131&view=rev
Log:
changes
Modified:
trunk/updater-kde/package/opensuse-updater-kde.changes
Modified: trunk/updater-kde/package/opensuse-updater-kde.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.changes (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.changes Thu Sep 6 17:06:30 2007
@@ -1,9 +1,16 @@
-------------------------------------------------------------------
+Thu Sep 6 17:03:20 CEST 2007 - tgoettlicher(a)suse.de
+
+- r7130
+- fixed duplicated text in error message (#308125)
+
+
+-------------------------------------------------------------------
Thu Sep 6 13:10:37 CEST 2007 - tgoettlicher(a)suse.de
- fixed notification area of opensuse-updater-kde goes out of the display boundaries (#307661)
- fixed bug in internal states
-- 7120
+- r7120
-------------------------------------------------------------------
Wed Sep 5 11:38:34 CEST 2007 - tgoettlicher(a)suse.de
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7130 - /trunk/updater-kde/updater/main.cpp
by tgoettlicher@svn.opensuse.org 06 Sep '07
by tgoettlicher@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: tgoettlicher
Date: Thu Sep 6 17:05:43 2007
New Revision: 7130
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7130&view=rev
Log:
fixed duplicated text in error message (#308125)
Modified:
trunk/updater-kde/updater/main.cpp
Modified: trunk/updater-kde/updater/main.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/main.cpp?rev…
==============================================================================
--- trunk/updater-kde/updater/main.cpp (original)
+++ trunk/updater-kde/updater/main.cpp Thu Sep 6 17:05:43 2007
@@ -40,7 +40,7 @@
KUniqueApplication::addCmdLineOptions();
if (!KUniqueApplication::start()) {
- kdError() << "ERROR: We are already running" << endl;
+ kdError() << argv[0] << " is already running" << endl;
exit(0);
}
UpdaterApplication app;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7129 - in /trunk/libzypp-bindings/examples/perl: ./ test.pl
by haass@svn.opensuse.org 06 Sep '07
by haass@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: haass
Date: Thu Sep 6 17:01:07 2007
New Revision: 7129
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7129&view=rev
Log:
perl-example how to readout the pdb-db and start a solver-run
Added:
trunk/libzypp-bindings/examples/perl/
trunk/libzypp-bindings/examples/perl/test.pl
Added: trunk/libzypp-bindings/examples/perl/test.pl
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/perl/t…
==============================================================================
--- trunk/libzypp-bindings/examples/perl/test.pl (added)
+++ trunk/libzypp-bindings/examples/perl/test.pl Thu Sep 6 17:01:07 2007
@@ -0,0 +1,62 @@
+use zypp;
+use rpdbtozypp;
+
+$z = zyppc::ZYppFactory_instance();
+$zypp = $z->getZYpp;
+$pdb = rpdbtozypp::PdbToZypp->new;
+print "Package to install: ";
+$ipkg = <STDIN>;
+chomp($ipkg);
+print "Importing packages from pdb!\n\n";
+print "This may take a while, please be patient!\n";
+$pdb->readOut;
+$store = $pdb->getStore;
+$zypp->addResolvables($store);
+
+$pool = $zypp->pool;
+$it_b = $pool->begin;
+$it_e = $pool->end;
+
+$checker = 0;
+
+print "Looking for package...!\n";
+while ($pool->iterator_equal($it_b, $pool->end) ne 1){
+ $pkg = $pool->iterator_value($it_b);
+ $test = $pkg->resolvable;
+ $it_b = $pool->iterator_incr($it_b);
+ if($test->name eq $ipkg){
+ print "Package found!\n";
+ $tmp = $pkg->status;
+ $tmp->setToBeInstalledUser;
+ $checker = 1;
+ $it_b = $it_e;
+ }
+}
+if($checker eq 0){
+ print "Package not in pdb!\n";
+ print "Check spelling!\n";
+ exit;
+}
+
+$resolver = zypp::Resolver->new($pool);
+
+$it_b = $pool->begin;
+if($resolver->resolvePool ne 1){
+ print "Unable to solve the pool!!!\n";
+ print "Problem Description: ";
+ $problems = $resolver->problemDescription;
+ foreach $problem (@$problems){
+ print $problem, "\n";
+ }
+}else{
+ print "These packages has to be installed: \n";
+# while ($it_b ne $pool->end){
+ while ($pool->iterator_equal($it_b, $pool->end) ne 1){
+ $pkg = $pool->iterator_value($it_b);
+ $it_b = $pool->iterator_incr($it_b);
+ $test = $pkg->resolvable;
+ if($pkg->status->isToBeInstalled eq 1){
+ print $test->name, "\n";
+ }
+ }
+}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7128 - in /trunk/libzypp/devel/devel.shaas/src: Makefile Makefile.PL Makefile.no PdbToZypp.i install.pl pdbtozypp.cc pdbtozypp.h
by haass@svn.opensuse.org 06 Sep '07
by haass@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: haass
Date: Thu Sep 6 17:00:17 2007
New Revision: 7128
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7128&view=rev
Log:
added swig-file + several changes
Added:
trunk/libzypp/devel/devel.shaas/src/Makefile.PL
trunk/libzypp/devel/devel.shaas/src/Makefile.no
trunk/libzypp/devel/devel.shaas/src/PdbToZypp.i
trunk/libzypp/devel/devel.shaas/src/install.pl
Removed:
trunk/libzypp/devel/devel.shaas/src/Makefile
Modified:
trunk/libzypp/devel/devel.shaas/src/pdbtozypp.cc
trunk/libzypp/devel/devel.shaas/src/pdbtozypp.h
Added: trunk/libzypp/devel/devel.shaas/src/Makefile.PL
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/Ma…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/src/Makefile.PL (added)
+++ trunk/libzypp/devel/devel.shaas/src/Makefile.PL Thu Sep 6 17:00:17 2007
@@ -0,0 +1,7 @@
+# File : Makefile.PL
+use ExtUtils::MakeMaker;
+WriteMakefile(
+ 'NAME' => 'rpdbtozypp', # Name of package
+ 'LIBS' => '-lm -lzypp -lpdbtozypp', # Name of custom libraries
+ 'OBJECT' => 'PdbToZypp_wrap.o /usr/lib/perl5/5.8.8/i586-linux-thread-multi/zypp.so' # Object files
+);
Added: trunk/libzypp/devel/devel.shaas/src/Makefile.no
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/Ma…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/src/Makefile.no (added)
+++ trunk/libzypp/devel/devel.shaas/src/Makefile.no Thu Sep 6 17:00:17 2007
@@ -0,0 +1,59 @@
+####### Compiler, tools and options
+
+CC = gcc
+CXX = g++
+DEFINES =
+CFLAGS = -pipe -O2 -Wall -W -fpic -D_REENTRANT $(DEFINES)
+CXXFLAGS = -pipe -O2 -Wall -W -fpic -D_REENTRANT $(DEFINES)
+INCPATH = -I/usr/include -I. -I. -I.
+LINK = g++
+LFLAGS = -shared -lmysqlclient
+LIBS = $(SUBLIBS) -L/usr/lib
+
+####### Output directory
+
+OBJECTS_DIR = ./
+
+####### Files
+
+SOURCES = db.cc resolvable.h pdbtozypp.cc
+OBJECTS = db.o pdbtozypp.o
+OBJCOMP = /usr/lib/libzypp.so
+DESTDIR =
+TARGET = libpdbtozypp.so
+
+first: all
+####### Implicit rules
+
+.SUFFIXES: .o .c .cpp .cc .cxx .C
+
+.cpp.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cc.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.cxx.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.C.o:
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
+
+.c.o:
+ $(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
+
+####### Build rules
+
+all: Makefile.no $(TARGET)
+
+$(TARGET): $(OBJECTS)
+ $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
+
+swig:
+ swig -c++ -perl5 PdbToZypp.i
+
+install:
+ install --mode=644 db.h /usr/include/pdbtozypp/
+ install --mode=644 resolvable.h /usr/include/pdbtozypp/
+ install --mode=644 pdbtozypp.h /usr/include/pdbtozypp/
+ install --mode=555 libpdbtozypp.so /usr/lib/
Added: trunk/libzypp/devel/devel.shaas/src/PdbToZypp.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/Pd…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/src/PdbToZypp.i (added)
+++ trunk/libzypp/devel/devel.shaas/src/PdbToZypp.i Thu Sep 6 17:00:17 2007
@@ -0,0 +1,18 @@
+%module rpdbtozypp
+%{
+#undef NORMAL
+#include "pdbtozypp.h"
+using namespace zypp;
+%}
+
+class PdbToZypp{
+ public:
+ //typedef zypp::ResStore ResStore;
+ //PdbToZypp(zypp::ResStore & _store);
+ PdbToZypp();
+ ~PdbToZypp();
+ void readOut();
+ ResStore getStore();
+ private:
+ ResStore store;
+};
Added: trunk/libzypp/devel/devel.shaas/src/install.pl
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/in…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/src/install.pl (added)
+++ trunk/libzypp/devel/devel.shaas/src/install.pl Thu Sep 6 17:00:17 2007
@@ -0,0 +1,12 @@
+print "Build libpdbtozypp.so\n";
+`make -f Makefile.no`;
+print "Install libpdbtozypp.so\n";
+`make -f Makefile.no install`;
+print "Build swig-binding\n";
+`make -f Makefile.no swig`;
+print "Build Makefile for perl-module with MakeMaker\n";
+`perl Makefile.PL`;
+print "Build perl-module\n";
+`make`;
+print "Install perl-module\n";
+`make install`;
Modified: trunk/libzypp/devel/devel.shaas/src/pdbtozypp.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/pd…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/src/pdbtozypp.cc (original)
+++ trunk/libzypp/devel/devel.shaas/src/pdbtozypp.cc Thu Sep 6 17:00:17 2007
@@ -5,11 +5,19 @@
//Constructor
PdbToZypp::PdbToZypp(){
+ //store = _store;
+}
+
+PdbToZypp::~PdbToZypp(){
+
+}
+
+void PdbToZypp::readOut(){
- store = new ResStore;
+ //store = new ResStore;
- database *dbDeps = new database("lorien.suse.de", "rpmread", "***", "rpm");
- database *dbPackages = new database("lorien.suse.de", "rpmread", "***", "package");
+ database *dbDeps = new database("lorien.suse.de", "rpmread", "rrrrrrr", "rpm");
+ database *dbPackages = new database("lorien.suse.de", "rpmread", "rrrrrrr", "package");
if(dbPackages->connect() != 1){
//std::cout << "NO DB CONNECTION!!!\n";
@@ -21,7 +29,8 @@
//return 1;
}
- dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID = 10 AND PackStatus IN (0, 6, 7, 8) AND BasedOnID IS NULL");
+ //dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID = 10 AND PackStatus IN (0, 6, 7, 8) AND BasedOnID IS NULL");
+ dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID IN (10, 64) AND PackStatus IN (0, 6, 7, 8) OR PackStatus IS NULL AND BasedOnID IS NULL");
std::vector< std::vector<string> > packIDs = dbPackages->getResult();
@@ -74,7 +83,22 @@
for(unsigned int l = 0; l < tempVec.size(); l++)
packDeps.push_back(tempVec.at(l));
+ sqlcom = "SELECT name, DirID FROM PackFilelist WHERE DirID IN(1, 22, 24, 96, 178, 756, 1981) AND BinPackID=";
+ sqlcom.append(binPack[k].at(0));
+ dbDeps->sqlexecute(sqlcom);
+ tempVec = dbDeps->getResult();
+
+ for(unsigned int m = 0; m < tempVec.size(); m++){
+ sqlcom = "SELECT dir FROM PackFileDirs WHERE DirID=";
+ sqlcom.append(tempVec[m].at(1));
+ dbDeps->sqlexecute(sqlcom);
+ std::vector< std::vector<string> > tempVec2 = dbDeps->getResult();
+ for(unsigned int n = 0; n < tempVec2.size(); n++){
+ string fileprov = tempVec2[n].at(0) + "/" + tempVec[m].at(0);
+ prov.insert(factory.parse(kind, fileprov, Rel::ANY, Edition("")));
+ }
+ }
}
for(unsigned int y = 0; y < packDeps.size(); y++){
@@ -168,7 +192,7 @@
}
}*/
- store->insert(p);
+ store.insert(p);
}
dbDeps->close();
@@ -176,6 +200,6 @@
}
-ResStore& PdbToZypp::getStore(){
- return *store;
+ResStore PdbToZypp::getStore(){
+ return store;
}
Modified: trunk/libzypp/devel/devel.shaas/src/pdbtozypp.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/src/pd…
==============================================================================
--- trunk/libzypp/devel/devel.shaas/src/pdbtozypp.h (original)
+++ trunk/libzypp/devel/devel.shaas/src/pdbtozypp.h Thu Sep 6 17:00:17 2007
@@ -11,9 +11,12 @@
class PdbToZypp{
public:
- typedef zypp::ResStore ResStore;
+ //typedef zypp::ResStore ResStore;
+ //PdbToZypp(zypp::ResStore & _store);
PdbToZypp();
- ResStore& getStore();
+ ~PdbToZypp();
+ void readOut();
+ zypp::ResStore getStore();
private:
- ResStore *store;
+ zypp::ResStore store;
};
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7127 - in /trunk/libzypp-bindings/swig: CMakeLists.txt ItemCapKind.i RepoInfo.i ResPool.i ResStatus.i Resolver.i perl5/ perl5/CMakeLists.txt perl5/perl.i zypp.i
by haass@svn.opensuse.org 06 Sep '07
by haass@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: haass
Date: Thu Sep 6 16:15:14 2007
New Revision: 7127
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7127&view=rev
Log:
first running version of perl-bindings
Added:
trunk/libzypp-bindings/swig/ItemCapKind.i
trunk/libzypp-bindings/swig/Resolver.i
trunk/libzypp-bindings/swig/perl5/
trunk/libzypp-bindings/swig/perl5/CMakeLists.txt
trunk/libzypp-bindings/swig/perl5/perl.i
Modified:
trunk/libzypp-bindings/swig/CMakeLists.txt
trunk/libzypp-bindings/swig/RepoInfo.i
trunk/libzypp-bindings/swig/ResPool.i
trunk/libzypp-bindings/swig/ResStatus.i
trunk/libzypp-bindings/swig/zypp.i
Modified: trunk/libzypp-bindings/swig/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/CMakeLists…
==============================================================================
--- trunk/libzypp-bindings/swig/CMakeLists.txt (original)
+++ trunk/libzypp-bindings/swig/CMakeLists.txt Thu Sep 6 16:15:14 2007
@@ -3,3 +3,5 @@
ADD_SUBDIRECTORY(python)
+ADD_SUBDIRECTORY(perl5)
+
Added: trunk/libzypp-bindings/swig/ItemCapKind.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ItemCapKin…
==============================================================================
--- trunk/libzypp-bindings/swig/ItemCapKind.i (added)
+++ trunk/libzypp-bindings/swig/ItemCapKind.i Thu Sep 6 16:15:14 2007
@@ -0,0 +1,59 @@
+/*%{
+
+struct solver::detail::ItemCapKind
+{
+ public:
+ Capability cap; //Capability which has triggerd this selection
+ Dep capKind; //Kind of that capability
+ PoolItem_Ref item; //Item which has triggered this selection
+ bool initialInstallation; //This item has triggered the installation
+ //Not already fullfilled requierement only.
+
+ ItemCapKind( PoolItem i, Capability c, Dep k, bool initial)
+ : cap( c )
+ , capKind( k )
+ , item( i )
+ , initialInstallation( initial )
+ { }
+};
+//typedef std::list<solver::detail::ItemCapKind> solver::detail::ItemCapKindList;
+%}
+*/
+
+namespace zypp
+{
+ namespace solver
+ {
+ namespace detail
+ {
+
+ struct ItemCapKind
+ {
+ public:
+ Capability cap;
+ Dep capKind;
+ PoolItem_Ref item;
+ bool initialInstallation;
+
+ /*%extend {
+ ItemCapKind(){};
+ }*/
+
+ //ItemCapKind();
+ ItemCapKind( PoolItem i, Capability c, Dep k, bool initial)
+ : cap( c )
+ , capKind( k )
+ , item( i )
+ , initialInstallation( initial )
+ { }
+ };
+ }
+ }
+}
+typedef std::list<solver::detail::ItemCapKind> solver::detail::ItemCapKindList;
+%template(ItemCapKindList) std::list<solver::detail::ItemCapKind>;
+
+#ifdef SWIGRUBY
+ auto_iterator(std::list<solver::detail::ItemCapKind>, solver::detail::ItemCapKind);
+#endif
+
Modified: trunk/libzypp-bindings/swig/RepoInfo.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/RepoInfo.i…
==============================================================================
--- trunk/libzypp-bindings/swig/RepoInfo.i (original)
+++ trunk/libzypp-bindings/swig/RepoInfo.i Thu Sep 6 16:15:14 2007
@@ -1,5 +1,7 @@
-
-%template(UrlSet) std::set<Url>;
+#ifdef SWIGPERL5
+#else
+ %template(UrlSet) std::set<Url>;
+#endif
class RepoInfo
{
Modified: trunk/libzypp-bindings/swig/ResPool.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResPool.i?…
==============================================================================
--- trunk/libzypp-bindings/swig/ResPool.i (original)
+++ trunk/libzypp-bindings/swig/ResPool.i Thu Sep 6 16:15:14 2007
@@ -27,10 +27,10 @@
/** \name Iterate through all ResObjects (all kinds). */
//@{
- /**
+ #ifdef SWIGPERL5
const_iterator begin() const;
const_iterator end() const;
- */
+ #endif
//@}
public:
@@ -150,6 +150,27 @@
};
+#ifdef SWIGPERL5
+
+%extend ResPool {
+
+ pool::PoolTraits::const_iterator iterator_incr(pool::PoolTraits::const_iterator *it ) {
+ (*it)++;
+ return *it;
+ }
+ pool::PoolTraits::const_iterator iterator_decr(pool::PoolTraits::const_iterator it) {
+ (it)--;
+ return it;
+ }
+ bool iterator_equal(pool::PoolTraits::const_iterator it1, pool::PoolTraits::const_iterator it2) {
+ return (it1 == it2);
+ }
+ PoolItem_Ref iterator_value(pool::PoolTraits::const_iterator it) {
+ return (*it);
+ }
+};
+
+#endif
#ifdef SWIGRUBY
Modified: trunk/libzypp-bindings/swig/ResStatus.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResStatus.…
==============================================================================
--- trunk/libzypp-bindings/swig/ResStatus.i (original)
+++ trunk/libzypp-bindings/swig/ResStatus.i Thu Sep 6 16:15:14 2007
@@ -1,6 +1,16 @@
class ResStatus
{
+ public:
+
+ /** Default ctor. */
+ ResStatus();
+
+ /** Ctor setting the initial . */
+ ResStatus( bool isInstalled_r );
+
+ /** Dtor. */
+ ~ResStatus();
public:
/** \name BitField range definitions.
@@ -78,9 +88,9 @@
};
enum SolverStateValue
{
- NORMAL = bit::RangeValue<SolverStateField,0>::value, // default, notthing special
- SEEN = bit::RangeValue<SolverStateField,1>::value, // already seen during ResolverUpgrade
- IMPOSSIBLE = bit::RangeValue<SolverStateField,2>::value // impossible to install
+ NORMAL = bit::RangeValue<SolverStateField,0>::value, // default, notthing special
+ SEEN = bit::RangeValue<SolverStateField,1>::value, // already seen during ResolverUpgrade
+ IMPOSSIBLE = bit::RangeValue<SolverStateField,2>::value // impossible to install
};
enum LicenceConfirmedValue
@@ -92,15 +102,6 @@
public:
- /** Default ctor. */
- ResStatus();
-
- /** Ctor setting the initial . */
- ResStatus( bool isInstalled_r );
-
- /** Dtor. */
- ~ResStatus();
-
/** Debug helper returning the bitfield.
* It's save to expose the bitfield, as it can't be used to
* recreate a ResStatus. So it is not possible to bypass
@@ -369,3 +370,14 @@
private:
BitFieldType _bitfield;
};
+
+#ifdef SWIGPERL5
+
+ %extend ResStatus {
+
+ bool setToBeInstalledUser()
+ {
+ return self->setToBeInstalled(ResStatus::USER);
+ }
+ };
+#endif
Added: trunk/libzypp-bindings/swig/Resolver.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/Resolver.i…
==============================================================================
--- trunk/libzypp-bindings/swig/Resolver.i (added)
+++ trunk/libzypp-bindings/swig/Resolver.i Thu Sep 6 16:15:14 2007
@@ -0,0 +1,50 @@
+#ifdef SWIGPERL5
+ %template(StringList) std::list<std::string>;
+#endif
+
+class Resolver
+{
+ public:
+ Resolver( const ResPool & pool);
+ virtual ~Resolver();
+ bool verifySystem ();
+ bool verifySystem (bool considerNewHardware);
+ bool establishPool (void);
+ bool freshenPool (void);
+ bool resolvePool (void);
+ bool resolvePool (bool tryAllPossibilities);
+ bool resolveDependencies( void );
+ void undo( void );
+ solver::detail::ResolverContext_Ptr context (void) const;
+ void doUpgrade( UpgradeStatistics & opt_stats_r );
+ std::list<PoolItem_Ref> problematicUpdateItems( void ) const;
+ ResolverProblemList problems();
+ std::list<std::string> problemDescription( void ) const;
+ void applySolutions( const ProblemSolutionList & solutions );
+
+ Arch architecture() const;
+ void setArchitecture( const Arch & arch);
+ void setForceResolve (const bool force);
+ const bool forceResolve();
+ void setPreferHighestVersion (const bool highestVersion);
+ const bool preferHighestVersion();
+ bool transactResObject( ResObject::constPtr robj, bool install = true);
+ //bool transactResKind( Resolvable::Kind kind );
+ void transactReset( ResStatus::TransactByValue causer );
+ void addRequire (const Capability & capability);
+ void addConflict (const Capability & capability);
+ void setTimeout( int seconds );
+ int timeout();
+ void setMaxSolverPasses (int count);
+ int maxSolverPasses ();
+ bool createSolverTestcase (const std::string & dumpPath = "/var/log/YaST2/solverTestcase");
+ const solver::detail::ItemCapKindList isInstalledBy (const PoolItem_Ref item);
+ const std::list<solver::detail::ItemCapKind> installs (const PoolItem_Ref item);
+ //const solver::detail::ItemCapKindList installs (const PoolItem_Ref item);
+
+ protected:
+
+ private:
+ solver::detail::Resolver_Ptr _pimpl;
+};
+
Added: trunk/libzypp-bindings/swig/perl5/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/perl5/CMak…
==============================================================================
--- trunk/libzypp-bindings/swig/perl5/CMakeLists.txt (added)
+++ trunk/libzypp-bindings/swig/perl5/CMakeLists.txt Thu Sep 6 16:15:14 2007
@@ -0,0 +1,41 @@
+FIND_PACKAGE(Perl REQUIRED)
+
+EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{cppflags}" OUTPUT_VARIABLE PERL_CXX_FLAGS)
+
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PERL_CXX_FLAGS}")
+
+EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{archlibexp}" OUTPUT_VARIABLE PERL_LIB_PATH)
+SET( PERL_INS_PATH "${PERL_LIB_PATH}" )
+SET( PERL_LIB_PATH "${PERL_LIB_PATH}/CORE" )
+
+MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}")
+MESSAGE(STATUS "Perl cpp-flags: ${PERL_CXX_FLAGS}")
+MESSAGE(STATUS "Perl lib path: ${PERL_LIB_PATH}")
+
+SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" )
+SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" )
+
+ADD_CUSTOM_COMMAND (
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx
+ COMMAND ${CMAKE_COMMAND} -E echo_append "Creating wrapper code for perl..."
+ COMMAND ${SWIG_EXECUTABLE} -c++ -perl5 -xmlout ${CMAKE_CURRENT_BINARY_DIR}/parse.xml -o ${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx -I${ZYPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../zypp.i
+ COMMAND ${CMAKE_COMMAND} -E echo "Done."
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../*.i ${CMAKE_CURRENT_SOURCE_DIR}/*.i
+)
+
+ADD_CUSTOM_TARGET( glue
+ DEPENDS ${SWIG_OUTPUT}
+)
+
+ADD_LIBRARY( zypp SHARED "${CMAKE_CURRENT_BINARY_DIR}/zypp_wrap.cxx" )
+SET_TARGET_PROPERTIES( zypp PROPERTIES PREFIX "" )
+ADD_DEPENDENCIES( zypp glue )
+
+INCLUDE_DIRECTORIES( ${PERL_LIB_PATH} )
+INCLUDE_DIRECTORIES( ${ZYPP_INCLUDE_DIR} )
+TARGET_LINK_LIBRARIES( zypp ${ZYPP_LIBRARY} )
+
+INSTALL(TARGETS zypp LIBRARY DESTINATION ${PERL_INS_PATH})
+INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/zypp.pm DESTINATION ${PERL_INS_PATH})
+
Added: trunk/libzypp-bindings/swig/perl5/perl.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/perl5/perl…
==============================================================================
(empty)
Modified: trunk/libzypp-bindings/swig/zypp.i
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/zypp.i?rev…
==============================================================================
--- trunk/libzypp-bindings/swig/zypp.i (original)
+++ trunk/libzypp-bindings/swig/zypp.i Thu Sep 6 16:15:14 2007
@@ -1,11 +1,17 @@
%module zypp
+#ifdef SWIGPERL5
+%{
+ #define SWIGPERLHACK
+ #undef NORMAL
+%}
+#endif
+
%{
/* Includes the header in the wrapper code */
#include "zypp/base/PtrTypes.h"
#include <zypp/Edition.h>
#include <zypp/ResTraits.h>
-#include <zypp/ResPoolProxy.h>
#include <zypp/ResStore.h>
#include <zypp/ZYppFactory.h>
#include <zypp/ZYpp.h>
@@ -14,7 +20,10 @@
#include "zypp/ResObject.h"
#include "zypp/ResPoolManager.h"
#include "zypp/Target.h"
-#include "zypp/target/TargetImpl.h"
+#ifndef SWIGPERLHACK
+ #include "zypp/target/TargetImpl.h"
+ #include "zypp/MediaSetAccess.h"
+#endif
#include "zypp/TranslatedText.h"
#include "zypp/CapFactory.h"
#include "zypp/Package.h"
@@ -23,8 +32,8 @@
#include "zypp/Repository.h"
#include "zypp/RepoManager.h"
#include "zypp/repo/RepoType.h"
-#include "zypp/MediaSetAccess.h"
#include "zypp/TmpPath.h"
+#include "zypp/Resolver.h"
using namespace boost;
using namespace zypp;
@@ -33,6 +42,7 @@
using namespace zypp::filesystem;
typedef std::set<Url> UrlSet;
+typedef std::list<std::string> StringList;
%}
%rename("+") "operator+";
@@ -65,9 +75,13 @@
%include "python/python.i"
#endif
+#ifdef SWIGPERL5
+%include "std_list.i"
+#endif
%include "Pathname.i"
%include "Url.i"
+%include "ResStatus.i"
%include "NeedAType.i"
%include "Arch.i"
%include "ResStore.i"
@@ -96,15 +110,18 @@
%include "Package.i"
%include "PublicKey.i"
%include "KeyRing.i"
-%include "Target.i"
-%include "ResStatus.i"
+#ifndef SWIGPERL5
+ %include "Target.i"
+ %include "MediaSetAccess.i"
+#endif
%include "PoolItem.i"
%include "ResPool.i"
%include "ResPoolManager.i"
%include "ZYppCommitPolicy.i"
%include "ZYppCommitResult.i"
-%include "MediaSetAccess.i"
%include "TmpPath.i"
+%include "Resolver.i"
+%include "ItemCapKind.i"
class ZYpp
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7126 - /trunk/libzypp/tests/zypp/TranslatedText.cc
by mlandres@svn.opensuse.org 06 Sep '07
by mlandres@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: mlandres
Date: Thu Sep 6 14:30:02 2007
New Revision: 7126
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7126&view=rev
Log:
add newline at eof
Modified:
trunk/libzypp/tests/zypp/TranslatedText.cc
Modified: trunk/libzypp/tests/zypp/TranslatedText.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/TranslatedTex…
==============================================================================
--- trunk/libzypp/tests/zypp/TranslatedText.cc (original)
+++ trunk/libzypp/tests/zypp/TranslatedText.cc Thu Sep 6 14:30:02 2007
@@ -26,32 +26,32 @@
void test_tt()
{
ZYpp::Ptr god;
-
+
god = getZYpp();
-
+
TranslatedText testTT;
MIL << "Locale: en" << std::endl;
god->setTextLocale(Locale("en"));
testTT.setText("default");
MIL << "value: '" << testTT.text() << "'" << std::endl;
BOOST_CHECK_EQUAL( testTT.text(), "default" );
-
+
testTT.setText("default english", Locale("en"));
BOOST_CHECK_EQUAL( testTT.text(), "default english" );
-
+
MIL << "Locale: es_ES" << std::endl;
god->setTextLocale(Locale("es_ES"));
-
+
BOOST_CHECK_EQUAL( testTT.text(), "default english" );
-
+
testTT.setText("hola esto es neutro", Locale("es"));
testTT.setText("this is neutral", Locale("en"));
-
+
BOOST_CHECK_EQUAL( testTT.text(), "hola esto es neutro" );
-
+
testTT.setText("hola Spain", Locale("es_ES"));
BOOST_CHECK_EQUAL( testTT.text(), "hola Spain" );
-
+
MIL << "Locale: null" << std::endl;
god->setTextLocale(Locale());
BOOST_CHECK_EQUAL( testTT.text(), "default" );
@@ -63,4 +63,4 @@
test_suite* test= BOOST_TEST_SUITE( "TranslatedText" );
test->add( BOOST_TEST_CASE( &test_tt ), 0 /* expected zero error */ );
return test;
-}
\ No newline at end of file
+}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7125 - in /trunk/libzypp: VERSION.cmake devel/devel.ma/Parse.cc package/libzypp.changes
by mlandres@svn.opensuse.org 06 Sep '07
by mlandres@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: mlandres
Date: Thu Sep 6 14:21:20 2007
New Revision: 7125
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7125&view=rev
Log:
changes
Modified:
trunk/libzypp/VERSION.cmake
trunk/libzypp/devel/devel.ma/Parse.cc
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7125&r…
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Thu Sep 6 14:21:20 2007
@@ -47,4 +47,4 @@
SET(LIBZYPP_MAJOR "3")
SET(LIBZYPP_MINOR "22")
SET(LIBZYPP_COMPATMINOR "21")
-SET(LIBZYPP_PATCH "3")
+SET(LIBZYPP_PATCH "4")
Modified: trunk/libzypp/devel/devel.ma/Parse.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?…
==============================================================================
--- trunk/libzypp/devel/devel.ma/Parse.cc (original)
+++ trunk/libzypp/devel/devel.ma/Parse.cc Thu Sep 6 14:21:20 2007
@@ -54,8 +54,8 @@
{
//handle( asKind<Package>( obj_r ) );
//handle( asKind<Patch>( obj_r ) );
- //handle( asKind<Pattern>( obj_r ) );
- //handle( asKind<Product>( obj_r ) );
+ handle( asKind<Pattern>( obj_r ) );
+ handle( asKind<Product>( obj_r ) );
return true;
}
@@ -71,11 +71,6 @@
{
if ( !p )
return;
-
- ui::PatchContents pc( p );
- MIL << p << endl;
- dumpRange( DBG << pc.size() << endl,
- pc.begin(), pc.end() );
}
void handle( const Pattern_constPtr & p )
@@ -83,7 +78,10 @@
if ( !p )
return;
- MIL << p << endl;
+ if ( p->vendor().empty() )
+ ERR << p << endl;
+ else if ( p->vendor() == "SUSE (assumed)" )
+ SEC << p << endl;
}
void handle( const Product_constPtr & p )
@@ -91,8 +89,9 @@
if ( !p )
return;
- ERR << p << endl;
- ERR << p->type() << endl;
+ USR << p << endl;
+ USR << p->vendor() << endl;
+ USR << p->type() << endl;
}
template<class _C>
@@ -329,6 +328,11 @@
{ /////////////////////////////////////////////////////////////////
+ void Vtst( const std::string & lhs, const std::string & rhs )
+ {
+ (VendorAttr::instance().equivalent( lhs, rhs )?MIL:ERR) << lhs << " <==> "<< rhs << endl;
+
+ }
/////////////////////////////////////////////////////////////////
} // namespace zypp
@@ -347,12 +351,23 @@
INT << "===[START]==========================================" << endl;
setenv( "ZYPP_CONF", "/Local/ROOT/zypp.conf", 1 );
- std::string t( "ABCD" );
- MIL << str::toLower(t.substr(0,3)) << endl;
- MIL << str::toLower(t.substr(0,4)) << endl;
- MIL << str::toLower(t.substr(0,5)) << endl;
- throw;
-
+ Vtst( "", "" );
+ Vtst( "", "a" );
+ Vtst( "", "suse lkgjhdl" );
+ Vtst( "", "opensuse" );
+ Vtst( "a", "" );
+ Vtst( "a", "a" );
+ Vtst( "a", "suse lkgjhdl" );
+ Vtst( "a", "opensuse" );
+ Vtst( "suse", "" );
+ Vtst( "suse", "a" );
+ Vtst( "suse", "suse lkgjhdl" );
+ Vtst( "suse", "opensuse" );
+ Vtst( "opensuse fdhgdd", "" );
+ Vtst( "opensuse fdhgdd", "a" );
+ Vtst( "opensuse fdhgdd", "suse lkgjhdl" );
+ Vtst( "opensuse fdhgdd", "opensuse" );
+ throw;
DigestReceive foo;
KeyRingSignalsReceive baa;
@@ -419,20 +434,12 @@
{
{
zypp::base::LogControl::TmpLineWriter shutUp;
- getZYpp()->initTarget( sysRoot );
+ //getZYpp()->initTarget( sysRoot );
+ getZYpp()->initTarget( "/" );
}
MIL << "Added target: " << pool << endl;
}
- INT << getZYpp()->diskUsage() << endl;
-
- {
- Measure x("SHUTDOWN");
- getZYpp()->removeResolvables( getZYpp()->target()->resolvables() );
- getZYpp()->target()->reset();
- }
-
-
std::for_each( pool.begin(), pool.end(), Xprint() );
///////////////////////////////////////////////////////////////////
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Thu Sep 6 14:21:20 2007
@@ -1,8 +1,15 @@
-------------------------------------------------------------------
+Thu Sep 6 14:11:58 CEST 2007 - ma(a)suse.de
+
+- Work arround installed patterns providing an empty vendor string. (#307743)
+- Let the solver treat vendor suse and opensuse as equivalent.
+- version 3.22.4
+
+-------------------------------------------------------------------
Thu Sep 6 12:33:27 CEST 2007 - schubi(a)suse.de
- Checking item before evaluating the concerning vendor. bug #307941
-- r 7119
+- r 7119
-------------------------------------------------------------------
Wed Sep 6 02:24:37 CEST 2007 - dmacvicar(a)suse.de
@@ -19,7 +26,7 @@
problems.
- improved error message if a requiremnt is not fulfilled Bug 307743
- Add "ignore" option to the solution if a requirement is not fulfilled
- Bug 304276
+ Bug 304276
- revision 7113
-------------------------------------------------------------------
@@ -35,7 +42,7 @@
Tue Sep 4 12:09:10 CEST 2007 - schubi(a)suse.de
- comparing vendor with VendorAttr::equivalent
-- revision 7103
+- revision 7103
-------------------------------------------------------------------
Mon Sep 3 18:43:51 CEST 2007 - schwab(a)suse.de
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7124 - /trunk/libzypp/zypp/target/store/XMLFilesBackend.cc
by mlandres@svn.opensuse.org 06 Sep '07
by mlandres@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: mlandres
Date: Thu Sep 6 14:21:06 2007
New Revision: 7124
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7124&view=rev
Log:
- Work arround installed patterns providing an empty vendor string. (#307743)
Modified:
trunk/libzypp/zypp/target/store/XMLFilesBackend.cc
Modified: trunk/libzypp/zypp/target/store/XMLFilesBackend.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/store/XMLFil…
==============================================================================
--- trunk/libzypp/zypp/target/store/XMLFilesBackend.cc (original)
+++ trunk/libzypp/zypp/target/store/XMLFilesBackend.cc Thu Sep 6 14:21:06 2007
@@ -791,6 +791,7 @@
impl->_install_notify = parsed.install_notify;
impl->_delete_notify = parsed.delete_notify;
impl->_license_to_confirm = parsed.license_to_confirm;
+ impl->_vendor = parsed.vendor;
impl->_size = parsed.size;
impl->_downloadSize = parsed.downloadSize;
impl->_install_only = parsed.install_only;
@@ -883,6 +884,7 @@
impl->_install_notify = parsed.install_notify;
impl->_delete_notify = parsed.delete_notify;
impl->_license_to_confirm = parsed.license_to_confirm;
+ impl->_vendor = parsed.vendor;
impl->_size = parsed.size;
impl->_downloadSize = parsed.downloadSize;
impl->_install_only = parsed.install_only;
@@ -920,6 +922,7 @@
impl->_install_notify = parsed.install_notify;
impl->_delete_notify = parsed.delete_notify;
impl->_license_to_confirm = parsed.license_to_confirm;
+ impl->_vendor = parsed.vendor;
impl->_size = parsed.size;
impl->_downloadSize = parsed.downloadSize;
impl->_install_only = parsed.install_only;
@@ -961,6 +964,7 @@
impl->_install_notify = parsed.install_notify;
impl->_delete_notify = parsed.delete_notify;
impl->_license_to_confirm = parsed.license_to_confirm;
+ impl->_vendor = parsed.vendor;
impl->_size = parsed.size;
impl->_downloadSize = parsed.downloadSize;
impl->_install_only = parsed.install_only;
@@ -1020,6 +1024,7 @@
impl->_install_notify = parsed.install_notify;
impl->_delete_notify = parsed.delete_notify;
impl->_license_to_confirm = parsed.license_to_confirm;
+ impl->_vendor = parsed.vendor;
impl->_size = parsed.size;
impl->_downloadSize = parsed.downloadSize;
impl->_install_only = parsed.install_only;
@@ -1173,6 +1178,7 @@
impl->_install_notify = parsed.install_notify;
impl->_delete_notify = parsed.delete_notify;
impl->_license_to_confirm = parsed.license_to_confirm;
+ impl->_vendor = parsed.vendor;
impl->_size = parsed.size;
impl->_downloadSize = parsed.downloadSize;
impl->_install_only = parsed.install_only;
@@ -1189,6 +1195,13 @@
if (!parsed.arch.empty())
arch = Arch(parsed.arch);
+ // Workaround for bug #307743:
+ // Hijack installed patterns with empty vendor.
+ if ( impl->_vendor.empty() )
+ {
+ impl->_vendor = "SUSE (assumed)";
+ }
+
// Collect basic Resolvable data
NVRAD dataCollect( parsed.name, Edition( parsed.ver, parsed.rel, parsed.epoch ), arch, createDependencies( parsed, ResTraits<Pattern>::kind));
Pattern::Ptr pattern = detail::makeResolvableFromImpl( dataCollect, impl );
@@ -1217,6 +1230,7 @@
impl->_install_notify = parsed.install_notify;
impl->_delete_notify = parsed.delete_notify;
impl->_license_to_confirm = parsed.license_to_confirm;
+ impl->_vendor = parsed.vendor;
impl->_size = parsed.size;
impl->_downloadSize = parsed.downloadSize;
impl->_install_only = parsed.install_only;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
06 Sep '07
Author: mlandres
Date: Thu Sep 6 14:20:35 2007
New Revision: 7123
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7123&view=rev
Log:
- Let the solver treat vendor suse and opensuse as equivalent.
Modified:
trunk/libzypp/zypp/VendorAttr.cc
Modified: trunk/libzypp/zypp/VendorAttr.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/VendorAttr.cc?rev=7…
==============================================================================
--- trunk/libzypp/zypp/VendorAttr.cc (original)
+++ trunk/libzypp/zypp/VendorAttr.cc Thu Sep 6 14:20:35 2007
@@ -147,18 +147,27 @@
bool VendorAttr::autoProtect( const Vendor & vendor_r ) const
{ return( ZConfig::instance().autolock_untrustedvendor() && ! trusted( vendor_r ) ); }
- bool VendorAttr::equivalent( const Vendor & lhs, const Vendor & rhs ) const
+ /** Helper: Lowercase prefix */
+ inline bool hasLcPrefix( const std::string & str_r, const std::string & pref_r )
+ { return str::toLower( str_r.substr( 0, pref_r.size() ) ) == pref_r; }
+
+ /** Helper: SuSE and equivalent vendors */
+ inline bool isSUSE( const Vendor & vnd_r )
{
- static const std::string defSUSE( "suse" );
+ static const std::string defSUSE ( "suse" );
+ static const std::string defopenSUSE( "opensuse" );
- if ( lhs == rhs )
- return true;
- // By now handcrafted equivalence definition:
- if ( str::toLower( lhs.substr( 0, 4 ) ) == defSUSE
- && str::toLower( rhs.substr( 0, 4 ) ) == defSUSE )
+ return( hasLcPrefix( vnd_r, defSUSE )
+ || hasLcPrefix( vnd_r, defopenSUSE ) );
+ }
+
+ bool VendorAttr::equivalent( const Vendor & lhs, const Vendor & rhs ) const
+ {
+ if ( lhs == rhs )
return true;
- return false;
+ // By now handcrafted equivalence definition:
+ return( isSUSE( lhs ) && isSUSE( rhs ) );
}
/////////////////////////////////////////////////////////////////
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7122 - /trunk/updater-kde/package/opensuse-updater-kde.spec
by tgoettlicher@svn.opensuse.org 06 Sep '07
by tgoettlicher@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: tgoettlicher
Date: Thu Sep 6 13:17:00 2007
New Revision: 7122
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7122&view=rev
Log:
spec
Modified:
trunk/updater-kde/package/opensuse-updater-kde.spec
Modified: trunk/updater-kde/package/opensuse-updater-kde.spec
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.spec (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.spec Thu Sep 6 13:17:00 2007
@@ -89,6 +89,11 @@
%changelog -n opensuse-updater-kde
+-------------------------------------------------------------------
+* Thu Sep 6 2007 - tgoettlicher(a)suse.de
+- fixed notification area of opensuse-updater-kde goes out of the display boundaries (#307661)
+- fixed bug in internal states
+- added state "no network" with gray tray icon
* Mon Sep 3 2007 - tgoettlicher(a)suse.de
- changed call of "yast2 inst_source" to "yast2 repositories"
- updated translations
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7121 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher@svn.opensuse.org 06 Sep '07
by tgoettlicher@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: tgoettlicher
Date: Thu Sep 6 13:14:26 2007
New Revision: 7121
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7121&view=rev
Log:
changes
Modified:
trunk/updater-kde/package/opensuse-updater-kde.changes
Modified: trunk/updater-kde/package/opensuse-updater-kde.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.changes (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.changes Thu Sep 6 13:14:26 2007
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Sep 6 13:10:37 CEST 2007 - tgoettlicher(a)suse.de
+
+- fixed notification area of opensuse-updater-kde goes out of the display boundaries (#307661)
+- fixed bug in internal states
+- 7120
+
+-------------------------------------------------------------------
Wed Sep 5 11:38:34 CEST 2007 - tgoettlicher(a)suse.de
- added state "no network" with gray tray icon
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
06 Sep '07
Author: schubi2
Date: Thu Sep 6 12:34:29 2007
New Revision: 7120
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7120&view=rev
Log:
Checking item before evaluating the concerning vendor
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Thu Sep 6 12:34:29 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Sep 6 12:33:27 CEST 2007 - schubi(a)suse.de
+
+- Checking item before evaluating the concerning vendor. bug #307941
+- r 7119
+
+-------------------------------------------------------------------
Wed Sep 6 02:24:37 CEST 2007 - dmacvicar(a)suse.de
- Fix for bug #307163 - empty package descriptions
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7119 - /trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
by schubi2@svn.opensuse.org 06 Sep '07
by schubi2@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: schubi2
Date: Thu Sep 6 12:33:05 2007
New Revision: 7119
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7119&view=rev
Log:
checking item before evaluate the concerning vendor
Modified:
trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
Modified: trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Queue…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc (original)
+++ trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc Thu Sep 6 12:33:05 2007
@@ -348,7 +348,9 @@
} else if (provider.status().isKept() && provider.status().isByUser()) {
misc_info = new ResolverInfoMisc (RESOLVER_INFO_TYPE_KEEP_PROVIDER, requirer, RESOLVER_INFO_PRIORITY_VERBOSE, match);
misc_info->setOtherPoolItem (provider);
- } else if (!VendorAttr::instance().equivalent(provider->vendor(), requirer->vendor())) {
+ } else if (provider
+ && requirer
+ && !VendorAttr::instance().equivalent(provider->vendor(), requirer->vendor())) {
misc_info = new ResolverInfoMisc (RESOLVER_INFO_TYPE_OTHER_VENDOR_PROVIDER,
requirer, RESOLVER_INFO_PRIORITY_VERBOSE, match);
misc_info->setOtherPoolItem (provider);
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7118 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes
by schubi2@svn.opensuse.org 06 Sep '07
by schubi2@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: schubi2
Date: Thu Sep 6 11:05:14 2007
New Revision: 7118
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7118&view=rev
Log:
r 7117
Modified:
trunk/libzypp/VERSION.cmake
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7118&r…
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Thu Sep 6 11:05:14 2007
@@ -47,4 +47,4 @@
SET(LIBZYPP_MAJOR "3")
SET(LIBZYPP_MINOR "22")
SET(LIBZYPP_COMPATMINOR "21")
-SET(LIBZYPP_PATCH "2")
+SET(LIBZYPP_PATCH "3")
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Thu Sep 6 11:05:14 2007
@@ -3,6 +3,8 @@
- Fix for bug #307163 - empty package descriptions
a.k.a shared tag not 100% implemented
+- r 7117
+- version 3.22.3
-------------------------------------------------------------------
Wed Sep 5 17:52:37 CEST 2007 - schubi(a)suse.de
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7117 - /trunk/libzypp/package/libzypp.changes
by dmacvicar@svn.opensuse.org 06 Sep '07
by dmacvicar@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: dmacvicar
Date: Thu Sep 6 02:24:02 2007
New Revision: 7117
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7117&view=rev
Log:
changes
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Thu Sep 6 02:24:02 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Sep 6 02:24:37 CEST 2007 - dmacvicar(a)suse.de
+
+- Fix for bug #307163 - empty package descriptions
+ a.k.a shared tag not 100% implemented
+
+-------------------------------------------------------------------
Wed Sep 5 17:52:37 CEST 2007 - schubi(a)suse.de
- logging "reverse" NEEDED_BY in the detail description of solver
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7116 - in /trunk/libzypp: tests/cache/CacheStore_test.cc tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en zypp/cache/CacheStore.cc zypp/cache/ResolvableQuery.cc
by dmacvicar@svn.opensuse.org 06 Sep '07
by dmacvicar@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: dmacvicar
Date: Thu Sep 6 02:23:59 2007
New Revision: 7116
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7116&view=rev
Log:
- Fix for bug #307163 - empty package descriptions
a.k.a shared tag not 100% implemented
Note: calling the same query in recursive manner is tricky.
All the tips to get my testcase to pass, where here:
http://www.sqlite.org/cvstrac/wiki?p=LibraryRoutineCalledOutOfSequence
Modified:
trunk/libzypp/tests/cache/CacheStore_test.cc
trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en
trunk/libzypp/zypp/cache/CacheStore.cc
trunk/libzypp/zypp/cache/ResolvableQuery.cc
Modified: trunk/libzypp/tests/cache/CacheStore_test.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheStore_t…
==============================================================================
--- trunk/libzypp/tests/cache/CacheStore_test.cc (original)
+++ trunk/libzypp/tests/cache/CacheStore_test.cc Thu Sep 6 02:23:59 2007
@@ -415,7 +415,11 @@
Package::Ptr p = asKind<Package>(*it);
if ( (p->name() == "foo") && p->arch() == Arch("x86_64") )
{
- BOOST_CHECK_EQUAL( p->description(), "foo bar");
+ BOOST_CHECK_EQUAL( p->description(), "This is the description");
+ }
+ if ( (p->name() == "foo") && p->arch() == Arch("i586") )
+ {
+ BOOST_CHECK_EQUAL( p->description(), "This is the description");
}
}
}
Modified: trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data…
==============================================================================
--- trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en (original)
+++ trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en Thu Sep 6 02:23:59 2007
@@ -2,7 +2,6 @@
=Pkg: foo 1.0 1 i586
=Sum: Foo program
+Des:
-<!-- DT:Rich -->
-<p>This package contains foo</p>
+This is the description
-Des:
##----------------------------------------
Modified: trunk/libzypp/zypp/cache/CacheStore.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc…
==============================================================================
--- trunk/libzypp/zypp/cache/CacheStore.cc (original)
+++ trunk/libzypp/zypp/cache/CacheStore.cc Thu Sep 6 02:23:59 2007
@@ -275,7 +275,7 @@
const data::Package_Ptr & package )
{
RecordId id = appendResolvable( repository_id, ResTraits<Package>::kind,
- NVRA( package->name, package->edition, package->arch ), package->deps );
+ NVRA( package->name, package->edition, package->arch ), package->deps, package->shareDataWith );
appendResObjectAttributes( id, package );
appendPackageBaseAttributes( id, package );
@@ -292,7 +292,7 @@
const data::SrcPackage_Ptr & package )
{
RecordId id = appendResolvable( repository_id, ResTraits<SrcPackage>::kind,
- NVRA( package->name, package->edition, package->arch ), package->deps );
+ NVRA( package->name, package->edition, package->arch ), package->deps, package->shareDataWith );
appendResObjectAttributes( id, package );
appendOnMediaLocation( id, attrSrcPackageLocation, package->repositoryLocation );
Modified: trunk/libzypp/zypp/cache/ResolvableQuery.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/ResolvableQue…
==============================================================================
--- trunk/libzypp/zypp/cache/ResolvableQuery.cc (original)
+++ trunk/libzypp/zypp/cache/ResolvableQuery.cc Thu Sep 6 02:23:59 2007
@@ -25,6 +25,7 @@
sqlite3_command_ptr _cmd_attr_tstr;
sqlite3_command_ptr _cmd_attr_num;
sqlite3_command_ptr _cmd_disk_usage;
+ sqlite3_command_ptr _cmd_shared_id;
Impl( const Pathname &dbdir)
: _dbdir(dbdir)
@@ -33,6 +34,8 @@
_con.open((dbdir + "zypp.db").asString().c_str());
_con.executenonquery("PRAGMA cache_size=8000;");
+ _cmd_shared_id.reset( new sqlite3_command( _con, "select shared_id from resolvables where id=:rid;") );
+
_cmd_attr_tstr.reset( new sqlite3_command( _con, "select a.text, l.name from text_attributes a,types l,types t where a.weak_resolvable_id=:rid and a.lang_id=l.id and a.attr_id=t.id and l.class=:lclass and t.class=:tclass and t.name=:tname;") );
@@ -322,6 +325,18 @@
sqlite3_reader reader = _cmd_attr_num->executereader();
if ( reader.read() )
return reader.getint(0);
+ else
+ {
+ reader.close();
+ sqlite3_reader idreader = _cmd_shared_id->executereader();
+ if ( idreader.read() )
+ {
+ _cmd_shared_id->bind(":rid", record_id);
+ data::RecordId sid = idreader.getint(0);
+ idreader.close();
+ return queryNumericAttributeInternal(con, sid, klass, name, default_value);
+ }
+ }
return default_value;
}
@@ -353,7 +368,19 @@
if ( c>0 )
return result;
-
+ else
+ {
+ reader.close();
+ _cmd_shared_id->bind(":rid", record_id);
+ sqlite3_reader idreader = _cmd_shared_id->executereader();
+ if ( idreader.read() )
+ {
+ data::RecordId sid = idreader.getint(0);
+ idreader.close();
+ return queryTranslatedStringAttributeInternal(con, sid, klass, name, default_value);
+ }
+ }
+
return default_value;
}
@@ -388,7 +415,19 @@
if ( reader.read() )
return reader.getstring(0);
-
+ else
+ {
+ reader.close();
+ _cmd_shared_id->bind(":rid", record_id);
+ sqlite3_reader idreader = _cmd_shared_id->executereader();
+ if ( idreader.read() )
+ {
+ data::RecordId sid = idreader.getint(0);
+ idreader.close();
+ return queryStringAttributeTranslationInternal( con, sid, locale, klass, name, default_value );
+ }
+ }
+
return default_value;
}
};
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7115 - in /trunk/libzypp/tests: cache/ repo/susetags/data/shared_attributes/ repo/susetags/data/shared_attributes/suse/ repo/susetags/data/shared_attributes/suse/setup/ repo/susetags/data/shared_a...
by dmacvicar@svn.opensuse.org 06 Sep '07
by dmacvicar@svn.opensuse.org 06 Sep '07
06 Sep '07
Author: dmacvicar
Date: Thu Sep 6 02:23:51 2007
New Revision: 7115
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7115&view=rev
Log:
test case and reproduced bug # 307163 : empty package descriptions
Added:
trunk/libzypp/tests/repo/susetags/data/shared_attributes/
trunk/libzypp/tests/repo/susetags/data/shared_attributes/content
trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/
trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/
trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/
trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages
trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.DU
trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en
Modified:
trunk/libzypp/tests/cache/CacheStore_test.cc
Modified: trunk/libzypp/tests/cache/CacheStore_test.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheStore_t…
==============================================================================
--- trunk/libzypp/tests/cache/CacheStore_test.cc (original)
+++ trunk/libzypp/tests/cache/CacheStore_test.cc Thu Sep 6 02:23:51 2007
@@ -387,6 +387,41 @@
check_tables_clean(tmpdir);
}
+/**
+ * \short Test that a susetags repo reads shared attributes
+ */
+void cache_write_shared_attributes(const Pathname &repodir)
+{
+ ZConfig::instance().overrideSystemArchitecture( Arch( "x86_64" ) );
+ data::RecordId repository_id;
+ filesystem::TmpDir tmpdir;
+ string alias = "novell.com";
+ write_susetags_repo( alias, repodir, tmpdir );
+
+ ResStore dbres = get_resolvables( alias, tmpdir);;
+ //read_resolvables( alias, tmpdir, std::inserter(dbres, dbres.end()));
+ MIL << dbres.size() << " resolvables" << endl;
+
+ // 2 packages and a product
+ BOOST_CHECK_EQUAL( dbres.size(), (unsigned)3);
+
+ for ( ResStore::const_iterator it = dbres.begin();
+ it != dbres.end();
+ ++it )
+ {
+ MIL << *it << endl;
+ if ( isKind<Package>(*it) )
+ {
+ Package::Ptr p = asKind<Package>(*it);
+ if ( (p->name() == "foo") && p->arch() == Arch("x86_64") )
+ {
+ BOOST_CHECK_EQUAL( p->description(), "foo bar");
+ }
+ }
+ }
+ check_tables_clean(tmpdir);
+}
+
void cache_write_susetags_normal_test(const std::string &dir)
{
Pathname repodir = Pathname(dir) + "/repo/susetags/data/stable-x86-subset";
@@ -399,6 +434,12 @@
cache_write_susetags(repodir);
}
+void cache_write_shared_attributes_test(const std::string &dir)
+{
+ Pathname repodir = Pathname(dir) + "/repo/susetags/data/shared_attributes";
+ cache_write_shared_attributes(repodir);
+}
+
test_suite*
init_unit_test_suite( int argc, char *argv[] )
{
@@ -437,8 +478,8 @@
(std::string const*)params, params+1));
test->add(BOOST_PARAM_TEST_CASE(&cache_write_susetags_gz_test,
(std::string const*)params, params+1));
- //test->add(BOOST_PARAM_TEST_CASE(&cache_write_test2,
- // (std::string const*)params, params+1));
+ test->add(BOOST_PARAM_TEST_CASE(&cache_write_shared_attributes_test,
+ (std::string const*)params, params+1));
return test;
}
Added: trunk/libzypp/tests/repo/susetags/data/shared_attributes/content
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data…
==============================================================================
--- trunk/libzypp/tests/repo/susetags/data/shared_attributes/content (added)
+++ trunk/libzypp/tests/repo/susetags/data/shared_attributes/content Thu Sep 6 02:23:51 2007
@@ -0,0 +1,30 @@
+PRODUCT openSUSE-factory
+VERSION 10.3
+DISTPRODUCT SuSE-Linux-STABLE-X86
+DISTVERSION 10.2.42-factory
+VENDOR SUSE LINUX Products GmbH, Nuernberg, Germany
+RELNOTESURL http://www.suse.com/relnotes/i386/openSUSE/FACTORY/release-notes.rpm
+ARCH.x86_64 x86_64 i686 i586 i486 i386 noarch
+ARCH.i686 i686 i586 i486 i386 noarch
+ARCH.i586 i586 i486 i386 noarch
+ARCH.i486 i486 i386 noarch
+ARCH.i386 i386 noarch
+DEFAULTBASE i586
+REQUIRES openSUSE-release = 10.3 pattern:basesystem
+PROVIDES product:openSUSE = 10.2.42
+OBSOLETES product:SUSE_LINUX product:openSUSE <= 10.2
+LINGUAS cs da de en en_GB es fi fr hu it ja km nl nb pl pt_BR zh_CN zh_TW
+SHORTLABEL FACTORY
+LABEL openSUSE FACTORY 10.3
+LABEL.de openSUSE FACTORY 10.3
+EXTRAURLS http://download.opensuse.org/distribution/10.2/repo/oss/
+OPTIONALURLS http://download.opensuse.org/distribution/10.2/repo/non-oss/ http://download.opensuse.org/distribution/10.2/repo/debug/
+DESCRDIR suse/setup/descr
+DATADIR suse
+FLAGS update
+LANGUAGE en_US
+META SHA1 cec02abacb62fce2964a787d516879822691be6e packages
+META SHA1 2664997a3bae2679cf1395a81d54a7dd4532c276 packages.DU
+META SHA1 1c539c3fe4a8ec5fbe96ce3b559fc952124f9acd packages.en
+
+
Added: trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data…
==============================================================================
--- trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages (added)
+++ trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages Thu Sep 6 02:23:51 2007
@@ -0,0 +1,32 @@
+##----------------------------------------
+=Pkg: foo 1.0 1 i586
+=Cks: SHA1 05f0647241433d01636785fd282cc824a6527269
++Req:
+bar > 1.0
+-Req:
+=Grp: Bar
+=Lic: BSD License and BSD-like, GNU General Public License (GPL)
+=Src: foo 1.0 1 src
+=Tim: 1183399094
+=Loc: 1 foo-1.0-1.i586.rpm
+=Siz: 16356019 38850584
++Aut:
+Foo Bar <foo(a)bar.org>
+-Aut:
+##----------------------------------------
+=Pkg: foo 1.0 1 x86_64
+=Cks: SHA1 05f0647241433d01636785fd282cc824a6527269
++Req:
+bar > 1.0
+-Req:
+=Grp: Bar
+=Lic: BSD License and BSD-like, GNU General Public License (GPL)
+=Src: foo 1.0 1 src
+=Tim: 1183399094
+=Loc: 1 foo-1.0-1.x86_64.rpm
+=Siz: 16356019 38850584
++Aut:
+Foo Bar <foo(a)bar.org>
+-Aut:
+=Shr: foo 1.0 1 i586
+
Added: trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.DU
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data…
==============================================================================
--- trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.DU (added)
+++ trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.DU Thu Sep 6 02:23:51 2007
@@ -0,0 +1,7 @@
+##----------------------------------------
+=Pkg: foo 1.0 1 i586
++Dir:
+/ 0 39444 0 3068
+usr/share/ 11 0 1 0
+-Dir:
+##----------------------------------------
Added: trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data…
==============================================================================
--- trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en (added)
+++ trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en Thu Sep 6 02:23:51 2007
@@ -0,0 +1,8 @@
+##----------------------------------------
+=Pkg: foo 1.0 1 i586
+=Sum: Foo program
++Des:
+<!-- DT:Rich -->
+<p>This package contains foo</p>
+-Des:
+##----------------------------------------
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
05 Sep '07
Author: schubi2
Date: Wed Sep 5 17:53:10 2007
New Revision: 7114
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7114&view=rev
Log:
r 7113
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Wed Sep 5 17:53:10 2007
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Wed Sep 5 17:52:37 CEST 2007 - schubi(a)suse.de
+
+- logging "reverse" NEEDED_BY in the detail description of solver
+ problems.
+- improved error message if a requiremnt is not fulfilled Bug 307743
+- Add "ignore" option to the solution if a requirement is not fulfilled
+ Bug 304276
+- revision 7113
+
+-------------------------------------------------------------------
Wed Sep 5 14:33:02 CEST 2007 - jkupec(a)suse.cz
- fixed the order of operands of susetags local metadata status
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7113 - in /trunk/libzypp/zypp/solver/detail: QueueItemRequire.cc Resolver.cc Resolver.h Resolver_problems.cc SolutionAction.cc
by schubi2@svn.opensuse.org 05 Sep '07
by schubi2@svn.opensuse.org 05 Sep '07
05 Sep '07
Author: schubi2
Date: Wed Sep 5 17:52:16 2007
New Revision: 7113
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7113&view=rev
Log:
- logging "reverse" NEEDED_BY in the detail description of solver
problems.
- improved error message if a requiremnt is not fulfilled Bug 307743
- Add "ignore" option to the solution if a requirement is not fulfilled
Bug 304276
Modified:
trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
trunk/libzypp/zypp/solver/detail/Resolver.cc
trunk/libzypp/zypp/solver/detail/Resolver.h
trunk/libzypp/zypp/solver/detail/Resolver_problems.cc
trunk/libzypp/zypp/solver/detail/SolutionAction.cc
Modified: trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Queue…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc (original)
+++ trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc Wed Sep 5 17:52:16 2007
@@ -615,7 +615,6 @@
}
// now check if a provider supplements or enhances an installed or to-be-installed resolvable
-
if (hint_match( item->dep( Dep::SUPPLEMENTS ), pool() )
|| hint_match( item->dep( Dep::ENHANCES ), pool() ))
{
Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/Resolver.cc (original)
+++ trunk/libzypp/zypp/solver/detail/Resolver.cc Wed Sep 5 17:52:16 2007
@@ -422,6 +422,13 @@
_extra_caps.insert (capability);
}
+void
+Resolver::removeExtraCapability (const Capability & capability)
+{
+ _extra_caps.erase (capability);
+}
+
+
void
Resolver::addExtraConflict (const Capability & capability)
Modified: trunk/libzypp/zypp/solver/detail/Resolver.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/Resolver.h (original)
+++ trunk/libzypp/zypp/solver/detail/Resolver.h Wed Sep 5 17:52:16 2007
@@ -225,6 +225,7 @@
void addPoolItemToVerify (PoolItem_Ref item);
void addExtraCapability (const Capability & capability);
+ void removeExtraCapability (const Capability & capability);
void addExtraConflict (const Capability & capability);
const CapSet extraCapability () { return _extra_caps; }
Modified: trunk/libzypp/zypp/solver/detail/Resolver_problems.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/Resolver_problems.cc (original)
+++ trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Wed Sep 5 17:52:16 2007
@@ -136,6 +136,16 @@
collector->problems.insert (make_pair( item, info));
} else {
collector->additionalInfo.insert (make_pair( item, info));
+
+ if (info->type()==RESOLVER_INFO_TYPE_NEEDED_BY) { // logging reverse needed by
+ ResolverInfoNeededBy_constPtr needed_by = dynamic_pointer_cast<const ResolverInfoNeededBy>(info);
+ PoolItemList itemList = needed_by->items();
+ for (PoolItemList::const_iterator iter = itemList.begin();
+ iter != itemList.end(); ++iter)
+ {
+ collector->additionalInfo.insert (make_pair( *iter, info));
+ }
+ }
}
// Collicting items which are providing requirements but they
@@ -699,8 +709,13 @@
break;
case RESOLVER_INFO_TYPE_NO_PROVIDER: { // There are no installable providers of c [for p]
ResolverInfoMisc_constPtr misc_info = dynamic_pointer_cast<const ResolverInfoMisc>(info);
- // TranslatorExplanation %s = name of package, patch, selection ...
- what = str::form (_("%s cannot be installed due to missing dependencies"), whoShort.c_str());
+ if (item.status().isInstalled()) {
+ // TranslatorExplanation %s = name of package, patch, selection ...
+ what = str::form (_("%s has missing dependencies"), whoShort.c_str());
+ } else {
+ // TranslatorExplanation %s = name of package, patch, selection ...
+ what = str::form (_("%s cannot be installed due to missing dependencies"), whoShort.c_str());
+ }
details = misc_info->message() + "\n";
details += logAdditionalInfo(collector.additionalInfo, item);
ResolverProblem_Ptr problem = new ResolverProblem (what, details);
@@ -947,6 +962,8 @@
details += more_details;
}
ResolverProblem_Ptr problem = new ResolverProblem (what, details);
+ // ignore requirement
+ problem->addSolution (new ProblemSolutionIgnoreRequires (problem, PoolItem_Ref(), misc_info->capability()));
problems.push_back (problem);
problem_created = true;
}
Modified: trunk/libzypp/zypp/solver/detail/SolutionAction.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Solut…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/SolutionAction.cc (original)
+++ trunk/libzypp/zypp/solver/detail/SolutionAction.cc Wed Sep 5 17:52:16 2007
@@ -181,8 +181,12 @@
bool
InjectSolutionAction::execute(Resolver & resolver) const
{
- Dependencies dependencies = _item.resolvable()->deps();
- CapSet depList = dependencies[Dep::CONFLICTS];
+ Dependencies dependencies;
+ CapSet depList;
+ if (_item != PoolItem_Ref()) {
+ dependencies = _item.resolvable()->deps();
+ depList = dependencies[Dep::CONFLICTS];
+ }
switch (_kind) {
case CONFLICTS:
// removing conflict in both resolvables
@@ -221,7 +225,13 @@
break;
case REQUIRES:
// removing the requires dependency from the item
- resolver.addIgnoreRequires (_item, _capability);
+ if (_item == PoolItem_Ref()) {
+ // this was a requirement via Resolver::addExtraCapability
+ // so we have to delete it.
+ resolver.removeExtraCapability (_capability);
+ } else {
+ resolver.addIgnoreRequires (_item, _capability);
+ }
break;
case ARCHITECTURE:
// This item is for ALL architectures available
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7112 - in /trunk/libzypp-testsuite/solver/data.deptestomatic: basic-exercises/ yast-tests/
by schubi2@svn.opensuse.org 05 Sep '07
by schubi2@svn.opensuse.org 05 Sep '07
05 Sep '07
Author: schubi2
Date: Wed Sep 5 17:48:32 2007
New Revision: 7112
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7112&view=rev
Log:
Testcases for bug 304276 and 307734 added or changed
Added:
trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution
trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml
Modified:
trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/Bug299486-test.solution
trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1
trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2
trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/Bug299486-test.solution
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/Bug299486-test.solution (original)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/Bug299486-test.solution Wed Sep 5 17:48:32 2007
@@ -2,3 +2,6 @@
>!> Problem:
>!> Requirememt asdfasdf cannot be fulfilled.
>!> There are no installable providers of asdfasdf
+>!> Solution:
+>!> Ignore this requirement just here
+>!>
Added: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution (added)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution Wed Sep 5 17:48:32 2007
@@ -0,0 +1,29 @@
+>!> 2 problems found:
+>!> Problem:
+>!> No valid solution found with just resolvables of best architecture.
+>!> With this run only resolvables with the best architecture have been regarded.
+>!> Solution:
+>!> Make a solver run with ALL possibilities.
+>!> Regarding all resolvables with a compatible architecture.
+>!> Problem:
+>!> Requirememt notavailable cannot be fulfilled.
+>!> There are no installable providers of notavailable
+>!> Solution:
+>!> Ignore this requirement just here
+>!>
+>!> Taking solution: 0
+>!> For problem: 1
+>!> No problems so far
+>!> No problems so far
+>!> Solution #1:
+>!> install A-2.0-1.noarch[test]
+>!> install B-1.0-1.noarch[test]
+>!> install D-1.0-1.noarch[test]
+>!> |unflag E-1.0-1.noarch[test]
+>!> installs=3, upgrades=0, uninstalls=0
+>!> Solution #2:
+>!> install A-2.0-1.noarch[test]
+>!> install B-1.0-1.noarch[test]
+>!> install C-1.0-1.noarch[test]
+>!> |unflag E-1.0-1.noarch[test]
+>!> installs=3, upgrades=0, uninstalls=0
Added: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml (added)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml Wed Sep 5 17:48:32 2007
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<test allow_virtual_conflicts="yes">
+<setup>
+ <system file="exercise-1-system.xml.gz"/>
+ <channel name="test" file="require-packages.xml.gz"/>
+</setup>
+<trial>
+ <addRequire kind="package" name="notavailable"/>
+ <addRequire kind="package" name="A"/>
+ <reportproblems/>
+ <takesolution problem="1" solution="0"/>
+ <reportproblems/>
+</trial>
+</test>
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 (original)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 Wed Sep 5 17:48:32 2007
@@ -4050,7 +4050,7 @@
>!> Ignore this requirement just here
>!>
>!> Problem:
->!> subversion-perl cannot be installed due to missing dependencies
+>!> subversion-perl has missing dependencies
>!> There are no installable providers of libaprutil-0.so.0 for subversion-perl-1.3.0_rc1-0.1.i586
>!> Solution:
>!> delete subversion-perl
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 (original)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 Wed Sep 5 17:48:32 2007
@@ -4050,7 +4050,7 @@
>!> Ignore this requirement just here
>!>
>!> Problem:
->!> subversion-perl cannot be installed due to missing dependencies
+>!> subversion-perl has missing dependencies
>!> There are no installable providers of libapr-0.so.0 for subversion-perl-1.3.0_rc1-0.1.i586
>!> Solution:
>!> delete subversion-perl
Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de…
==============================================================================
--- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 (original)
+++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 Wed Sep 5 17:48:32 2007
@@ -4050,7 +4050,7 @@
>!> Ignore this requirement just here
>!>
>!> Problem:
->!> subversion-perl cannot be installed due to missing dependencies
+>!> subversion-perl has missing dependencies
>!> There are no installable providers of libaprutil-0.so.0 for subversion-perl-1.3.0_rc1-0.1.i586
>!> Solution:
>!> delete subversion-perl
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7111 - in /trunk/updater-kde/updater: MainWindow.cpp progresspopup.cpp simpleview.cpp zypp/ZYppUpdater.cpp
by tgoettlicher@svn.opensuse.org 05 Sep '07
by tgoettlicher@svn.opensuse.org 05 Sep '07
05 Sep '07
Author: tgoettlicher
Date: Wed Sep 5 17:06:16 2007
New Revision: 7111
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7111&view=rev
Log:
backup
Modified:
trunk/updater-kde/updater/MainWindow.cpp
trunk/updater-kde/updater/progresspopup.cpp
trunk/updater-kde/updater/simpleview.cpp
trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
Modified: trunk/updater-kde/updater/MainWindow.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.c…
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Wed Sep 5 17:06:16 2007
@@ -355,26 +355,55 @@
// todo
void MainWindow::slotAppletState(int state, int patches, int packages)
{
- // don't show updates tray icon when only optional updates are available
- if (state == APPLET_UPDATES && patchCountRecommended(false) + patchCountSecurity(false) == 0)
- applet->setState(APPLET_ONLY_OPTIONAL_UPDATES);
- else
- applet->setState(state);
- applet->setUpdates(patches, packages);
- if (_caps.canProvidePackages && UpdaterSettings::self()->showPackages())
- _simple->setTotalCount(patches + packages);
- else
- _simple->setTotalCount(patches);
- _simple->setRecommendedCount(patchCountRecommended());
- _simple->setSecurityCount(patchCountSecurity());
- _simple->setRestartCount(patchCountRestart());
- _simple->setState(state);
+ if (state == APPLET_UPDATES || state == APPLET_CRITICAL_UPDATES )
+ {
+ _simple->setRecommendedCount(patchCountRecommended());
+ _simple->setSecurityCount(patchCountSecurity());
+ _simple->setRestartCount(patchCountRestart());
+ if (_caps.canProvidePackages && UpdaterSettings::self()->showPackages())
+ {
+ _simple->setTotalCount(patches + packages);
- _check_updates_action->setEnabled(true);
- _edit_sources_action->setEnabled(true);
+ if ( patchCountRecommended(false) + patchCountSecurity(false) == 0)
+ {
+ applet->setState(APPLET_ONLY_OPTIONAL_UPDATES);
+ _simple->setState(APPLET_ONLY_OPTIONAL_UPDATES);
+ }
+ else
+ {
+ applet->setState(state);
+ _simple->setState(state);
+ }
+ }
+ else
+ {
+ _simple->setTotalCount(patches);
+
+ if ( patchCountRecommended(false) + patchCountSecurity(false) == 0 && patches > 0)
+ {
+ applet->setState(APPLET_ONLY_OPTIONAL_UPDATES);
+ _simple->setState(APPLET_ONLY_OPTIONAL_UPDATES);
+ }
+ else if (patches > 0)
+ {
+ applet->setState(state);
+ _simple->setState(state);
+ }
+ else
+ {
+ applet->setState(APPLET_NO_UPDATES);
+ _simple->setState(APPLET_NO_UPDATES);
+ }
+ }
+ }
+ else
+ {
+ _simple->setState(state);
+ applet->setState(state);
+ }
if ( state == APPLET_CHECKING || state == APPLET_INSTALLING || state == APPLET_NO_NETWORK )
_check_updates_action->setEnabled(false);
@@ -382,6 +411,11 @@
_check_updates_action->setEnabled(true);
+
+ _check_updates_action->setEnabled(true);
+ _edit_sources_action->setEnabled(true);
+
+
}
void MainWindow::slotSetProgress(int step, int totalSteps, QString text)
Modified: trunk/updater-kde/updater/progresspopup.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/progresspopu…
==============================================================================
--- trunk/updater-kde/updater/progresspopup.cpp (original)
+++ trunk/updater-kde/updater/progresspopup.cpp Wed Sep 5 17:06:16 2007
@@ -42,6 +42,7 @@
void ProgressPopup::setText(QString text)
{
packageLabel->setText(text);
+ positionSelf();
}
void ProgressPopup::setTotalSteps(int steps)
Modified: trunk/updater-kde/updater/simpleview.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.c…
==============================================================================
--- trunk/updater-kde/updater/simpleview.cpp (original)
+++ trunk/updater-kde/updater/simpleview.cpp Wed Sep 5 17:06:16 2007
@@ -229,6 +229,7 @@
bar->hide();
break;
+ case APPLET_ONLY_OPTIONAL_UPDATES:
case APPLET_UPDATES:
case APPLET_CRITICAL_UPDATES:
headline->setText(i18n("<b>New software for your system is available</b>"));
@@ -273,7 +274,6 @@
else
norestart->hide();
-
if(securityCount == 0 && recommendedCount == 0 )
{
install->setEnabled(false);
@@ -340,6 +340,7 @@
void SimpleView::setSecurityCount(int count)
{
+ kdDebug() << count << " == sec" << endl;
securityCount=count;
}
Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpd…
==============================================================================
--- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original)
+++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Wed Sep 5 17:06:16 2007
@@ -263,7 +263,7 @@
emit(updateApplet(APPLET_PKGMGR_UPDATES, _patchList->childCount(), _packageList->childCount()));
else if (critical_available)
emit(updateApplet(APPLET_CRITICAL_UPDATES, _patchList->childCount(), _packageList->childCount()));
- else if ( _patchList->childCount() > 0 )
+ else if ( _patchList->childCount() + _packageList->childCount() > 0 )
emit(updateApplet(APPLET_UPDATES, _patchList->childCount(), _packageList->childCount()));
else
emit(updateApplet(APPLET_NO_UPDATES, 0, 0));
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7110 - in /trunk/libzypp: libzypp.spec.cmake package/libzypp.changes
by jkupec@svn.opensuse.org 05 Sep '07
by jkupec@svn.opensuse.org 05 Sep '07
05 Sep '07
Author: jkupec
Date: Wed Sep 5 14:56:18 2007
New Revision: 7110
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7110&view=rev
Log:
- correct compiler flags
Modified:
trunk/libzypp/libzypp.spec.cmake
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/libzypp.spec.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=7…
==============================================================================
--- trunk/libzypp/libzypp.spec.cmake (original)
+++ trunk/libzypp/libzypp.spec.cmake Wed Sep 5 14:56:18 2007
@@ -1,7 +1,7 @@
#
# spec file for package libzypp
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,7 +11,7 @@
# norootforbuild
Name: @PACKAGE@
-License: GPL
+License: GPL v2 or later
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
@@ -75,12 +75,12 @@
cd build
cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
-DLIB=%{_lib} \
- -DCMAKE_C_FLAGS="%{optflags}" \
- -DCMAKE_CXX_FLAGS="%{optflags}" \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=1 \
..
-make %{?jobs:-j %jobs}
+make %{?jobs:-j %jobs} VERBOSE=1
make -C doc/autodoc %{?jobs:-j %jobs}
make -C po %{?jobs:-j %jobs} translations
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Wed Sep 5 14:56:18 2007
@@ -14,6 +14,11 @@
- revision 7103
-------------------------------------------------------------------
+Mon Sep 3 18:43:51 CEST 2007 - schwab(a)suse.de
+
+- Use $RPM_OPT_FLAGS.
+
+-------------------------------------------------------------------
Mon Sep 3 17:14:02 CEST 2007 - ma(a)suse.de
- Reset transact bits when switching status from
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7109 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes
by jkupec@svn.opensuse.org 05 Sep '07
by jkupec@svn.opensuse.org 05 Sep '07
05 Sep '07
Author: jkupec
Date: Wed Sep 5 14:47:12 2007
New Revision: 7109
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7109&view=rev
Log:
version
Modified:
trunk/libzypp/VERSION.cmake
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7109&r…
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Wed Sep 5 14:47:12 2007
@@ -47,4 +47,4 @@
SET(LIBZYPP_MAJOR "3")
SET(LIBZYPP_MINOR "22")
SET(LIBZYPP_COMPATMINOR "21")
-SET(LIBZYPP_PATCH "1")
+SET(LIBZYPP_PATCH "2")
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Wed Sep 5 14:47:12 2007
@@ -5,6 +5,7 @@
computation which caused the YaST repositories to always get
refreshed (part of bug #304310)
- revision 7107
+- version 3.22.2
-------------------------------------------------------------------
Tue Sep 4 12:09:10 CEST 2007 - schubi(a)suse.de
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7108 - in /trunk/libzypp: package/libzypp.changes zypp/RepoManager.cc
by jkupec@svn.opensuse.org 05 Sep '07
by jkupec@svn.opensuse.org 05 Sep '07
05 Sep '07
Author: jkupec
Date: Wed Sep 5 14:38:27 2007
New Revision: 7108
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7108&view=rev
Log:
changes
Modified:
trunk/libzypp/package/libzypp.changes
trunk/libzypp/zypp/RepoManager.cc
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Wed Sep 5 14:38:27 2007
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Wed Sep 5 14:33:02 CEST 2007 - jkupec(a)suse.cz
+
+- fixed the order of operands of susetags local metadata status
+ computation which caused the YaST repositories to always get
+ refreshed (part of bug #304310)
+- revision 7107
+
+-------------------------------------------------------------------
Tue Sep 4 12:09:10 CEST 2007 - schubi(a)suse.de
- comparing vendor with VendorAttr::equivalent
Modified: trunk/libzypp/zypp/RepoManager.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=…
==============================================================================
--- trunk/libzypp/zypp/RepoManager.cc (original)
+++ trunk/libzypp/zypp/RepoManager.cc Wed Sep 5 14:38:27 2007
@@ -327,6 +327,7 @@
case RepoType::YAST2_e :
{
+ // the order of RepoStatus && RepoStatus matters! (#304310)
status = RepoStatus( rawpath + "/content") && (RepoStatus( rawpath + "/media.1/media"));
}
break;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
05 Sep '07
Author: jkupec
Date: Wed Sep 5 14:32:41 2007
New Revision: 7107
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7107&view=rev
Log:
- fixed the order of operands of susetags local metadata status
computation (part of bug #304310)
Modified:
trunk/libzypp/zypp/RepoManager.cc
Modified: trunk/libzypp/zypp/RepoManager.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=…
==============================================================================
--- trunk/libzypp/zypp/RepoManager.cc (original)
+++ trunk/libzypp/zypp/RepoManager.cc Wed Sep 5 14:32:41 2007
@@ -327,7 +327,7 @@
case RepoType::YAST2_e :
{
- status = (RepoStatus( rawpath + "/media.1/media") && RepoStatus( rawpath + "/content") );
+ status = RepoStatus( rawpath + "/content") && (RepoStatus( rawpath + "/media.1/media"));
}
break;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7106 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher@svn.opensuse.org 05 Sep '07
by tgoettlicher@svn.opensuse.org 05 Sep '07
05 Sep '07
Author: tgoettlicher
Date: Wed Sep 5 11:41:53 2007
New Revision: 7106
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7106&view=rev
Log:
changes
Modified:
trunk/updater-kde/package/opensuse-updater-kde.changes
Modified: trunk/updater-kde/package/opensuse-updater-kde.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.changes (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.changes Wed Sep 5 11:41:53 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Sep 5 11:38:34 CEST 2007 - tgoettlicher(a)suse.de
+
+- added state "no network" with gray tray icon
+- r7105
+
+-------------------------------------------------------------------
Mon Sep 3 16:02:13 CEST 2007 - tgoettlicher(a)suse.de
- changed call of "yast2 inst_source" to "yast2 repositories"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7105 - in /trunk/updater-kde: icons/ updater/
by tgoettlicher@svn.opensuse.org 05 Sep '07
by tgoettlicher@svn.opensuse.org 05 Sep '07
05 Sep '07
Author: tgoettlicher
Date: Wed Sep 5 11:40:46 2007
New Revision: 7105
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7105&view=rev
Log:
added state no network with gray tray icon
Added:
trunk/updater-kde/icons/cr16-app-opensuseupdater_gray.png (with props)
trunk/updater-kde/icons/cr24-app-opensuseupdater_gray.png (with props)
trunk/updater-kde/icons/cr32-app-opensuseupdater_gray.png (with props)
trunk/updater-kde/icons/cr48-app-opensuseupdater_gray.png (with props)
trunk/updater-kde/icons/opensuseupdater_gray.png (with props)
Modified:
trunk/updater-kde/updater/Constants.h
trunk/updater-kde/updater/MainWindow.cpp
trunk/updater-kde/updater/TrayIcon.cpp
trunk/updater-kde/updater/Updater.h
trunk/updater-kde/updater/simpleview.cpp
Added: trunk/updater-kde/icons/cr16-app-opensuseupdater_gray.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr16-app-opens…
==============================================================================
Binary file - no diff available.
Added: trunk/updater-kde/icons/cr24-app-opensuseupdater_gray.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr24-app-opens…
==============================================================================
Binary file - no diff available.
Added: trunk/updater-kde/icons/cr32-app-opensuseupdater_gray.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr32-app-opens…
==============================================================================
Binary file - no diff available.
Added: trunk/updater-kde/icons/cr48-app-opensuseupdater_gray.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/cr48-app-opens…
==============================================================================
Binary file - no diff available.
Added: trunk/updater-kde/icons/opensuseupdater_gray.png
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/icons/opensuseupdate…
==============================================================================
Binary file - no diff available.
Modified: trunk/updater-kde/updater/Constants.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Constants.h?…
==============================================================================
--- trunk/updater-kde/updater/Constants.h (original)
+++ trunk/updater-kde/updater/Constants.h Wed Sep 5 11:40:46 2007
@@ -22,7 +22,7 @@
#define PROGRAM_NAME "opensuseupdater"
#define PROGRAM_DISPLAY_NAME "openSUSE Updater"
-#define VERSION "0.4"
+#define VERSION "0.6"
#define TRAY_ICON_GREEN "opensuseupdater_green"
#define TRAY_ICON_RED "opensuseupdater_red"
@@ -31,6 +31,7 @@
#define TRAY_ICON_CHECKING "opensuseupdater_busy"
#define TRAY_ICON_INSTALLING "opensuseupdater_busy"
#define TRAY_ICON_UNKNOWN "opensuseupdater_unknown"
+#define TRAY_ICON_GRAY "opensuseupdater_gray"
#define PROGRAM_ICON "opensuseupdater"
Modified: trunk/updater-kde/updater/MainWindow.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.c…
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Wed Sep 5 11:40:46 2007
@@ -376,7 +376,7 @@
_check_updates_action->setEnabled(true);
_edit_sources_action->setEnabled(true);
- if ( state == APPLET_CHECKING || state == APPLET_INSTALLING )
+ if ( state == APPLET_CHECKING || state == APPLET_INSTALLING || state == APPLET_NO_NETWORK )
_check_updates_action->setEnabled(false);
else
_check_updates_action->setEnabled(true);
@@ -734,9 +734,10 @@
if (ConnectionManager::self()->status() != NetworkStatus::Online &&
ConnectionManager::self()->status() != NetworkStatus::NoNetworks )
{
- ConnectionManager::self()->registerConnectSlot(this,SLOT(checkUpdates(displayProgress)));
+ ConnectionManager::self()->registerConnectSlot(this,SLOT(checkUpdatesWithoutProgress()));
kdDebug() << "No network available" << endl;
kdDebug() << "Waiting for network connection..." << endl;
+ slotAppletState(APPLET_NO_NETWORK, 0, 0);
return;
}
Modified: trunk/updater-kde/updater/TrayIcon.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/TrayIcon.cpp…
==============================================================================
--- trunk/updater-kde/updater/TrayIcon.cpp (original)
+++ trunk/updater-kde/updater/TrayIcon.cpp Wed Sep 5 11:40:46 2007
@@ -103,6 +103,11 @@
setPixmap(loadIcon(TRAY_ICON_GREEN));
break;
+ case APPLET_NO_NETWORK:
+ QToolTip::add(this, i18n("Unable to check whether updates are available."));
+ setPixmap(loadIcon(TRAY_ICON_GRAY));
+ break;
+
case APPLET_PKGMGR_UPDATES:
case APPLET_CRITICAL_UPDATES:
QToolTip::add(this, i18n("New software updates are available."));
Modified: trunk/updater-kde/updater/Updater.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Updater.h?re…
==============================================================================
--- trunk/updater-kde/updater/Updater.h (original)
+++ trunk/updater-kde/updater/Updater.h Wed Sep 5 11:40:46 2007
@@ -55,7 +55,8 @@
APPLET_INSTALLING, /** installing patches or packages **/
APPLET_PKGMGR_UPDATES, /** Updates available that affect the package manager **/
APPLET_UNKNOWN, /** Unknown update status: No repositories are known to zypper **/
- APPLET_ONLY_OPTIONAL_UPDATES /** Only optional updates are available (for trayicon) **/
+ APPLET_ONLY_OPTIONAL_UPDATES, /** Only optional updates are available (for trayicon) **/
+ APPLET_NO_NETWORK /** No Network connection available **/
};
/**
Modified: trunk/updater-kde/updater/simpleview.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.c…
==============================================================================
--- trunk/updater-kde/updater/simpleview.cpp (original)
+++ trunk/updater-kde/updater/simpleview.cpp Wed Sep 5 11:40:46 2007
@@ -309,6 +309,19 @@
textBrowser->hide();
break;
+ case APPLET_NO_NETWORK:
+ headline->setText(i18n("<b>Unable to check whether updates are available.</b>"));
+ title->show();
+ title->setText("");
+ recommended->hide();
+ norestart->hide();
+ install->hide();
+ ok->show();
+ details->hide();
+ bar->hide();
+ textBrowser->hide();
+ break;
+
}
updateSelection();
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
04 Sep '07
Author: schubi2
Date: Tue Sep 4 12:09:42 2007
New Revision: 7104
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7104&view=rev
Log:
7103
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Tue Sep 4 12:09:42 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Sep 4 12:09:10 CEST 2007 - schubi(a)suse.de
+
+- comparing vendor with VendorAttr::equivalent
+- revision 7103
+
+-------------------------------------------------------------------
Mon Sep 3 17:14:02 CEST 2007 - ma(a)suse.de
- Reset transact bits when switching status from
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7103 - in /trunk/libzypp/zypp/solver/detail: Helper.cc QueueItemRequire.cc ResolverUpgrade.cc
by schubi2@svn.opensuse.org 04 Sep '07
by schubi2@svn.opensuse.org 04 Sep '07
04 Sep '07
Author: schubi2
Date: Tue Sep 4 12:08:57 2007
New Revision: 7103
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7103&view=rev
Log:
comparing vendor with VendorAttr::equivalent
Modified:
trunk/libzypp/zypp/solver/detail/Helper.cc
trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
Modified: trunk/libzypp/zypp/solver/detail/Helper.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Helpe…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/Helper.cc (original)
+++ trunk/libzypp/zypp/solver/detail/Helper.cc Tue Sep 4 12:08:57 2007
@@ -27,7 +27,7 @@
#include "zypp/base/Logger.h"
#include "zypp/base/String.h"
#include "zypp/base/Gettext.h"
-
+#include "zypp/VendorAttr.h"
#include "zypp/base/Algorithm.h"
#include "zypp/ResPool.h"
#include "zypp/ResFilters.h"
@@ -134,7 +134,7 @@
if ( installed.resolvable() )
{
- if ( installed->vendor() != provider->vendor() )
+ if ( !VendorAttr::instance().equivalent(installed->vendor(),provider->vendor()) )
{
MIL << "Discarding '" << provider << "' from vendor '"
<< provider->vendor() << "' different to uninstalled '"
Modified: trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Queue…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc (original)
+++ trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc Tue Sep 4 12:08:57 2007
@@ -25,7 +25,7 @@
#include "zypp/base/Logger.h"
#include "zypp/base/String.h"
#include "zypp/base/Gettext.h"
-
+#include "zypp/VendorAttr.h"
#include "zypp/base/Algorithm.h"
#include "zypp/ResPool.h"
#include "zypp/ResFilters.h"
@@ -221,7 +221,7 @@
bool vendorFit = true;
if ( provider
&& upgrades
- && provider->vendor() != upgrades->vendor()) {
+ && !VendorAttr::instance().equivalent(provider->vendor(), upgrades->vendor())) {
// checking if there is already an ignore
MIL << "provider " << provider << " has ANOTHER vendor '" << provider->vendor() << "' than the updated item "
<< upgrades << endl;
@@ -348,7 +348,7 @@
} else if (provider.status().isKept() && provider.status().isByUser()) {
misc_info = new ResolverInfoMisc (RESOLVER_INFO_TYPE_KEEP_PROVIDER, requirer, RESOLVER_INFO_PRIORITY_VERBOSE, match);
misc_info->setOtherPoolItem (provider);
- } else if (provider->vendor() != requirer->vendor()) {
+ } else if (!VendorAttr::instance().equivalent(provider->vendor(), requirer->vendor())) {
misc_info = new ResolverInfoMisc (RESOLVER_INFO_TYPE_OTHER_VENDOR_PROVIDER,
requirer, RESOLVER_INFO_PRIORITY_VERBOSE, match);
misc_info->setOtherPoolItem (provider);
Modified: trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol…
==============================================================================
--- trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc (original)
+++ trunk/libzypp/zypp/solver/detail/ResolverUpgrade.cc Tue Sep 4 12:08:57 2007
@@ -42,7 +42,7 @@
#include "zypp/base/String.h"
#include "zypp/base/Gettext.h"
#include "zypp/base/Exception.h"
-
+#include "zypp/VendorAttr.h"
#include "zypp/base/Algorithm.h"
#include "zypp/ResPool.h"
#include "zypp/ResStatus.h"
@@ -213,7 +213,7 @@
bool operator()( const CapAndItem & cai )
{
PoolItem provider( cai.item );
- if ( provider->vendor() != forItem->vendor() )
+ if ( !VendorAttr::instance().equivalent(provider->vendor(), forItem->vendor()) )
{
MIL << "Discarding '" << provider << "' from vendor '"
<< provider->vendor() << "' different to uninstalled '"
@@ -361,7 +361,7 @@
continue;
}
- if ( installed->vendor() != candidate->vendor() )
+ if ( !VendorAttr::instance().equivalent(installed->vendor(), candidate->vendor()) )
{
MIL << "Discarding '" << candidate << "' from vendor '"
<< candidate->vendor() << "' different to uninstalled '"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7102 - in /trunk/libzypp/devel/devel.ma: CMakeLists.txt FakePool.cc
by mlandres@svn.opensuse.org 04 Sep '07
by mlandres@svn.opensuse.org 04 Sep '07
04 Sep '07
Author: mlandres
Date: Tue Sep 4 10:40:41 2007
New Revision: 7102
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7102&view=rev
Log:
backup
Added:
trunk/libzypp/devel/devel.ma/FakePool.cc
Modified:
trunk/libzypp/devel/devel.ma/CMakeLists.txt
Modified: trunk/libzypp/devel/devel.ma/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/CMakeList…
==============================================================================
--- trunk/libzypp/devel/devel.ma/CMakeLists.txt (original)
+++ trunk/libzypp/devel/devel.ma/CMakeLists.txt Tue Sep 4 10:40:41 2007
@@ -29,7 +29,7 @@
## ############################################################
-FOREACH( loop_var ScanSource Iorder Xml Main)
+FOREACH( loop_var ScanSource Iorder Xml Main FakePool AOUT Parse Test Basic)
ADD_EXECUTABLE( ${loop_var}
${loop_var}.cc
)
@@ -39,15 +39,6 @@
ENDFOREACH( loop_var )
-FOREACH( loop_var AOUT Parse Test Basic)
- ADD_EXECUTABLE( ${loop_var}
- ${loop_var}.cc
- )
- TARGET_LINK_LIBRARIES( ${loop_var}
- zypp
- )
-ENDFOREACH( loop_var )
-
FOREACH( loop_var MaTest )
ADD_EXECUTABLE( ${loop_var}
${loop_var}.cc
Added: trunk/libzypp/devel/devel.ma/FakePool.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/FakePool.…
==============================================================================
--- trunk/libzypp/devel/devel.ma/FakePool.cc (added)
+++ trunk/libzypp/devel/devel.ma/FakePool.cc Tue Sep 4 10:40:41 2007
@@ -0,0 +1,84 @@
+#include "Tools.h"
+#include "Tools.h"
+
+#include <iostream>
+
+#include <zypp/base/LogControl.h>
+#include <zypp/base/LogTools.h>
+#include <zypp/base/String.h>
+#include <zypp/base/SerialNumber.h>
+#include <zypp/PathInfo.h>
+#include <zypp/TmpPath.h>
+#include "zypp/ResPoolProxy.h"
+
+using namespace std;
+using namespace zypp;
+using namespace zypp::ui;
+
+bool chst( Selectable::Ptr & sel, Status status )
+{
+ DBG << "+++ " << sel << endl;
+ Status ostatus( sel->status() );
+ bool res = sel->set_status( status );
+ (res?MIL:WAR) << ostatus << " -> " << status << " ==>(" << res << ") " << sel->status() << endl;
+ DBG << "--- " << sel << endl;
+ return res;
+}
+
+/******************************************************************
+**
+** FUNCTION NAME : main
+** FUNCTION TYPE : int
+*/
+int main( int argc, char * argv[] )
+{
+ INT << "===[START]==========================================" << endl;
+
+ const char *const lines[] = {
+ "@ package",
+ "@ installed",
+ "- foo 1 1 i686",
+ "@ available",
+ "- foo 2 1 i686",
+ "@ fin"
+ };
+
+ debug::addPool( lines, lines+(sizeof(lines)/sizeof(const char *const)) );
+
+ ResPool pool( getZYpp()->pool() );
+ ResPoolProxy uipool( getZYpp()->poolProxy() );
+
+ USR << pool << endl;
+ USR << uipool << endl;
+
+ //for_each( pool.begin(), pool.end(), Print() );
+
+ Selectable::Ptr sel( *uipool.byKindBegin<Package>() );
+
+/* enum Status
+ {
+ S_Protected, // Keep this unmodified ( have installedObj && S_Protected )
+ S_Taboo, // Keep this unmodified ( have no installedObj && S_Taboo)
+ // requested by user:
+ S_Del, // delete installedObj ( clears S_Protected if set )
+ S_Update, // install candidateObj ( have installedObj, clears S_Protected if set )
+ S_Install, // install candidateObj ( have no installedObj, clears S_Taboo if set )
+ // not requested by user:
+ S_AutoDel, // delete installedObj
+ S_AutoUpdate, // install candidateObj ( have installedObj )
+ S_AutoInstall, // install candidateObj ( have no installedObj )
+ // no modification:
+ S_KeepInstalled, // no modification ( have installedObj && !S_Protected, clears S_Protected if set )
+ S_NoInst, // no modification ( have no installedObj && !S_Taboo, clears S_Taboo if set )
+ };
+*/
+ MIL << sel << endl;
+ chst( sel, ui::S_Update );
+ chst( sel, ui::S_Install );
+ chst( sel, ui::S_Protected );
+ chst( sel, ui::S_KeepInstalled );
+
+ INT << "===[END]============================================" << endl
+ << endl;
+ return 0;
+}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7101 - /trunk/updater-gnome/package/opensuse-updater-gnome.changes
by joshkress@svn.opensuse.org 03 Sep '07
by joshkress@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: joshkress
Date: Mon Sep 3 18:00:03 2007
New Revision: 7101
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7101&view=rev
Log:
changes
Modified:
trunk/updater-gnome/package/opensuse-updater-gnome.changes
Modified: trunk/updater-gnome/package/opensuse-updater-gnome.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/package/opensuse-u…
==============================================================================
--- trunk/updater-gnome/package/opensuse-updater-gnome.changes (original)
+++ trunk/updater-gnome/package/opensuse-updater-gnome.changes Mon Sep 3 18:00:03 2007
@@ -3,6 +3,8 @@
- affects-package-manager patches handled properly
- fixed memory problem
+- r7097
+- v0.4.2
-------------------------------------------------------------------
Tue Sep 3 12:49:55 CEST 2007 - jkress(a)suse.de
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
03 Sep '07
Author: jkupec
Date: Mon Sep 3 17:33:51 2007
New Revision: 7100
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7100&view=rev
Log:
changes
Modified:
trunk/zypper/package/zypper.changes
Modified: trunk/zypper/package/zypper.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re…
==============================================================================
--- trunk/zypper/package/zypper.changes (original)
+++ trunk/zypper/package/zypper.changes Mon Sep 3 17:33:51 2007
@@ -1,10 +1,16 @@
-------------------------------------------------------------------
+Mon Sep 3 17:32:33 CEST 2007 - jkupec(a)suse.cz
+
+- fix broken compiler flags (schwab)
+- r7099
+- 0.8.19
+
+-------------------------------------------------------------------
Mon Sep 3 17:09:00 CEST 2007 - jkupec(a)suse.cz
- authentication prompt implemented (#190609)
- LOCK documention added to man page (mvidner)
- r7093
-- 0.8.19
-------------------------------------------------------------------
Mon Sep 3 14:15:59 CEST 2007 - jkupec(a)suse.cz
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
03 Sep '07
Author: jkupec
Date: Mon Sep 3 17:32:26 2007
New Revision: 7099
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7099&view=rev
Log:
- fixed compiler flags (schwab)
Modified:
trunk/zypper/zypper.spec.cmake
Modified: trunk/zypper/zypper.spec.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/zypper.spec.cmake?rev=709…
==============================================================================
--- trunk/zypper/zypper.spec.cmake (original)
+++ trunk/zypper/zypper.spec.cmake Mon Sep 3 17:32:26 2007
@@ -1,7 +1,7 @@
#
# spec file for package @PACKAGE@ (Version @VERSION@)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,7 +14,7 @@
BuildRequires: libzypp-devel > 3.20.1 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1
BuildRequires: gcc-c++ >= 4.2 cmake >= 2.4.6 pkg-config >= 0.20
Requires: procps
-License: GPL
+License: GPL v2 or later
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Autoreqprov: on
@@ -24,7 +24,7 @@
Release: 0
Source: @PACKAGE@-@VERSION@.tar.bz2
Prefix: /usr
-Url: http://en.opensuse.org/Zypper
+URL: http://en.opensuse.org/Zypper
Provides: y2pmsh
Obsoletes: y2pmsh
@@ -46,8 +46,9 @@
cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
-DSYSCONFDIR=%{_sysconfdir} \
-DMANDIR=%{_mandir} \
- -DCMAKE_C_FLAGS="%{optflags}" \
- -DCMAKE_CXX_FLAGS="%{optflags}" \
+ -DCMAKE_VERBOSE_MAKEFILE=TRUE \
+ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
+ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \
-DCMAKE_BUILD_TYPE=Release \
..
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7098 - in /trunk/updater-gnome: VERSION.cmake opensuse-updater-gnome.spec package/opensuse-updater-gnome.changes
by joshkress@svn.opensuse.org 03 Sep '07
by joshkress@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: joshkress
Date: Mon Sep 3 17:23:22 2007
New Revision: 7098
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7098&view=rev
Log:
- changes
- spec file
- r7097
- v0.4.2
Modified:
trunk/updater-gnome/VERSION.cmake
trunk/updater-gnome/opensuse-updater-gnome.spec
trunk/updater-gnome/package/opensuse-updater-gnome.changes
Modified: trunk/updater-gnome/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/VERSION.cmake?rev=…
==============================================================================
--- trunk/updater-gnome/VERSION.cmake (original)
+++ trunk/updater-gnome/VERSION.cmake Mon Sep 3 17:23:22 2007
@@ -20,4 +20,4 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "4")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "2")
Modified: trunk/updater-gnome/opensuse-updater-gnome.spec
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/opensuse-updater-g…
==============================================================================
--- trunk/updater-gnome/opensuse-updater-gnome.spec (original)
+++ trunk/updater-gnome/opensuse-updater-gnome.spec Mon Sep 3 17:23:22 2007
@@ -1,5 +1,5 @@
#
-# spec file for package opensuse-updater-gnome (Version 0.4.1)
+# spec file for package opensuse-updater-gnome (Version 0.4.2)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,13 +16,13 @@
License: GPL v2 or later
Group: System/Packages
Summary: GNOME updater applet for OpenSUSE
-Version: 0.4.1
+Version: 0.4.2
Release: 1
URL: http://en.opensuse.org/GNOME_Updater_Applet
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prefix: /usr
Source0: %{name}-%{version}.tar.bz2
-Requires: zypper >= 0.5.3
+Requires: zypper >= 0.8.18
Requires: libglade2 libgnome gnome-panel libgnomesu
# No translations yet.
# Requires: %{name}-lang = %{version}
@@ -96,6 +96,9 @@
#%files lang -f %{name}.lang
%changelog
+* Mon Sep 03 2007 - jkress(a)suse.de
+- v0.4.2
+- zypper dependency bumped to v0.8.18
* Thu Aug 30 2007 - jkress(a)suse.de
- v0.4.1
* Tue Aug 07 2007 - maw(a)suse.de
Modified: trunk/updater-gnome/package/opensuse-updater-gnome.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/package/opensuse-u…
==============================================================================
--- trunk/updater-gnome/package/opensuse-updater-gnome.changes (original)
+++ trunk/updater-gnome/package/opensuse-updater-gnome.changes Mon Sep 3 17:23:22 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Sep 3 17:17:51 CEST 2007 - jkress(a)suse.de
+
+- affects-package-manager patches handled properly
+- fixed memory problem
+
+-------------------------------------------------------------------
Tue Sep 3 12:49:55 CEST 2007 - jkress(a)suse.de
- took care of yet another Gtk-CRITICAL
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7097 - in /trunk/updater-gnome/src: updater-applet-support.c updater-applet-support.h updater-backend.c updater-backend.h zypp/updater-zypp.c
by joshkress@svn.opensuse.org 03 Sep '07
by joshkress@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: joshkress
Date: Mon Sep 3 17:13:15 2007
New Revision: 7097
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7097&view=rev
Log:
- affects-package-management patches now handled properly
- fix some memory propblems
Modified:
trunk/updater-gnome/src/updater-applet-support.c
trunk/updater-gnome/src/updater-applet-support.h
trunk/updater-gnome/src/updater-backend.c
trunk/updater-gnome/src/updater-backend.h
trunk/updater-gnome/src/zypp/updater-zypp.c
Modified: trunk/updater-gnome/src/updater-applet-support.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet…
==============================================================================
--- trunk/updater-gnome/src/updater-applet-support.c (original)
+++ trunk/updater-gnome/src/updater-applet-support.c Mon Sep 3 17:13:15 2007
@@ -7,9 +7,20 @@
#include <gtk/gtk.h>
+
#include "updater-applet-support.h"
void updater_applet_set_icon(UpdaterApplet *applet, const char *icon_stock_id)
{
gtk_status_icon_set_from_stock (GTK_STATUS_ICON (applet->applet_icon), icon_stock_id);
}
+
+void updater_applet_restart(UpdaterApplet *applet)
+{
+ g_print ("updater_applet_restart: calling updater_destroy!\n");
+ updater_destroy(applet->updater);
+ g_print ("updater_applet_restart: calling applet in 2 sec.\n");
+ system("(sleep 2; opensuse-updater-gnome-applet ) &");
+ g_print ("updater_applet_restart: calling gtk_main_quit!\n");
+ gtk_main_quit ();
+}
Modified: trunk/updater-gnome/src/updater-applet-support.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet…
==============================================================================
--- trunk/updater-gnome/src/updater-applet-support.h (original)
+++ trunk/updater-gnome/src/updater-applet-support.h Mon Sep 3 17:13:15 2007
@@ -36,4 +36,6 @@
/** Sets applet icon to \a icon_stock_id. See ICON_* stock IDs definitions. */
void updater_applet_set_icon(UpdaterApplet *applet, const char *icon_stock_id);
+void updater_applet_restart(UpdaterApplet *applet);
+
#endif /*UPDATERAPPLET_H_*/
Modified: trunk/updater-gnome/src/updater-backend.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-backen…
==============================================================================
--- trunk/updater-gnome/src/updater-backend.c (original)
+++ trunk/updater-gnome/src/updater-backend.c Mon Sep 3 17:13:15 2007
@@ -206,17 +206,19 @@
void backend_install_watch (GPid pid,
gint status,
- gpointer updater)
+ gpointer updater_ptr)
{
+ SUSEUpdater *updater = updater_ptr;
+
g_print ("child process %d (you) exited with status %d.\n",pid,status);
updater_ui_set_for_active_operation(updater,FALSE);
-
- /* This doesn't work. It never worked. I could kill this code!
- verb_check_now (updater, 0, NULL);
- */
- updater_check_now(updater);
+ g_print ("Includes pkgmanager updates: %d.\n", updater->backend->includes_package_management_update);
+ if(updater->backend->includes_package_management_update)
+ updater_applet_restart(updater->applet);
+ else
+ updater_check_now(updater);
}
Modified: trunk/updater-gnome/src/updater-backend.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-backen…
==============================================================================
--- trunk/updater-gnome/src/updater-backend.h (original)
+++ trunk/updater-gnome/src/updater-backend.h Mon Sep 3 17:13:15 2007
@@ -54,6 +54,8 @@
gboolean recommended_are_mandatory;
gboolean include_optional_patches;
gboolean include_third_party_packages;
+
+ gboolean includes_package_management_update;
// process' output buffers
guint8 *poutbuf;
@@ -103,7 +105,7 @@
void backend_install_watch (GPid pid,
gint status,
- gpointer backend);
+ gpointer backend_ptr);
GIOChannel *
set_up_io_channel (gint fd, GIOCondition cond, GIOFunc func, gpointer data);
Modified: trunk/updater-gnome/src/zypp/updater-zypp.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/zypp/updater-z…
==============================================================================
--- trunk/updater-gnome/src/zypp/updater-zypp.c (original)
+++ trunk/updater-gnome/src/zypp/updater-zypp.c Mon Sep 3 17:13:15 2007
@@ -93,6 +93,8 @@
backend->third_party_packages_count = 0;
backend->needrestart_updates_count = 0;
+ backend->includes_package_management_update = FALSE;
+
backend->updates_list_security = g_string_new(NULL);
backend->updates_list_security_needrestart = g_string_new(NULL);
backend->updates_list_recommended_patches = g_string_new(NULL);
@@ -141,6 +143,8 @@
if ((!xmlStrcmp(item->resolvabletype, (const xmlChar *)"patch")))
{
/* We have a patch */
+ if ((!xmlStrcmp(item->pkgmanager, (const xmlChar *)"true"))) /* A very special patch */
+ backend->includes_package_management_update = TRUE;
if (patch_source == "") /* Setting the patch source to exclude packages from this source */
{
@@ -148,7 +152,7 @@
g_print("Patch Source: %s\n", patch_source);
}
- if ((!xmlStrcmp(item->type, (const xmlChar *)"security")))
+ if ((!xmlStrcmp(item->type, (const xmlChar *)"security")) || (!xmlStrcmp(item->pkgmanager, (const xmlChar *)"true")))
{
/* It's a security patch! */
if ((!xmlStrcmp(item->restart, (const xmlChar *)"true")))
@@ -468,7 +472,7 @@
return 0;
g_string_free(zypper_gui_cmd, TRUE);
- g_free(install_argv);
+ // g_free(install_argv);
return pid;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7096 - in /trunk/zypper: VERSION.cmake package/zypper.changes
by jkupec@svn.opensuse.org 03 Sep '07
by jkupec@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: jkupec
Date: Mon Sep 3 17:12:58 2007
New Revision: 7096
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7096&view=rev
Log:
changes&version
Modified:
trunk/zypper/VERSION.cmake
trunk/zypper/package/zypper.changes
Modified: trunk/zypper/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/VERSION.cmake?rev=7096&r1…
==============================================================================
--- trunk/zypper/VERSION.cmake (original)
+++ trunk/zypper/VERSION.cmake Mon Sep 3 17:12:58 2007
@@ -20,4 +20,4 @@
SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "8")
-SET(VERSION_PATCH "18")
+SET(VERSION_PATCH "19")
Modified: trunk/zypper/package/zypper.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re…
==============================================================================
--- trunk/zypper/package/zypper.changes (original)
+++ trunk/zypper/package/zypper.changes Mon Sep 3 17:12:58 2007
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Mon Sep 3 17:09:00 CEST 2007 - jkupec(a)suse.cz
+
+- authentication prompt implemented (#190609)
+- LOCK documention added to man page (mvidner)
+- r7093
+- 0.8.19
+
+-------------------------------------------------------------------
Mon Sep 3 14:15:59 CEST 2007 - jkupec(a)suse.cz
- removing rpm message improved (#307132)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7095 - /trunk/libzypp/package/libzypp.changes
by mlandres@svn.opensuse.org 03 Sep '07
by mlandres@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: mlandres
Date: Mon Sep 3 17:10:53 2007
New Revision: 7095
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7095&view=rev
Log:
changes
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Mon Sep 3 17:10:53 2007
@@ -4,6 +4,7 @@
- Reset transact bits when switching status from
"update" to "protected" (#246976)
- version 3.22.1
+- revision 7094
-------------------------------------------------------------------
Mon Sep 3 13:56:42 CEST 2007 - schubi(a)suse.de
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7094 - in /trunk/libzypp: VERSION.cmake devel/devel.ma/Basic.cc package/libzypp.changes zypp/ui/SelectableImpl.cc zypp/ui/SelectableImpl.h
by mlandres@svn.opensuse.org 03 Sep '07
by mlandres@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: mlandres
Date: Mon Sep 3 17:10:22 2007
New Revision: 7094
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7094&view=rev
Log:
Reset transact bits when switching status from "update" to "protected" (#246976)
Modified:
trunk/libzypp/VERSION.cmake
trunk/libzypp/devel/devel.ma/Basic.cc
trunk/libzypp/package/libzypp.changes
trunk/libzypp/zypp/ui/SelectableImpl.cc
trunk/libzypp/zypp/ui/SelectableImpl.h
Modified: trunk/libzypp/VERSION.cmake
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7094&r…
==============================================================================
--- trunk/libzypp/VERSION.cmake (original)
+++ trunk/libzypp/VERSION.cmake Mon Sep 3 17:10:22 2007
@@ -47,4 +47,4 @@
SET(LIBZYPP_MAJOR "3")
SET(LIBZYPP_MINOR "22")
SET(LIBZYPP_COMPATMINOR "21")
-SET(LIBZYPP_PATCH "0")
+SET(LIBZYPP_PATCH "1")
Modified: trunk/libzypp/devel/devel.ma/Basic.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Basic.cc?…
==============================================================================
--- trunk/libzypp/devel/devel.ma/Basic.cc (original)
+++ trunk/libzypp/devel/devel.ma/Basic.cc Mon Sep 3 17:10:22 2007
@@ -9,27 +9,22 @@
#include <zypp/base/SerialNumber.h>
#include <zypp/PathInfo.h>
#include <zypp/TmpPath.h>
+#include "zypp/ResPoolProxy.h"
using namespace std;
using namespace zypp;
+using namespace zypp::ui;
-void chk( ResObject::constPtr p )
+bool chst( Selectable::Ptr & sel, Status status )
{
- MIL << p << endl;
- DBG << p->deps() << endl;
+ DBG << "+++ " << sel << endl;
+ Status ostatus( sel->status() );
+ bool res = sel->set_status( status );
+ (res?MIL:WAR) << ostatus << " -> " << status << " ==>(" << res << ") " << sel->status() << endl;
+ DBG << "--- " << sel << endl;
+ return res;
}
-namespace zypp {
-namespace filesystem {
- void touch( const char * p )
- {
- static std::string w;
- ofstream s(p);
- s<<w<<endl;
- w+="a";
- }
-}
-}
/******************************************************************
**
** FUNCTION NAME : main
@@ -39,38 +34,49 @@
{
INT << "===[START]==========================================" << endl;
- ResPool pool( getZYpp()->pool() );
- USR << pool << endl;
-
const char *const lines[] = {
"@ package",
"@ installed",
"- foo 1 1 i686",
- "@ provides",
- "modalias(kernel-bigsmp:pci:*provided*)",
- "@ suplements",
- "modalias(kernel-bigsmp:pci:*suplements*)",
+ "@ available",
+ "- foo 2 1 i686",
"@ fin"
};
- //debug::addPool( lines, lines+(sizeof(lines)/sizeof(const char *const)) );
- //debug::addPool( "/tmp/a" );
+ debug::addPool( lines, lines+(sizeof(lines)/sizeof(const char *const)) );
+
+ ResPool pool( getZYpp()->pool() );
+ ResPoolProxy uipool( getZYpp()->poolProxy() );
+
USR << pool << endl;
- for_each( pool.begin(), pool.end(), chk );
+ USR << uipool << endl;
+
+ //for_each( pool.begin(), pool.end(), Print() );
- SEC << pool.serial().serial() << endl;
- SEC << pool.serial().serial() << endl;
- filesystem::touch( "/etc/sysconfig/storage" );
- SEC << pool.serial().serial() << endl;
- SEC << pool.serial().serial() << endl;
- SEC << pool.serial().serial() << endl;
- filesystem::touch( "/etc/sysconfig/storage" );
- SEC << pool.serial().serial() << endl;
- SEC << pool.serial().serial() << endl;
- filesystem::touch( "/etc/sysconfig/storage" );
- SEC << pool.serial().serial() << endl;
- SEC << pool.serial().serial() << endl;
- SEC << pool.serial().serial() << endl;
+ Selectable::Ptr sel( *uipool.byKindBegin<Package>() );
+
+/* enum Status
+ {
+ S_Protected, // Keep this unmodified ( have installedObj && S_Protected )
+ S_Taboo, // Keep this unmodified ( have no installedObj && S_Taboo)
+ // requested by user:
+ S_Del, // delete installedObj ( clears S_Protected if set )
+ S_Update, // install candidateObj ( have installedObj, clears S_Protected if set )
+ S_Install, // install candidateObj ( have no installedObj, clears S_Taboo if set )
+ // not requested by user:
+ S_AutoDel, // delete installedObj
+ S_AutoUpdate, // install candidateObj ( have installedObj )
+ S_AutoInstall, // install candidateObj ( have no installedObj )
+ // no modification:
+ S_KeepInstalled, // no modification ( have installedObj && !S_Protected, clears S_Protected if set )
+ S_NoInst, // no modification ( have no installedObj && !S_Taboo, clears S_Taboo if set )
+ };
+*/
+ MIL << sel << endl;
+ chst( sel, ui::S_Update );
+ chst( sel, ui::S_Install );
+ chst( sel, ui::S_Protected );
+ chst( sel, ui::S_KeepInstalled );
INT << "===[END]============================================" << endl
<< endl;
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Mon Sep 3 17:10:22 2007
@@ -1,8 +1,15 @@
-------------------------------------------------------------------
+Mon Sep 3 17:14:02 CEST 2007 - ma(a)suse.de
+
+- Reset transact bits when switching status from
+ "update" to "protected" (#246976)
+- version 3.22.1
+
+-------------------------------------------------------------------
Mon Sep 3 13:56:42 CEST 2007 - schubi(a)suse.de
- new translations added
-- rev 7083
+- rev 7083
-------------------------------------------------------------------
Fri Aug 31 22:10:55 CEST 2007 - ma(a)suse.de
Modified: trunk/libzypp/zypp/ui/SelectableImpl.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableImpl.c…
==============================================================================
--- trunk/libzypp/zypp/ui/SelectableImpl.cc (original)
+++ trunk/libzypp/zypp/ui/SelectableImpl.cc Mon Sep 3 17:10:22 2007
@@ -126,6 +126,7 @@
bool setProtected() const
{
if ( inst ) {
+ resetTransactingCandidates();
inst.status().setTransact( false, ResStatus::USER );
return inst.status().setLock( true, ResStatus::USER );
} else
Modified: trunk/libzypp/zypp/ui/SelectableImpl.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ui/SelectableImpl.h…
==============================================================================
--- trunk/libzypp/zypp/ui/SelectableImpl.h (original)
+++ trunk/libzypp/zypp/ui/SelectableImpl.h Mon Sep 3 17:10:22 2007
@@ -188,7 +188,7 @@
return str << '[' << obj.kind() << ']' << obj.name() << ": " << obj.status()
<< " (I " << obj._installedItem << ")"
<< " (A " << obj._availableItems.size() << ")"
- << obj._candidate;
+ << obj.candidateObj();
}
/////////////////////////////////////////////////////////////////
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7093 - /trunk/zypper/src/zypper-media-callbacks.h
by jkupec@svn.opensuse.org 03 Sep '07
by jkupec@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: jkupec
Date: Mon Sep 3 17:08:46 2007
New Revision: 7093
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7093&view=rev
Log:
- authentication prompt implemented (190609)
Modified:
trunk/zypper/src/zypper-media-callbacks.h
Modified: trunk/zypper/src/zypper-media-callbacks.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-media-callback…
==============================================================================
--- trunk/zypper/src/zypper-media-callbacks.h (original)
+++ trunk/zypper/src/zypper-media-callbacks.h Mon Sep 3 17:08:46 2007
@@ -22,6 +22,7 @@
#include <zypp/Repository.h>
#include <zypp/Digest.h>
#include <zypp/Url.h>
+#include <zypp/media/MediaUserAuth.h>
#include "zypper.h"
#include "zypper-callbacks.h"
@@ -106,6 +107,50 @@
}
};
+ struct AuthenticationReportReceiver : public zypp::callback::ReceiveReport<zypp::media::AuthenticationReport>
+ {
+ virtual bool prompt(const zypp::Url & url,
+ const std::string & description,
+ zypp::media::AuthData & auth_data)
+ {
+ if (gSettings.non_interactive)
+ {
+ MIL << "Non-interactive mode: aborting" << std::endl;
+ cout_vv << description << std::endl;
+ cout_vv << "Non-interactive mode: aborting" << std::endl;
+ return false;
+ }
+
+ cout << description << std::endl;
+
+ // curl authentication
+ zypp::media::CurlAuthData * auth_data_ptr =
+ dynamic_cast<zypp::media::CurlAuthData*> (&auth_data);
+ if (auth_data_ptr)
+ {
+ cout_vv << "available auth types: "
+ << auth_data_ptr->authTypeAsString() << std::endl;
+
+ cout << "User Name: ";
+ string username;
+ std::cin >> username;
+ auth_data_ptr->setUserName(username);
+
+ cout << "Password: ";
+ string password;
+ std::cin >> password;
+ if (password.empty()) return false;
+ auth_data_ptr->setPassword(password);
+
+ auth_data_ptr->setAuthType("basic,digest");
+
+ return true;
+ }
+
+ return false;
+ }
+ };
+
///////////////////////////////////////////////////////////////////
}; // namespace ZmartRecipients
///////////////////////////////////////////////////////////////////
@@ -115,18 +160,21 @@
private:
ZmartRecipients::MediaChangeReportReceiver _mediaChangeReport;
ZmartRecipients::DownloadProgressReportReceiver _mediaDownloadReport;
+ ZmartRecipients::AuthenticationReportReceiver _mediaAuthenticationReport;
public:
MediaCallbacks()
{
MIL << "Set media callbacks.." << endl;
_mediaChangeReport.connect();
_mediaDownloadReport.connect();
+ _mediaAuthenticationReport.connect();
}
~MediaCallbacks()
{
_mediaChangeReport.disconnect();
_mediaDownloadReport.disconnect();
+ _mediaAuthenticationReport.disconnect();
}
};
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7092 - /trunk/libzypp-testsuite/solver/deptestomatic.howto
by kkaempf@svn.opensuse.org 03 Sep '07
by kkaempf@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: kkaempf
Date: Mon Sep 3 16:54:30 2007
New Revision: 7092
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7092&view=rev
Log:
typo
Modified:
trunk/libzypp-testsuite/solver/deptestomatic.howto
Modified: trunk/libzypp-testsuite/solver/deptestomatic.howto
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/deptest…
==============================================================================
--- trunk/libzypp-testsuite/solver/deptestomatic.howto (original)
+++ trunk/libzypp-testsuite/solver/deptestomatic.howto Mon Sep 3 16:54:30 2007
@@ -50,7 +50,7 @@
</setup>
<!-- Any trials must be preceeded by the setup! -->
- <!-- There has to be exactly one setup-section and at least on trial-section -->
+ <!-- There has to be exactly one setup-section and at least one trial-section -->
<trial>
<note/> <!-- -->
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7091 - /trunk/updater-kde/package/opensuse-updater-kde.spec
by tgoettlicher@svn.opensuse.org 03 Sep '07
by tgoettlicher@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: tgoettlicher
Date: Mon Sep 3 16:47:49 2007
New Revision: 7091
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7091&view=rev
Log:
spec
Modified:
trunk/updater-kde/package/opensuse-updater-kde.spec
Modified: trunk/updater-kde/package/opensuse-updater-kde.spec
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.spec (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.spec Mon Sep 3 16:47:49 2007
@@ -89,6 +89,10 @@
%changelog -n opensuse-updater-kde
+* Mon Sep 3 2007 - tgoettlicher(a)suse.de
+- changed call of "yast2 inst_source" to "yast2 repositories"
+- updated translations
+- fixed bug that prevented install of pkg-mgr-patch
* Thu Aug 30 2007 - tgoettlicher(a)suse.de
- improved error handling
* Thu Aug 30 2007 - tgoettlicher(a)suse.de
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
Author: mvidner
Date: Mon Sep 3 16:05:38 2007
New Revision: 7090
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7090&view=rev
Log:
Documented /etc/zypp/locks
Modified:
trunk/zypper/doc/zypper.8
Modified: trunk/zypper/doc/zypper.8
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=7090&r1=…
==============================================================================
--- trunk/zypper/doc/zypper.8 (original)
+++ trunk/zypper/doc/zypper.8 Mon Sep 3 16:05:38 2007
@@ -346,11 +346,38 @@
.I \-R, \-\-root <dir>
Operates on a different root directory.
+.SH "LOCKS"
+.LP
+The file
+.B /etc/zypp/locks
+can contain a list of packages to be locked. These will not be updated
+or removed by the solver.
+
+Empty lines and lines beginning with \fB#\fR are ignored. Each line is of the form
+"\fIPATTERN \fR[ \fIOP EDITION \fR]"
+where
+.I PATTERN
+is a name with shell wildcards \fB?\fR and \fB*\fR,
+.I OP
+is one of \fB< <= = >= >\fR, and
+.I EDITION
+is \fI VERSION\fR[\fB-\fIRELEASE\fR].
+
+.TP
+Example:
+# Don't update the old KDE
+.br
+kde* < 3.5
+
+
.SH "FILES"
.TP
.B /etc/zypp/repos.d
Directory containing repository configuration (*.repo) files. You can use the \fBrepo\fR commands to manipulate these files, or you can edit them yourself. In either case, after doing the modifications, executing \fBzypper refresh\fR is strongly recommended.
.TP
+.B /etc/zypp/locks
+File with package lock definitions, see the section LOCKS.
+.TP
.B /var/cache/zypp/raw
Directory for storing raw metadata contained in repositories.
.TP
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7089 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher@svn.opensuse.org 03 Sep '07
by tgoettlicher@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: tgoettlicher
Date: Mon Sep 3 16:05:17 2007
New Revision: 7089
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7089&view=rev
Log:
changes
Modified:
trunk/updater-kde/package/opensuse-updater-kde.changes
Modified: trunk/updater-kde/package/opensuse-updater-kde.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.changes (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.changes Mon Sep 3 16:05:17 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 3 16:02:13 CEST 2007 - tgoettlicher(a)suse.de
+
+- changed call of "yast2 inst_source" to "yast2 repositories"
+- r7088
+
+-------------------------------------------------------------------
Mon Sep 3 12:49:17 CEST 2007 - tgoettlicher(a)suse.de
- updated translations
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7088 - /trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
by tgoettlicher@svn.opensuse.org 03 Sep '07
by tgoettlicher@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: tgoettlicher
Date: Mon Sep 3 16:04:07 2007
New Revision: 7088
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7088&view=rev
Log:
changed call of "yast2 inst_source" to "yast2 repositories"
Modified:
trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpd…
==============================================================================
--- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original)
+++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Mon Sep 3 16:04:07 2007
@@ -493,7 +493,7 @@
kdDebug() << "configure updater" << endl;
KProcess *inst_source = new KProcess;
- *inst_source << "opensuseupdater-su" << "-c" << "/sbin/yast2 inst_source";
+ *inst_source << "opensuseupdater-su" << "-c" << "/sbin/yast2 repositories";
connect( inst_source, SIGNAL( processExited( KProcess * ) ),
SLOT( slotInstSourceProcessExited( KProcess * ) ) );
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
03 Sep '07
Author: jkupec
Date: Mon Sep 3 14:16:44 2007
New Revision: 7087
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7087&view=rev
Log:
.chages
Modified:
trunk/zypper/package/zypper.changes
Modified: trunk/zypper/package/zypper.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re…
==============================================================================
--- trunk/zypper/package/zypper.changes (original)
+++ trunk/zypper/package/zypper.changes Mon Sep 3 14:16:44 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 3 14:15:59 CEST 2007 - jkupec(a)suse.cz
+
+- removing rpm message improved (#307132)
+- r7086
+
+-------------------------------------------------------------------
Mon Sep 3 12:34:35 CEST 2007 - kkaempf(a)suse.de
- make (r)etry (c)ancel answer case-insensitive (#307122)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7086 - in /trunk/zypper/src: zypper-misc.cc zypper-rpm-callbacks.h
by jkupec@svn.opensuse.org 03 Sep '07
by jkupec@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: jkupec
Date: Mon Sep 3 14:15:45 2007
New Revision: 7086
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7086&view=rev
Log:
- removing rpm message improved (#307132)
Modified:
trunk/zypper/src/zypper-misc.cc
trunk/zypper/src/zypper-rpm-callbacks.h
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=70…
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Mon Sep 3 14:15:45 2007
@@ -746,8 +746,11 @@
cout << endl;
- cout_n << format(_("Overall download size: %s.")) % download_size;
- cout_n << " ";
+ if (download_size > 0)
+ {
+ cout_n << format(_("Overall download size: %s.")) % download_size;
+ cout_n << " ";
+ }
if (new_installed_size > 0)
// TrasnlatorExplanation %s will be substituted by a byte count e.g. 212 K
cout_n << format(_("After the operation, additional %s will be used."))
Modified: trunk/zypper/src/zypper-rpm-callbacks.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-rpm-callbacks.…
==============================================================================
--- trunk/zypper/src/zypper-rpm-callbacks.h (original)
+++ trunk/zypper/src/zypper-rpm-callbacks.h Mon Sep 3 14:15:45 2007
@@ -137,13 +137,16 @@
{
virtual void start( zypp::Resolvable::constPtr resolvable )
{
- display_progress ( "remove-resolvable", cout, _("Removing ") + to_string (resolvable), 0);
+ //! \todo (10.3+) use format
+ display_progress ( "remove-resolvable", cout,
+ _("Removing ") + resolvable->name() + string("-") + resolvable->edition().asString(), 0);
}
virtual bool progress(int value, zypp::Resolvable::constPtr resolvable)
{
// TranslatorExplanation This text is a progress display label e.g. "Removing [42%]"
- display_progress ( "remove-resolvable", cout, _("Removing ") + to_string (resolvable), value);
+ display_progress ( "remove-resolvable", cout,
+ _("Removing ") + resolvable->name() + string("-") + resolvable->edition().asString(), value);
return true;
}
@@ -177,7 +180,7 @@
void display_step( zypp::Resolvable::constPtr resolvable, int value )
{
- // TranslatorExplanation This text is a progress display label e.g. "Installing [42%]"
+ // TranslatorExplanation This text is a progress display label e.g. "Installing foo-1.1.2 [42%]"
string s = boost::str(boost::format(_("Installing: %s-%s"))
% resolvable->name() % resolvable->edition());
display_progress ( "install-resolvable", cout, s, value);
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7085 - in /trunk/libzypp: devel/devel.ma/Parse.cc zypp/VendorAttr.cc zypp/VendorAttr.h
by mlandres@svn.opensuse.org 03 Sep '07
by mlandres@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: mlandres
Date: Mon Sep 3 13:57:23 2007
New Revision: 7085
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7085&view=rev
Log:
Added 'bool VendorAttr::equivalent( const Vendor & lhs, const Vendor & rhs ) const'.
Test whether to vendor strings denote the same (or equivalent) vendors.
Modified:
trunk/libzypp/devel/devel.ma/Parse.cc
trunk/libzypp/zypp/VendorAttr.cc
trunk/libzypp/zypp/VendorAttr.h
Modified: trunk/libzypp/devel/devel.ma/Parse.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?…
==============================================================================
--- trunk/libzypp/devel/devel.ma/Parse.cc (original)
+++ trunk/libzypp/devel/devel.ma/Parse.cc Mon Sep 3 13:57:23 2007
@@ -53,7 +53,7 @@
bool operator()( const PoolItem & obj_r )
{
//handle( asKind<Package>( obj_r ) );
- handle( asKind<Patch>( obj_r ) );
+ //handle( asKind<Patch>( obj_r ) );
//handle( asKind<Pattern>( obj_r ) );
//handle( asKind<Product>( obj_r ) );
return true;
@@ -347,10 +347,11 @@
INT << "===[START]==========================================" << endl;
setenv( "ZYPP_CONF", "/Local/ROOT/zypp.conf", 1 );
-
- INT << ZConfig::instance().download_use_patchrpm() << endl;
- INT << ZConfig::instance().download_use_deltarpm() << endl;
- return 0;
+ std::string t( "ABCD" );
+ MIL << str::toLower(t.substr(0,3)) << endl;
+ MIL << str::toLower(t.substr(0,4)) << endl;
+ MIL << str::toLower(t.substr(0,5)) << endl;
+ throw;
DigestReceive foo;
KeyRingSignalsReceive baa;
@@ -414,7 +415,7 @@
USR << "pool: " << pool << endl;
SEC << pool.knownRepositoriesSize() << endl;
- if ( 0 )
+ if ( 1 )
{
{
zypp::base::LogControl::TmpLineWriter shutUp;
@@ -425,6 +426,13 @@
INT << getZYpp()->diskUsage() << endl;
+ {
+ Measure x("SHUTDOWN");
+ getZYpp()->removeResolvables( getZYpp()->target()->resolvables() );
+ getZYpp()->target()->reset();
+ }
+
+
std::for_each( pool.begin(), pool.end(), Xprint() );
///////////////////////////////////////////////////////////////////
Modified: trunk/libzypp/zypp/VendorAttr.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/VendorAttr.cc?rev=7…
==============================================================================
--- trunk/libzypp/zypp/VendorAttr.cc (original)
+++ trunk/libzypp/zypp/VendorAttr.cc Mon Sep 3 13:57:23 2007
@@ -147,6 +147,20 @@
bool VendorAttr::autoProtect( const Vendor & vendor_r ) const
{ return( ZConfig::instance().autolock_untrustedvendor() && ! trusted( vendor_r ) ); }
+ bool VendorAttr::equivalent( const Vendor & lhs, const Vendor & rhs ) const
+ {
+ static const std::string defSUSE( "suse" );
+
+ if ( lhs == rhs )
+ return true;
+ // By now handcrafted equivalence definition:
+ if ( str::toLower( lhs.substr( 0, 4 ) ) == defSUSE
+ && str::toLower( rhs.substr( 0, 4 ) ) == defSUSE )
+ return true;
+
+ return false;
+ }
+
/////////////////////////////////////////////////////////////////
} // namespace zypp
///////////////////////////////////////////////////////////////////
Modified: trunk/libzypp/zypp/VendorAttr.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/VendorAttr.h?rev=70…
==============================================================================
--- trunk/libzypp/zypp/VendorAttr.h (original)
+++ trunk/libzypp/zypp/VendorAttr.h Mon Sep 3 13:57:23 2007
@@ -52,6 +52,13 @@
**/
bool autoProtect( const Vendor & vendor_r ) const;
+ /** Return whether two vendor strings shold be treated as the same vendor.
+ * Usually the solver is allowed to automatically select a package of an
+ * equivalent vendor when updating. Replacing a package with one of a
+ * different vendor usually must be confirmed by the user.
+ */
+ bool equivalent( const Vendor & lhs, const Vendor & rhs ) const;
+
private:
VendorAttr();
};
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
03 Sep '07
Author: schubi2
Date: Mon Sep 3 13:57:10 2007
New Revision: 7084
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7084&view=rev
Log:
new translations added
Modified:
trunk/libzypp/package/libzypp.changes
Modified: trunk/libzypp/package/libzypp.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?…
==============================================================================
--- trunk/libzypp/package/libzypp.changes (original)
+++ trunk/libzypp/package/libzypp.changes Mon Sep 3 13:57:10 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Sep 3 13:56:42 CEST 2007 - schubi(a)suse.de
+
+- new translations added
+- rev 7083
+
+-------------------------------------------------------------------
Fri Aug 31 22:10:55 CEST 2007 - ma(a)suse.de
- Added ability to switch off use of patch and delta rpms via zypp.conf (#305864)
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
Author: schubi2
Date: Mon Sep 3 13:56:27 2007
New Revision: 7083
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7083&view=rev
Log:
new translations
Modified:
trunk/libzypp/po/af.po
trunk/libzypp/po/ar.po
trunk/libzypp/po/bg.po
trunk/libzypp/po/bn.po
trunk/libzypp/po/bs.po
trunk/libzypp/po/ca.po
trunk/libzypp/po/cs.po
trunk/libzypp/po/cy.po
trunk/libzypp/po/da.po
trunk/libzypp/po/de.po
trunk/libzypp/po/el.po
trunk/libzypp/po/en_GB.po
trunk/libzypp/po/en_US.po
trunk/libzypp/po/es.po
trunk/libzypp/po/et.po
trunk/libzypp/po/fi.po
trunk/libzypp/po/fr.po
trunk/libzypp/po/gl.po
trunk/libzypp/po/gu.po
trunk/libzypp/po/he.po
trunk/libzypp/po/hi.po
trunk/libzypp/po/hr.po
trunk/libzypp/po/hu.po
trunk/libzypp/po/id.po
trunk/libzypp/po/it.po
trunk/libzypp/po/ja.po
trunk/libzypp/po/ka.po
trunk/libzypp/po/km.po
trunk/libzypp/po/ko.po
trunk/libzypp/po/lo.po
trunk/libzypp/po/lt.po
trunk/libzypp/po/mk.po
trunk/libzypp/po/mr.po
trunk/libzypp/po/nb.po
trunk/libzypp/po/nl.po
trunk/libzypp/po/pa.po
trunk/libzypp/po/pl.po
trunk/libzypp/po/pt.po
trunk/libzypp/po/pt_BR.po
trunk/libzypp/po/ro.po
trunk/libzypp/po/ru.po
trunk/libzypp/po/si.po
trunk/libzypp/po/sk.po
trunk/libzypp/po/sl.po
trunk/libzypp/po/sr.po
trunk/libzypp/po/sv.po
trunk/libzypp/po/ta.po
trunk/libzypp/po/tr.po
trunk/libzypp/po/uk.po
trunk/libzypp/po/vi.po
trunk/libzypp/po/wa.po
trunk/libzypp/po/xh.po
trunk/libzypp/po/zh_CN.po
trunk/libzypp/po/zh_TW.po
trunk/libzypp/po/zu.po
Modified: trunk/libzypp/po/af.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/af.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/af.po (original)
+++ trunk/libzypp/po/af.po Mon Sep 3 13:56:27 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-03 12:03\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -13,77 +13,77 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url-skema laat nie ân %s toe nie"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ongeldige %s komponent '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ongeldige %s komponent"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Padparameter-ontleding nie vir hierdie URL ondersteun nie"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Navraagstring-ontleding nie vir hierdie URL ondersteun nie"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url-skema is ân vereiste komponent"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ongeldige Url-skema '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url-skema laat nie ân gebruikernaam toe nie"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url-skema laat nie ân wagwoord toe nie"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url-skema vereis ân gasheerkomponent"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url-skema laat nie ân gasheerkomponent toe nie"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ongeldige gasheerkomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url-skema laat nie ân poort toe nie"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ongeldige poortkomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url-skema vereis padnaam"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relatiewe pad nie toegelaat indien magtiging bestaan nie"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Padparameter-ontleding nie vir hierdie URL ondersteun nie"
@@ -2730,7 +2730,7 @@
msgstr "%s vervang deur %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2738,19 +2738,19 @@
"Hierdie oplossings sal uit die stelsel geskrap word."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s sal nie ongeïnstalleer word nie, want dit word steeds vereis"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2758,38 +2758,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ongeldige inligting"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s word deur ander oplossings benodig"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s word benodig deur %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2799,7 +2799,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s verkeer in konflik met ander oplossings"
@@ -2808,14 +2808,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s verkeer in konflik met %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2825,24 +2825,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s maak ander oplossings uitgedien"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s uitgediendes %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s uitgediendes:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2851,7 +2851,7 @@
"Hierdie oplossings sal uit die stelsel geskrap word."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s hang van ander oplossings af"
@@ -2859,38 +2859,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s hang af van %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s hang af van:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Kind van"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Kan %s nie installeer nie"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Geen voorsiening %s nie"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2899,32 +2899,32 @@
"\n"
"Daar is geen hulpbron wat hierdie vereiste ondersteun, beskikbaar nie."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Toekomstige probleme wat bo/onder hierdie resolusie beskryf word, sal nie alle afhanklikhede oplos nie"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Kan %s nie installeer nie, omdat dit in konflik verkeer met %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s word nie geïnstalleer nie en is as oninstalleerbaar gemerk"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Kan %s nie installeer nie vanweë afhanklikheidsprobleme"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2932,8 +2932,8 @@
msgstr "skrap %s?"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2941,119 +2941,131 @@
msgstr "moenie %s installeer nie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s het vereistes waaraan nie voldoen is nie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s het afhanklikhede wat ontbreek"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s kan nie geïnstalleer word nie vanweë ontbrekende afhanklikhede"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s vervul afhanklikhede van %s, maar sal ongeïnstalleer word"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s vervul afhanklikhede van %s, maar sal op u stelsel gehou word"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Geen nodigheid om %s te installeer nie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Kan %s nie installeer om die afhanklikhede van %s te vervul nie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Kan %s nie installeer om die afhanklikhede van %s te vervul nie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s sal nie ongeïnstalleer word nie, want dit word steeds vereis"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s uitgediendes %s. Maar %s kan nie geskrap word nie, want dit is gesluit."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Kan %s nie installeer nie, want dit verkeer in konflik"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s is oninstalleerbaar vanweë konflikte met %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignoreer dié vereiste net hier"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Ignoreer dié vereiste net hier"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installeer %s, hoewel dit die argitektuur kan verander"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s voorsien hierdie afhanklikheid, maar sal die argitektuur van die geïnstalleerde item wysig"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Installeer %s, hoewel dit die argitektuur kan verander"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s voorsien hierdie afhanklikheid, maar sal die argitektuur van die geïnstalleerde item wysig"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignoreer hierdie konflik van %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignoreer die uitgediende %s in %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignoreer dat %s reeds gestel is om te installeer"
@@ -3064,7 +3076,7 @@
msgstr "Moenie waar oplossings ter sprake is, installeer of skrap nie"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "om %s vir %s te vereis tydens bywerk van %s"
@@ -3315,8 +3327,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s voorsien %s, maar dit het ân ander argitektuur."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s voorsien %s, maar dit het ân ander argitektuur."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Kan nie aan vereiste %s vir %s voldoen nie"
@@ -3328,7 +3346,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s word vereis deur ân ander geïnstalleerde oplossing; gevolglik sal dit nie ontkoppel word nie."
@@ -3340,7 +3358,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s word vereis deur ân ander geïnstalleerde oplossing; gevolglik sal dit nie ontkoppel word nie."
@@ -3352,7 +3370,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s is gesluit en kan nie ongeïnstalleer word nie."
@@ -3363,7 +3381,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "ân Konflik oor %s (%s) vereis die verwydering van om-geïnstalleer-te-word-%s"
@@ -3374,23 +3392,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Merk van %s as oninstalleerbaar vanweë konflikte oor %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "vanaf %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Fout!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Belangrik!"
@@ -3447,9 +3465,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s word benodig deur %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4768,6 +4786,10 @@
"Verwag %s, kry %s\n"
" Gebruik die lêer in elk geval?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s word benodig deur %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Kan Url-magtiging nie ontleed nie"
Modified: trunk/libzypp/po/ar.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ar.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/ar.po (original)
+++ trunk/libzypp/po/ar.po Mon Sep 3 13:56:27 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-09-27 09:57+0200\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -18,77 +18,77 @@
"X-Language-Local: Arabic*\n"
"X-Generator: poTranslator\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Ùا ÙسÙ
Ø Ù
خطط Url ب٠%s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ù
ÙÙÙ %s غÙر صاÙØ '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ù
ÙÙÙ %s غÙر صاÙØ"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "تØÙÙÙ Ù
عÙÙ
Ø© اÙÙ
سار غÙر Ù
دعÙÙ
ÙعÙÙا٠URL Ùذا"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "تØÙÙ٠سÙسÙØ© اÙاستعÙاÙ
غÙر Ù
دعÙÙ
ÙعÙÙا٠URL Ùذا"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Ùعتبر Ù
خطط Url Ù
ÙÙÙÙا Ù
Ø·ÙÙبÙا"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ù
خطط Url غÙر صاÙØ '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Ùا ÙسÙ
Ø Ù
خطط Url بإدخا٠اسÙ
Ù
ستخدÙ
"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Ùا ÙسÙ
Ø Ù
خطط Url بإدخا٠ÙÙÙ
ة سر"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "ÙتطÙب Ù
خطط Url ÙجÙد Ù
ÙÙÙ Ù
ضÙÙ"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Ùا ÙسÙ
Ø Ù
خطط Url بÙجÙد Ù
ÙÙÙ Ù
ضÙÙ"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ù
ÙÙ٠اÙÙ
ضÙÙ '%s' غÙر صاÙØ"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Ùا ÙسÙ
Ø Ù
خطط Url بإدخا٠Ù
ÙÙØ°"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ù
ÙÙ٠اÙÙ
ÙÙØ° '%s' غÙر صاÙØ"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "ÙتطÙب Ù
خطط Url ÙجÙد Ù
سار اسÙ
"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "غÙر Ù
سÙ
ÙØ Ø¨Ø§ÙÙ
سار اÙÙسب٠ÙÙ ØاÙØ© ÙجÙد سÙطة"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "تØÙÙÙ Ù
عÙÙ
Ø© اÙÙ
سار غÙر Ù
دعÙÙ
ÙعÙÙا٠URL Ùذا"
@@ -2736,7 +2736,7 @@
msgstr "%s تÙ
استبداÙ٠ب٠%s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2744,19 +2744,19 @@
"سÙتÙ
ØØ°Ù Ùذ٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙÙ Ù
٠اÙÙظاÙ
."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "ÙÙ ÙتÙ
Ø¥Ùغاء تثبÙت %s ÙØ£ÙÙ Ùا Ùزا٠Ù
Ø·ÙÙبÙا"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2764,38 +2764,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "اÙÙ
عÙÙÙ
ات غÙر صاÙØØ©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s Ù
Ø·ÙÙب بÙاسطة اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙأخرÙ"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s Ù
Ø·ÙÙب بÙاسطة %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2805,7 +2805,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "Ùتعارض %s Ù
ع اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙأخرÙ"
@@ -2814,14 +2814,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s Ùتعارض Ù
ع %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2831,24 +2831,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s Ùجع٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙأخر٠ÙدÙÙ
Ø©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s Ùجع٠اÙعÙصر اÙتاÙÙ ÙدÙÙ
Ùا %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s Ùجع٠اÙعÙصر اÙتاÙÙ ÙدÙÙ
Ùا:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2857,7 +2857,7 @@
"سÙتÙ
ØØ°Ù Ùذ٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙÙ Ù
٠اÙÙظاÙ
."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ÙعتÙ
د عÙ٠اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙأخرÙ"
@@ -2865,38 +2865,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s ÙعتÙ
د عÙÙ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ÙعتÙ
د عÙÙ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "عÙصر Ùرع٠ÙÙ"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "تعذر تثبÙت %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Ùا ÙÙجد Ø£Ù Ø´ÙØ¡ ÙÙÙر %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2905,32 +2905,32 @@
"\n"
"Ùا ÙتÙÙر Ø£Ù Ù
Ùرد ÙدعÙ
Ùذا اÙÙ
تطÙب."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ÙتÙجة ÙÙÙ
Ø´ÙÙات اÙÙ
ÙضØØ© أعÙاÙ/أدÙاÙØ ÙÙ ÙÙÙÙ
Ùذا اÙتØدÙد بØÙ ÙاÙØ© اÙتبعÙات"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "تعذر تثبÙت %s ÙØ£ÙÙ Ùتعارض Ù
ع %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "ÙÙ
ÙتÙ
تثبÙت %s ÙتÙ
Ùضع عÙاÙ
Ø© عÙÙÙ ÙÙاب٠ÙØ¥Ùغاء اÙتثبÙت"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "تعذر تثبÙت %s بسبب ÙجÙد Ù
Ø´ÙÙات Ù٠اÙتبعÙØ©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2938,8 +2938,8 @@
msgstr "ØØ°Ù %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2947,119 +2947,131 @@
msgstr "عدÙ
تثبÙت %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "ÙÙ
ÙتÙ
استÙÙاء Ù
تطÙبات %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "تÙ
ÙÙد تبعÙات %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "تعذر تثبÙت %s بسبب عدÙ
ÙجÙد اÙتبعÙات"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "ÙستÙÙÙ %s تبعÙات %sØ ÙÙ٠سÙتÙ
Ø¥Ùغاء تثبÙتÙ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "ÙستÙÙÙ %s تبعÙات %sØ ÙÙ٠سÙتÙ
اÙاØتÙاظ ب٠Ù٠اÙÙظاÙ
ÙدÙÙ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Ùا داع٠ÙتثبÙت %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "تعذر تثبÙت %s ÙاستÙÙاء تبعÙات %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "تعذر تثبÙت %s ÙاستÙÙاء تبعÙات %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "ÙÙ ÙتÙ
Ø¥Ùغاء تثبÙت %s ÙØ£ÙÙ Ùا Ùزا٠Ù
Ø·ÙÙبÙا"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s Ùجع٠%s ÙدÙÙ
Ùا. ÙÙÙ Ùتعذر ØØ°Ù %s ÙØ£ÙÙ Ù
ÙÙÙ."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "تعذر تثبÙت %s ÙØ£ÙÙ Ù
تعارض"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ÙÙ
Ù٠إÙغاء تثبÙت٠ÙØ£ÙÙ Ùتعارض Ù
ع %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "تجاÙÙ Ùذا اÙÙ
تطÙب ÙÙا ÙÙØ·"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "تجاÙÙ Ùذا اÙÙ
تطÙب ÙÙا ÙÙØ·"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ÙÙ
بتثبÙت %s باÙرغÙ
Ù
٠أÙÙ Ùد Ùؤد٠إÙ٠تغÙÙر اÙÙÙÙÙ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "ÙÙÙر %s Ùذ٠اÙتبعÙØ©Ø ÙÙÙ٠سÙؤد٠إÙ٠تغÙÙر ÙÙÙ٠اÙعÙصر اÙÙ
ثبÙÙت"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "ÙÙ
بتثبÙت %s باÙرغÙ
Ù
٠أÙÙ Ùد Ùؤد٠إÙ٠تغÙÙر اÙÙÙÙÙ"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "ÙÙÙر %s Ùذ٠اÙتبعÙØ©Ø ÙÙÙ٠سÙؤد٠إÙ٠تغÙÙر ÙÙÙ٠اÙعÙصر اÙÙ
ثبÙÙت"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "تجاÙ٠تعارض %s Ùذا"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "تجاÙÙ %s اÙÙدÙÙ
ÙÙ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "تجاÙ٠أÙ٠تÙ
تعÙÙÙ %s باÙÙع٠ÙتثبÙتÙ"
@@ -3070,7 +3082,7 @@
msgstr "عدÙ
تثبÙت اÙتبعÙات اÙÙابÙØ© ÙÙتØÙÙ٠اÙÙ
تعÙÙØ© Ø£Ù ØØ°ÙÙا"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ÙØ·Ùب %s ÙÙ %s عÙد تØدÙØ« %s"
@@ -3321,8 +3333,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s ÙÙÙر %sØ ÙÙÙ ÙÙ ÙÙÙ٠آخر."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s ÙÙÙر %sØ ÙÙÙ ÙÙ ÙÙÙ٠آخر."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "تعذر استÙÙاء Ù
تطÙب %s ÙÙ %s"
@@ -3334,7 +3352,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s Ù
Ø·ÙÙب بÙاسطة تبعÙØ© ÙابÙØ© ÙÙتØÙÙÙ Ù
ثبÙÙتة أخرÙØ Ùذا ÙÙ ÙتÙ
Ø¥Ùغاء اÙارتباط."
@@ -3346,7 +3364,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s Ù
Ø·ÙÙب بÙاسطة تبعÙØ© ÙابÙØ© ÙÙتØÙÙÙ Ù
ثبÙÙتة أخرÙØ Ùذا ÙÙ ÙتÙ
Ø¥Ùغاء اÙارتباط."
@@ -3358,7 +3376,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s Ù
ÙÙÙ ÙÙتعذر Ø¥Ùغاء تثبÙتÙ."
@@ -3369,7 +3387,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "ÙتطÙب تعارض %s (%s) إزاÙØ© %s اÙÙ
Ø·ÙÙب تثبÙتÙ"
@@ -3380,23 +3398,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "تعÙÙÙ
%s باعتبار٠Ùاب٠ÙØ¥Ùغاء اÙتثبÙت بسبب ÙجÙد تعارضات عÙÙ %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "Ù
Ù %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "خطأ!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "ÙاÙ
!"
@@ -3453,9 +3471,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s Ù
Ø·ÙÙب بÙاسطة %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4774,6 +4792,10 @@
"Ù
تÙÙع %sØ ØªÙ
اÙعثÙر عÙÙ %s\n"
" Ù٠ترÙد استخداÙ
اÙÙ
Ù٠عÙ٠أ٠ØاÙØ"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s Ù
Ø·ÙÙب بÙاسطة %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "تعذر تØÙÙ٠سÙطة Url"
Modified: trunk/libzypp/po/bg.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bg.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/bg.po (original)
+++ trunk/libzypp/po/bg.po Mon Sep 3 13:56:27 2007
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: zypp.bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-09 18:05+0200\n"
"Last-Translator: Borislav Mitev <morbid_viper(a)tkzs.org>\n"
"Language-Team: Bulgarian <bg(a)li.org>\n"
@@ -22,77 +22,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10.2\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "невалидно име на ÑÑлÑга '%1'."
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Ðевалидна инÑоÑмаÑиÑ"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "невалидно име на ÑÑлÑга '%1'."
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2838,7 +2838,7 @@
msgstr "%s е заменен Ð¾Ñ %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2846,19 +2846,19 @@
"Тези пакеÑи Ñе бÑÐ´Ð°Ñ Ð¸Ð·ÑÑиÑи Ð¾Ñ ÑиÑÑемаÑа."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s нÑма да бÑде деинÑÑалиÑан, заÑоÑо вÑе оÑе е необÑ
одим"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2866,38 +2866,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ðевалидна инÑоÑмаÑиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s е необÑ
одим на дÑÑг пакеÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s е необÑ
одим на %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2907,7 +2907,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s е в конÑÐ»Ð¸ÐºÑ Ñ Ð´ÑÑги пакеÑи"
@@ -2916,14 +2916,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s е в конÑÐ»Ð¸ÐºÑ Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2933,24 +2933,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s пÑави ненÑжни дÑÑги пакеÑи"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s пÑави ненÑжно %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s пÑави ненÑжно: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2959,7 +2959,7 @@
"Тези пакеÑи Ñе бÑÐ´Ð°Ñ Ð¸Ð·ÑÑиÑи Ð¾Ñ ÑиÑÑемаÑа."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s завиÑи Ð¾Ñ Ð´ÑÑги пакеÑи"
@@ -2967,38 +2967,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s завиÑи Ð¾Ñ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s завиÑи оÑ: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "ÐеÑе на"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s не може да бÑде инÑÑалиÑан"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Ðикой не доÑÑÐ°Ð²Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -3007,32 +3007,32 @@
"\n"
"ÐÑма налиÑен ÑеÑÑÑÑ Ð·Ð° поддÑÑжкаÑа на Ñова изиÑкване."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ÐоÑади пÑоблемиÑе, коиÑо Ñа показани по-долÑ/гоÑе Ñега нÑма да Ð¼Ð¾Ð³Ð°Ñ Ð´Ð° ÑеÑдовлеÑвоÑÑÑ Ð²ÑиÑки завиÑимоÑÑи."
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s не може да бÑде инÑÑалиÑан, заÑоÑо е в конÑÐ»Ð¸ÐºÑ Ñ %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s не е инÑÑалиÑан и не може да бÑде маÑкиÑан за деинÑÑалиÑане."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "%s не може да бÑде инÑÑалиÑан поÑади пÑобем ÑÑÑ Ð·Ð°Ð²Ð¸ÑимоÑÑиÑе"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3040,8 +3040,8 @@
msgstr "изÑÑиване на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3049,119 +3049,131 @@
msgstr "без инÑÑалиÑане на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s има незадоволени изиÑканиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s има липÑваÑи завиÑимоÑÑи"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s не може да бÑде инÑÑалиÑан поÑади липÑваÑи завиÑимоÑÑи"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s задоволÑва завиÑимоÑÑиÑе на %s, но Ñе бÑде деинÑÑалиÑан"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s задоволÑва завиÑимоÑÑиÑе на %s, но Ñе бÑде деинÑÑалиÑан"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "ÐÑма нÑжда Ð¾Ñ Ð¸Ð½ÑÑалиÑане на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s не може да бÑде инÑÑалиÑан за задоволÑване на завиÑимоÑÑиÑе на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s не може да бÑде инÑÑалиÑан за задоволÑване на завиÑимоÑÑиÑе на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s нÑма да бÑде деинÑÑалиÑан, заÑоÑо вÑе оÑе е необÑ
одим"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s пÑави ненÑжен %s, но %s не може да бÑде изÑÑиÑ, заÑоÑо е заклÑÑен."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s не може да бÑде инÑÑалиÑан, заÑоÑо е в конÑликÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s е недеинÑÑалиÑÑем поÑади конÑликÑа Ñ %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ÐÑенебÑегване на Ñова изиÑкване Ñамо ÑÑк"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ÐÑенебÑегване на Ñова изиÑкване Ñамо ÑÑк"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ÐнÑÑалиÑане на %s, вÑпÑеки Ñе Ñе пÑомени аÑÑ
иÑекÑÑÑаÑа"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s задоволÑва Ñази завиÑимоÑÑ, но Ñе пÑомени аÑÑ
иÑекÑÑÑаÑа на инÑÑалиÑÐ°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "ÐнÑÑалиÑане на %s, вÑпÑеки Ñе Ñе пÑомени аÑÑ
иÑекÑÑÑаÑа"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s задоволÑва Ñази завиÑимоÑÑ, но Ñе пÑомени аÑÑ
иÑекÑÑÑаÑа на инÑÑалиÑÐ°Ð½Ð¸Ñ Ð¿Ð°ÐºÐµÑ"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "ÐÑенебÑегване на конÑликÑа на %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "ÐÑенебÑегване на оÑÑаÑелиÑе %s в %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "ÐÑенебÑегване на Ñова, Ñе %s е зададен веÑе за инÑÑалиÑане"
@@ -3172,7 +3184,7 @@
msgstr "Ðез инÑÑалиÑане или пÑемаÑ
ване на конÑликÑниÑе пакеÑи"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "за изиÑканоÑо %s за %s, когаÑо Ñе обновÑва %s"
@@ -3423,8 +3435,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s доÑÑÐ°Ð²Ñ %s, но има дÑÑга аÑÑ
иÑекÑÑÑа."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s доÑÑÐ°Ð²Ñ %s, но има дÑÑга аÑÑ
иÑекÑÑÑа."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ðе Ð¼Ð¾Ð³Ð°Ñ Ð´Ð° Ñе ÑдовлеÑвоÑÑÑ Ð¸Ð·Ð¸ÑкваниÑÑа на %s за %s"
@@ -3436,7 +3454,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s Ñе изиÑква Ð¾Ñ Ð´ÑÑг инÑÑалиÑан Ð¿Ð°ÐºÐµÑ Ð¸ нÑма да бÑде пÑемаÑ
наÑ."
@@ -3448,7 +3466,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s Ñе изиÑква Ð¾Ñ Ð´ÑÑг инÑÑалиÑан Ð¿Ð°ÐºÐµÑ Ð¸ нÑма да бÑде пÑемаÑ
наÑ."
@@ -3460,7 +3478,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s е заклÑÑен и не може да бÑде деинÑÑалиÑан."
@@ -3471,7 +3489,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "ÐонÑликÑÑÑ Ñ %s (%s) изиÑква пÑемаÑ
ванеÑо на %s, коеÑо е било подгоÑвено за инÑÑалиÑане"
@@ -3482,23 +3500,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "ÐаÑкиÑане на %s каÑо деинÑÑалиÑÑем поÑади конÑликÑа Ñ %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "Ð¾Ñ %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " ÐÑеÑка!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Ðажно!"
@@ -3555,9 +3573,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s е необÑ
одим на %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -5004,6 +5022,10 @@
"Use the file anyway?"
msgstr ""
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s е необÑ
одим на %s"
+
#~ msgid "Ignore this requirement generally"
#~ msgstr "ÐÑенебÑегване на Ñова изиÑкване"
Modified: trunk/libzypp/po/bn.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bn.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/bn.po (original)
+++ trunk/libzypp/po/bn.po Mon Sep 3 13:56:27 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n"
@@ -12,77 +12,77 @@
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url যà§à¦à¦¨à¦¾ %s à¦à¦° à¦
নà§à¦®à¦¤à¦¿ দà§à§ না"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "à¦
বà§à¦§ %s à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦ %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "à¦
বà§à¦§ %s à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "à¦à¦ URL à¦à¦° à¦à¦¨à§à¦¯à§ পথ পà§à¦¯à¦¾à¦°à¦¾à¦®à¦¿à¦à¦¾à¦° পারà§à¦¸à¦¿à¦ সমরà§à¦¥à¦¿à¦¤ নà§"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "à¦à¦ URL à¦à¦° à¦à¦¨à§à¦¯à§ সà§à¦à§à¦°à¦¿à¦ পারà§à¦¸à¦¿à¦ সমরà§à¦¥à¦¿à¦¤ নà§"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url যà§à¦à¦¨à¦¾ à¦à¦à¦à¦¿ à¦à¦¬à¦¶à§à¦¯à¦¿à¦ à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "à¦
বà§à¦§ Url যà§à¦à¦¨à¦¾ %s"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url যà§à¦à¦¨à¦¾ বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦à¦¾à¦°à§à¦° নামà§à¦° à¦
নà§à¦®à¦¤à¦¿ দà§à§ না"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url যà§à¦à¦¨à¦¾ পাসà¦à§à¦¾à¦°à§à¦¡à§à¦° à¦
নà§à¦®à¦¤à¦¿ দà§à§ না"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url যà§à¦à¦¨à¦¾à¦° à¦à¦¨à§à¦¯ হà§à¦¸à§à¦ à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url যà§à¦à¦¨à¦¾ হà§à¦¸à§à¦ à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦-à¦à¦° à¦
নà§à¦®à¦¤à¦¿ দà§à§ না"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "à¦
বà§à¦§ হà§à¦¸à§à¦ à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦ '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url যà§à¦à¦¨à¦¾ পà§à¦°à§à¦à§à¦° à¦
নà§à¦®à¦¤à¦¿ দà§à§ না"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "à¦
বà§à¦§ পà§à¦°à§à¦ à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦ '%s' "
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url যà§à¦à¦¨à¦¾à¦° à¦à¦¨à§à¦¯ পথà§à¦° নাম দরà¦à¦¾à¦°"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "à¦
থরিà¦à¦¿ বিদà§à¦¯à¦®à¦¾à¦¨ থাà¦à¦²à§ রিলà§à¦à¦¿à¦ পথà§à¦° à¦
নà§à¦®à¦¤à¦¿ নà§à¦"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "à¦à¦ URL à¦à¦° à¦à¦¨à§à¦¯à§ পথ পà§à¦¯à¦¾à¦°à¦¾à¦®à¦¿à¦à¦¾à¦° পারà§à¦¸à¦¿à¦ সমরà§à¦¥à¦¿à¦¤ নà§"
@@ -2729,7 +2729,7 @@
msgstr "%s পà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ হà§à§à¦à§ %s দà§à¦¬à¦¾à¦°à¦¾"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2737,19 +2737,19 @@
"à¦à¦ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿ সিসà§à¦à§à¦® থà§à¦à§ মà§à¦à§ দà§à¦à§à¦¾ হবà§à¥¤"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s বিসà§à¦¥à¦¾à¦ªà¦¿à¦¤ হবৠনা à¦à¦¾à¦°à¦£ à¦à¦à¦¾à¦° à¦à¦à¦¨à¦ পà§à¦°à§à§à¦à¦¨ à¦à¦à§"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2757,38 +2757,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "à¦
বà§à¦§ তথà§à¦¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ রিà¦à¦²à¦à§à¦¬à¦²à§à¦° %s পà§à¦°à§à§à¦à¦¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s à¦à¦° %s দরà¦à¦¾à¦°"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2798,7 +2798,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ বিশà§à¦²à§à¦·à§à¦¯à¦à§à¦²à¦¿à¦° সà¦à§à¦à§ %s à¦à¦° দà§à¦¬à¦¨à§à¦¦à§à¦¬"
@@ -2807,14 +2807,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s-à¦à¦° সà¦à§à¦à§ %s-à¦à¦° দà§à¦¬à¦¨à§à¦¦à§à¦¬"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2824,24 +2824,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿à¦à§ পà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ দিà§à§à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s %sà¦à§ পà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ দিà§à§à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s পà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ দিà§à§à¦à§: %sà¦à§"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2850,7 +2850,7 @@
"à¦à¦ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿ সিসà§à¦à§à¦® থà§à¦à§ মà§à¦à§ দà§à¦à§à¦¾ হবà§à¥¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s à¦
নà§à¦¯ রিà¦à¦²à¦à§à¦¬à¦²à¦à§à¦²à¦¿à¦° à¦à¦ªà¦°à§ নিরà§à¦à¦° à¦à¦°à§"
@@ -2858,38 +2858,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s নিরà§à¦à¦° à¦à¦°à§ %s à¦à¦° à¦à¦ªà¦°à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s নিরà§à¦à¦° à¦à¦°à§ à¦à¦° à¦à¦ªà¦°à§: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "à¦à¦° সনà§à¦¤à¦¾à¦¨"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "in/ssTklà¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾ যাবৠনা"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "à¦à§à¦¨à¦à¦à¦¾à¦ %s পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§ না"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2898,32 +2898,32 @@
"\n"
"à¦à¦®à¦¨ à¦à§à¦¨à¦ সà¦à¦¸à§à¦¥à¦¾à¦¨ à¦à¦ªà¦²à¦¬à§à¦§ নà§à¦ যা à¦à¦ পà§à¦°à§à§à¦à¦¨à¦à¦¿à¦à§ সমরà§à¦¥à¦¨ à¦à¦°à§"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "à¦à¦ রà§à¦à¦²à¦¿à¦à¦¶à¦¨à§à¦° à¦à¦ªà¦°à§/নিà¦à§ বরà§à¦£à¦¿à¦¤ সমসà§à¦¯à¦¾à¦à§à¦²à¦¿ সমসà§à¦¤ নিরà§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿à¦° সমাধান à¦à¦°à¦¬à§ না"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ পারৠনা à¦à¦¾à¦°à¦£ à¦à¦à¦¾ %s à¦à¦° সাথৠবিবাদ তà§à¦°à¦¿ à¦à¦°à¦à§"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾ নà§à¦ à¦à¦¬à¦ à¦à¦¨à¦à¦¨à§à¦¸à¦à¦² হিসাবৠà¦à¦¿à¦¹à§à¦¨à¦¿à¦¤ à¦à¦°à¦¾ হà§à§à¦à§"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "নিরà§à¦à¦°à¦¤à¦¾ সমসà§à¦¯à¦¾à¦à§à¦²à¦¿à¦° à¦à¦¾à¦°à¦£à§ %s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ পারৠনা"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2931,8 +2931,8 @@
msgstr "%s মà§à¦à§ ফà§à¦²à§à¦¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2940,119 +2940,131 @@
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à§ না"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s à¦à¦° à¦
পà§à¦°à§à¦£ পà§à¦°à§à§à¦à¦¨ à¦à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s à¦à¦° হারিà§à§ যাà¦à§à¦¾ নিরà§à¦à¦°à¦¶à§à¦²à¦à§à¦²à¦¿ à¦à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "হারিà§à§ যাà¦à§à¦¾ নিরà§à¦à¦°à¦¶à§à¦²à¦à§à¦²à¦¿à¦° à¦à¦¨à§à¦¯ %s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾ যাবৠনা"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s %s à¦à¦° নিরà§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ পà§à¦°à¦£ à¦à¦°à§ à¦à¦¿à¦¨à§à¦¤à§ বিসà§à¦¥à¦¾à¦ªà¦¿à¦¤ হবà§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s %s à¦à¦° নিরà§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ পà§à¦°à¦£ à¦à¦°à§ à¦à¦¿à¦¨à§à¦¤à§ à¦à¦à§ à¦à¦ªà¦¨à¦¾à¦° সিসà§à¦à§à¦®à§ রাà¦à¦¾ হবà§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾à¦° পà§à¦°à§à§à¦à¦¨ নà§à¦"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s à¦à¦° নিরà§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ পà§à¦°à¦£ à¦à¦°à¦¾à¦° à¦à¦¨à§à¦¯à§ %s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ পারৠনা"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s à¦à¦° নিরà§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿ পà§à¦°à¦£ à¦à¦°à¦¾à¦° à¦à¦¨à§à¦¯à§ %s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ পারৠনা"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s বিসà§à¦¥à¦¾à¦ªà¦¿à¦¤ হবৠনা à¦à¦¾à¦°à¦£ à¦à¦à¦¾à¦° à¦à¦à¦¨à¦ পà§à¦°à§à§à¦à¦¨ à¦à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s %s à¦à§ পà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ দিà§à§à¦à§à¥¤ à¦à¦¿à¦¨à§à¦¤à§ %s মà§à¦à§ দà§à¦à§à¦¾ যাৠনা à¦à¦¾à¦°à¦£ à¦à¦à¦¾ লঠহà§à§ à¦à¦à§à¥¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦¤à§ পারৠনা à¦à¦¾à¦°à¦£ à¦à¦à¦¾ বিবাদ তà§à¦°à¦¿ à¦à¦°à¦à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s à¦à¦° সà¦à§à¦à§ দà§à¦¬à¦¨à§à¦¦à§à¦¬à§à¦° à¦à¦¨à§à¦¯ %s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾à¦° à¦
যà§à¦à§à¦¯"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "à¦à¦¿à¦à§ à¦
মà§à¦®à¦¾à¦à¦¸à¦¿à¦¤ à¦à¦¬à¦¶à§à¦¯à¦à¦¤à¦¾ à¦à¦à§..."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "à¦à¦¿à¦à§ à¦
মà§à¦®à¦¾à¦à¦¸à¦¿à¦¤ à¦à¦¬à¦¶à§à¦¯à¦à¦¤à¦¾ à¦à¦à§..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à§à¦¨ যদিঠà¦à¦à¦¾ à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° পালà¦à§ দà§à¦¬à§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s à¦à¦ নিরà§à¦à¦°à¦¤à¦¾ পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§ à¦à¦¿à¦¨à§à¦¤à§ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦à¦à¦à§à¦®à§à¦° à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° পালà¦à§ দà§à¦¬à§ "
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "%s সà§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à§à¦¨ যদিঠà¦à¦à¦¾ à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° পালà¦à§ দà§à¦¬à§"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s à¦à¦ নিরà§à¦à¦°à¦¤à¦¾ পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§ à¦à¦¿à¦¨à§à¦¤à§ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦à¦à¦à§à¦®à§à¦° à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° পালà¦à§ দà§à¦¬à§ "
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s à¦à¦° দà§à¦¬à¦¨à§à¦¦à§à¦¬ à¦
à¦à§à¦°à¦¾à¦¹à§à¦¯ à¦à¦°à§à¦¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%s-ঠà¦
পà§à¦°à¦à¦²à¦¿à¦¤ %s à¦
à¦à§à¦°à¦¾à¦¹à§à¦¯ à¦à¦°à§à¦¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "%s à¦à¦¤à§à¦®à¦§à§à¦¯à§à¦ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ হà¦à§à¦¾ নিরà§à¦¦à¦¿à¦·à§à¦ রà§à§à¦à§, à¦à¦ বিষà§à¦à¦¿ à¦à¦ªà§à¦à§à¦·à¦¾ à¦à¦°à§à¦¨"
@@ -3063,7 +3075,7 @@
msgstr "%1 à¦à¦° দà§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° সাথà§"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s à¦à¦¨à§à¦¨à§à¦¤ à¦à¦°à¦¾à¦° সমà§à§ %s à¦à¦° à¦à¦¨à§à¦¯à§ %s à¦à¦° পà§à¦°à§à§à¦à¦¨à§à¦° à¦à¦¨à§à¦¯à§"
@@ -3314,8 +3326,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s %s পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§, à¦à¦¿à¦¨à§à¦¤à§ à¦à¦à¦¾à¦° à¦
নà§à¦¯ à¦à¦à¦à¦¾ à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° à¦à¦à§à¥¤"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s %s পà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§, à¦à¦¿à¦¨à§à¦¤à§ à¦à¦à¦¾à¦° à¦
নà§à¦¯ à¦à¦à¦à¦¾ à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° à¦à¦à§à¥¤"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s à¦à¦° à¦à¦¨à§à¦¯ %s à¦à¦° পà§à¦°à§à§à¦à¦¨ পà§à¦°à¦£ à¦à¦°à¦¤à§ পারৠনা"
@@ -3327,7 +3345,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ রিà¦à¦²à¦à§à¦¬à¦²à§à¦° à¦à¦¨à§à¦¯ %s দরà¦à¦¾à¦°, তাঠà¦à¦à¦¾ à¦à¦¨à¦²à¦¿à¦à§à¦à¦¡ হবৠনা। "
@@ -3339,7 +3357,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ রিà¦à¦²à¦à§à¦¬à¦²à§à¦° à¦à¦¨à§à¦¯ %s দরà¦à¦¾à¦°, তাঠà¦à¦à¦¾ à¦à¦¨à¦²à¦¿à¦à§à¦à¦¡ হবৠনা। "
@@ -3351,7 +3369,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s লঠà¦à¦°à¦¾ à¦à¦à§ à¦à¦¬à¦ à¦à¦¨à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à¦¾ যাবৠনা ।"
@@ -3362,7 +3380,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) নিà§à§ বিবাদà§à¦° à¦à¦¨à§à¦¯à§ à¦
নà§à¦¯à¦¾à¦¨à§à¦¯ সà§à¦¥à¦¾à¦ªà¦¿à¦¤ হতৠà¦à¦²à¦¾ %s à¦
পসারণà§à¦° পà§à¦°à§à§à¦à¦¨"
@@ -3373,23 +3391,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s নিà§à§ বিবাদà§à¦° à¦à¦¾à¦°à¦£à§ %s à¦à§ বিসà§à¦¥à¦¾à¦ªà¦¨à§à¦° à¦
যà§à¦à§à¦¯ রà§à¦ªà§ à¦à¦¿à¦¹à§à¦¨à¦¿à¦¤ à¦à¦°à¦¾ হà¦à§à¦à§"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s থà§à¦à§"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "তà§à¦°à§à¦à¦¿"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "à¦à¦°à§à¦°à¦¿!"
@@ -3446,9 +3464,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s à¦à¦° %s দরà¦à¦¾à¦°"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4766,6 +4784,10 @@
"%s ফাà¦à¦²à§à¦° à¦à¦à¦à¦¿ à¦
বà§à¦§ à¦à§à¦à¦¸à¦¾à¦® à¦à¦à§à¥¤\n"
"%s পà§à¦°à¦¤à§à¦¯à¦¾à¦¶à¦¿à¦¤ à¦à¦¿à¦², পাà¦à§à¦¾ à¦à§à¦à§ %sতবà§à¦ ফাà¦à¦²à¦à¦¿ বà§à¦¯à¦¬à¦¹à¦¾à¦° à¦à¦°à¦¤à§ à¦à¦¾à¦¨?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s à¦à¦° %s দরà¦à¦¾à¦°"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Url à¦
থরিà¦à¦¿ পারà§à¦¸ à¦à¦°à¦¤à§ à¦
à¦à§à¦·à¦®"
Modified: trunk/libzypp/po/bs.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bs.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/bs.po (original)
+++ trunk/libzypp/po/bs.po Mon Sep 3 13:56:27 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2002-07-23 18:27+0200\n"
"Last-Translator: Damir Bjelobradic <Nagual(a)lugbih.org>\n"
"Language-Team: Bosnian <i18n(a)suse.de>\n"
@@ -18,77 +18,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3066,25 +3066,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3092,38 +3092,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3131,7 +3131,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3140,14 +3140,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3155,31 +3155,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3187,68 +3187,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instaliram driver..."
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3256,8 +3256,8 @@
msgstr "Izbrii"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3265,118 +3265,130 @@
msgstr "Instaliram driver..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "&Da, instaliraj"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3387,7 +3399,7 @@
msgstr "Instaliram driver..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3639,9 +3651,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3652,7 +3670,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3664,7 +3682,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3676,7 +3694,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3687,7 +3705,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3698,24 +3716,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Greška"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3775,7 +3793,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/ca.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ca.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/ca.po (original)
+++ trunk/libzypp/po/ca.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-02-26 19:15+0100\n"
"Last-Translator: Olga López\n"
"Language-Team: Catalan\n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "L'esquema de l'URL no permet un %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "El component de %s '%s' no és và lid"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Component de %s no và lid"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "No s'admet l'anà lisi de parà metres de camà per a aquesta URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "No s'admet l'anà lisi de cadenes de consulta per a aquesta URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "L'esquema de l'URL és un component necessari"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "L'esquema de l'URL '%s' no és và lid"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "L'esquema de l'URL no permet un nom d'usuari"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "L'esquema de l'URL no permet una contrasenya"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "L'esquema de l'URL requereix un component d'ordinador central"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "L'esquema de l'URL no permet un component d'ordinador central"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "El component de l'ordinador central '%s' no és và lid"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "L'esquema de l'URL no permet un port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "El component de port '%s' no és và lid"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "L'esquema de l'URL requereix un nom de camÃ"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "No es permet un camà relatiu si existeix una autoritat"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "No s'admet l'anà lisi de parà metres de camà per a aquesta URL"
@@ -2877,7 +2877,7 @@
msgstr "%s ha estat reemplaçat per %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2885,19 +2885,19 @@
"Aquests Ãtems amb dependències es suprimiran del sistema."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s no es desinstal·larà perquè encara es necessita"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2905,38 +2905,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "La informació no és và lida"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "Altres Ãtems amb dependències necessiten %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s requereix %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2946,7 +2946,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s entra en conflicte amb altres Ãtems amb dependències"
@@ -2955,14 +2955,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s entra en conflicte amb %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2972,24 +2972,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s desactualitza altres Ãtems amb dependències"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s desactualitza %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s desactualitza:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2998,7 +2998,7 @@
"Aquests Ãtems amb dependències es suprimiran del sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depèn d'altres Ãtems amb dependències"
@@ -3006,38 +3006,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s depèn de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s depèn de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Fill de"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "No es pot instal·lar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "No es proporciona %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -3046,32 +3046,32 @@
"\n"
"No hi ha cap recurs disponible que admeti aquest requisit."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Atesos els problemes descrits anteriorment o a continuació, aquesta resolució no resoldrà totes les dependències"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "No es pot instal·lar %s perquè entra en conflicte amb %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s no s'ha instal·lat i s'ha marcat com a no instal·lable"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "No es pot instal·lar %s a causa de problemes de dependència"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3079,8 +3079,8 @@
msgstr "suprimeix %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3088,119 +3088,131 @@
msgstr "no instal·lis %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s té requisits no complerts"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "Falten dependències per a %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s no es pot instal·lar atès que falten dependències"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s compleixen les dependències de %s però es desinstal·laran"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s compleixen les dependències de %s però es conservaran al sistema"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "No cal instal·lar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "No es pot instal·lar %s per a complir les dependències de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "No es pot instal·lar %s per a complir les dependències de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s no es desinstal·larà perquè encara es necessita"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s desactualitza %s. No obstant, %s no es pot suprimir perquè està bloquejat."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "No es pot instal·lar %s perquè entra en conflicte"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s no es pot instal·lar atesos els conflictes amb %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignora aquest requisit només en aquest cas"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Ignora aquest requisit només en aquest cas"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Instal·la %s, encara que canviï l'arquitectura"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s proporciona aquesta dependència però canviaria l'arquitectura de l'element instal·lat"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Instal·la %s, encara que canviï l'arquitectura"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s proporciona aquesta dependència però canviaria l'arquitectura de l'element instal·lat"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignora aquest conflicte de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignora l'obsolet %s a %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignora que %s ja s'ha definit per a instal·lar-se"
@@ -3211,7 +3223,7 @@
msgstr "No instal·lis ni suprimeixis els Ãtems amb dependències relacionats"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "per a requerir %s per a %s en actualitzar %s"
@@ -3462,8 +3474,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s proporciona %s, però té una altra arquitectura."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s proporciona %s, però té una altra arquitectura."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "No es pot satisfer el requisit %s per a %s"
@@ -3475,7 +3493,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "Un altre Ãtem amb dependències instal·lat necessita %s, de manera que no es desenllaçarà ."
@@ -3487,7 +3505,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "Un altre Ãtem amb dependències instal·lat necessita %s, de manera que no es desenllaçarà ."
@@ -3499,7 +3517,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s està bloquejat i no es pot desinstal·lar."
@@ -3510,7 +3528,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Per causa d'un conflicte relacionat amb %s (%s), cal suprimir el %s que s'ha d'instal·lar"
@@ -3521,23 +3539,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "A causa de conflictes relacionats amb %s, es marcarà %s com a no instal·lable"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "de %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Error"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Important"
@@ -3595,9 +3613,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s requereix %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -5172,6 +5190,10 @@
"S'esperava %s, i s'ha trobat %s\n"
"Voleu utilitzar aquest fitxer de tota manera?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s requereix %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "No es pot analitzar l'autoritat de l'URL"
Modified: trunk/libzypp/po/cs.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/cs.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/cs.po (original)
+++ trunk/libzypp/po/cs.po Mon Sep 3 13:56:27 2007
@@ -1,4 +1,4 @@
-# translation of zypp.po to cs_CZ
+# translation of zypp.po to
# Czech message file for YaST2 (@memory@).
# Copyright (C) 2005 SUSE Linux Products GmbH.
# Copyright (C) 2002 SuSE Linux AG.
@@ -6,91 +6,92 @@
#
# Petr Pavlik <pp(a)suse.cz>, 1999, 2000, 2001.
# Klara Cihlarova <koty(a)seznam.cz>, 2006.
+# Jakub Hegenbart <jhegenbart(a)suse.cz>, 2007.
msgid ""
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2006-06-07 12:21+0200\n"
-"Last-Translator: Novell Language <language(a)novell.com>\n"
-"Language-Team: Novell Language <language(a)novell.com>\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 18:25+0200\n"
+"Last-Translator: Jakub Hegenbart <jhegenbart(a)suse.cz>\n"
+"Language-Team: <cs(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Schéma URL nepovoluje %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Neplatná %s souÄást %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Neplatná %s souÄást"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Pro toto URL nenà podporována analýza parametru cesty."
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Pro toto URL nenà podporována analýza ÅetÄzce dotazu."
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "URL schéma je vyžadovanou souÄástÃ"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Neplatné schéma URL %s"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Schéma URL nepovoluje uživatelské jméno."
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Schéma URL nepovoluje heslo."
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Schéma URL vyžaduje souÄást hostitele."
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Schéma URL nepovoluje souÄást hostitele."
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Neplatná souÄást hostitele %s"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Schéma URL nepovoluje port."
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Neplatná souÄást portu %s"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Schéma URL vyžaduje název cesty."
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relativnà cesta nenà povolena, pokud existuje autorita"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Pro toto URL nenà podporována analýza parametru cesty."
@@ -112,9 +113,8 @@
#. TranslatorExplanation followed by the list of error messages that lead to this exception
#: ../zypp/base/Exception.cc:89
-#, fuzzy
msgid "History:"
-msgstr "XF86History"
+msgstr "Historie:"
#: ../zypp/repo/PackageProvider.cc:222
msgid "applydeltarpm check failed."
@@ -126,30 +126,29 @@
#. TranslatorExplanation %s = package being checked for integrity
#: ../zypp/repo/PackageProvider.cc:303
-#, fuzzy, c-format
+#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
-msgstr "Kontrola integrity balÃÄku %s se nezdaÅila. Chcete jej stáhnout znovu?"
+msgstr "Kontrola integrity balÃÄku %s se nezdaÅila. Chcete pokus opakovat?"
#: ../zypp/repo/RepoProvideFile.cc:205
-#, fuzzy
msgid "No url in repository."
-msgstr "Soubor '%1' nebyl nalezen v repozitáÅi."
+msgstr "Adresa URL nebyla nalezena v repozitáÅi."
#. iteration over urls
#: ../zypp/repo/RepoProvideFile.cc:267
-#, fuzzy, c-format
+#, c-format
msgid "Can't provide file %s from repository %s"
-msgstr "Nelze poskytnout %s ze %s"
+msgstr "Nelze poskytnout soubor %s z repozitáÅe %s"
#: ../zypp/repo/cached/RepoImpl.cc:78
#, c-format
msgid "Reading '%s' repository cache"
-msgstr ""
+msgstr "NaÄÃtá se vyrovnávacà pamÄÅ¥ repozitáÅe '%s'"
#: ../zypp/repo/cached/RepoImpl.cc:199
#, c-format
msgid "Reading patch and delta rpms from '%s' repository cache"
-msgstr ""
+msgstr "NaÄÃtajà se balÃÄky oprav RPM a delta RPM z vyrovnávacà pamÄti repozitáÅe '%s'"
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
@@ -168,32 +167,32 @@
#: ../zypp/RepoManager.cc:115
#, c-format
msgid "Cleaning repository '%s' cache"
-msgstr ""
+msgstr "ProbÃhá ÄistÄnà vyrovnávacà pamÄti repozitáÅe '%s'."
#: ../zypp/RepoManager.cc:614
msgid "Valid metadata not found at specified URL(s)"
-msgstr ""
+msgstr "Na zadané adrese nebo adresách URL nebyla nalezena platná metadata"
#: ../zypp/RepoManager.cc:664
#, c-format
msgid "Building repository '%s' cache"
-msgstr ""
+msgstr "VytváÅà se vyrovnávacà pamÄÅ¥ repozitáÅe '%s'"
#. progress.sendTo( progressrcv );
#: ../zypp/RepoManager.cc:809
#, c-format
msgid "Reading repository '%s' cache"
-msgstr ""
+msgstr "NaÄÃtá se vyrovnávacà pamÄÅ¥ repozitáÅe '%s'"
#: ../zypp/RepoManager.cc:899
-#, fuzzy, c-format
+#, c-format
msgid "Adding repository '%s'"
-msgstr "Vkládánà zdrojů"
+msgstr "PÅidává se repozitáŠ'%s'"
#: ../zypp/RepoManager.cc:1004
-#, fuzzy, c-format
+#, c-format
msgid "Removing repository '%s'"
-msgstr "Vkládánà zdrojů"
+msgstr "OdebÃrá se repozitáŠ'%s'"
#: ../zypp/Url.cc:112
msgid "Invalid LDAP URL query string"
@@ -314,7 +313,7 @@
#. language code: ang
#: ../zypp/LanguageCode.cc:274
msgid "English, Old (ca.450-1100)"
-msgstr "AngliÄtina, stará (cca 450-1100)"
+msgstr "AngliÄtina, stará (cca. 450-1100)"
#. language code: apa
#: ../zypp/LanguageCode.cc:276
@@ -711,7 +710,7 @@
#. language code: crh
#: ../zypp/LanguageCode.cc:438
msgid "Crimean Tatar"
-msgstr "Crimean Tatar"
+msgstr "Krymská tatarština"
#. language code: crp
#: ../zypp/LanguageCode.cc:440
@@ -837,7 +836,7 @@
#. language code: elx
#: ../zypp/LanguageCode.cc:492
msgid "Elamite"
-msgstr "Elamite"
+msgstr "Elamština"
#. language code: eng en
#: ../zypp/LanguageCode.cc:494
@@ -1048,7 +1047,7 @@
#. language code: guj gu
#: ../zypp/LanguageCode.cc:584
msgid "Gujarati"
-msgstr "Gudžarádština"
+msgstr "Gudžarátština"
#. language code: gwi
#: ../zypp/LanguageCode.cc:586
@@ -1094,7 +1093,7 @@
#. language code: him
#: ../zypp/LanguageCode.cc:602
msgid "Himachali"
-msgstr "Himachali"
+msgstr "HimáÄalÃ"
#. language code: hin hi
#: ../zypp/LanguageCode.cc:604
@@ -1105,7 +1104,7 @@
#. language code: hit
#: ../zypp/LanguageCode.cc:606
msgid "Hittite"
-msgstr "Hittite"
+msgstr "Chetitština"
#. language code: hmn
#: ../zypp/LanguageCode.cc:608
@@ -1148,7 +1147,7 @@
#. language code: ice isl is
#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624
msgid "Icelandic"
-msgstr "Islandské"
+msgstr "Islandština"
#. language code: ido io
#: ../zypp/LanguageCode.cc:626
@@ -1223,7 +1222,7 @@
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
-msgstr "Italské"
+msgstr "Italština"
#. language code: jav jv
#: ../zypp/LanguageCode.cc:656
@@ -1238,7 +1237,7 @@
#. language code: jpn ja
#: ../zypp/LanguageCode.cc:660
msgid "Japanese"
-msgstr "Japonské"
+msgstr "Japonština"
#. language code: jpr
#: ../zypp/LanguageCode.cc:662
@@ -1909,7 +1908,7 @@
#. language code: oto
#: ../zypp/LanguageCode.cc:920
msgid "Otomian Languages"
-msgstr "Otomianské jazyky"
+msgstr "Osmanské jazyky"
#. language code: paa
#: ../zypp/LanguageCode.cc:922
@@ -2665,7 +2664,7 @@
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
-msgstr ""
+msgstr "Chybà vyžadovaný soubor: "
#: ../zypp/target/hal/HalContext.cc:96
msgid "HalContext not connected"
@@ -2713,9 +2712,9 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1913
-#, fuzzy, c-format
+#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
-msgstr "rpm uložil %s jako %s, ale nebylo možné zjistit rozdÃl"
+msgstr "Program rpm uložil %s jako %s, ale nebylo možné zjistit rozdÃl"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1915
@@ -2724,14 +2723,14 @@
"rpm saved %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""
-"rpm uložil %s jako %s.\n"
+"Program rpm uložil %s jako %s.\n"
"PrvnÃch 25 Åádek rozdÃlů:\n"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1918
-#, fuzzy, c-format
+#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
-msgstr "rpm vytvoÅil %s jako %s, ale nebylo možné zjistit rozdÃly"
+msgstr "Program rpm vytvoÅil %s jako %s, ale nebylo možné zjistit rozdÃl"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1920
@@ -2740,7 +2739,7 @@
"rpm created %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""
-"rpm vytvoÅil %s jako %s.\n"
+"Program rpm vytvoÅil %s jako %s.\n"
"PrvnÃch odliÅ¡ných 25 Åádek:\n"
#. %s = filename of rpm package
@@ -2752,7 +2751,7 @@
#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
msgid "rpm output:"
-msgstr "rpm výstup:"
+msgstr "Výstup programu rpm:"
#
#. %s = filename of rpm package
@@ -2764,14 +2763,14 @@
#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
msgid "Additional rpm output:"
-msgstr "Dalšà rpm výstup:"
+msgstr "Dalšà výstup programu rpm:"
#. %s = name of rpm package
#. timestamp
#: ../zypp/target/rpm/RpmDb.cc:2044
#, c-format
msgid "%s remove failed"
-msgstr "OdstranÄné %s selhalo"
+msgstr "OdstranÄnà %s se nezdaÅilo"
#. timestamp
#: ../zypp/target/rpm/RpmDb.cc:2050
@@ -2803,66 +2802,64 @@
msgstr "%s nahrazen %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:262
+#, c-format
msgid "%s will be deleted by the user.\n"
-msgstr ""
-"\n"
-"Tyto balÃÄky budou smazány."
+msgstr "%s bude odstranÄn uživatelem.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
-msgstr ""
+msgstr "%s bude odstranÄn jinou aplikacÃ. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:273
+#, c-format
msgid "%s will be installed by the user.\n"
-msgstr "%s nebude odinstalován, protože je stále vyžadován"
+msgstr "%s bude nainstalován uživatelem.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
-msgstr ""
+msgstr "%s bude nainstalován jinou aplikacÃ. (ApplLow/ApplHigh)\n"
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
-msgstr ""
+msgstr "Nebylo nalezeno žádné platné ÅeÅ¡enà se závislostmi pouze nejlepÅ¡Ã architektury."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
-msgstr ""
+msgstr "PÅi této operaci byly vzaty v úvahu pouze závislosti s nejlepÅ¡Ã architekturou.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
-msgstr ""
+msgstr "Pokud jsou zahrnuty vÅ¡echny možné závislosti, může operace trvat delÅ¡Ã dobu, ale dospÄje k platnému výsledku."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Chybná informace"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s je požadován jinými balÃÄky"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s je požadován pro %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2872,7 +2869,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s koliduje"
@@ -2881,14 +2878,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s koliduje s %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2898,24 +2895,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s je novÄjÅ¡Ã než jiné závisejÃcà balÃÄky"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s je novÄjÅ¡Ã než %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s je novÄjÅ¡Ã než: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2924,7 +2921,7 @@
"Tyto balÃÄky budou smazány."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s závislà na jiných balÃÄcÃch"
@@ -2932,72 +2929,70 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s závisà na %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s závisà na: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Potomek"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Nelze nainstalovat %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Žádný balÃÄek neposkytuje %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
"\n"
-"Požadavky nelze uspokojit z žádného zdroje."
+"Požadavky nelze uspokojit z žádného dostupného zdroje."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
-msgstr "Kvůli problémům nÞe toto ÅeÅ¡enà nevyÅeÅ¡Ã vÅ¡echny problémy se závislostmi"
+msgstr "Kvůli uvedeným nebo následujÃcÃm problémům nevyÅeÅ¡Ã toto ÅeÅ¡enà vÅ¡echny závislosti"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
+#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
-msgstr "Nelze nainstalovat %s, protože koliduje s %s"
+msgstr "Nelze nainstalovat %s, protože způsobuje konflikt s %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s nebude nainstalován a byl oznaÄen jako nenainstalovatelný"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Vzhledem k problémům se závislostà nelze nainstalovat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3005,8 +3000,8 @@
msgstr "smazat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3014,139 +3009,149 @@
msgstr "neinstalovat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s obsahuje nevyÅeÅ¡ené závislosti"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s má nesplnÄné závislosti"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s nelze nainstalovat kvůli nesplnÄným závislostem"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:714
+#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
-msgstr "%s bude kvůli závislosti s %s oddinstalován"
+msgstr "%s splÅuje závislosti %s, bude vÅ¡ak odinstalován"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:724
+#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
-msgstr "%s splÅuje závislosti %s, ale zůstane ponechán v systému."
+msgstr "%s splÅuje závislosti %s, bude vÅ¡ak ponechán v systému"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Nenà potÅeba instalovat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:742
+#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Nelze nainstalovat %s ke splnÄnà závislostà %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Nelze nainstalovat %s ke splnÄnà závislostà %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
+#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s nebude odinstalován, protože je stále vyžadován"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:826
+#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
-msgstr "%s je novÄjÅ¡Ã než %s, ale %s nelze smazat, protože je uzamÄený."
+msgstr "%s je novÄjÅ¡Ã než %s, ale %s nelze odstranit, protože je uzamÄený."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:858
+#, c-format
msgid "Cannot install %s, because it is conflicting"
-msgstr "Nelze nainstalovat %s, protože koliduje"
+msgstr "Nelze nainstalovat %s, protože způsobuje konflikt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s nelze nainstalovat, koliduje s %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
-msgstr ""
+msgstr "Požadavek %s nelze splnit."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorovat požadavky pouze nynÃ"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
-#, fuzzy
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
-msgstr "Ignorovat požadavky pouze nynÃ"
+msgstr "ObecnÄ ignorovat tento požadavek"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Instalovat %s i pÅes zmÄnu architektury"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
+#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
-msgstr "%s obsahuje závislosti, ale zmÄnà architekturu nainstalované položky"
+msgstr "%s poskytuje tuto závislost, ale zmÄnà architekturu nainstalované položky"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Instalovat %s i pÅes zmÄnu dodavatele"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s poskytuje tuto závislost, ale zmÄnà dodavatele nainstalované položky"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorovat konflikt %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorovat zastaralé %s v %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorovat nastavenà %s k instalaci"
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
msgid "Do not install or delete the resolvables concerned"
-msgstr "Neinstalovat nebo nemazat závisejÃcà balÃÄky"
+msgstr "Neinstalovat a nemazat pÅÃsluÅ¡né závislosti"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "vyžadujÃcà %s pro %s pÅi aktualizaci %s"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency
#: ../zypp/solver/detail/ResolverInfoMissingReq.cc:64
-#, fuzzy, c-format
+#, c-format
msgid "%s is lacking the requirement %s"
-msgstr "%s nesplÅuje požadavky %s"
+msgstr "Pro %s nenà splnÄn požadavek %s"
#: ../zypp/solver/detail/ResolverInfoMisc.cc:56
msgid ", Action: "
@@ -3221,16 +3226,16 @@
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
-#, fuzzy, c-format
+#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
-msgstr "%s Äeká na instalaci, ale nelze ho nainstalovat kvůli problémům se závislostmi."
+msgstr "%s Äeká na instalaci, ale instalaci nelze provést kvůli problémům se závislostmi."
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:167
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s since it is already marked as needed to be uninstalled"
-msgstr "Nelze nainstalovat %s, je již oznaÄen k odinstalovánÃ"
+msgstr "Nelze nainstalovat %s, je již oznaÄen jako urÄený k odinstalovánÃ"
#. Translator: %s = name of patch
#. TranslatorExplanation: A patch which is not needed (does not apply) cant be installed
@@ -3239,9 +3244,9 @@
#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed
#. TranslatorExplanation: package is not installed.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:179
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because it does not apply to this system."
-msgstr "Nelze nainstalovat %s, protože nelze aplikovat na systém."
+msgstr "Nelze nainstalovat %s, protože ho nelze použÃt pro tento systém."
#. affected() = item 1 which has to be installed
#. _capability =
@@ -3249,9 +3254,9 @@
#. other_capability() =
#. Translator: %s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoMisc.cc:190
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because %s is already marked as needed to for installation"
-msgstr "Nelze nainstalovat %s, protože %s již oznaÄen jako potÅebný k instalaci"
+msgstr "Nelze nainstalovat %s, protože %s je již oznaÄen jako potÅebný k instalaci"
#. Translator: %s = name of patch,product
#: ../zypp/solver/detail/ResolverInfoMisc.cc:198
@@ -3317,9 +3322,9 @@
#. TranslatorExplanation: removal of this resolvable would therefore break dependency
#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled
#: ../zypp/solver/detail/ResolverInfoMisc.cc:292
-#, fuzzy, c-format
+#, c-format
msgid "There are no alternative providers of %s installed"
-msgstr "Nenà žádný alternativnà zdroj %s"
+msgstr "Neexistuje žádný alternativnà poskytovatel nainstalované závislosti %s"
#. Translator: 1.%s = name of package,patch....
#. TranslatorExample: for bar
@@ -3348,9 +3353,9 @@
#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible
#. TranslatorExplanation: bar requires something from foo
#: ../zypp/solver/detail/ResolverInfoMisc.cc:341
-#, fuzzy, c-format
+#, c-format
msgid "Upgrading to %s to avoid removing %s is not possible."
-msgstr "Aktualizace %s nenà vzhledem k možnému odstranÄnà %s možná."
+msgstr "Aktualizaci %s s cÃlem vyhnout se odinstalovánà %s nelze provést."
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:359
@@ -3388,9 +3393,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s poskytuje %s, ale je urÄen pro jinou architekturu."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s poskytuje %s, poskytuje ho však jiný dodavatel (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Nelze splnit požadavky %s pro %s"
@@ -3401,10 +3412,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
+#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
-msgstr "%s je požadován jinými nainstalovanými závislostmi a nelze odlinkovat."
+msgstr "%s je požadován jinou závislostà urÄenou k instalaci, proto na nÄj nebude zruÅ¡en odkaz."
#. affected() = provider of cap
#. _capability =
@@ -3413,10 +3424,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
+#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
-msgstr "%s je požadován jinými nainstalovanými závislostmi a nelze odlinkovat."
+msgstr "%s je požadován jinou nainstalovanou závislostÃ, proto na nÄj nebude zruÅ¡en odkaz."
#. affected() = to-be-uninstalled resolvable which is locked
#. _capability =
@@ -3425,7 +3436,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s je uzamÄen a nelze odinstalovat."
@@ -3436,10 +3447,10 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
-msgstr "Konflikt s %s (%s) vyžaduje odstranÄnà instalovaného %s"
+msgstr "Konflikt s %s (%s) vyžaduje odstranÄnà závislosti %s, která Äeká na instalaci"
#. affected() = provider of capability
#. _capability = provided by provider
@@ -3447,23 +3458,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s oznaÄen jako neinstalovatelný kvůli konfliktu s %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "z %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Chyba!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Důležité!"
@@ -3491,11 +3502,11 @@
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
msgid "Make a solver run with ALL possibilities."
-msgstr ""
+msgstr "Spustà ÅeÅ¡itel se zváženÃm VÅ ECH možnostÃ"
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
msgid "Regarding all resolvables with a compatible architecture."
-msgstr ""
+msgstr "V úvahu jsou brány všechny závislosti s kompatibilnà architekturou."
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
@@ -3506,23 +3517,23 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:60
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:110
-#, fuzzy, c-format
+#, c-format
msgid "%s is recommended by %s"
-msgstr "%s je požadován pro %s"
+msgstr "%s je doporuÄen závislostà %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:66
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:116
-#, fuzzy, c-format
+#, c-format
msgid "%s is suggested by %s"
-msgstr "%s je požadován pro %s"
+msgstr "%s je navrhován závislostà %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s je požadován pro %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -3605,7 +3616,7 @@
#. :AFG:004:
#: ../zypp/CountryCode.cc:220
msgid "Antigua and Barbuda"
-msgstr "Antigua and Barbuda"
+msgstr "Antigua a Barbuda"
# AI
#. :ATG:028:
@@ -3628,7 +3639,7 @@
#. :ARM:051:
#: ../zypp/CountryCode.cc:224
msgid "Netherlands Antilles"
-msgstr "Netherlands Antilles"
+msgstr "Nizozemské Antily"
# AO
#. :ANT:530:
@@ -3640,7 +3651,7 @@
#. :AGO:024:
#: ../zypp/CountryCode.cc:226
msgid "Antarctica"
-msgstr "Antarctica"
+msgstr "Antarktida"
#. :ATA:010:
#: ../zypp/CountryCode.cc:227
@@ -3651,7 +3662,7 @@
#. :ARG:032:
#: ../zypp/CountryCode.cc:228
msgid "American Samoa"
-msgstr "American Samoa"
+msgstr "Americká Samoa"
#. :ASM:016:
#: ../zypp/CountryCode.cc:229
@@ -3954,7 +3965,7 @@
#. :ESP:724:
#: ../zypp/CountryCode.cc:284
msgid "Ethiopia"
-msgstr "Ethiopia"
+msgstr "Etiopie"
#. :ETH:231:
#: ../zypp/CountryCode.cc:285
@@ -3970,7 +3981,7 @@
#. :FJI:242:
#: ../zypp/CountryCode.cc:287
msgid "Falkland Islands (Malvinas)"
-msgstr "Falkland Islands (Malvinas)"
+msgstr "Falklandské ostrovy (MalvÃny)"
#. :FLK:238:
#: ../zypp/CountryCode.cc:288
@@ -4057,7 +4068,7 @@
#. :GLP:312:
#: ../zypp/CountryCode.cc:303
msgid "Equatorial Guinea"
-msgstr "Equatorial Guinea"
+msgstr "RovnÃková Guinea"
#. :GNQ:226:
#: ../zypp/CountryCode.cc:304
@@ -4600,7 +4611,7 @@
#. :ROU:642:
#: ../zypp/CountryCode.cc:401
msgid "Russian Federation"
-msgstr "Russian Federation"
+msgstr "Ruská Federace"
# RW
#. :RUS:643:
@@ -4697,7 +4708,7 @@
#. :SUR:740:
#: ../zypp/CountryCode.cc:418
msgid "Sao Tome and Principe"
-msgstr "Sao Tome and Principe"
+msgstr "Svatý Tomáš a Princův ostrov"
#. :STP:678:
#: ../zypp/CountryCode.cc:419
@@ -4709,7 +4720,7 @@
#. :SLV:222:
#: ../zypp/CountryCode.cc:420
msgid "Syria"
-msgstr "Suriname"
+msgstr "Sýrie"
# SZ
#. :SYR:760:
@@ -4985,85 +4996,3 @@
"OÄekáváno %s, nalezeno %s\n"
"Chcete soubor pÅesto použÃt?"
-#~ msgid "Unable to parse Url authority"
-#~ msgstr "Nelze analyzovat autoritu URL."
-
-#~ msgid "Ignore this requirement generally"
-#~ msgstr "Ignorovat požadavky"
-
-#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
-#~ msgstr "%s je požadován jinými instalovanými závislostmi a nelze odlinkovat."
-
-# 53583 AttribValues/description
-#~ msgid "Cannot create a file needed to perform update installation."
-#~ msgstr "Nelze vytvoÅit soubor potÅebný k provedenà instalace aktualizace."
-
-#~ msgid "Unable to restore all sources."
-#~ msgstr "Nelze obnovit všechny zdroje."
-
-#~ msgid "At least one source already registered, stored sources cannot be restored."
-#~ msgstr "Již je registrován nejménÄ jeden zdroj, uložené zdroje nelze obnovit."
-
-#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
-#~ msgstr "Nelze nainstalovat %s ke splnÄnà závislostà %s"
-
-#~ msgid "%s dependend on %s"
-#~ msgstr "%s závisà na %s"
-
-# 27557 AttribValues/label
-#~ msgid "Reading index files"
-#~ msgstr "Ätou se soubory indexu"
-
-#~ msgid "The signed repomd.xml file failed the signature check."
-#~ msgstr "NezdaÅila se kontrola podpisu podepsaného souboru repomd.xml."
-
-#~ msgid "Reading product from %s"
-#~ msgstr "Äte se produkt z %s"
-
-#~ msgid "Reading filelist from %s"
-#~ msgstr "Äte se seznam souborů z %s"
-
-#~ msgid "Reading packages from %s"
-#~ msgstr "Ätou se balÃky z %s"
-
-#~ msgid "Reading selection from %s"
-#~ msgstr "Äte se výbÄr z %s."
-
-#~ msgid "Reading pattern from %s"
-#~ msgstr "Äte se profil z %s."
-
-# 27557 AttribValues/label
-#~ msgid "Reading patches index %s"
-#~ msgstr "Äte se index oprav %s"
-
-#~ msgid "Reading patch %s"
-#~ msgstr "Äte se oprava %s"
-
-#~ msgid "The script file failed the checksum test."
-#~ msgstr "Kontrolnà souÄet souboru skriptu je chybný."
-
-#~ msgid "Reading packages file"
-#~ msgstr "Äte se soubor balÃku"
-
-# 33390 AttribValues/label
-#~ msgid "Reading translation: %s"
-#~ msgstr "Äte se pÅeklad: %s"
-
-#, fuzzy
-#~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?"
-#~ msgstr "Kontrola integrity balÃÄku %s se nezdaÅila. Chcete jej stáhnout znovu nebo zruÅ¡it instalaci?"
-
-#~ msgid " miss checksum."
-#~ msgstr " chybÄjÃcà kontrolnà souÄet."
-
-#~ msgid " fails checksum verification."
-#~ msgstr " selhala kontrola kontrolnÃho souÄtu."
-
-#~ msgid "Downloading %s"
-#~ msgstr "Stahuje se %s"
-
-#~ msgid "Downloaded %s from %s"
-#~ msgstr "Staženo %s z %s"
-
-#~ msgid "%s needed by %s"
-#~ msgstr "%s je vyžadován %s"
Modified: trunk/libzypp/po/cy.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/cy.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/cy.po (original)
+++ trunk/libzypp/po/cy.po Mon Sep 3 13:56:27 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2003-09-23 10:33+0200\n"
"Last-Translator: Kevin Donnelly <kevin(a)dotmon.com>\n"
"Language-Team: Welsh <i18n(a)suse.de>\n"
@@ -16,77 +16,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=5; plural=(n == 0 ? 0 : n == 1 ? 1 : n < 6 ? 2 : n == 6 ? 3 : 4);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2949,25 +2949,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2975,38 +2975,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3014,7 +3014,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3023,14 +3023,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3038,31 +3038,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3070,68 +3070,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Arsefydlu %s: \"%s\""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Rhaid arsefydlu'r pecynnau yma:"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3139,8 +3139,8 @@
msgstr "&Dileu"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3148,118 +3148,130 @@
msgstr "Arsefydlu %s: \"%s\""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "&Ie, gosod"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3270,7 +3282,7 @@
msgstr "Gosod gyrrydd..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3522,9 +3534,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3535,7 +3553,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3547,7 +3565,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3559,7 +3577,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Rhaid arsefydlu'r pecynnau yma:"
@@ -3570,7 +3588,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3581,24 +3599,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Gwall"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3658,7 +3676,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/da.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/da.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/da.po (original)
+++ trunk/libzypp/po/da.po Mon Sep 3 13:56:27 2007
@@ -11,8 +11,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 16:41+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 15:16+0200\n"
"Last-Translator: Martin Schlander <suse(a)linuxin.dk>\n"
"Language-Team: <opensuse-translation(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
@@ -21,77 +21,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "URL-oversigt tillader ikke %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ugyldig %s-komponent '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ugyldig %s-komponent"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Fortolkning af stiparameter er ikke understøttet af denne URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Fortolkning af forespørgselsstreng er ikke understøttet af denne URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url-oversigt er en påkrævet komponent"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ugyldig URL-oversigt '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "URL-oversigt tillader ikke et brugernavn"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "URL-oversigt tillader ikke en adgangskode"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "URL-oversigt kræver en værtskomponent"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "URL-oversigt tillader ikke en værtskomponent"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ugyldig værtskomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "URL-oversigt tillader ikke en port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ugyldig portkomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "URL-oversigt kræver et stinavn"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relativ sti er ikke tilladt hvis autoritet eksisterer"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Fortolkning af stiparameter er ikke understøttet af denne URL"
@@ -2812,25 +2812,25 @@
msgstr "%s erstattet af %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s vil blive slettet af brugeren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s vil blive slettet af et andet program (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s vil blive installeret af brugeren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s vil blive installeret af et andet program. (ApplLow/ApplHigh)\n"
@@ -2838,38 +2838,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Ingen gyldig løsning fundet udelukkende med resolvables fra bedste arktitektur."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "I denne kørsel er kun resolvables med den bedste arkitektur taget i betragtning.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "At tage alle mulige resolvables i betragtning tager tid men kan give et godt resultat."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ugyldig information"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s behøves af andre ændringer"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s er nødvendig for %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2879,7 +2879,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s konflikter med andre ændringer"
@@ -2888,14 +2888,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s konflikter med %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2905,24 +2905,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s forælder andre ændringer"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s forælder %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s forælder %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2931,7 +2931,7 @@
"Disse resolvables vil blive slettet fra systemet."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s afhænger af andre resolvables"
@@ -2939,38 +2939,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s afhænger af %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s afhænger af %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Barn af"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s kan ikke installeres"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Ingen tilbyder %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2978,31 +2978,31 @@
"\n"
"Der er ingen tilgængelige ressourcer, der understøtter dette krav."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Grundet problemerne beskrevet ovenfor/nedenunder vil denne beslutning ikke løse alle afhængigheder"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Kan ikke installere %s, fordi den konflikter med %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s er ikke blevet installeret og er markeret som ikke-installerbar"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Kan ikke installere %s grundet afhængighedsproblemer"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3010,8 +3010,8 @@
msgstr "slet %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3019,120 +3019,132 @@
msgstr "installér ikke %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s har ikke-opfyldte krav"
#
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s har manglende afhængigheder"
#
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Kan ikke installere %s grundet afhængighedsproblemer"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s opfylder afhængighedskravene til %s, men vil blive afinstalleret"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s opfylder afhængighederne for %s, men vil blive bevaret på systemet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Det er ikke nødvendigt at installere %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Kan ikke installere %s, for at opfylde afhængighedskravene til %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Kan ikke installere %s, for at opfylde afhængighedskravene til %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s vil ikke blive afinstalleret, da den stadig kræves"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s forælder %s. Men %s kan ikke slettes, fordi den er låst."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Kan ikke installere %s, fordi den konflikter"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s kan ikke installeres på grund af konflikter med %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Kravet %s kan ikke opfyldes."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorér dette krav her"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Ignorér dette krav generelt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installér %s selvom det ændrer arkitekturen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s giver denne afhængighed, men ændrer arkitekturen i det installerede element"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Installér %s selvom det ændrer 'leverandør'"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s giver denne afhængighed, men ændrer 'leverandør' for det installerede element"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorer denne konflikt med %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorér forældede %s i %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorér, at %s allerede er angivet til installation"
@@ -3142,7 +3154,7 @@
msgstr "Installér ikke, eller slet de pågældende resolvables"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "for at kræve %s til %s når du opgraderer %s"
@@ -3394,9 +3406,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s tilbyder %s, men har en anden arkitektur."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s tilbyder %s, men har en anden 'leverandør' (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Kan ikke tilfredsstille kravet %s for %s"
@@ -3407,7 +3425,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s er krævet af anden installeret resolvable, så den bliver ikke linket fra."
@@ -3419,7 +3437,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s er krævet af anden installeret resolvable, så den bliver ikke linket fra."
@@ -3431,7 +3449,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s er låst og kan ikke afinstalleres."
@@ -3442,7 +3460,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "En konflikt over %s (%s) kræver at %s, der er sat til installering, bliver fjernet."
@@ -3453,23 +3471,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Markerer %s som ikke-installerbar grundet konflikter over %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "fra %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Fejl!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Vigtigt!"
@@ -3529,8 +3547,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s opfriskes af %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s vil blive evalueret til installation (genopfrisket) af %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/de.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/de.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/de.po (original)
+++ trunk/libzypp/po/de.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2005-03-09 13:54+0100\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "%s laut URL-Schema nicht zulässig"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Unzulässige %s-Komponente: '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Unzulässige %s-Komponente"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Die Analyse von Pfadparametern wird für diese URL nicht unterstützt"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Die Analyse von Abfragezeichenketten wird für diese URL nicht unterstützt"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Das URL-Schema ist eine erforderliche Komponente"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "'%s' ist ein unzulässiges URL-Schema"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Benutzername laut URL-Schema nicht zulässig"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Passwort laut URL-Schema nicht zulässig"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Für das URL-Schema ist eine Host-Komponente erforderlich"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Host-Komponente laut URL-Schema nicht zulässig"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Unzulässige Host-Komponente: '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Port laut URL-Schema nicht zulässig"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Unzulässige Portkomponente: '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Für das URL-Schema ist ein Pfadname erforderlich"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Die Angabe des relativen Pfads ist nicht erlaubt, wenn die Zertifizierungsstelle vorhanden ist"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Die Analyse von Pfadparametern wird für diese URL nicht unterstützt"
@@ -2732,25 +2732,25 @@
msgstr "%s ersetzt durch %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s wird durch Benutzerinteraktion gelöscht.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s werden durch ein anderes Programm gelöscht.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s wird vom Benutzer installiert.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s wird durch ein andere Programm installiert.\n"
@@ -2758,41 +2758,41 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
#, fuzzy
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Wenn nur Abhängigkeiten der besten Architektur für diese Maschine verwendet werden, wird keine eindeutige Lösung gefunden."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
#, fuzzy
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Bei diesem Resolver-Lauf wurden nur Abhängigkeiten für die beste Architektur berücksichtigt.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
#, fuzzy
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Alle evtl. möglichen auflösbaren Objekte zu berücksichtigen braucht viel Zeit, kann aber zu einem besseren Ergebnis führen."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ungültige Informationen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s wird von anderen auflösbaren Objekten benötigt."
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s wird benötigt von %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2802,7 +2802,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s steht in Konflikt mit anderen auflösbaren Objekten"
@@ -2811,14 +2811,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s steht in Konflikt mit %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2828,24 +2828,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s ersetzt andere auflösbare Objekte"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s ersetzt %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s ersetzt:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2854,7 +2854,7 @@
"Diese auflösbaren Objekte werden aus dem System gelöscht."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s hängt von anderen auflösbaren Objekten ab"
@@ -2862,38 +2862,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s hängig von %s ab"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ist abhängig von:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Untergeordnetes Element von"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Installation von %s nicht möglich"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Kein Objekt stellt %s bereit."
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2902,32 +2902,32 @@
"\n"
"Es ist keine Ressource verfügbar, die diese Anforderung unterstützt."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Aufgrund der oben/unten beschriebenen Problemen löst diese Auflösung nicht alle Abhängigkeiten"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Installation von %s aufgrund eines Konflikts mit %s nicht möglich"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s ist nicht installiert und als nicht installierbar gekennzeichnet"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Installation von %s aufgrund von Abhängigkeitsproblemen nicht möglich"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2935,8 +2935,8 @@
msgstr "%s löschen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2944,119 +2944,131 @@
msgstr "%s nicht installieren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "Unerfüllbare Anforderungen von %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "Fehlende Abhängigkeiten von %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s kann aufgrund fehlender Abhängigkeiten nicht installiert werden"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s erfüllt die Abhängigkeiten von %s, wird jedoch deinstalliert"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s erfüllt die Abhängigkeiten von %s, wird jedoch in Ihrem System beibehalten"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s muss nicht installiert werden"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Installation von %s zur Erfüllung der Abhängigkeiten von %s nicht möglich"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Installation von %s zur Erfüllung der Abhängigkeiten von %s nicht möglich"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s wird nicht deinstalliert; wird noch immer benötigt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s ersetzt %s. %s kann aber nicht gelöscht werden, weil gesperrt."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Installation von %s aufgrund eines Konflikts nicht möglich"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s kann nicht installiert werden aufgrund von Konflikten mit %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Anforderung wird hier ignoriert"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Anforderung wird hier ignoriert"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s installieren, auch wenn sich die Architektur dadurch ändert"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s stellt diese Abhängigkeit zur Verfügung, ändert aber die Architektur des installierten Elements"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "%s installieren, auch wenn sich die Architektur dadurch ändert"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s stellt diese Abhängigkeit zur Verfügung, ändert aber die Architektur des installierten Elements"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Diesen Konflikt von %s ignorieren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Veraltete %s in %s ignorieren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorieren, dass %s bereits für die Installation festgelegt wurde"
@@ -3067,7 +3079,7 @@
msgstr "Betreffende auflösbare Objekte nicht installieren oder löschen"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "für die Voraussetzung von %s für %s beim Aufrüsten von %s"
@@ -3318,8 +3330,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s stellt %s zur Verfügung, hat aber eine andere Architektur"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s stellt %s zur Verfügung, hat aber eine andere Architektur"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Anforderung %s für %s kann nicht erfüllt werden"
@@ -3331,7 +3349,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s wird von anderem installierten auflösbaren Objekt benötigt. Demzufolge wird Verbindung nicht aufgehoben."
@@ -3343,7 +3361,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s wird von anderem installierten auflösbaren Objekt benötigt. Demzufolge wird Verbindung nicht aufgehoben."
@@ -3355,7 +3373,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s ist gesperrt und kann nicht deinstalliert werden."
@@ -3366,7 +3384,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Aufgrund eines Konflikts mit %s (%s) muss das zu installierende %s entfernt werden"
@@ -3377,23 +3395,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s wird aufgrund von Konflikten mit %s als nicht installierbar gekennzeichnet"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "von %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Fehler!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Wichtig!"
@@ -3452,8 +3470,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s wird aufgefrischt von %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4770,6 +4788,9 @@
"Erwartet: %s, gefunden: %s\n"
" Datei trotzdem verwenden?"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s wird aufgefrischt von %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Die Zertifizierungsstelle der URL kann nicht analysiert werden"
Modified: trunk/libzypp/po/el.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/el.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/el.po (original)
+++ trunk/libzypp/po/el.po Mon Sep 3 13:56:27 2007
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: zypp.el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-08-16 18:04+0300\n"
"Last-Translator: Vasileios Giannakopoulos <billg(a)hellug.gr>\n"
"Language-Team: Îλληνικά\n"
@@ -21,77 +21,77 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Το Url ÏÏήμα δεν εÏιÏÏÎÏει Îνα %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "ÎανθαÏμÎνο %s ÏÏ
ÏÏαÏÎ¹ÎºÏ '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "ÎανθαÏμÎνο %s ÏÏ
ÏÏαÏικÏ"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "ΠανάλÏ
Ïη ÏαÏαμÎÏÏοÏ
διαδÏÎ¿Î¼Î®Ï Î´ÎµÎ½ Ï
ÏοÏÏηÏίζεÏαι αÏÏ Î±Ï
ÏÏ Ïο URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "ΠανάλÏ
Ïη γÏÎ±Î¼Î¼Î®Ï Î±Î½Î±Î¶Î®ÏηÏÎ·Ï Î´ÎµÎ½ Ï
ÏοÏÏηÏίζεÏαι αÏÏ Î±Ï
ÏÏ Ïο URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Το ÏÏήμα Url είναι Îνα αÏαιÏοÏμενο ÏÏ
ÏÏαÏικÏ"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "ÎανθαÏμÎνο ÏÏήμα Url '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Το ÏÏήμα Url δεν εÏιÏÏÎÏει Ïνομα ÏÏήÏÏη"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Το ÏÏήμα Url δεν εÏιÏÏÎÏει ÏÏ
νθημαÏικÏ"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Το ÏÏήμα Url αÏαιÏεί Îνα ÏÏ
ÏÏαÏÎ¹ÎºÏ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏή"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Το ÏÏήμα Url δεν εÏιÏÏÎÏει Îνα ÏÏ
ÏÏαÏÎ¹ÎºÏ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏή"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "ÎανθαÏμÎνο ÏÏ
ÏÏαÏÎ¹ÎºÏ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏÏή '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Το ÏÏήμα Url δεν ÏÎ±Ï ÎµÏιÏÏÎÏει μια θÏÏα"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "ÎανθαÏμÎνο ÏÏ
ÏÏαÏÎ¹ÎºÏ Î¸ÏÏÎ±Ï '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Το ÏÏήμα Url αÏαιÏεί Ïνομα διαδÏομήÏ"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "ΣÏεÏική διαδÏομή δεν εÏιÏÏÎÏεÏαι εαν Ï
ÏάÏÏει αÏÏή"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "ΠανάλÏ
Ïη ΠαÏαμÎÏÏοÏ
ÎιαδÏÎ¿Î¼Î®Ï Î´ÎµÎ½ Ï
ÏοÏÏηÏίζεÏαι αÏÏ Î±Ï
ÏÏ Ïο URL"
@@ -2741,7 +2741,7 @@
msgstr "%s ανÏικαÏαÏÏάθηκε αÏÏ %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2749,19 +2749,19 @@
"ÎÏ
Ïά Ïα εÏιλÏÏιμα θα διαγÏαÏοÏν αÏÏ Ïο ÏÏÏÏημα."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "Το %s δεν θα αÏεγκαÏαÏÏαθεί γιαÏί ακÏμη αÏαιÏείÏαι"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2769,41 +2769,41 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
#, fuzzy
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Îεν βÏÎθηκε ÎγκÏ
Ïη λÏÏη με μοναδικά εÏιλÏÏιμα ÏÎ·Ï ÎºÎ±Î»ÏÏεÏÎ·Ï Î±ÏÏιÏεκÏονικήÏ"
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
#, fuzzy
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Îε αÏ
ÏÏ ÎµÎºÏελείÏε μÏνο εÏιλÏÏιμα με Ïην καλÏÏεÏη θεÏÏοÏμενη αÏÏιÏεκÏονική.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
#, fuzzy
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "ÎÏον αÏοÏά Ïλα Ïα Ïιθανά εÏιλÏÏιμα, ÏαίÏνει ÏÏÏνο αλλά μÏοÏεί να Ï
ÏάÏξει ÎγκÏ
Ïο αÏοÏÎλεÏμα."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "ÎανθαÏμÎνη ÏληÏοÏοÏία"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "Το %s ÏÏειάζεÏαι αÏÏ Î¬Î»Î»Î± εÏιλÏÏιμα"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "Το %s ÏÏειάζεÏαι αÏÏ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2813,7 +2813,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "Το %s ÏÏ
γκÏοÏεÏαι με άλλα εÏιλÏÏιμα"
@@ -2822,14 +2822,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "Το %s ÏÏ
γκÏοÏεÏαι με %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2839,24 +2839,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "Το %s ÏεÏαλαιÏνει άλλα εÏιλÏÏιμα"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "Το %s ÏεÏαλαιÏνει %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "Το %s ÏεÏαλαιÏνει: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2865,7 +2865,7 @@
"ÎÏ
Ïά Ïα εÏιλÏÏιμα θα διαγÏαÏοÏν αÏÏ Ïο ÏÏÏÏημα."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "Το %s εξαÏÏάÏαι αÏÏ Î¬Î»Î»Î± εÏιλÏÏιμα"
@@ -2873,38 +2873,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "Το %s εξαÏÏάÏαι αÏÏ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "Το %s εξαÏÏάÏαι αÏÏ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Παιδί ÏοÏ
"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "ÎανÎÎ½Î±Ï Î´ÎµÎ½ ÏαÏÎÏει Ïο %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2913,32 +2913,32 @@
"\n"
"Îεν Ï
ÏάÏÏει διαθÎÏÎ¹Î¼Î¿Ï ÏÏÏÎ¿Ï ÏοÏ
να Ï
ÏοÏÏηÏίζει αÏ
Ïή Ïην αÏαίÏηÏη."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ÎξαιÏÎ¯Î±Ï ÏÏοβλημάÏÏν ÏοÏ
ÏεÏιγÏάÏονÏαι ÏαÏαÏάνÏ/ÏαÏακάÏÏ Î±Ï
Ïή η εÏίλÏ
Ïη δεν θα λÏÏει ÏÎ»ÎµÏ ÏÎ¹Ï ÎµÎ¾Î±ÏÏήÏειÏ"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s εÏειδή ÏÏ
γκÏοÏεÏαι με Ïο %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Το %s δεν είναι εγκαÏεÏÏημÎνο και ÎÏει ÏημειÏθεί ÏÏ Î¼Î· εγκαÏαÏÏήÏιμο"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s εξαιÏÎ¯Î±Ï ÏÏοβλημάÏÏν εξαÏÏήÏεÏν"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2946,8 +2946,8 @@
msgstr "διαγÏαÏή %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2955,119 +2955,131 @@
msgstr "να μην εγκαÏαÏÏαθεί Ïο %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "Ïο %s ÎÏει μη εκÏληÏÏμÎÎ½ÎµÏ Î±ÏαιÏήÏειÏ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "Ïο %s ÎÏει ελλειÏÎµÎ¯Ï ÎµÎ¾Î±ÏÏήÏειÏ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Ïο %s δε μÏοÏεί να εγκαÏαÏÏαθεί εξαιÏÎµÎ¯Î±Ï ÎµÎ»Î»ÎµÎ¹ÏÏν εξαÏÏήÏεÏν"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "Ïο %s εκÏληÏÏνει ÏÎ¹Ï ÎµÎ¾Î±ÏÏήÏÎµÎ¹Ï ÏοÏ
%s αλλά θα αÏεγκαÏαÏÏαθεί"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "Ïο %s εκÏληÏÏνει ÏÎ¹Ï ÎµÎ¾Î±ÏÏήÏÎµÎ¹Ï ÏοÏ
%s αλλά θα διαÏηÏηθεί ÏÏο ÏÏÏÏημα ÏαÏ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Îαμια ανάγκη για εγκαÏάÏÏαÏη %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s με ÏκοÏÏ Ïην εκÏλήÏÏÏη ÏÏν εξαÏÏήÏεÏν ÏοÏ
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s με ÏκοÏÏ Ïην εκÏλήÏÏÏη ÏÏν εξαÏÏήÏεÏν ÏοÏ
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "Το %s δεν θα αÏεγκαÏαÏÏαθεί γιαÏί ακÏμη αÏαιÏείÏαι"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "Το %s ÏεÏαλαιÏνει Ïο %s. Îλλά Ïο %s δεν μÏοÏεί να διαγÏαÏεί εÏειδή είναι κλειδÏμÎνο."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "ÎδÏ
ναμία εγκαÏάÏÏαÏÎ·Ï %s εÏειδή ÏÏ
γκÏοÏεÏαι"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "Το %s είναι μη εγκαÏαÏÏήÏιμο εξαιÏÎ¯Î±Ï ÏÏ
γκÏοÏÏεÏν με Ïο %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ÎγνÏηÏη αÏ
ÏÎ®Ï ÏÎ·Ï Î±ÏαίÏηÏÎ·Ï Î¼Ïνο εδÏ"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ÎγνÏηÏη αÏ
ÏÎ®Ï ÏÎ·Ï Î±ÏαίÏηÏÎ·Ï Î¼Ïνο εδÏ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ÎγκαÏάÏÏαÏη %s ÏαÏÏλο ÏοÏ
θα αλλάξει Ïην αÏÏιÏεκÏονική"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "Το %s ÏαÏÎÏει αÏ
Ïή Ïην εξάÏÏηÏη αλλά θα αλλάξει Ïην αÏÏιÏεκÏονική ÏοÏ
εγκαÏεÏÏημÎνοÏ
ανÏικειμÎνοÏ
"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "ÎγκαÏάÏÏαÏη %s ÏαÏÏλο ÏοÏ
θα αλλάξει Ïην αÏÏιÏεκÏονική"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "Το %s ÏαÏÎÏει αÏ
Ïή Ïην εξάÏÏηÏη αλλά θα αλλάξει Ïην αÏÏιÏεκÏονική ÏοÏ
εγκαÏεÏÏημÎνοÏ
ανÏικειμÎνοÏ
"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "ÎγνÏηÏη αÏ
ÏÎ®Ï ÏÎ·Ï ÏÏγκÏοÏ
ÏÎ·Ï ÏοÏ
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "ÎγνÏηÏη ÏοÏ
ÏεÏαλαιÏμÎνοÏ
%s ÏÏο %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "ÎγνÏηÏη οÏι Ïο %s είναι ήδη ÎÏοιμο για εγκαÏάÏÏαÏη"
@@ -3078,7 +3090,7 @@
msgstr "Îα μην γίνει εγκαÏάÏÏαÏη ή διαγÏαÏή ÏοÏ
αÏοÏά εÏιλÏÏιμα"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "για Ïην αÏαίÏηÏη %s για %s ÏÏαν αναβαθμίζεÏαι Ïο %s"
@@ -3329,8 +3341,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "Το %s ÏαÏÎÏει Ïο %s, αλλά ÎÏει διαÏοÏεÏική αÏÏιÏεκÏονική."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "Το %s ÏαÏÎÏει Ïο %s, αλλά ÎÏει διαÏοÏεÏική αÏÏιÏεκÏονική."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "ÎδÏ
ναμία ικανοÏοίηÏÎ·Ï Î±Î¯ÏηÏÎ·Ï %s για %s"
@@ -3342,7 +3360,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "Το %s αÏαιÏείÏαι αÏÏ Î¬Î»Î»Î¿ εγκαÏεÏÏημÎνο εÏιλÏÏιμο, εÏομÎνÏÏ Î´ÎµÎ½ θα αÏοεÏιλεÏθεί."
@@ -3354,7 +3372,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "Το %s αÏαιÏείÏαι αÏÏ Î¬Î»Î»Î¿ εγκαÏεÏÏημÎνο εÏιλÏÏιμο, εÏομÎνÏÏ Î´ÎµÎ½ θα αÏοεÏιλεÏθεί."
@@ -3366,7 +3384,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Το %s είναι κλειδÏμÎνο και δε μÏοÏεί να αÏεγκαÏαÏÏαθεί."
@@ -3377,7 +3395,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Îια διαμάÏη ÏÏο %s (%s) αÏαιÏεί Ïην αÏαίÏεÏη ÏοÏ
ÏÏÎ¿Ï ÎµÎ³ÎºÎ±ÏάÏÏαÏη %s"
@@ -3388,23 +3406,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "ΣημειÏνονÏÎ±Ï Ïο %s ÏÏ Î¼Î· εγκαÏαÏÏήÏιμο λÏÎ³Ï ÏÏν διαμαÏÏν ÏÏο %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "αÏÏ Ïο %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "ΣÏάλμα!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "ΣημανÏικÏ!"
@@ -3462,9 +3480,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "Το %s ÏÏειάζεÏαι αÏÏ %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4784,6 +4802,10 @@
"ÎναμενÏÏαν %s, βÏÎθηκε %s\n"
"ΧÏήÏη αÏ
ÏÎ¿Ï ÏοÏ
αÏÏείοÏ
ÏαÏ' αÏ
Ïά;"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "Το %s ÏÏειάζεÏαι αÏÏ %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "ÎδÏ
ναμία ανάλÏ
ÏηÏÏ ÏÎ·Ï Î±ÏÏÎ®Ï Url"
Modified: trunk/libzypp/po/en_GB.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/en_GB.po?rev=7083&r1=…
==============================================================================
--- trunk/libzypp/po/en_GB.po (original)
+++ trunk/libzypp/po/en_GB.po Mon Sep 3 13:56:27 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-08-19 16:20+0100\n"
"Last-Translator: Benjamin Weber <b.weber(a)warwick.ac.uk>\n"
"Language-Team: <en(a)li.org>\n"
@@ -20,77 +20,77 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url scheme does not allow a %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Invalid %s component '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Invalid %s component"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Path parameter parsing not supported for this URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Query string parsing not supported for this URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url scheme is a required component"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Invalid Url scheme '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url scheme does not allow a username"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url scheme does not allow a password"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url scheme requires a host component"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url scheme does not allow a host component"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Invalid host component '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url scheme does not allow a port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Invalid port component '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url scheme requires path name"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relative path not allowed if authority exists"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Path Parameter parsing not supported for this URL"
@@ -2735,25 +2735,25 @@
msgstr "%s replaced by %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s will be deleted by the user.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s will be installed by the user.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s will be installed by another application. (ApplLow/ApplHigh)\n"
@@ -2761,38 +2761,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "No valid solution found with just resolvables of best architecture."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "With this run only resolvables with the best architecture have been regarded.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Regarding all possible resolvables takes time, but can come to a valid result."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Invalid information"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s is needed by other resolvables"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s is needed by %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2802,7 +2802,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s conflicts with other resolvables"
@@ -2811,14 +2811,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s conflicts with %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2828,24 +2828,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s obsoletes other resolvables"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s obsoletes %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s obsoletes:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2854,7 +2854,7 @@
"These resolvables will be deleted from the system."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depends on other resolvables"
@@ -2862,38 +2862,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s depends on %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s depends on:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Child of"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Cannot install %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "None provides %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2901,31 +2901,31 @@
"\n"
"There is no resource available which supports this requirement."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Due to the problems described above/below, this resolution will not solve all dependencies"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Cannot install %s, because it is conflicting with %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s is not installed and has been marked as not installable"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Cannot install %s due to dependency problems"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2933,8 +2933,8 @@
msgstr "delete %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2942,118 +2942,130 @@
msgstr "do not install %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s has unfulfilled requirements"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s has missing dependencies"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s cannot be installed due to missing dependencies"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s fulfils dependencies of %s but will be uninstalled"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s fulfils dependencies of %s but will be kept on your system"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "No need to install %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Cannot install %s to fulfil the dependencies of %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Cannot install %s to fulfil the dependencies of %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s will not be uninstalled, because it is still required"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s obsoletes %s. But %s cannot be deleted, because it is locked."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Cannot install %s, because it is conflicting"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s is not installable due to conflicts with %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Requirement %s cannot be fulfilled."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignore this requirement just here"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Generally ignore this requirement"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Install %s although it would change the architecture"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s provides this dependency, but would change the architecture of the installed item"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Install %s although it would change the architecture"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s provides this dependency, but would change the architecture of the installed item"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignore this conflict of %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignore the obsolete %s in %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignore that %s is already set to install"
@@ -3063,7 +3075,7 @@
msgstr "Do not install or delete the resolvables concerned"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "for requiring %s for %s when upgrading %s"
@@ -3314,8 +3326,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s provides %s, but has another architecture."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s provides %s, but has another architecture."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Can't satisfy requirement %s for %s"
@@ -3327,7 +3345,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s is required by another resolvable selected for installation, so it won't be unlinked."
@@ -3339,7 +3357,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s is required by another installed resolvable, so it won't be unlinked."
@@ -3351,7 +3369,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s is locked and cannot be uninstalled."
@@ -3362,7 +3380,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
@@ -3373,23 +3391,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Marking %s as not installable due to conflicts over %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "from %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Error!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Important!"
@@ -3447,8 +3465,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4767,3 +4785,5 @@
"Expected %s, found %s\n"
"Use the file anyway?"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s is freshened by %s"
Modified: trunk/libzypp/po/en_US.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/en_US.po?rev=7083&r1=…
==============================================================================
--- trunk/libzypp/po/en_US.po (original)
+++ trunk/libzypp/po/en_US.po Mon Sep 3 13:56:27 2007
@@ -6,8 +6,8 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2002-07-18 14:04+0200\n"
+"POT-Creation-Date: 2007-08-28 11:53+0200\n"
+"PO-Revision-Date: 2007-08-22 14:13+0200\n"
"Last-Translator: proofreader <i18n(a)suse.de>\n"
"Language-Team: English <i18n(a)suse.de>\n"
"MIME-Version: 1.0\n"
@@ -15,77 +15,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "Invalid component URI: "
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Invalid component URI: "
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Invalid privilege '{0}'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Invalid component URI: "
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Invalid component URI: "
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2734,25 +2734,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2760,38 +2760,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2799,7 +2799,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2808,14 +2808,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2823,31 +2823,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2855,68 +2855,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2924,8 +2924,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2933,118 +2933,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Requirement %s cannot be fulfilled."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3054,7 +3066,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3305,9 +3317,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3318,7 +3336,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3330,7 +3348,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3342,7 +3360,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3353,7 +3371,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3364,23 +3382,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3438,7 +3456,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/es.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/es.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/es.po (original)
+++ trunk/libzypp/po/es.po Mon Sep 3 13:56:27 2007
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-05-31 13:42\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -20,77 +20,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "El esquema de URL no permite un elemento %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Componente %s incorrecto %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Componente %s incorrecto"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "El análisis de parámetros de vÃa no es compatible con esta dirección URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "El análisis de cadenas de consulta no es compatible con esta dirección URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "El esquema de url es un componente obligatorio"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Esquema de URL incorrecto %s."
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "El esquema de URL no permite un nombre de usuario"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "El esquema de URL no permite una contraseña"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "El esquema de URL requiere un componente host"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "El esquema de URL no permite un componente host"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Componente host incorrecto %s"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "El esquema de URL no permite un puerto"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Componente de puerto incorrecto %s"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "El esquema URL requiere un nombre de vÃa"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "No se permiten vÃas relativas si existe una autoridad"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "El análisis de parámetros de vÃa no es compatible con esta dirección URL"
@@ -2753,7 +2753,7 @@
msgstr "%s es sustituido por %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2761,19 +2761,19 @@
"Estas resoluciones se suprimirán del sistema."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s no se desinstalará porque aún es necesario"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2781,38 +2781,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Información no válida"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "Otras resoluciones necesitan %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s es necesario para %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2822,7 +2822,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s entra en conflicto con otras resoluciones"
@@ -2831,14 +2831,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s está en conflicto con %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2848,24 +2848,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s deja obsoletas a otras resoluciones"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s deja obsoleto a %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s deja obsoleto a:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2874,7 +2874,7 @@
"Estas resoluciones se suprimirán del sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depende de otras resoluciones"
@@ -2882,20 +2882,20 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s depende de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s depende de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Elemento secundario de"
@@ -2904,19 +2904,19 @@
# include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "No es posible instalar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "No se proporciona %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2925,32 +2925,32 @@
"\n"
"No hay ningún recurso disponible que cumpla este requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Debido a los problemas descritos a continuación o anteriormente, esta resolución no resolverá todas las dependencias"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "No es posible instalar %s porque entra en conflicto con %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s no se ha instalado y se ha marcado como no instalable"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "No es posible instalar %s debido a problemas de dependencias"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2961,8 +2961,8 @@
# include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249
# include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2970,114 +2970,126 @@
msgstr "no instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s tiene requisitos sin cumplir"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "Faltan dependencias de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s no se puede instalar debido a dependencias que no están presentes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s satisface las dependencias de %s, pero se desinstalará"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s satisface las dependencias de %s, pero se conservará en el sistema"
# clients/online_update_load.ycp:1004
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "No es necesario instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "No es posible instalar %s para satisfacer las dependencias de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "No es posible instalar %s para satisfacer las dependencias de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s no se desinstalará porque aún es necesario"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s deja obsoleto a %s. Pero no se puede suprimir %s porque está bloqueado."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "No es posible instalar %s porque tiene un conflicto"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s no se puede instalar debido a conflictos con %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Omitir este requisito sólo aquÃ"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Omitir este requisito sólo aquÃ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Instalar %s aunque cambie la arquitectura"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s proporciona esta dependencia, pero cambiará la arquitectura del elemento instalado"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Instalar %s aunque cambie la arquitectura"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s proporciona esta dependencia, pero cambiará la arquitectura del elemento instalado"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Omitir este conflicto de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Omitir el %s obsoleto de %s"
@@ -3086,7 +3098,7 @@
# include/scanner/scanner_start.ycp:180
# include/scanner/scanner_start.ycp:180
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Omitir que %s ya está configurado para la instalación"
@@ -3097,7 +3109,7 @@
msgstr "No instalar ni suprimir las resoluciones relativas"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "para requerir %s para %s al actualizar %s"
@@ -3357,8 +3369,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s proporciona %s, pero tiene otra arquitectura."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s proporciona %s, pero tiene otra arquitectura."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "No es posible cumplir el requisito %s para %s"
@@ -3370,7 +3388,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "Otra resolución instalada requiere %s, por lo que no se anulará el enlace."
@@ -3382,7 +3400,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "Otra resolución instalada requiere %s, por lo que no se anulará el enlace."
@@ -3394,7 +3412,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s está bloqueado y no es posible desinstalarlo."
@@ -3405,7 +3423,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Un conflicto en %s (%s) requiere eliminar la resolución %s incluida para la instalación"
@@ -3416,25 +3434,25 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Marcando %s como no instalable debido a conflictos en %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "de %s"
# include/ui/common_messages.ycp:95
# include/ui/common_messages.ycp:99
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Error"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Importante"
@@ -3491,9 +3509,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s es necesario para %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4812,6 +4830,10 @@
"Se esperaba %s, se ha encontrado %s\n"
" ¿Desea utilizar el archivo de todos modos?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s es necesario para %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "No es posible analizar la dirección URL de autoridad"
Modified: trunk/libzypp/po/et.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/et.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/et.po (original)
+++ trunk/libzypp/po/et.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: zypp.et\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-05-04 13:39+0300\n"
"Last-Translator: Ain Vagula <avagula(a)gmail.com>\n"
"Language-Team: Estonian <linux-ee(a)lists.eenet.ee>\n"
@@ -18,77 +18,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "Vigane komponendi URI: "
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Vigane komponendi URI: "
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "vigane teenuse nimi '%1'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Vigane komponendi URI: "
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Vigane komponendi URI: "
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2741,25 +2741,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s tuleb paigaldada."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2767,38 +2767,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Vigane teave"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2806,7 +2806,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2815,14 +2815,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2830,31 +2830,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2862,68 +2862,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2931,8 +2931,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2940,118 +2940,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s tuleb paigaldada."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3061,7 +3073,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3312,9 +3324,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3325,7 +3343,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3337,7 +3355,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3349,7 +3367,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3360,7 +3378,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3371,23 +3389,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Viga!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Oluline!"
@@ -3445,7 +3463,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/fi.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/fi.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/fi.po (original)
+++ trunk/libzypp/po/fi.po Mon Sep 3 13:56:27 2007
@@ -13,9 +13,9 @@
msgstr ""
"Project-Id-Version: zypp.fi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-16 00:30+0300\n"
-"Last-Translator: Sami Vento <sami.vento(a)opensuse.fi>\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 21:18+0300\n"
+"Last-Translator: Jyri Palokangas <jmp(a)opensuse.fi>\n"
"Language-Team: Suomi <fi(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -23,77 +23,77 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Ei sallittu URL-mallissa: %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Virheellinen %s-komponentti '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Virheellinen %s-komponentti"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Tämän URL-osoitteen jäsentäminen parametreihin ei ole tuettu"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Tämän URL-osoitteen jäsentäminen kyselyksi ei ole tuettu"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url-malli on pakollinen"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Virheellinen URL-muoto '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "URL-malli ei salli käyttäjänimeä"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "URL-malli ei salli salasanaa"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url-malli edellyttää konenimen"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "URL-malli ei salli konenimeä"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Virheellinen konenimen komponentti '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "URL-malli ei salli portin määritystä"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Virheellinen komponentti porttimäärityksessä '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "URL-malli edellyttää polun nimen määrittämisen"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Suhteellisen polun määrittäminen ei ole sallittua, jos valtuuttaja on määritetty"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Tämä URL-osoite ei tue polun jäsentämistä"
@@ -2865,25 +2865,25 @@
msgstr "%s korvataan osalla %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s poistetaan käyttäjän mukana.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s poistetaan toisen ohjelman mukana. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s asennetaan käyttäjän mukana.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s asennetaan toisen ohjelman mukana. (ApplLow/ApplHigh)\n"
@@ -2891,38 +2891,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Parhaiten soveltuvasta arkkitehtuurin paketeista ei löytynyt sopivia ratkaisuja pakettiriivuuksien tyydyttämiseksi."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Tällä ajolla harkitaan ainoastaan parhaiten soveltuvan arkkitehtuuria.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Tarkastelemalla kaikkia mahdollisia vaihtoehtoja voidaan löytää sopiva ratkaisu, mutta se vie aikaa."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Epäkelvot tiedot"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "Muut osat tarvitsevat %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%2$s tarvisee osaa %1$s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2932,7 +2932,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s on ristiriidassa muiden osien kanssa"
@@ -2941,14 +2941,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s on ristiriidassa osan %s kanssa"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2958,24 +2958,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s vanhentaa muut osat"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s vanhentaa %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s vanhentaa:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2984,7 +2984,7 @@
"Nämä osat poistetaan järjestelmästä."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s on riippuvainen muista osista"
@@ -2992,38 +2992,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s on riippuvainen osasta %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s riippuu osasta:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Lapsi"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Ei voida asentaa %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Mikään ei tarjoa %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -3031,31 +3031,31 @@
"\n"
"Ei ole saatavilla osaa, joka täyttäisi tämän riippuvuuden."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Yllä tai alla kuvattujen ongelmien takia tämä ehdotus ei ratkaise kaikkia riippuvuuksia"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Ei voida asentaa osaa %s, koska se on ristiriidassa osan %s kanssa"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s ei asennettu ja se on merkitty poistettavaksi"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Ei voida asentaa %s riippuvuusongelmien vuoksi"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3063,8 +3063,8 @@
msgstr "poista %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3072,118 +3072,130 @@
msgstr "älä asenna %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "Osalla %s on täyttämättömiä vaatimuksia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "osalla %s on puuttuvia riippuvuuksia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Osaa %s ei voida asentaa puuttuvien riippuvuuksien takia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "Osa %s täyttää osan %s riippuvuudet, mutta se poistetaan"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "Osa %s täyttää osan %s riippuvuudet ja se säilytetään järjestelmässä"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Ei tarvetta asentaa %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Ei voida asentaa %s täyttämään osan %s riippuvuudet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Ei voida asentaa %s täyttämään osan %s riippuvuudet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ei poisteta, koska sitä tarvitaan edelleen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "osa %s vanhentaa %s. Mutta %s ei voida poistaa koska se on lukittu."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "osaa %s ei voida asentaa, koska se on ristiriidassa"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s on poistettavissa, koska se on ristiriidassa osan %s kanssa"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Tarvetta %s ei voida täyttää."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Jätä tämä vaatimus huomiotta vain tässä"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Jätä tämä vaatimus huomiotta"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Asenna %s vaikka se muuttaisi arkkitehtuuria"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s tarjoaa tämän riippuvuuden, mutta vaihtaa asennetun kohteen arkkitehtuurin"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Asenna %s vaikka se muuttaisi valmistajan"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s tarjoaa tämän riippuvuuden, mutta vaihtaa asennetun kohteen valmistajan"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Jätä osan %s ristiriitaa huomiotta"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Jätä osan %s vanhentuminen %s huomiotta"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Jätä huomiotta, että %s on jo asetettu asennettavaksi"
@@ -3193,7 +3205,7 @@
msgstr "Ãlä asenna tai poista tätä koskevia osia"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "tarvitaan %s osaa %s varten, kun päivitetään %s"
@@ -3444,9 +3456,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "Osa %s tarjoaa %s, mutta se on eri arkkitehtuuria."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "Osa %s tarjoaa %s, mutta sillä on eri valmistaja (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ei voida tyydyttää vaatimusta %s osalle %s"
@@ -3457,7 +3475,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "Jokin asennettavaksi merkitty paketti vaatii osan %s, joten sitä ei poisteta."
@@ -3469,7 +3487,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "Muu asennettu osa vaatii %s, joten sitä ei poisteta."
@@ -3481,7 +3499,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s on lukittu ja sitä ei voida poistaa."
@@ -3492,7 +3510,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Ristiriita osasta %s (%s) vaatii asennettavaksi määritellyn %s poistamista"
@@ -3503,23 +3521,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Merkitään %s poistettavaksi %s olevan ristiriidan vuoksi"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s:sta"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Virhe!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Tärkeä!"
@@ -3577,8 +3595,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%2$s päivittää osan %1$s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s on määritelty asennettavaksi (päivitettäväksi) %s takia"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -5100,11 +5118,3 @@
"Odotettiin arvoa %s, saatiin %s\n"
"Käytetäänkö tiedostoa silti?"
-#~ msgid "Unable to parse Url authority"
-#~ msgstr "URL-valtuuttajaa ei voitu jäsentää"
-
-#~ msgid "Ignore this requirement generally"
-#~ msgstr "Jätä tämä vaatimus huomiotta yleisesti"
-
-#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
-#~ msgstr "Muut asennettavat osat vaativat %s, joten sitä ei poisteta."
Modified: trunk/libzypp/po/fr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/fr.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/fr.po (original)
+++ trunk/libzypp/po/fr.po Mon Sep 3 13:56:27 2007
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-16 14:14+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-29 17:29+0200\n"
"Last-Translator: Guillaume GARDET <guillaume.gardet(a)free.fr>\n"
"Language-Team: French Team <opensuse-fr(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
@@ -19,77 +19,79 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Le schéma de l'Url n'autorise pas de %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Composant '%s' non valide %s "
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Composant %s non valide"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Analyse du paramètre de chemin non prise en charge pour cette URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782
+#: ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Analyse de la chaîne de requête non prise en charge pour cette URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Le modèle URL est un composant requis"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Schéma d'Url '%s' non valide"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Le schéma de l'Url n'autorise pas de nom d'utilisateur"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Le schéma de l'Url n'autorise pas de mot de passe"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Le schéma de l'Url nécessite un composant d'hôte"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Le schéma de l'Url n'autorise pas de composant d'hôte"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Composant d'hôte non valide '%s' "
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Le schéma de l'Url n'autorise pas de port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Composant de port non valide '%s' "
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Le schéma de l'Url requiert un nom de chemin"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117
+#: ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Chemin relatif non autorisé en présence d'une autorité"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Analyse du paramètre de chemin non prise en charge pour cette URL"
@@ -153,11 +155,13 @@
msgid "Unsupported HTTP authentication method '%s'"
msgstr "Méthode d'autentification HTTP '%s' non supportée"
-#: ../zypp/media/MediaCurl.cc:715 ../zypp/media/MediaCurl.cc:784
+#: ../zypp/media/MediaCurl.cc:715
+#: ../zypp/media/MediaCurl.cc:784
msgid "Invalid user name or password."
msgstr "Mot de passe ou nom d'utilisateur invalide."
-#: ../zypp/media/MediaCurl.cc:718 ../zypp/media/MediaCurl.cc:787
+#: ../zypp/media/MediaCurl.cc:718
+#: ../zypp/media/MediaCurl.cc:787
#, c-format
msgid "Authentication required for '%s'"
msgstr "Authentification requise pour '%s'"
@@ -209,7 +213,8 @@
msgid "Invalid empty Url object reference"
msgstr "Référence de l'objet d'Url vide non valide"
-#: ../zypp/Url.cc:321 ../zypp/Url.cc:335
+#: ../zypp/Url.cc:321
+#: ../zypp/Url.cc:335
msgid "Unable to parse Url components"
msgstr "Impossible d'analyser les composants de l'Url"
@@ -219,7 +224,8 @@
#. Defined LanguageCode constants
#. Defined CountryCode constants
-#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215
+#: ../zypp/LanguageCode.cc:225
+#: ../zypp/CountryCode.cc:215
msgid "No Code"
msgstr "Pas de code"
@@ -284,7 +290,8 @@
msgstr "Akkadien"
#. language code: alb sqi sq
-#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264
+#: ../zypp/LanguageCode.cc:262
+#: ../zypp/LanguageCode.cc:264
msgid "Albanian"
msgstr "Albanais"
@@ -334,7 +341,8 @@
msgstr "Aragonais"
#. language code: arm hye hy
-#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286
+#: ../zypp/LanguageCode.cc:284
+#: ../zypp/LanguageCode.cc:286
msgid "Armenian"
msgstr "Arménien"
@@ -434,7 +442,8 @@
msgstr "Balinais"
#. language code: baq eus eu
-#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328
+#: ../zypp/LanguageCode.cc:326
+#: ../zypp/LanguageCode.cc:328
msgid "Basque"
msgstr "Basque"
@@ -544,7 +553,8 @@
msgstr "Bulgare"
#. language code: bur mya my
-#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374
+#: ../zypp/LanguageCode.cc:372
+#: ../zypp/LanguageCode.cc:374
msgid "Burmese"
msgstr "Birman"
@@ -609,7 +619,8 @@
msgstr "Djaghatai"
#. language code: chi zho zh
-#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402
+#: ../zypp/LanguageCode.cc:400
+#: ../zypp/LanguageCode.cc:402
msgid "Chinese"
msgstr "Chinois"
@@ -719,7 +730,8 @@
msgstr "Couchitiques (autres langues)"
#. language code: cze ces cs
-#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448
+#: ../zypp/LanguageCode.cc:446
+#: ../zypp/LanguageCode.cc:448
msgid "Czech"
msgstr "Tchèque"
@@ -794,7 +806,8 @@
msgstr "Néerlandais moyen (vers 1050-1350)"
#. language code: dut nld nl
-#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480
+#: ../zypp/LanguageCode.cc:478
+#: ../zypp/LanguageCode.cc:480
msgid "Dutch"
msgstr "Hollandais"
@@ -899,7 +912,8 @@
msgstr "Fon"
#. language code: fre fra fr
-#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524
+#: ../zypp/LanguageCode.cc:522
+#: ../zypp/LanguageCode.cc:524
msgid "French"
msgstr "Français"
@@ -949,12 +963,14 @@
msgstr "Germaniques (autres langues)"
#. language code: geo kat ka
-#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546
+#: ../zypp/LanguageCode.cc:544
+#: ../zypp/LanguageCode.cc:546
msgid "Georgian"
msgstr "Géorgien"
#. language code: ger deu de
-#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550
+#: ../zypp/LanguageCode.cc:548
+#: ../zypp/LanguageCode.cc:550
msgid "German"
msgstr "Allemand"
@@ -1024,7 +1040,8 @@
msgstr "Grec ancien (jusqu'Ã 1453)"
#. language code: gre ell el
-#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580
+#: ../zypp/LanguageCode.cc:578
+#: ../zypp/LanguageCode.cc:580
msgid "Greek, Modern (1453-)"
msgstr "Grec moderne (après 1453)"
@@ -1129,7 +1146,8 @@
msgstr "Igbo"
#. language code: ice isl is
-#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624
+#: ../zypp/LanguageCode.cc:622
+#: ../zypp/LanguageCode.cc:624
msgid "Icelandic"
msgstr "Islandais"
@@ -1500,7 +1518,8 @@
msgstr "Lushai"
#. language code: mac mkd mk
-#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774
+#: ../zypp/LanguageCode.cc:772
+#: ../zypp/LanguageCode.cc:774
msgid "Macedonian"
msgstr "Macédonien"
@@ -1540,7 +1559,8 @@
msgstr "Mandingue"
#. language code: mao mri mi
-#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792
+#: ../zypp/LanguageCode.cc:790
+#: ../zypp/LanguageCode.cc:792
msgid "Maori"
msgstr "Maori"
@@ -1560,7 +1580,8 @@
msgstr "Masai"
#. language code: may msa ms
-#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802
+#: ../zypp/LanguageCode.cc:800
+#: ../zypp/LanguageCode.cc:802
msgid "Malay"
msgstr "Malais"
@@ -1701,7 +1722,8 @@
#. language code: nau na
#. :NPL:524:
-#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:380
+#: ../zypp/LanguageCode.cc:858
+#: ../zypp/CountryCode.cc:380
msgid "Nauru"
msgstr "Nauruan"
@@ -1901,7 +1923,8 @@
msgstr "Perse, ancien (vers 600-400 av. J.-C.)"
#. language code: per fas fa
-#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940
+#: ../zypp/LanguageCode.cc:938
+#: ../zypp/LanguageCode.cc:940
msgid "Persian"
msgstr "Persan"
@@ -1986,7 +2009,8 @@
msgstr "Tsigane"
#. language code: rum ron ro
-#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976
+#: ../zypp/LanguageCode.cc:974
+#: ../zypp/LanguageCode.cc:976
msgid "Romanian"
msgstr "Roumain"
@@ -2046,7 +2070,8 @@
msgstr "Santal"
#. language code: scc srp sr
-#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002
+#: ../zypp/LanguageCode.cc:1000
+#: ../zypp/LanguageCode.cc:1002
msgid "Serbian"
msgstr "Serbe"
@@ -2061,7 +2086,8 @@
msgstr "Ãcossais"
#. language code: scr hrv hr
-#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010
+#: ../zypp/LanguageCode.cc:1008
+#: ../zypp/LanguageCode.cc:1010
msgid "Croatian"
msgstr "Croate"
@@ -2116,7 +2142,8 @@
msgstr "Slaves (autres langues)"
#. language code: slo slk sk
-#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034
+#: ../zypp/LanguageCode.cc:1032
+#: ../zypp/LanguageCode.cc:1034
msgid "Slovak"
msgstr "Slovaque"
@@ -2311,7 +2338,8 @@
msgstr "Thaï"
#. language code: tib bod bo
-#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114
+#: ../zypp/LanguageCode.cc:1112
+#: ../zypp/LanguageCode.cc:1114
msgid "Tibetan"
msgstr "Tibétain"
@@ -2332,7 +2360,8 @@
#. language code: tkl
#. :TJK:762:
-#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:428
+#: ../zypp/LanguageCode.cc:1122
+#: ../zypp/CountryCode.cc:428
msgid "Tokelau"
msgstr "Tokelau"
@@ -2408,7 +2437,8 @@
#. language code: tvl
#. :TTO:780:
-#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:435
+#: ../zypp/LanguageCode.cc:1152
+#: ../zypp/CountryCode.cc:435
msgid "Tuvalu"
msgstr "Tuvalu"
@@ -2508,7 +2538,8 @@
msgstr "Washo"
#. language code: wel cym cy
-#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194
+#: ../zypp/LanguageCode.cc:1192
+#: ../zypp/LanguageCode.cc:1194
msgid "Welsh"
msgstr "Gallois"
@@ -2592,7 +2623,8 @@
msgid "Zuni"
msgstr "Zuni"
-#: ../zypp/ZYppFactory.cc:279 ../zypp/ZYppFactory.cc:334
+#: ../zypp/ZYppFactory.cc:279
+#: ../zypp/ZYppFactory.cc:334
msgid "Software management is already running."
msgstr "La gestion des logiciels est déjà en cours d'exécution."
@@ -2633,7 +2665,8 @@
msgid "Not a CDROM drive"
msgstr "Pas un lecteur de CDROM"
-#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55
+#: ../zypp/target/hal/HalException.h:46
+#: ../zypp/target/hal/HalException.h:55
#: ../zypp/target/hal/HalException.h:64
msgid "Hal Exception"
msgstr "Exception Hal"
@@ -2687,7 +2720,8 @@
msgstr "Ãchec de l'installation de %s"
# TLABEL firewall_2002_03_14_2340__2
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1927
+#: ../zypp/target/rpm/RpmDb.cc:2045
msgid "rpm output:"
msgstr "Sortie rpm :"
@@ -2700,7 +2734,8 @@
msgstr "%s installé."
# TLABEL firewall_2002_03_14_2340__51
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1936
+#: ../zypp/target/rpm/RpmDb.cc:2053
msgid "Additional rpm output:"
msgstr "Sortie rpm supplémentaire :"
@@ -2743,25 +2778,25 @@
msgstr "%s remplacé par %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s sera supprimé par l'utilisateur.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s sera supprimé par une autre apllication. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s sera installé par l'utilisateur.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s sera installé par une autre application. (ApplLow/ApplHigh)\n"
@@ -2769,41 +2804,41 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
#, fuzzy
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Aucune solution trouvée avec les solutions de la meillleur architecture."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
#, fuzzy
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Par ce processus, seuls les résolutions avec la meilleur architecture ont été considérées.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
#, fuzzy
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Considérer toutes les résolutions possibles prend du temps mais peut amener à un résultat valide."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Informations incorrectes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s est requis par d'autres correctifs"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s est requis par %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2813,7 +2848,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s est en conflit avec d'autres correctifs"
@@ -2822,14 +2857,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s en conflit avec %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2839,24 +2874,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s rend d'autres correctifs obsolètes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s rend obsolète %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s rend obsolète :%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2865,7 +2900,7 @@
"Ces correctifs seront supprimés du système."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s dépend d'autres correctifs"
@@ -2873,39 +2908,39 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s dépend de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s dépend de :%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Enfant de"
# TLABEL partitioning_2002_01_04_0147__180
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Impossible d'installer %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Aucun ne fournit %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2914,34 +2949,34 @@
"\n"
"Aucune ressource disponible qui prenne en charge cette exigence."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Ãtant donné les problèmes décrits ci-dessus/dessous, cette solution ne résoudra pas toutes les dépendances"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Impossible d'installer %s car il est en conflit avec %s"
# TLABEL autoinst_2002_08_07_0216__335
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s n'est pas installé et est marqué comme non installable"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Impossible d'installer %s à cause de problèmes de dépendance"
# TLABEL packages_2002_01_04_0147__198
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2950,8 +2985,8 @@
# TLABEL partitioning_2002_01_04_0147__180
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2959,121 +2994,133 @@
msgstr "ne pas installer %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s ne respecte pas certaines exigences"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s comporte des dépendances manquantes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Impossible d'installer %s à cause de dépendances manquantes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s satisfait les dépendances de %s mais sera désinstallé"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s satisfait les dépendances de %s mais sera conservé sur votre système"
# TLABEL online_update_2002_01_04_0147__92
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Aucune nécessité d'installer %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Impossible d'installer %s pour satisfaire les dépendances de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Impossible d'installer %s pour satisfaire les dépendances de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ne sera pas désinstallé car il est toujours requis"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s %s obsolètes. Mais il est impossible de supprimer %s qui est verrouillé."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Impossible d'installer %s à cause d'un conflit"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ne peut pas être installé car il est en conflit avec %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorer cette exigence cette fois uniquement"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Ignorer cette exigence cette fois uniquement"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installer %s bien que cela modifie l'architecture"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s offre cette dépendance, mais changerait l'architecture de l'élément installé"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Installer %s bien que cela modifie l'architecture"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s offre cette dépendance, mais changerait l'architecture de l'élément installé"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorer ce conflit de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorer le %s obsolète dans %s"
# TLABEL scanner_2002_01_04_0147__15
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorer que %s est déjà prêt(e) à être installé"
@@ -3084,7 +3131,7 @@
msgstr "Ne pas installer ou supprimer les correctifs concernés"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "pour l'exigence %s destinée à %s lors de la mise à niveau de %s"
@@ -3339,9 +3386,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s offre %s, mais a une autre architecture."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s fournit %s, mais a un autre créateur (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Impossible de satisfaire l'exigence %s pour %s"
@@ -3352,7 +3405,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s est nécessaire à un autre correctif installé pour éviter l'absence de liaison."
@@ -3364,7 +3417,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s est nécessaire à un autre correctif installé pour éviter l'absence de liaison."
@@ -3377,7 +3430,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s est verrouillé et ne peut pas être désinstallé."
@@ -3388,7 +3441,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Un conflit sur %s (%s) nécessite le retrait de %s à installer."
@@ -3399,25 +3452,25 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Marquage de %s comme non installable en raison de conflits sur %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "Ã partir de %s"
# TLABEL wizard_2002_01_04_0147__40
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Erreur !"
# TLABEL autoinst_2002_08_07_0216__135
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Important !"
@@ -3477,8 +3530,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s est rafraichis par %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -3732,7 +3785,8 @@
#. :CCK:166:
#. :CAF:140:
-#: ../zypp/CountryCode.cc:255 ../zypp/CountryCode.cc:257
+#: ../zypp/CountryCode.cc:255
+#: ../zypp/CountryCode.cc:257
msgid "Congo"
msgstr "Congo"
@@ -4797,88 +4851,67 @@
"%s attendu, %s trouvé\n"
" Voulez-vous utiliser ce fichier malgré tout ?"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s est rafraichis par %s"
#~ msgid "Unable to parse Url authority"
#~ msgstr "Impossible d'analyser l'autorité de l'Url"
-
#~ msgid "Ignore this requirement generally"
#~ msgstr "Ignorer cette exigence en règle générale"
-
#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
#~ msgstr "%s est requis par un autre correctif à installer, donc sa liaison ne sera pas supprimée."
-
#~ msgid "Cannot create a file needed to perform update installation."
#~ msgstr "Impossible de créer un fichier nécessaire pour installer la mise à jour."
-
#~ msgid "Unable to restore all sources."
#~ msgstr "Impossible de restaurer toutes les sources."
-
#~ msgid "At least one source already registered, stored sources cannot be restored."
#~ msgstr "Au moins une source est déjà enregistrée ; les sources stockées ne peuvent pas être restaurées."
-
#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
#~ msgstr "Impossible d'installer %s pour satisfaire les dépendances de %s"
-
#~ msgid "%s dependend on %s"
#~ msgstr "%s dépendant de %s"
-
#~ msgid "Reading index files"
#~ msgstr "Lecture des fichiers d'index"
-
#~ msgid "The signed repomd.xml file failed the signature check."
#~ msgstr "Le fichier repomd.xml signé a échoué au contrôle de signature."
# TLABEL restore_2002_08_07_0216__60
#~ msgid "Reading product from %s"
#~ msgstr "Lecture du produit depuis %s"
-
# TLABEL restore_2002_08_07_0216__60
#~ msgid "Reading filelist from %s"
#~ msgstr "Lecture de la liste de fichiers depuis %s"
-
# TLABEL restore_2002_08_07_0216__60
#~ msgid "Reading packages from %s"
#~ msgstr "Lecture des paquetages depuis %s"
-
# TLABEL restore_2002_08_07_0216__60
#~ msgid "Reading selection from %s"
#~ msgstr "Lecture de la sélection depuis %s"
-
# TLABEL restore_2002_08_07_0216__60
#~ msgid "Reading pattern from %s"
#~ msgstr "Lecture du modèle depuis %s"
-
#~ msgid "Reading patches index %s"
#~ msgstr "Lecture de l'index des correctifs %s"
-
# TLABEL autoinst_2002_08_07_0216__71
#~ msgid "Reading patch %s"
#~ msgstr "Lecture du correctif %s"
-
#~ msgid "The script file failed the checksum test."
#~ msgstr "Ãchec du fichier de script lors du test relatif à la somme de contrôle."
-
#~ msgid "Reading packages file"
#~ msgstr "Lecture du fichier des paquetages"
-
# progress indicator label
#~ msgid "Reading translation: %s"
#~ msgstr "Lecture de la traduction : %s"
-
#, fuzzy
#~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?"
#~ msgstr "Ãchec de la vérification de l'intégrité du paquetage %s. Souhaitez-vous tenter de le télécharger de nouveau, ou voulez-vous annuler l'installation ?"
-
#~ msgid " miss checksum."
#~ msgstr " a manqué la somme de contrôle."
-
#~ msgid " fails checksum verification."
#~ msgstr " a échoué lors de la vérification des sommes de contrôle."
-
#~ msgid "Downloading %s"
#~ msgstr "Téléchargement de %s"
-
#~ msgid "Downloaded %s from %s"
#~ msgstr "Téléchargement de %s à partir de %s"
-
#~ msgid "%s needed by %s"
#~ msgstr "%s requis par %s"
+
Modified: trunk/libzypp/po/gl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/gl.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/gl.po (original)
+++ trunk/libzypp/po/gl.po Mon Sep 3 13:56:27 2007
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2002-07-23 11:51+0200\n"
"Last-Translator: Jesús Bravo Ãlvarez <jba(a)pobox.com>\n"
"Language-Team: Galician <i18n(a)suse.de>\n"
@@ -20,77 +20,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3108,25 +3108,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3134,38 +3134,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3173,7 +3173,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3182,14 +3182,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3197,31 +3197,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3229,68 +3229,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instalando en:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3298,8 +3298,8 @@
msgstr "Eliminar"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3307,118 +3307,130 @@
msgstr "Instalando en:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3429,7 +3441,7 @@
msgstr "Instalando o controlador..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3680,9 +3692,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3693,7 +3711,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3705,7 +3723,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3717,7 +3735,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3728,7 +3746,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3739,24 +3757,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Erro"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3816,7 +3834,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/gu.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/gu.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/gu.po (original)
+++ trunk/libzypp/po/gu.po Mon Sep 3 13:56:27 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: nis\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-11 18:41+0530\n"
"Last-Translator: Priyavert Sharma<priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions<linux_team(a)agreeya.com>\n"
@@ -11,77 +11,77 @@
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10.2\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url યà«àªàª¨àª¾ %s નૠમàªàªà«àª°à« àªàªªàª¤à« નથà«"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "àª
માનà«àª¯ %s àªàªàª '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "àª
માનà«àª¯ %s àªàªàª"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "ઠURL માàªà« મારà«àª પારમિતિ પારà«àª¸àª¿àªàª સહાયિત નથà«"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "ઠURL માàªà« àªà«àªµà«àª°àª¿ સà«àªà«àª°à«àªàª પારà«àª¸àª¿àªàª સહાયિત નથà«"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url યà«àªàª¨àª¾àª¨à« àªàªàª àªàª°à«àª°à« àªà«"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "àª
માનà«àª¯ Url યà«àªàª¨àª¾ '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url યà«àªàª¨àª¾ વપરાશàªàª°à«àª¤àª¾àª¨à« મàªàªà«àª°à« àªàªªàª¤à«àª નથà«"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url યà«àªàª¨àª¾ પાસવરà«àª¡àª¨à« મàªàªà«àª°à« àªàªªàª¤à«àª નથà«"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url યà«àªàª¨àª¾àª¨à« હà«àª¸à«àª àªàªàª àªàª°à«àª°à« àªà«"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url યà«àªàª¨àª¾ હà«àª¸à«àª àªàªàªàª¨à« મàªàªà«àª°à« àªàªªàª¤à«àª નથà«"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "àª
માનà«àª¯ હà«àª¸à«àª àªàªàª '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url યà«àªàª¨àª¾àª¨à« પà«àª°à«àªàª¨à« મàªàªà«àª°à« àªàªªàª¤à«àª નથà«"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "àª
માનà«àª¯ પà«àª°à«àª àªàªàª '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url યà«àªàª¨àª¾àª¨à« મારà«àª નામ àªàª°à«àª°à« àªà«"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "હૠàª
ધિàªà«àª¤àª¿ હાàªàª° હà«àª¯ તૠરિલà«àªàª¿àªµ મારà«àªàª¨à« મàªàªà«àª°à« નથà«"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "ઠURL માàªà« મારà«àª પારમિતિ પારà«àª¸àª¿àªàª સહાયિત નથà«"
@@ -2728,7 +2728,7 @@
msgstr "%s દà«àªµàª¾àª°àª¾ %s નૠàªàªà«àª¯àª¾àª મà«àªàª¾àª¯à«àª"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2736,19 +2736,19 @@
"ઠરિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સિસà«àªàª®àª®àª¾àªàª¥à« àªàª¾àª¢à« નાàªàªµàª¾àª®àª¾àª àªàªµàª¶à«."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s àª
સà«àª¥àª¾àªªàª¿àª¤ થશૠનહà«àª àªàª¾àª°àª£àªà« તૠહàªà« àªàª°à«àª°à« àªà«"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2756,38 +2756,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "àª
માનà«àª¯ માહિતà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "àª
નà«àª¯ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ દà«àªµàª¾àª°àª¾ %s àªàª°à«àª°à« હતà«àª"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s દà«àªµàª¾àª°àª¾ %s àªàª°à«àª°à« હતà«àª"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2797,7 +2797,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s, àª
નà«àª¯ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સાથૠવિસàªàªàª¤ àªà«"
@@ -2806,14 +2806,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s, %s સાથૠવિસàªàªàª¤ àªà«"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2823,24 +2823,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s àª
નà«àª¯ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ àª
લઠપાડૠàªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s àª
લઠપાડવà«àª %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s àª
લઠપાડવà«àª : %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2849,7 +2849,7 @@
"ઠરિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સિસà«àªàª®àª®àª¾àªàª¥à« àªàª¾àª¢à« નાàªàªµàª¾àª®àª¾àª àªàªµàª¶à«."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s àª
નà«àª¯ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ પર àªàª§àª¾àª° રાàªà« àªà«"
@@ -2857,38 +2857,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s, %s પર àªàª§àª¾àª° રાàªà« àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s પર àªàª§àª¾àª° રાàªà« àªà« : %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "નà«àª àªàª¾àªàª²à«àª¡"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s સà«àª¥àª¾àªªàª¿ શàªàª¾àª¶à« નહà«àª"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "%s àªà«àª àªàªªàª¤à«àª નથà«"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2897,32 +2897,32 @@
"\n"
"àªà«àª સà«àª¤à«àª°à«àª¤ પà«àª°àª¾àªªà«àª¯ નથૠàªà« ઠàªàª°à«àª°àª¿àª¯àª¾àª¤àª¨à« સહાય àªàª°à«."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ઠરિàªà«àª²à«àª¯à«àª¶àª¨àª¨à« àªàªªàª°/નà«àªà« દરà«àª¶àª¾àªµà«àª² બાàªà« નિàªàª³àª¤à« મà«àª¶à«àªà«àª²à«àª બધૠપરાધિનતાàªàª¨à« àªàªà«àª²àª²àª¾àªµà« શàªàª¶à« નહà«àª"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s સà«àª¥àª¾àªªàª¿ શàªàª¾àª¶à« નહà«àª àªàª¾àª°àª£àªà« તૠ%s સાથૠવિસàªàªàª¤ àªà«"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s સà«àª¥àªªàª¾àª¯à«àª નથૠàª
નૠàª
સà«àª¥àª¾àªªàª¨ તરà«àªà« àªàª¿àª¹àª¿àª¤ àªàª°à«àª¯à«àª હતà«àª"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "પરાધિનતા મà«àª¶à«àªà«àª²à«àªàª¨à« àªàª¾àª°àª£à« %s સà«àª¥àª¾àªªàª¿ શàªàª¾àª¯à«àª નથà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2930,8 +2930,8 @@
msgstr "%s àªàª¾àª¢à« નાàªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2939,119 +2939,131 @@
msgstr "%s સà«àª¥àª¾àªªàª¶à« નહà«àª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s પાસૠàª
પà«àª°à«àª£ àªàª°à«àª°àª¿àª¯àª¾àª¤à« àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s પાસૠàªà«àªà« àªàª¯à«àª²à« પરાધિનતા àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "àªà«àªà« àªàª¯à«àª²à« પરાધિનતાનૠàªàª¾àª°àª£à« %s સà«àª¥àª¾àªªàª¿ શàªàª¾àª¯à«àª નથà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s, %s નૠપરાધિનતા પà«àª°à«àª£ àªàª°à« àªà« પરàªàª¤à« તૠàª
સà«àª¥àª¾àªªàª¿àª¤ àªàª°àª¾àª¶à«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s, %s નૠપરાધિનતા પà«àª°à«àª£ àªàª°à« àªà« પરàªàª¤à« તૠતમારા સિસà«àªàª® પર રાàªàª¶à«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s સà«àª¥àª¾àªªàªµàª¾àª¨à« àªàª°à«àª° નથà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s નૠપરાધિનતા પà«àª°à«àª£ àªàª°àªµàª¾ %s સà«àª¥àª¾àªªà« શàªàª¶à« નહà«àª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s નૠપરાધિનતા પà«àª°à«àª£ àªàª°àªµàª¾ %s સà«àª¥àª¾àªªà« શàªàª¶à« નહà«àª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s àª
સà«àª¥àª¾àªªàª¿àª¤ થશૠનહà«àª àªàª¾àª°àª£àªà« તૠહàªà« àªàª°à«àª°à« àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s àª
લઠપાડવà«àª %s. પરàªàª¤à« %s àªàª¾àª¢à« શàªàª¾àª¶à« નહà«àª àªàª¾àª°àª£àªà« તૠલà«àª àªàª°à«àª²à«àª àªà«."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s સà«àª¥àª¾àªªàª¿àª¤ àªàª°à« શàªàª¾àª¶à« નહà«àª àªàª¾àª°àª£àªà« તૠવિસàªàªàª¤ àªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s સાથૠવિસàªàªàª¤ હà«àªµàª¾àª¥à« %s àª
સà«àª¥àª¾àªªàª¿àª¤ àªà«"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ઠàªàª°à«àª°àª¿àª¯àª¾àª¤ àª
હà«àª માતà«àª° àª
વàªàª£à«"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ઠàªàª°à«àª°àª¿àª¯àª¾àª¤ àª
હà«àª માતà«àª° àª
વàªàª£à«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s સà«àª¥àª¾àªªà« àªà« àªà« તૠસàªàª°àªàª¨àª¾ બદલૠશàªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s ઠપરાધિનતા પà«àª°à« પાડૠàªà« પરàªàª¤à« સà«àª¥àª¾àªªà«àª² બાબતનà«àª¸àªàª°àªàª¨àª¾ àªàª¦àª¾àª બદલૠશàªà«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "%s સà«àª¥àª¾àªªà« àªà« àªà« તૠસàªàª°àªàª¨àª¾ બદલૠશàªà«"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s ઠપરાધિનતા પà«àª°à« પાડૠàªà« પરàªàª¤à« સà«àª¥àª¾àªªà«àª² બાબતનà«àª¸àªàª°àªàª¨àª¾ àªàª¦àª¾àª બદલૠશàªà«"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s નૠઠવિસàªàªàª¤àª¤àª¾ àª
વàªàª£à«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%s માઠàª
લઠપાડà«àª²àª¾ %s નૠàª
વàªàª£à«"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "પહà«àª²à«àª¥à« સà«àª¥àª¾àªªàªµàª¾ સà«àª àªàª°à«àª² તૠ%s àª
વàªàª£à«"
@@ -3062,7 +3074,7 @@
msgstr "સàªàª¬àªàª§àª¿àª¤ રિàªà«àª²à«àªµà«àª¬àª²à«àª¸ સà«àª¥àª¾àªªà« àªà« àªàª¾àª¢à« નહà«àª"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "àªà«àª¯àª¾àª°à« %s àª
દà«àª¯àª¤àª¨ àªàª°àª¤àª¾ હà«àªµ તà«àª¯àª¾àª°à« %s માàªà« %s àªàª°à«àª°à« àªà«"
@@ -3313,8 +3325,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s, %s પà«àª°à«àª પાડૠàªà«, પરàªàª¤à« તà«àª¨à« પાસૠબà«àªà« સàªàª°àªàª¨àª¾ àªà«."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s, %s પà«àª°à«àª પાડૠàªà«, પરàªàª¤à« તà«àª¨à« પાસૠબà«àªà« સàªàª°àªàª¨àª¾ àªà«."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s માàªà« %s àªàª°à«àª°àª¿àª¯àª¾àª¤ સàªàª¤à«àª·à«àª àªàª°à« શàªàª¤à«àª નથà«"
@@ -3326,7 +3344,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s, àª
નà«àª¯ સà«àª¥àª¾àªªàª¿àª¤ àªà« તૠરિàªà«àª²à«àªµà«àª¬àª² દà«àªµàª¾àª°àª¾ àªàª°à«àª°à« àªà«, તà«àª¥à« તૠàª
નલિàªàª થઠશàªàª¶à«àª¨àª¹à«àª."
@@ -3338,7 +3356,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s, àª
નà«àª¯ સà«àª¥àª¾àªªàª¿àª¤ àªà« તૠરિàªà«àª²à«àªµà«àª¬àª² દà«àªµàª¾àª°àª¾ àªàª°à«àª°à« àªà«, તà«àª¥à« તૠàª
નલિàªàª થઠશàªàª¶à«àª¨àª¹à«àª."
@@ -3350,7 +3368,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s લà«àª àªà« àª
નૠàª
સà«àª¥àª¾àªªàª¿àª¤ થઠશàªàª¶à« નહà«àª"
@@ -3361,7 +3379,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) નૠવિસàªàªàª¤àª¤àª¾ સà«àª¥àª¾àªªàª¿àª¤ àªàª°àªµàª¾àª¨à«àª àªà« તૠ%s નૠદà«àª° àªàª°àªµàª¾àª¨à«àª àªàª°à«àª°à« બનાવૠàªà«"
@@ -3372,23 +3390,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s નૠવિસàªàªàª¤àª¤àª¾àª¨àª¾ àªàª¾àª°àª£à« %s નૠàª
સà«àª¥àª¾àªªàª¿àª¤ તરà«àªà« àªàª¿àª¹àª¿àª¤ àªàª°à«"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s માàªàª¥à«"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "àªà«àª²!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "àª
àªàª¤à«àª¯àª¨à«àª!"
@@ -3445,9 +3463,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s દà«àªµàª¾àª°àª¾ %s àªàª°à«àª°à« હતà«àª"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4766,6 +4784,10 @@
"%s નૠસàªàªàª¾àªµàª¨àª¾ હતà«, %s મળૠ\n"
"àªà«àª પણ રà«àª¤à« ફાàªàª² વાપરવૠàªà«?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s દà«àªµàª¾àª°àª¾ %s àªàª°à«àª°à« હતà«àª"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Url àª
ધિàªà«àª¤àª¿ પારà«àª¸ àªàª°àªµàª¾ àª
àªà«àª·àª®"
Modified: trunk/libzypp/po/he.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/he.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/he.po (original)
+++ trunk/libzypp/po/he.po Mon Sep 3 13:56:27 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2004-08-09 10:24+0200\n"
"Last-Translator: xxx <yyy(a)example.org>\n"
"Language-Team: Hebrew <i18n(a)suse.de>\n"
@@ -15,77 +15,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3046,25 +3046,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3072,38 +3072,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3111,7 +3111,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3120,14 +3120,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3135,31 +3135,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3167,70 +3167,70 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "×תק×× ×¢×:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
# main dialog: Button Delete partition
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3239,8 +3239,8 @@
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3248,118 +3248,130 @@
msgstr "×תק×× ×¢×:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "&××× ×ער×ת ק×××ת"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3370,7 +3382,7 @@
msgstr "×תק×× ×ר××ר..."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3624,9 +3636,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3637,7 +3655,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3649,7 +3667,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3661,7 +3679,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3672,7 +3690,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3683,24 +3701,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "ש××××"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3761,7 +3779,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/hi.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hi.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/hi.po (original)
+++ trunk/libzypp/po/hi.po Mon Sep 3 13:56:27 2007
@@ -1,87 +1,90 @@
+# translation of zypp.hi.po to Hindi
+# Sangeeta Kumari <k.sangeeta09(a)gmail.com>, 2007.
msgid ""
msgstr ""
-"Project-Id-Version: NetworkManager-vpnc\n"
+"Project-Id-Version: zypp.hi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2006-01-26 15:19+0100\n"
-"Last-Translator: Priyavert Sharma <priyavert.sharma(a)agreeya.com>\n"
-"Language-Team: AgreeYa Solutions <www.agreeya.com>\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 22:33+0530\n"
+"Last-Translator: Sangeeta Kumari <k.sangeeta09(a)gmail.com>\n"
+"Language-Team: Hindi <en(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url सà¥à¤à¥à¤® à¤à¤¿à¤¸à¥ %s à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ दà¥à¤¤à¥ हà¥"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "à¤
मानà¥à¤¯ %s à¤
वयव '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "à¤
मानà¥à¤¯ %s à¤
वयव"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "पथ मानठपारà¥à¤à¤¿à¤à¤ à¤à¤¸ URL à¤à¥ लिठसमरà¥à¤¥à¤¿à¤¤ नहà¥à¤ हà¥"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "à¤à¤¸ URL à¤à¥ लिठà¤à¥à¤µà¥à¤°à¥ सà¥à¤à¥à¤°à¤¿à¤à¤ पारà¥à¤à¤¿à¤à¤ समरà¥à¤¥à¤¿à¤¤ नहà¥à¤ हà¥"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url सà¥à¤à¥à¤® à¤à¤ à¤à¤µà¤¶à¥à¤¯à¤ à¤
वयव हà¥"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "à¤
मानà¥à¤¯ Url सà¥à¤à¥à¤® '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url सà¥à¤à¥à¤® à¤à¤¿à¤¸à¥ à¤à¤ªà¤¯à¥à¤à¤à¤°à¥à¤¤à¤¾ नाम à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ दà¥à¤¤à¥ हà¥"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url सà¥à¤à¥à¤® à¤à¤¿à¤¸à¥ पासवरà¥à¤¡ à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ दà¥à¤¤à¥ हà¥"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url सà¥à¤à¥à¤® à¤à¥ à¤à¤ हà¥à¤¸à¥à¤ à¤
वयव à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url सà¥à¤à¥à¤® à¤à¤¿à¤¸à¥ हà¥à¤¸à¥à¤ à¤
वयव à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ दà¥à¤¤à¥ हॠ"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "à¤
मानà¥à¤¯ हà¥à¤¸à¥à¤ à¤
वयव '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url सà¥à¤à¥à¤® à¤à¤¿à¤¸à¥ पà¥à¤°à¥à¤ à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ दà¥à¤¤à¥ हॠ"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "à¤
मानà¥à¤¯ पà¥à¤°à¥à¤ à¤
वयव '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url सà¥à¤à¥à¤® à¤à¥ पथ नाम à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "यदि पà¥à¤°à¤¾à¤§à¤¿à¤à¤°à¤£ मà¥à¤à¥à¤¦ हॠतॠसापà¥à¤à¥à¤· पथ à¤à¥ à¤
नà¥à¤®à¤¤à¤¿ नहà¥à¤ हà¥"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "à¤à¤¸ URL à¤à¥ लिठपथ मानठपारà¥à¤à¤¿à¤à¤ समरà¥à¤¥à¤¿à¤¤ नहà¥à¤ हà¥"
@@ -104,7 +107,7 @@
#. TranslatorExplanation followed by the list of error messages that lead to this exception
#: ../zypp/base/Exception.cc:89
msgid "History:"
-msgstr ""
+msgstr "à¤à¤¤à¤¿à¤¹à¤¾à¤¸:"
#: ../zypp/repo/PackageProvider.cc:222
msgid "applydeltarpm check failed."
@@ -2728,7 +2731,7 @@
msgstr "%s सॠ%s à¤à¥ पà¥à¤°à¤¤à¤¿à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2736,19 +2739,19 @@
"यॠरिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ सिसà¥à¤à¤® सॠमिà¤à¤¾ दिठà¤à¤¾à¤à¤à¤à¥à¥¤"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s à¤à¥ à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤à¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤
ब à¤à¥ हà¥"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2756,38 +2759,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "à¤
मानà¥à¤¯ सà¥à¤à¤¨à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2795,7 +2798,7 @@
msgstr "%s à¤à¥ à¤à¤¨à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हॠ:%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s à¤à¤¾ à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ सॠà¤à¤à¤°à¤¾à¤µ हà¥"
@@ -2804,14 +2807,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s à¤à¤¾ %s सॠà¤à¤à¤°à¤¾à¤µ हॠ"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2821,24 +2824,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ à¤à¥ पà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° दà¥à¤¤à¤¾ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s à¤à¥ %s पà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° दà¥à¤¤à¤¾ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s पà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° दà¥à¤¤à¤¾ हॠ: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2847,7 +2850,7 @@
"यॠरिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ सिसà¥à¤à¤® सॠमिà¤à¤¾ दिठà¤à¤¾à¤à¤à¤à¥à¥¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤²à¥à¤¸ पर निरà¥à¤à¤° à¤à¤°à¤¤à¤¾ हà¥"
@@ -2855,38 +2858,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s पर %s निरà¥à¤à¤° à¤à¤°à¤¤à¤¾ हॠ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s à¤à¤¨ पर निरà¥à¤à¤° à¤à¤°à¤¤à¤¾ हॠ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "à¤à¥ सà¤à¤¤à¤¤à¤¿"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s à¤à¤¾ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "à¤à¥à¤ नहà¥à¤ %s पà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2895,32 +2898,32 @@
"\n"
"à¤à¥à¤ सà¥à¤°à¥à¤¤ à¤à¤ªà¤²à¤¬à¥à¤§ नहà¥à¤ हॠà¤à¥ à¤à¤¸ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ समरà¥à¤¥à¤¨ दà¥à¥¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "à¤à¤¸ रिà¤à¥à¤²à¥à¤¯à¥à¤¶à¤¨ à¤à¥ à¤à¤ªà¤°/नà¥à¤à¥ वरà¥à¤£à¤¿à¤¤ शà¥à¤· समसà¥à¤¯à¤¾à¤à¤ सà¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¤¾à¤¸à¤®à¤¾à¤§à¤¾à¤¨ नहà¥à¤ à¤à¤°à¥à¤à¤à¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s à¤à¤¾ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¤¾ %s à¤à¥ साथ à¤à¤à¤°à¤¾à¤µ हà¥"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾ हॠà¤à¤° à¤
नà¤à¤à¤¸à¥à¤à¤¾à¤² यà¥à¤à¥à¤¯ à¤à¥ रà¥à¤ª मà¥à¤ à¤à¤¿à¤¹à¥à¤¨à¤¿à¤¤ à¤à¤° दिया à¤à¤¯à¤¾ हà¥"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "निरà¥à¤à¤°à¤¤à¤¾ समसà¥à¤¯à¤¾à¤à¤ à¤à¥ à¤à¤¾à¤°à¤£ %s à¤à¤¾ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2928,8 +2931,8 @@
msgstr "%s मिà¤à¤¾à¤à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2937,119 +2940,131 @@
msgstr "%s सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ न à¤à¤°à¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s à¤à¥ पास à¤à¤¸à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾à¤à¤ हà¥à¤ à¤à¥ सà¤à¤¤à¥à¤·à¥à¤ नहà¥à¤ हà¥à¤ हà¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s à¤à¥ à¤à¥à¤à¥ हà¥à¤ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ हà¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s à¤à¥ à¤à¥à¤à¥ हà¥à¤ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¥ à¤à¤¾à¤°à¤£ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ सà¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s à¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ %s पà¥à¤°à¥ à¤à¤°à¤¤à¤¾ हॠलà¥à¤à¤¿à¤¨ à¤à¤¸à¥ à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤° दिया à¤à¤¾à¤à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s à¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ %s पà¥à¤°à¥ à¤à¤°à¤¤à¤¾ हॠलà¥à¤à¤¿à¤¨ à¤à¤¸à¥ à¤à¤ªà¤à¥ सिसà¥à¤à¤® पर रà¤à¤¾ à¤à¤¾à¤à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¨à¥ à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ नहà¥à¤ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s à¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¥ पà¥à¤°à¤¾ à¤à¤°à¤¨à¥ à¤à¥ लिठ%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s à¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¥ पà¥à¤°à¤¾ à¤à¤°à¤¨à¥ à¤à¥ लिठ%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s à¤à¥ à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤à¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤
ब à¤à¥ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s पà¥à¤°à¤¾à¤¨à¤¾ à¤à¤° दà¥à¤¤à¤¾ हॠ%s à¤à¥à¥¤ लà¥à¤à¤¿à¤¨ %s à¤à¥ मिà¤à¤¾à¤¯à¤¾ नहà¥à¤ à¤à¤¾ सà¤à¤¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ यह लà¥à¤ हà¥à¥¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾ à¤à¥à¤¯à¥à¤à¤à¤¿ यह à¤à¤à¤°à¤¾à¤µ पà¥à¤¦à¤¾ à¤à¤°à¤¤à¤¾ हà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¥à¤¯ हॠà¤à¥à¤¯à¥à¤à¤à¤¿ à¤à¤¸à¤à¤¾ %s à¤à¥ साथ à¤à¤à¤°à¤¾à¤µ हà¥"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "सिरà¥à¤« यहाठपर à¤à¤¸ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ à¤
नदà¥à¤à¥ à¤à¤° दà¥à¤"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "सिरà¥à¤« यहाठपर à¤à¤¸ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ à¤
नदà¥à¤à¥ à¤à¤° दà¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤ यदà¥à¤¯à¤ªà¤¿ यह सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ à¤à¥ बदल दà¥à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "यह निरà¥à¤à¤°à¤¤à¤¾ %s पà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾ हॠलà¥à¤à¤¿à¤¨ यह सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ वसà¥à¤¤à¥ à¤à¥à¤¸à¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ à¤à¥ बदल दà¥à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥à¤ यदà¥à¤¯à¤ªà¤¿ यह सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ à¤à¥ बदल दà¥à¤à¤¾"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "यह निरà¥à¤à¤°à¤¤à¤¾ %s पà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾ हॠलà¥à¤à¤¿à¤¨ यह सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ वसà¥à¤¤à¥ à¤à¥à¤¸à¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ à¤à¥ बदल दà¥à¤à¤¾"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s à¤à¥ à¤à¤¸ à¤à¤à¤°à¤¾à¤µ à¤à¥ à¤
नदà¥à¤à¥ à¤à¤° दà¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%s à¤à¥ %s मà¥à¤ हà¤à¤¾à¤ à¤à¤¾à¤¨à¥ à¤à¥ à¤
नदà¥à¤à¤¾ à¤à¤°à¥à¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "%s सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤¨à¥ à¤à¥ तà¥à¤¯à¤¾à¤° हॠà¤à¤¸à¤à¥ à¤
नदà¥à¤à¤¾ à¤à¤°à¥à¤"
@@ -3060,7 +3075,7 @@
msgstr "सà¤à¤¬à¤à¤§à¤¿à¤¤ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤² à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ या मिà¤à¤¾à¤à¤ नहà¥à¤"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s à¤à¥ à¤
पà¤à¥à¤°à¥à¤¡ à¤à¤°à¤¤à¥ समय %s हà¥à¤¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ लिà¤"
@@ -3311,8 +3326,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s हॠ%s पà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾ हà¥, लà¥à¤à¤¿à¤¨ à¤à¤¸à¤à¥ पास à¤à¥à¤ à¤à¤° सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ हà¥à¥¤"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s हॠ%s पà¥à¤°à¤¦à¤¾à¤¨ à¤à¤°à¤¤à¤¾ हà¥, लà¥à¤à¤¿à¤¨ à¤à¤¸à¤à¥ पास à¤à¥à¤ à¤à¤° सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ हà¥à¥¤"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s à¤à¥ लिठ%s à¤à¤µà¤¾à¤¶à¥à¤¯à¤à¤¤à¤¾à¤à¤ सà¤à¤¤à¥à¤·à¥à¤ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
@@ -3324,7 +3345,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ हॠà¤à¥à¤à¥ à¤à¤¿à¤¸à¥ à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤² à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥, à¤
तठयह à¤
नलिà¤à¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ सà¤à¤¤à¤¾à¥¤"
@@ -3336,7 +3357,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ हॠà¤à¥à¤à¥ à¤à¤¿à¤¸à¥ à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤² à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥, à¤
तठयह à¤
नलिà¤à¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ सà¤à¤¤à¤¾à¥¤"
@@ -3348,7 +3369,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s लà¥à¤ हॠà¤à¤¯à¤¾ हॠà¤à¤° à¤à¤¸à¥ à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ सà¤à¤¤à¤¾à¥¤"
@@ -3359,7 +3380,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) पर à¤à¤à¤°à¤¾à¤µ à¤à¥ लिठसà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤¨à¥ वालॠ%s à¤à¥ हà¤à¤¾à¤ à¤à¤¾à¤¨à¥ à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
@@ -3370,23 +3391,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s पर à¤à¤à¤°à¤¾à¤µ हà¥à¤¨à¥ à¤à¥ à¤à¤¾à¤°à¤£ %s à¤à¥ à¤
सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨à¥à¤¯ à¤à¥ रà¥à¤ª मà¥à¤ à¤à¤¿à¤¨à¥à¤¹à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ रहा हà¥"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s सà¥"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "तà¥à¤°à¥à¤à¤¿!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "महतà¥à¤µà¤ªà¥à¤°à¥à¤£!"
@@ -3443,9 +3464,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4764,78 +4785,3 @@
"%s à¤à¥ à¤à¤®à¥à¤®à¥à¤¦ थà¥, %s मिला\n"
"फिर à¤à¥ फाà¤à¤² à¤à¤¾ पà¥à¤°à¤¯à¥à¤ à¤à¤°à¥à¤?"
-#~ msgid "Unable to parse Url authority"
-#~ msgstr "Url पà¥à¤°à¤¾à¤§à¤¿à¤à¤°à¤£ à¤à¥ पारà¥à¤ à¤à¤°à¤¨à¥ मà¥à¤ à¤
à¤à¥à¤·à¤®"
-
-#~ msgid "Ignore this requirement generally"
-#~ msgstr "सामानà¥à¤¯ तà¥à¤° पर à¤à¤¸ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ à¤à¥ à¤
नदà¥à¤à¥ à¤à¤° दà¥à¤"
-
-#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
-#~ msgstr "सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤¨à¥ वालॠà¤à¤¿à¤¸à¥ à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¬à¤² à¤à¥ %s à¤à¥ à¤à¤µà¤¶à¥à¤¯à¤à¤¤à¤¾ हà¥, à¤
तठयह à¤
नलिà¤à¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ सà¤à¤¤à¤¾à¥¤"
-
-#~ msgid "Cannot create a file needed to perform update installation."
-#~ msgstr "à¤
दà¥à¤¯à¤¤à¤¨ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ à¤à¤°à¤¨à¥ à¤à¥ लिठà¤à¤µà¤¶à¥à¤¯à¤ फाà¤à¤² à¤à¥ सà¥à¤à¤¿à¤¤ नहà¥à¤ à¤à¤° सà¤à¤¤à¤¾"
-
-#~ msgid "Unable to restore all sources."
-#~ msgstr "सà¤à¥ सà¥à¤°à¥à¤¤à¥à¤ à¤à¥ पà¥à¤¨à¤°à¥à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¨à¥ मà¥à¤ à¤
à¤à¥à¤·à¤®"
-
-#~ msgid "At least one source already registered, stored sources cannot be restored."
-#~ msgstr "à¤à¤® सॠà¤à¤® à¤à¤ सà¥à¤°à¥à¤¤ पहलॠसॠपà¤à¤à¥à¤à¥à¤¤, सà¤à¤à¥à¤°à¤¹à¥à¤¤ सà¥à¤°à¥à¤¤à¥à¤ à¤à¥ पà¥à¤¨à¤°à¥à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾à¤à¤¾ सà¤à¤¤à¤¾ हà¥à¥¤"
-
-#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
-#~ msgstr "%s à¤à¥ निरà¥à¤à¤°à¤¤à¤¾à¤à¤ à¤à¥ पà¥à¤°à¤¾ à¤à¤°à¤¨à¥ à¤à¥ लिठ%s à¤à¥ सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¿à¤¤ नहà¥à¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾ सà¤à¤¤à¤¾"
-
-#~ msgid "%s dependend on %s"
-#~ msgstr "%s निरà¥à¤à¤° हॠ%s पर"
-
-#~ msgid "Reading index files"
-#~ msgstr "सà¥à¤à¥ फाà¤à¤²à¥à¤ à¤à¥ पढ़ रहा हà¥"
-
-#~ msgid "The signed repomd.xml file failed the signature check."
-#~ msgstr "साà¤à¤¨ à¤à¥ हà¥à¤ repomd.xml फाà¤à¤² नॠहसà¥à¤¤à¤¾à¤à¥à¤·à¤° à¤à¤¾à¤à¤ à¤à¥ नाà¤à¤¾à¤® à¤à¤¿à¤¯à¤¾à¥¤"
-
-#~ msgid "Reading product from %s"
-#~ msgstr "%s सॠà¤à¤¤à¥à¤ªà¤¾à¤¦ à¤à¥ पढ़ रहा हà¥"
-
-#~ msgid "Reading filelist from %s"
-#~ msgstr "%s सॠफाà¤à¤²à¤¸à¥à¤à¥ पढ़ रहा हà¥"
-
-#~ msgid "Reading packages from %s"
-#~ msgstr "%s सॠपà¥à¤à¥à¤à¥à¤ à¤à¥ पढ़ रहा हà¥"
-
-#~ msgid "Reading selection from %s"
-#~ msgstr "%s सॠà¤à¤¯à¤¨ à¤à¥ पढ़ रहा हà¥"
-
-#~ msgid "Reading pattern from %s"
-#~ msgstr "%s सॠपà¥à¤à¤°à¥à¤¨ à¤à¥ पढ़ रहा हà¥"
-
-#~ msgid "Reading patches index %s"
-#~ msgstr "पà¥à¤à¥à¤¸ सà¥à¤à¥ %s à¤à¥ पढ़ रहा हà¥"
-
-#~ msgid "Reading patch %s"
-#~ msgstr "पà¥à¤ %s à¤à¥ पढ़ रहा हà¥"
-
-#~ msgid "The script file failed the checksum test."
-#~ msgstr "सà¥à¤à¥à¤°à¤¿à¤ªà¥à¤ फाà¤à¤² नॠà¤à¥à¤à¤¸à¤® à¤à¤¾à¤à¤ à¤à¥ नाà¤à¤¾à¤® à¤à¤¿à¤¯à¤¾à¥¤"
-
-#~ msgid "Reading packages file"
-#~ msgstr "पà¥à¤à¥à¤ फाà¤à¤² à¤à¥ पढ़ रहा हà¥"
-
-#~ msgid "Reading translation: %s"
-#~ msgstr "à¤
नà¥à¤µà¤¾à¤¦ à¤à¥ पढ़ रहा हॠ: %s"
-
-#, fuzzy
-#~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?"
-#~ msgstr " पà¥à¤à¥à¤ %s नॠà¤à¤à¥à¤à¤°à¤£ à¤à¤¾à¤à¤ à¤à¥ नाà¤à¤¾à¤® à¤à¤¿à¤¯à¤¾à¥¤ à¤à¥à¤¯à¤¾ à¤à¤ª पà¥à¤¨à¤ à¤à¤¸à¤à¥ डाà¤à¤¨à¤²à¥à¤¡à¤¿à¤à¤ या सà¤à¤¸à¥à¤¥à¤¾à¤ªà¤¨ रदà¥à¤¦ à¤à¤°à¤¨à¥ à¤à¤¾ पà¥à¤°à¤¯à¤¾à¤¸ à¤à¤°à¤¨à¤¾ à¤à¤¾à¤¹à¤¤à¥ हà¥à¤?"
-
-#~ msgid " miss checksum."
-#~ msgstr " à¤à¥à¤à¤¾ à¤à¥à¤à¤¸à¤®à¥¤"
-
-#~ msgid " fails checksum verification."
-#~ msgstr " à¤à¥à¤à¤¸à¤® पà¥à¤°à¤®à¤¾à¤£à¥à¤à¤°à¤£ नाà¤à¤¾à¤® रहा।"
-
-#~ msgid "Downloading %s"
-#~ msgstr "%s à¤à¥ डाà¤à¤¨à¤²à¥à¤¡ à¤à¤° रहा हà¥"
-
-#~ msgid "Downloaded %s from %s"
-#~ msgstr "%s सॠ%s डाà¤à¤¨à¤²à¥à¤¡ à¤à¤¿à¤¯à¤¾ à¤à¤¯à¤¾"
Modified: trunk/libzypp/po/hr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hr.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/hr.po (original)
+++ trunk/libzypp/po/hr.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2001-07-17 16:22+0200\n"
"Last-Translator: Vlatko Kosturjak <kost(a)iname.com>\n"
"Language-Team: Croatian <i18n(a)suse.de>\n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "Neispravan URI komponente: "
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Neispravan URI komponente: "
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "URL shema je obavezna komponenta"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "neispravno ime servisa '%1'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Neispravan URI komponente: "
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Neispravan URI komponente: "
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relativna putanja nije dozvoljena ako postoji autoritet"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3060,25 +3060,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3086,38 +3086,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3125,7 +3125,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3134,14 +3134,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3149,31 +3149,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3181,68 +3181,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instaliram na:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Ovi paketi trebaju biti instalirani:"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3250,8 +3250,8 @@
msgstr "&Obriši"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3259,118 +3259,130 @@
msgstr "Instaliram na:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "Äe biti instaliran kao:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "Direktorij %1 je veÄ na listi."
@@ -3381,7 +3393,7 @@
msgstr "Postaviti konfiguracijske vrijednosti."
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3633,9 +3645,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3646,7 +3664,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3658,7 +3676,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3670,7 +3688,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Ovi paketi trebaju biti instalirani:"
@@ -3681,7 +3699,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3692,24 +3710,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Greška"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "Uvoz podataka"
@@ -3770,7 +3788,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/hu.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hu.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/hu.po (original)
+++ trunk/libzypp/po/hu.po Mon Sep 3 13:56:27 2007
@@ -15,87 +15,87 @@
msgstr ""
"Project-Id-Version: zypp.hu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 16:56+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-25 16:50+0200\n"
"Last-Translator: Kalman Kemenczy <kkemenczy(a)novell.com>\n"
"Language-Team: <hu(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Az URI séma nem engedélyezi a(z) %s használatát"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ãrvénytelen %s url komponens: '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Hibás URI komponens: %s"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Az elérési út feldolgazása ehhez az URI-hez nem támogatott"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "A lekérdezés feldolgozása ehhez az URI-hez nem támogatott"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Az url-séma megadása szükséges"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ãrvénytelen URI-séma: '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Az URI séma nem engedélyezi a felhasználónevet"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Az URI séma nem engedélyezi a jelszót"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Az URI sémában a gépkomponenst (host) megadása kötelezÅ"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Az URI séma megadása nem engedélyezi a gépkomponenst (host)"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Hibás gépkomponens (host): '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Az URI séma nem engedélyezi a portot"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ãrvénytelen port komponens: '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Az URI sémában az elérési útvonal megadása szükséges"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Megadott hitelesÃtÅ esetén a relatÃv elérési útvonal megadása nem támogatott"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Az elérési útvonal feldolgozása ehhez az URI-hez nem támogatott"
@@ -2867,25 +2867,25 @@
msgstr "A(z) %s csomagot felváltja %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "A felhasználó törli a(z) %s csomagot.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "Egy alkalmazás törli a(z) %s csomagot. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "A felhasználó telepÃti a(z) %s csomagot.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "Egy alkalmazás telepÃti a(z) %s csomagot. (ApplLow/ApplHigh)\n"
@@ -2893,38 +2893,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Nem található érvényes megoldás kizárólag a legmegfelelÅbb architektúra feloldhatóinak használatával."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Ez a futtatás csak a legmegfelelÅbb architektúra feloldhatóit veszi figyelembe.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Az összes lehetséges feloldandó vizsgálata hosszabb ideig tart, de megbÃzhatóbb eredményt ad."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ãrvénytelen információ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "A(z) %s csomagot más feloldhatók igénylik"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "A(z) %s csomagot igényli %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2934,7 +2934,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ütközik más feloldhatókkal"
@@ -2943,14 +2943,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s és %s ütközik"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2960,24 +2960,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s elavulttá tesz más feloldhatókat"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s elavulttá teszi a(z) %s csomagot"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s elavulttá teszi: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2986,7 +2986,7 @@
"Ezek a feloldhatók törlésre kerülnek a rendszerbÅl."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s függ más feloldhatóktól"
@@ -2994,39 +2994,39 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s függ a(z) %s csomagtól"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s függ ettÅl: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "SzülÅje "
# modules/inst_target_part.ycp:676
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s nem telepÃthetÅ"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "A(z) %s képességet semmi nem biztosÃtja"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -3034,31 +3034,31 @@
"\n"
"Nem áll rendelkezésre ezt a követelményt kielégÃtÅ erÅforrás."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "A fent/lent leÃrt problémák miatt ez a feloldás nem oldja fel az összes függÅséget"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s nem telepÃthetÅ, mert ütközik (%s)"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s nincs telepÃtve és nem telepÃthetÅnek lett megjelölve"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "%s nem telepÃthetÅ függÅségi problémák miatt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3067,8 +3067,8 @@
# modules/inst_target_part.ycp:676
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3076,118 +3076,130 @@
msgstr "%s nem telepÃthetÅ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s egyes követelményei nincsenek kielégÃtve"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s függÅségei hiányoznak"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s nem telepÃthetÅ hiányzó függÅségek miatt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s kielégÃti %s függÅségeit, de eltávolÃtásra kerül"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "A(z) %s kielégÃti a(z) %s függÅségeit, de a rendszeren marad"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Nincs szükség %s telepÃtésére"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s nem telepÃthetÅ %s függÅségeinek teljesÃtéséhez"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s nem telepÃthetÅ %s függÅségeinek teljesÃtéséhez"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s nem távolÃtható el, mert még mindig szükséges"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s miatt %s elavult, de %s zárolás miatt nem törölhetÅ."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "A(z) %s nem telepÃthetÅ, mert ütközik"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s nem telepÃthetÅ, mert ütközik (%s)"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "A(z) %s követelmény nem teljesÃthetÅ."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Követelmény figyelmen kÃvül hagyása csak itt"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Követelmény figyelmen kÃvül hagyása csak itt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s telepÃtése, habár ez megváltoztatja az architektúrát"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s biztosÃtja a kÃvánt függÅséget, de megváltoztatja a telepÃtett egység architektúráját"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "%s telepÃtése, habár ennek más a gyártója"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s biztosÃtja a kÃvánt függÅséget, de ennek más a gyártója"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s ezen ütközése figyelmen kÃvül marad"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%s elavulásának (%s miatt) figyelmen kÃvül hagyása"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "%s telepÃtésre megjelölése figyelmen kÃvül marad"
@@ -3197,7 +3209,7 @@
msgstr "Ne telepÃtse vagy törölje a vonatkozó feloldhatókat"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "mert %s szükséges %s esetén, %s frissÃtésekor"
@@ -3450,9 +3462,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s biztosÃtja %s-t, de más architektúrával rendelkezik."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s biztosÃtja %s-t, de más gyártótól (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s %s követelménye nem elégÃthetÅ ki"
@@ -3463,7 +3481,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "A(z) %s csomagot egy másik telepÃtett feloldható igényli, ezért a csatolása nem lesz megszüntetve."
@@ -3475,7 +3493,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "A(z) %s csomagot egy másik telepÃtett feloldható igényli, ezért a csatolása nem lesz megszüntetve."
@@ -3487,7 +3505,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s zárolva van, ezért nem távolÃtható el."
@@ -3498,7 +3516,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s ütközése (%s) a telepÃtendÅ %s eltávolÃtását igényli"
@@ -3509,23 +3527,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s nem telepÃthetÅnek lesz jelölve, mert ütközik a(z) %s csomaggal"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s csomagból"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Hiba!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Fontos!"
@@ -3583,8 +3601,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "A(z) %s csomagot frissÃti a(z) %s csomag"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "A(z) %s csomag frissebb verziója kerül telepÃtésre a(z) %s csomag telepÃtése miatt."
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/id.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/id.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/id.po (original)
+++ trunk/libzypp/po/id.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2002-10-08 13:38+0200\n"
"Last-Translator: I Made Wiryana <made(a)nakula.rvs.uni-bielefeld.de>\n"
"Language-Team: Indonesian <i18n(a)suse.de>\n"
@@ -17,82 +17,82 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "Data komponen url '%2' tidak valid %1"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Data tidak valid dalam komponen url %1"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
#, fuzzy
msgid "Path parameter parsing not supported for this URL"
msgstr "Parsing parameter path tidak didukung untuk url ini"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
#, fuzzy
msgid "Query string parsing not supported for this URL"
msgstr "Parsing string query tidak didukung untuk url ini"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Skema url merupakan komponen yang dibutuhkan"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Skema url '%1' tidak valid"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
#, fuzzy
msgid "Url scheme requires a host component"
msgstr "Skema url merupakan komponen yang dibutuhkan"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
#, fuzzy
msgid "Url scheme does not allow a host component"
msgstr "Skema url merupakan komponen yang dibutuhkan"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Data komponen url nama host '%1' tidak valid"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Data komponen url '%2' tidak valid %1"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
#, fuzzy
msgid "Url scheme requires path name"
msgstr "Skema url membutuhkan nama path"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Path relatif tidak dibolehkan bila otorita ada"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
#, fuzzy
msgid "Path Parameter parsing not supported for this URL"
msgstr "Parsing Parameter Path tidak didukung untuk url ini"
@@ -3137,25 +3137,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3163,38 +3163,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3202,7 +3202,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -3211,14 +3211,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3226,31 +3226,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3258,68 +3258,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Italia"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3327,8 +3327,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3336,118 +3336,130 @@
msgstr "Italia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3457,7 +3469,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3708,9 +3720,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3721,7 +3739,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3733,7 +3751,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3745,7 +3763,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3756,7 +3774,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3767,23 +3785,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3842,7 +3860,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/it.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/it.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/it.po (original)
+++ trunk/libzypp/po/it.po Mon Sep 3 13:56:27 2007
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 16:34+0100\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 20:01+0100\n"
"Last-Translator: Alberto Passalacqua <alberto.passalacqua(a)tin.it>\n"
"Language-Team: Novell Language <opensuse-translation(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
@@ -20,79 +20,79 @@
"X-Poedit-Language: Italian\n"
"X-Poedit-Country: ITALY\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Lo schema dell'url non consente alcun %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "%s componente '%s' non valido"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Componente %s non valido"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Analisi sintattica del parametro del percorso non supportata per questo URL"
-#: ../zypp/url/UrlBase.cc:778
-#: ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782
+#: ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Analisi sintattica della stringa di interrogazione non supportata per questo URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Lo schema url è un componente obbligatorio"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Schema dell'url '%s' non valido"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Lo schema dell'url non consente alcun nome utente"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Lo schema dell'url non consente alcuna password"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Per lo schema dell'url è necessario un componente host"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Lo schema dell'url non consente alcun componente host"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Componente dell'host '%s' non valido"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Lo schema dell'url non consente alcuna porta"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Componente della porta '%s' non valido"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Lo schema dell'url necessita di un nome di percorso"
-#: ../zypp/url/UrlBase.cc:1113
-#: ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117
+#: ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Percorso relativo non consentito se l'autorità esiste già "
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Analisi sintattica del parametro del percorso non supportata per questo URL"
@@ -2772,25 +2772,25 @@
msgstr "%s sostituito da %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s verrà cancellato dall'utente.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "'%s' verrà cancellato da un'altra applicazione. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s verrà installato dall'utente.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s verrà installato da un'altra applicazione. (ApplLow/ApplHigh)\n"
@@ -2798,38 +2798,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Usando solo i risolubili per la migliore architettura compatibile non è stata trovata alcuna soluzione valida."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Con questo tentativo sono stati analizzati solo i risolubili con la migliore architettura.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Analizzare tutti i possibili risolvibili richiede del tempo ma può anche fornire un risultato valido."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Informazioni non valide"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s è richiesto da altri risolvibili"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s è richiesto da %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2839,7 +2839,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s è in conflitto con altri risolvibili"
@@ -2848,14 +2848,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s in conflitto con %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2865,24 +2865,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s non è più utilizzato dagli altri risolvibili"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s non più utilizzato %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s non più utilizzato:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2891,7 +2891,7 @@
"Questi risolvibili verranno eliminati dal sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s dipende da altri risolvibili"
@@ -2899,39 +2899,39 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s dipende da %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s dipende da:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Figlio di"
# TLABEL modules/inst_target_part.ycp:680
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Impossibile installare %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Nessun componente fornisce %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2939,31 +2939,31 @@
"\n"
"Nessuna risorsa disponibile che supporta questo requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "A causa dei problemi descritti in alto o di seguito, questa risoluzione non risolverà le dipendenze"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Impossibile installare %s perché in conflitto con %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s non è installato ed è stato contrassegnato come non installabile"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Impossibile installare %s a causa di problemi di dipendenze"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2972,8 +2972,8 @@
# TLABEL modules/inst_target_part.ycp:680
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2981,118 +2981,130 @@
msgstr "non installare %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s presenta requisiti non soddisfatti"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "Dipendenze mancanti in %s "
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Impossibile installare %s. Alcune dipendenze sono mancanti"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s soddisfa le dipendenze di %s ma verrà disinstallato"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s soddisfa le dipendenze di %s ma verrà mantenuto nel sistema"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Non è necessario installare %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Impossibile installare %s per soddisfare le dipendenze di %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Impossibile installare %s per soddisfare le dipendenze di %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s non sarà disinstallato perché ancora richiesto"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s rende obsoleto %s. Tuttavia, non è possibile eliminare %s perché bloccato."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Impossibile installare %s perché in conflitto"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s non può essere installato perché in conflitto con %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Il requisito %s non può essere soddisfatto."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignora questo requisito solo qui"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Ignora questo requisito globalmente"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installa %s anche se l'architettura viene modificata"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s fornisce questa dipendenza ma modifica l'architettura dell'elemento installato"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Installa %s benché ciò cambi il rivenditore"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s fornisce questa dipendenza ma modifica il rivenditore dell'elemento installato"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignora questo conflitto di %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignora %s obsoleto in %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignora che %s è già impostato per l'installazione"
@@ -3102,7 +3114,7 @@
msgstr "Non installare o eliminare i risolvibili di pertinenza"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "affinché %s richieda %s durante l'aggiornamento di %s"
@@ -3355,9 +3367,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s fornisce %s, ma presenta un'altra architettura."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s fornisce %s, ma presenta un'altro rivenditore (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Impossibile soddisfare i requisiti %s per %s"
@@ -3368,7 +3386,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s è richiesto da un altro risolubione selezionato per l'installazione, pertanto non sarà scollegato."
@@ -3380,7 +3398,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s è richiesto da un altro risolubile installato, pertanto non sarà scollegato."
@@ -3392,7 +3410,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s è bloccato e non può essere disinstallato."
@@ -3403,7 +3421,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Un conflitto su %s (%s) richiede la rimozione di %s che è pianificato per l'installazione"
@@ -3414,23 +3432,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Contrassegno in corso di %s come disinstallabile a causa di conflitti su %s."
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "da %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Errore"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Importante"
@@ -3489,8 +3507,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s è aggiornato da %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s sarà considerato per l'intallazione (aggiornato) da %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4808,6 +4826,8 @@
"Previsto %s, trovato %s\n"
"Utilizzarlo?"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s è aggiornato da %s"
#~ msgid "Unable to parse Url authority"
#~ msgstr "Impossibile analizzare sintatticamente l'autorità url"
#~ msgid "Ignore this requirement generally"
Modified: trunk/libzypp/po/ja.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ja.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/ja.po (original)
+++ trunk/libzypp/po/ja.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-06-16 14:06\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "URLã¹ãã¼ãã¯ã%s ãç¦æ¢ãã¦ãã¾ã"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "ç¡å¹ãª %s ã³ã³ãã¼ãã³ãã%sã"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "ç¡å¹ãª %s ã³ã³ãã¼ãã³ã"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "ãã®URLã«å¯¾ãã¦ããã¹ãã©ã¡ã¼ã¿è§£æã¯ãµãã¼ãããã¦ãã¾ãã"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "ãã®URLã«å¯¾ãã¦ãã¯ã¨ãªæåå解æã¯ãµãã¼ãããã¦ãã¾ãã"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Urlã¹ãã¼ã ã¯å¿
é ã®ã³ã³ãã¼ãã³ãã§ã"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "ç¡å¹ãªURLã¹ãã¼ãã%sã"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "URLã¹ãã¼ãã¯ãã¦ã¼ã¶åãç¦æ¢ãã¦ãã¾ã"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "URLã¹ãã¼ãã¯ããã¹ã¯ã¼ããç¦æ¢ãã¦ãã¾ã"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "URLã¹ãã¼ãã«ã¯ããã¹ãã³ã³ãã¼ãã³ããå¿
è¦ã§ã"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "URLã¹ãã¼ãã¯ããã¹ãã³ã³ãã¼ãã³ããç¦æ¢ãã¦ãã¾ã"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "ç¡å¹ãªãã¹ãã³ã³ãã¼ãã³ãã%sã"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "URLã¹ãã¼ãã¯ããã¼ããç¦æ¢ãã¦ãã¾ã"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "ç¡å¹ãªãã¼ãã³ã³ãã¼ãã³ãã%sã"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "URLã¹ãã¼ãã«ã¯ããã¹åãå¿
è¦ã§ã"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "æ©é¢ãåå¨ããå ´åãç¸å¯¾ãã¹ã¯è¨±å¯ããã¾ããã "
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "ãã®URLã«å¯¾ãã¦ããã¹ãã©ã¡ã¼ã¿è§£æã¯ãµãã¼ãããã¦ãã¾ãã"
@@ -2735,7 +2735,7 @@
msgstr "%s 㯠%s ã«ç½®ãæãããã¾ã"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2743,19 +2743,19 @@
"ãããã®resolvableã¯ã·ã¹ãã ããåé¤ããã¾ãã"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s ã¯ã¾ã å¿
è¦ãªã®ã§ãã¢ã³ã¤ã³ã¹ãã¼ã«ããã¾ãã"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2763,38 +2763,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "ç¡å¹ãªæ
å ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s ã¯ä»ã®resolvableãå¿
è¦ã¨ãã¦ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s 㯠%s ãå¿
è¦ã¨ãã¦ãã¾ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2804,7 +2804,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ã¯ä»ã®resolvableã¨ç«¶åãã¦ãã¾ã"
@@ -2813,14 +2813,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s %s ã¨ç«¶åãã¾ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2830,24 +2830,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s ã¯ä»ã®resolvableãå»æ¢ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s 㯠%s ãå»æ¢ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s å»æ¢:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2856,7 +2856,7 @@
"ãããã®resolvableã¯ã·ã¹ãã ããåé¤ããã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ã¯ä»ã®resolvableã«ä¾åãã¾ã"
@@ -2864,38 +2864,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s 㯠%s ã«ä¾åãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ã¯ä»¥ä¸ã«ä¾åãã¾ã:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "ã®å"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "ãããã %s ãæä¾ãã¾ãã"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2904,32 +2904,32 @@
"\n"
"ãã®è¦æ±ããµãã¼ããã¦ãã使ç¨å¯è½ãªãªã½ã¼ã¹ãããã¾ããã"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ä¸è¨/ä¸è¨ã®åé¡ã«ããããã®è©¦ã¿ã§ã¯ãã¹ã¦ã®ä¾åé¢ä¿ã解決ããã¾ããã"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s 㯠%s ã¨ç«¶åãã¦ããã®ã§ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ããã¦ããããã¢ã³ã¤ã³ã¹ãã¼ã«ä¸å¯è½ã¨ãã¼ã¯ããã¦ãã¾ã"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "ä¾åé¢ä¿ã®åé¡ã«ããã%s ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2937,8 +2937,8 @@
msgstr "%s ãåé¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2946,119 +2946,131 @@
msgstr "%s ãã¤ã³ã¹ãã¼ã«ããªã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s ã«ã¯æºãããã¦ããªãè¦ä»¶ãããã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s ã¯ä¾åé¢ä¿ãä¸è¶³ãã¦ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "ä¾åé¢ä¿ããªãããã%s ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s 㯠%s ã®ä¾åé¢ä¿ãæºããã¦ãã¾ãããã¢ã³ã¤ã³ã¹ãã¼ã«ããã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s ã¯ã%s ã®ä¾åé¢ä¿ãæºããã¦ãã¾ããããå©ç¨ã®ã·ã¹ãã ã«ä¿æããã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ããå¿
è¦ã¯ããã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ã㦠%s ã®ä¾åé¢ä¿ãæºãããã¨ãã§ãã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ã㦠%s ã®ä¾åé¢ä¿ãæºãããã¨ãã§ãã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ã¯ã¾ã å¿
è¦ãªã®ã§ãã¢ã³ã¤ã³ã¹ãã¼ã«ããã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s å»æ¢ %s. ããã¯ããã¦ãããã %s ãåé¤ã§ãã¾ããã"
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s ã¯ç«¶åãã¦ããã®ã§ãã¤ã³ã¹ãã¼ã«ã§ãã¾ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ã¯æ¬¡ã¨ç«¶åãã¦ãããããã¢ã³ã¤ã³ã¹ãã¼ã«ã§ãã¾ã: %s "
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ãã®è¦æ±ãããã§ã ãç¡è¦ãã¾ã"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ãã®è¦æ±ãããã§ã ãç¡è¦ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ã¢ã¼ããã¯ãã£ãå¤æ´ããã¾ããã%s ãã¤ã³ã¹ãã¼ã«ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s ã¯ãã®ä¾åé¢ä¿ãä¸ãã¾ãããã¤ã³ã¹ãã¼ã«ããã¢ã¤ãã ã®ã¢ã¼ããã¯ãã£ã¯å¤æ´ããã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "ã¢ã¼ããã¯ãã£ãå¤æ´ããã¾ããã%s ãã¤ã³ã¹ãã¼ã«ãã¾ã"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s ã¯ãã®ä¾åé¢ä¿ãä¸ãã¾ãããã¤ã³ã¹ãã¼ã«ããã¢ã¤ãã ã®ã¢ã¼ããã¯ãã£ã¯å¤æ´ããã¾ã"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s ã®ãã®ç«¶åãç¡è¦ãã¾ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "å»æ¢ %s ã %s ã§ç¡è¦ãã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ããããã«æ¢ã«è¨å®ããã¦ããã®ãç¡è¦ãã¾ã"
@@ -3069,7 +3081,7 @@
msgstr "é¢é£ããresolavlesãã¤ã³ã¹ãã¼ã«ãã¾ãã¯åé¤ããªã"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s ã® %s åãã®ãã®ãè¦æ±ãããã(%s ãæ´æ°)"
@@ -3320,8 +3332,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s 㯠%s ãä¸ãã¾ãããã¢ã¼ããã¯ãã£ã¯ç°ãªãã¾ãã"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s 㯠%s ãä¸ãã¾ãããã¢ã¼ããã¯ãã£ã¯ç°ãªãã¾ãã"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s ã®è¦æ± %s ãæºãããã¨ãã§ãã¾ãã"
@@ -3333,7 +3351,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s ã¯ã¤ã³ã¹ãã¼ã«ãããä»ã®resolvableãå¿
è¦ã¨ãããã®ãªã®ã§ãã¢ã³ãªã³ã¯ã§ãã¾ããã"
@@ -3345,7 +3363,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s ã¯ã¤ã³ã¹ãã¼ã«ãããä»ã®resolvableãå¿
è¦ã¨ãããã®ãªã®ã§ãã¢ã³ãªã³ã¯ã§ãã¾ããã"
@@ -3357,7 +3375,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s ã¯ããã¯ããã¦ãããã¢ã³ã¤ã³ã¹ãã¼ã«ã§ãã¾ããã"
@@ -3368,7 +3386,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s)ã«é¢ãã競åã«ãããã¤ã³ã¹ãã¼ã«äºå®ã® %s ãåé¤ããå¿
è¦ãããã¾ã"
@@ -3379,23 +3397,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s ãã¤ã³ã¹ãã¼ã«ä¸å¯ã«ãã¾ã(%s ã«é¢ãã競åã®ãã)"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s ãã"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "ã¨ã©ã¼!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "éè¦!"
@@ -3452,9 +3470,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s 㯠%s ãå¿
è¦ã¨ãã¦ãã¾ã"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4773,6 +4791,10 @@
"äºæããã¦ããã®ã¯ %sãè¦ã¤ãã£ãã®ã¯ %s\n"
"ãã®ãã¡ã¤ã«ã使ç¨ãã¾ãã?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s 㯠%s ãå¿
è¦ã¨ãã¦ãã¾ã"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "URLæ©é¢ã解æã§ãã¾ãã"
Modified: trunk/libzypp/po/ka.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ka.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/ka.po (original)
+++ trunk/libzypp/po/ka.po Mon Sep 3 13:56:27 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2005-05-18 10:33+0200\n"
"Last-Translator: Aiet Kolkhi <aiet(a)qartuli.net>\n"
"Language-Team: Georgian <i18n(a)suse.de>\n"
@@ -16,77 +16,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2727,25 +2727,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2753,38 +2753,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2792,7 +2792,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2801,14 +2801,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2816,31 +2816,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2848,68 +2848,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2917,8 +2917,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2926,118 +2926,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3047,7 +3059,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3298,9 +3310,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3311,7 +3329,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3323,7 +3341,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3335,7 +3353,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3346,7 +3364,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3357,23 +3375,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3431,7 +3449,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/km.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/km.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/km.po (original)
+++ trunk/libzypp/po/km.po Mon Sep 3 13:56:27 2007
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: zypp.km\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-18 15:46+0700\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 02:30+0700\n"
"Last-Translator: Khoem Sokhem <khoemsokhem(a)khmeros.info>\n"
"Language-Team: Khmer <support(a)khmeros.info>\n"
"MIME-Version: 1.0\n"
@@ -19,77 +19,77 @@
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: 0\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "ááááááá¶ááá Url áá·áâá¢áá»áááá¶á %s áá"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "ááá¶ááá¶á %s áá·áâáááá¹ááááá¼á '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "ááá¶ááá¶á %s áá·áâáááá¹ááááá¼á"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "áá·ááá¶áâáá¶ááááâáá¶ááááâááá¶ááá¶ááááááâáááá¼áâááááá¶áá URL áááâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "áá·ááá¶áâáá¶ááááâáá¶ááááâááááá¢ááááâáááá½áâááááá¶áá URL áááâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "ááááááá¶ááá Url áá·ááááâáá¶âááá¶ááá¶áâáááâáá¶áâáá¶ááá¶áâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "ááááááá¶ááá Url áá·áâáááá¹ááááá¼á '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "ááááááá¶ááá Url áá·áâá¢áá»áááá¶áâáááááâá¢ááááááá¾âá¡á¾á"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "ááááááá¶ááá Url áá·áâá¢áá»áááá¶áâáá¶áááâááááá¶ááâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "ááááááá¶ááá Url áá¶ááá¶áâááá¶ááá¶áâááááâááá¶ááá¸á"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "ááááááá¶ááá Url áá·áá¢áá»áááá¶áâááá¶ááá¶áâááááâááá¶ááá¸áâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "ááá¶ááá¶áâááááâááá¶ááá¸áâáá·áâáááá¹ááááá¼á '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "ááááááá¶ááá Url áá·áâá¢áá»áááá¶áâá
áááâá¡á¾á"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "ááá¶ááá¶áâá
áááâáá·áâáááá¹ááááá¼á '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "ááááááá¶ááá Url áá¶ááá¶áâáááááâáááá¼á"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "áá·ááá¶áâá¢áá»áááá¶áâáááá¼áâáááâáá¶ááááâáá ááááá·áâáá¾âáá¶áâá¢á¶áááá¶áá"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "áá·ááá¶áâáá¶ááááâáá¶áâáááâááá¶ááá¶ááááááâáááá¼áâááááá¶áá URL áááâá¡á¾á"
@@ -2647,9 +2647,9 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1913
-#, fuzzy, c-format
+#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
-msgstr "rpm áá¶áâááááá¶áá»á %s áᶠ%s ááá»ááááâáá¶âáá·áâá¢á¶á
âáááááâáá¶áâáá»ááááá¶âáá¶á"
+msgstr "rpm áá¶ááâáááá¶âáá»á %s áᶠ%s ááá»ááááâáá¶âá¢á¶á
âáááááâáá¶áâáá»áâáááá¶"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1915
@@ -2663,7 +2663,7 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1918
-#, fuzzy, c-format
+#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm áá¶áâááááá¾á %s áᶠ%s ááá»ááááâáá¶âáá·áâá¢á¶á
âáááááâáá¶áâáá»áâáááá¶"
@@ -2736,25 +2736,25 @@
msgstr "%s áá¶áâáááá½áâááá %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s áá¹áâáááá¼áâáá¶áâáá»áâáááâá¢áááâáááá¾Â á\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s áá¹áâáááá¼áâáá¶ááá»áâáááâáááááá·áá¸âááááá á (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s áá¹áâáááá¼áâáá¶áâááá¡á¾áâáááââá¢áááâáááá¾Â á\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s áá¹áâáááá¼áâáá¶áâááá¡á¾áâáááâáááááá·áá¸âááááá á (ApplLow/ApplHigh)\n"
@@ -2762,41 +2762,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
-msgstr "ááâáá·ááá¾áâáááááâáááá¶áâáááá¹ááááá¼áâ ááááááá¾âááâáááá
ááâááááááááá¶áâááâáááá¶ááááááááâááá¢ááááá»áâáááâáá á"
+msgstr "ááâáá·áâáá¾áâáááááâáááá¶áâ áááâáá·áâá¢á¶á
âááááááá¶áâááâáááá¶ááááááááâááâááá¢âáááá»á á"
-#: ../zypp/solver/detail/Resolver_problems.cc:323
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "áááâá²áááá¶âáááâááááá¶ááâááâá¢ááá¸âá¢á¶á
âááááááá¶áâáá¶áâáá¶âáá½áâáááá¶ááááááááâááâááá¢âáááá»áâáááá¼áâáá¶áâááâáá·á
á¶ááá¶Â á\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
-msgstr "á
ááááââá¢ááá¸âá¢á¶á
âááááááá¶áâáá¶ááááâá¢á¶á
âáá¾áâá¡á¾áâáá¶ááá¢ááââáááá¼ááá¶áâááááááᶠááá»ááááâááá½áâáá¶áâááááááâáááááá¹ááááá¼á á"
+msgstr "áááâáá¶ááááâáá
âáá¹áâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áâáá¶ááâá¢ááâáááá¼áâáá¶áâááááááá¶â ááá»ááááâá¢á¶á
âááá½áâáá¶áááááááâáááá¹ááááá¼á á"
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "áááááá¶áâáá·áâáááá¹ááááá¼á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s áááá¼ááá¶áâáááâáááá
ááâááááááá¶áâáááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s áááá¼ááá¶áâááá %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2806,7 +2803,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s áááááááá·á
âáá¶áá½áâáááá
ááááááááá¶áâáááááá"
@@ -2815,14 +2812,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s áááâááááá·á
âáá¶áá½áâáá¹á %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2832,24 +2829,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s áááâáááá¾âáááá
ááááááááá¶áâáááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s áááâáááá¾ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s áááâáááá¾Â  á %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2858,7 +2855,7 @@
"áááá
ááááááááá¶ááá¶áááááâáá¹áâáááá¼áâáá¶áâáá»áâá
ááâáá¸âáááááááá á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ááá¢ááâáá¾áááá
ááááááááá¶áâáááááá"
@@ -2866,72 +2863,70 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s ááá¢áááá¾ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ááá¢áááá¾Â á %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "áá¼áâáááá"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "áááá¶áâáááá
ááâáá¶âááááá %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
"\n"
-"áá·áâáá¶áâáááá¶áâáá¶âáááâáá¶ááááâááááá¼ááá¶áâááá á"
+"áá·ááá¶áâáááá¶áâáááâáá¶ááááâááááá¼áâáá¶áâááá á"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
-msgstr "áááâáá¶áâááâáá¶áâáááá á¶âáá¼á
âáááâáá·ááááá¶âáá¶ááá¾/áá¶áááááá ááááááááá¶áâáááâáá·áâá¢á¶á
âááááááá¶áâáááá
ááâáááâáááá¼ááá¶áâáá¶áâá¡á¾á"
+msgstr "áááâáá¶áâááâáá¶áâáááá á¶ââáá¼á
âáá¶áâáá·ááááá¶âáá¶áâáá¾/áá¶áâááááá ááááááááá¶áâáááâáá¹áâáá·áâá¢á¶á
âááááááá¶áâáá¶áâá¢á¶áááááâáá¶ááá¢ááâáá¶áâáá"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
+#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
-msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸áááááâáá¶âáááá»áâáááâááááá·á
âáá¶áá½ááá¹á %s"
+msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸áááááâáá¶âáááááááá·á
âáá¶âáá½á %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "áá·áâáá¶áâááá¡á¾á %s á¡á¾á á á¾áâáá¶áâááááá¶ááâáá¶âáᶠá¢á¶á
âáá»áâáá¶á"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áááâáá¶áâáááá¶ááááá á¶âáá¶áâá¢á¶ááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2939,8 +2934,8 @@
msgstr "áá»á %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2948,139 +2943,149 @@
msgstr "áá»áâááá¡á¾á %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s áá¶áâááááá¼áâáá¶áâáááâáá·áâáá¶áâááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s áá¶áâáá¶áâá¢á¶áááááâáááâáá¶áá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¶ááá áááâáá¶áâáá¶ááâáá¶áâá¢á¶ááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:714
+#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
-msgstr "%s áááááâáááá
ááâááááá¼ááá¶ááááá %s ááá»áááááá¹áâáááá¼áâáá¶áâáá»á"
+msgstr "%s áááááâáá¶áâá¢á¶áááááâáááá %s ááá»ááááâáá¹áâáááá¼áâáá¶ááá»á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:724
+#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
-msgstr "%s áááááâáá¶áâá¢á¶áááááâáááá %s ááá»ááááâáá¹áâáááá¼áâáá¶áâáá»áâáá
âáá¾âááááááááâááááâá¢ááá"
+msgstr "%s áááááâáá¶áá¢á¶áááááâáááá %s ááá»ááááâáá¹áâáááá¼áâáá¶áâááááá¶áá»áâáá
âáááá»áâááááááááâááááâá¢ááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "áá·áâá
á¶ááá¶á
áâááá¡á¾á %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:742
+#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
-msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¾áááá¸âááááááááá
ááâááááá¼ááá¶áâáááá %s"
+msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¾áááá¸âáááááâáá¶áâá¢á¶áááááâáááá %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¾áááá¸âááááááááá
ááâááááá¼ááá¶áâáááá %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
+#, c-format
msgid "%s will not be uninstalled, because it is still required"
-msgstr "áá·áâá¢á¶á
âáá»á %s áá¶á áá¸áááááâáá
âáááá¼ááá¶áâáá¶âáá
âá¡á¾á"
+msgstr "%s áá¹áâáá·áâáááá¼áâáá¶áâáá»áâáá áá¸áááááâáá¶âáá
âááâáááá¼áâáá¶á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:826
+#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
-msgstr "%s áááâáááá¾ %s á ááá»ááááâáá·áâá¢á¶á
âáá»á %s áá¶ááá áá¸áááááâáá¶âáá¶ááâááá á"
+msgstr "%s ááááááá¾ %s á ááá»áááá %s áá·áâá¢á¶á
âáááá¼áâáá¶ááá»á áá¸áááááâáá¶âáá¶áááá á"
-#: ../zypp/solver/detail/Resolver_problems.cc:835
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:858
+#, c-format
msgid "Cannot install %s, because it is conflicting"
-msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¶ááá áá¸áááááâáá¶âáááá»áâáááâááááá·á
"
+msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸áááááâáá¶âáááá»áâáááááááá·á
"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "áá·áâá¢á¶á
âáá»á %s áá¶áááâ áááááâáá¶âáááááááá·á
âáá¶âáá½áâáá¹á %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "áá·áâá¢á¶á
âáááááâááááá¼áâáá¶á %s"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "áá·áâá¢á¾áá¾âáá¹áâááááá¼áâáá¶áâáááâáááá
âáá¸ááá"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
-#, fuzzy
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
-msgstr "áá·áâá¢á¾áá¾âáá¹áâááááá¼áâáá¶áâáááâáááá
âáá¸ááá"
+msgstr "áá¶âáá¼áá
áá·áá¢á¾áá¾âááááá¼áâáá¶âáááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ááá¡á¾á %s áááâáá¸áá¶âáá¶âáá¹áâáááá¶áááááá¼áâáááá¶ááááááááâááááá"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
+#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
-msgstr "%s áááááâáá¶áâá¢á¶áááááâááá ááá»ááááâáá¹áâáááá¶áááááá¼áâáááá¶ááááááááâááááâáá¶áá»âááááá¶áâááá¡á¾á"
+msgstr "%s áááááâáá¼áâáá¶áâá¢á¶áááááâááá ááá»ááááâáá¹áâáááá¶áááááá¼áâáááá¶áááááááááâááááâáá¶áá»âáááâáá¶áâááá¡á¾á"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "ááá¡á¾á %s áááâáá¸âáá¶âáá¶âáááá¶áááááá¼áâáááá»áá áá»áâáááâááâááá"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s áááááâáá¶áâá¢á¶áááááâáááâ ááá»ááááâáá¹áâáááá¶áááááá¼áâáááá»áá áá»áâáááâááááâáá¶áá»âáááâáá¶áâááá¡á¾á"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "áá·áâá¢á¾áá¾âáá¹áâáá¶áâáááâááááá·á
âáá %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "áá·áâá¢á¾áá¾âáá¹áâáá¶áâáááâáááá¾ %s áá
âáááá»á %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "áá·áâá¢á¾áá¾áá¶âáá¶áâááááá %s áá¾áááá¸âááá¡á¾áâáá½á
á á¾á"
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
msgid "Do not install or delete the resolvables concerned"
-msgstr "áá»áâááá¡á¾á á¬âáá»áâáááá
ááâááááááá¶áâááááá"
+msgstr "áá»áâááá¡á¾á á¬âáá»áâá¢ááá¸âáááá¢á¶á
âááááááá¶áâáá¶áâáááâáá¶áááá"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ááááá¶ááâáá¶ááá¶ááá¶á %s á
áááá %s ááááááâáááá¾âá²áá %s áá¶ááâáááá"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency
#: ../zypp/solver/detail/ResolverInfoMissingReq.cc:64
-#, fuzzy, c-format
+#, c-format
msgid "%s is lacking the requirement %s"
-msgstr "%s áá¶ááâááááá¼ááá¶á %s"
+msgstr "%s ááááâááááá¼áâáá¶á %s"
#: ../zypp/solver/detail/ResolverInfoMisc.cc:56
msgid ", Action: "
@@ -3155,16 +3160,16 @@
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
-#, fuzzy, c-format
+#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
-msgstr "%s áááá¼áâáá¶áâááááááááâá²ááâááá¡á¾á ááá»ááááâáá¶âáá·áâá¢á¶á
âáá
âáá½á
áááâáá¶áâááâáá¶áâáááá á¶âáááá
ááâáááâáááá¼ááá¶á á"
+msgstr "%s áááá¼áâáá¶áâáááááâááááááá¶âááá¡á¾á ááá»ááááâáá¶âáá·áá¢á¶á
â ááááá¶áâááâáááá á¶âáá¶áâá¢á¶ááááá á"
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:167
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s since it is already marked as needed to be uninstalled"
-msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áááááâáá¶âáá¶áâááááá¶áááᶠáá»á"
+msgstr "áá·áá¢á¶á
âááá¡á¾á %s ááááááá¶âáá¶âáááá¼áâáá¶áâááááá¶ááâáá¶âá
á¶ááá¶á
áâáááá¼áâáá»á"
#. Translator: %s = name of patch
#. TranslatorExplanation: A patch which is not needed (does not apply) cant be installed
@@ -3173,9 +3178,9 @@
#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed
#. TranslatorExplanation: package is not installed.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:179
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because it does not apply to this system."
-msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áááááâáá¶âáá·áâá¢áá»ááááâáá
âááááááááâááá á"
+msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸áááááâáá¶âáá·áâá¢áá»ááááâááááááááâááá á"
#. affected() = item 1 which has to be installed
#. _capability =
@@ -3183,9 +3188,9 @@
#. other_capability() =
#. Translator: %s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoMisc.cc:190
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because %s is already marked as needed to for installation"
-msgstr "áá·áá¢á¶á
âááá¡á¾áâ %s á
á¶ááâáá¶áááá¸âáá¶áâááááá¶ááâáá¶âáááá¼áâá²ááâááá¡á¾á %s ááâááááá"
+msgstr "áá·áâá¢á¶á
âááá¡á¾á %s áá¸ááááá %s áááá¼áâáá¶áâááááá¶ááâáá¶âá
á¶ááá¶á
áââááááá¶ááâááá¡á¾á"
#. Translator: %s = name of patch,product
#: ../zypp/solver/detail/ResolverInfoMisc.cc:198
@@ -3251,9 +3256,9 @@
#. TranslatorExplanation: removal of this resolvable would therefore break dependency
#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled
#: ../zypp/solver/detail/ResolverInfoMisc.cc:292
-#, fuzzy, c-format
+#, c-format
msgid "There are no alternative providers of %s installed"
-msgstr "áá·áâáá¶áâá¢ááááááááâáá½áâáááááâáááâáá¶áááá¡á¾ááááá %s"
+msgstr "áááá¶áâáááá»áá áá»áâáááááâáá¶âáááá½áââáááá %s áá¶áâááá¡á¾á"
#. Translator: 1.%s = name of package,patch....
#. TranslatorExample: for bar
@@ -3282,9 +3287,9 @@
#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible
#. TranslatorExplanation: bar requires something from foo
#: ../zypp/solver/detail/ResolverInfoMisc.cc:341
-#, fuzzy, c-format
+#, c-format
msgid "Upgrading to %s to avoid removing %s is not possible."
-msgstr "áááá¾ %s á²ááâáá¶áááááá áá¾áááá¸âá
áááá¶áâáá %s á
áá áá·áâá¢á¶á
âáá
áá½á
á¡á¾á á"
+msgstr "áá·áâá¢á¶á
âáááá¾âá²áá %s ááááá¾á áá¾áááá¸ááááá¶ááá¶áââáá %s á
ááâ á"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:359
@@ -3322,9 +3327,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s ááááá %s ááá»ááááâáá¶áâáááá¶ááááááááâááááá á"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s ááááá %s ááá»ááááâáá¶áâáááá»áá áá»áâáááâááááá (%s) á"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "áá·áâá¢á¶á
âáááááâáá¶áâááááá¼ááá¶á %s ááááá¶áá %s"
@@ -3335,10 +3346,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
+#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
-msgstr "%s áááá¼ááá¶áâáááâáááá
ááâááááááá¶áâáááááá áá¼á
ááááâáá¶âáá·áâá¢á¶á
âáááá¶á
áâá
ááâáá¸áááá¶âáá¶áâá¡á¾á á"
+msgstr "%s áááá¼áâáá¶ááá¶ááá¶áâáááâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áâáááááâáááâáááâáá¶áâáááá¾áâááááá¶ááâááá¡á¾á áá¼á
ááááâáá¶âáá¹áâáá·áâáááá¼ááá¶áâááááá¶áááá á"
#. affected() = provider of cap
#. _capability =
@@ -3347,10 +3358,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
+#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
-msgstr "%s áááá¼ááá¶áâáááâáááá
ááâááááááá¶áâáááááá áá¼á
ááááâáá¶âáá·áâá¢á¶á
âáááá¶á
áâá
ááâáá¸áááá¶âáá¶áâá¡á¾á á"
+msgstr "%s áááá¼áâáá¶áâáá¶ááá¶áâáááâá¢ááá¸âáááâá¢á¶á
âáááâá¢á¶á
âááááááá¶áâáá¶áâááááá áá¼á
ááááâáá¶âáá¹áâáá·áâáááá¼áâáá¶áâááááá¶ááâáá á"
#. affected() = to-be-uninstalled resolvable which is locked
#. _capability =
@@ -3359,7 +3370,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s áá¶áááá áá·áâáá·áâá¢á¶á
âáá»áâáá¶áâá¡á¾á á"
@@ -3370,10 +3381,10 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
-msgstr "áá¶ááááâááááá·á
âáá¾ %s (%s) áááá¼ááá¶áâááâá
áá %s"
+msgstr "áá¶áâáááááááá·á
%s (%s) áá¶ááá¶áâá²ááâáá %s á
áá áááâáááá¼áâáá¶áâáááááâááááááá¶âááááá¶ááâááá¡á¾á"
#. affected() = provider of capability
#. _capability = provided by provider
@@ -3381,23 +3392,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "ááááá¶áá %s áᶠá¢á¶á
âáá»áâáá¶á áááâáá¶áâááâáá¶áâáááááááá·á
áá¾ %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "áḠ%s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " ááá á»á!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " áááá¶áá!"
@@ -3428,9 +3439,8 @@
msgstr "áááá¾á²ááâá¢áááâááááááá¶áâáááâáá¶áá½áâáááááá¶áâáá¶ááá¢áá á"
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
-#, fuzzy
msgid "Regarding all resolvables with a compatible architecture."
-msgstr "á
ááááâáááá
ááâááááááááá¶áâáá¶ááá¢ááâááááá¶áâáááá¶ááááááááâáááâáááááá¶Â á"
+msgstr "áá¶ááááâáá¹áâá¢ááá¸âáááâá¢á¶á
âááááááá¶áâáá¶áâáá¶ááâá¢ááââáá¶âáá½áâáááá¶ááááâááááâáááâááâáááá¶Â á"
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55
@@ -3456,8 +3466,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s áááá¼áâáá¶áâáááá¾âá²ááâáááááâááá %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s áá¹áâáááá¼áâáá¶áâáá¶áâáááááâááááá¶ááâáá¶âáááá¡á¾á (áá¶áâáááá¾âá²ááâááááá) ááá %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/ko.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ko.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/ko.po (original)
+++ trunk/libzypp/po/ko.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2001-07-18 11:05+0200\n"
"Last-Translator: Hwang, Sang-Jin <violiet(a)suse.de>\n"
"Language-Team: Korean <i18n(a)suse.de>\n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3146,25 +3146,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3172,38 +3172,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3211,7 +3211,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1ì %2ì 충ëí©ëë¤"
@@ -3220,14 +3220,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "%1ì %2ì 충ëí©ëë¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3235,31 +3235,31 @@
msgstr "%1ì %2ì 충ëí©ëë¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3267,69 +3267,69 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "ì¤ì¹ì¤:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%1ì %2ì 충ëí©ëë¤"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "ì´ í¨í¤ì§ë ì´ë¯¸ ì¤ì¹ëì´ ìì´ì ì¤ì¹ê° ëì§ ììµëë¤."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3338,8 +3338,8 @@
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3347,123 +3347,135 @@
msgstr "ì¤ì¹ì¤:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, fuzzy, c-format
msgid "%s has missing dependencies"
msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
# text is shown in a line of a package list
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "ë¤ì ì¤ì¹í´ì¼ í©ëë¤."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "ìì¡´ì±ì ë§ì¡±íì§ ëª»í¨:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1ì %2ì 충ëí©ëë¤"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
# text is shown in a column of a package list entry
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "í´ê²°í ì ìë ì구ì¬í..."
# text is shown in a column of a package list entry
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "í´ê²°í ì ìë ì구ì¬í..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1ì %2ì 충ëí©ëë¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1ì %2ì 충ëí©ëë¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "%1 ëë í 리ë ì´ë¯¸ 목ë¡ì ììµëë¤."
@@ -3474,7 +3486,7 @@
msgstr "%1ì %2ì 충ëí©ëë¤"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3728,9 +3740,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3741,7 +3759,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3753,7 +3771,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3765,7 +3783,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "ì´ í¨í¤ì§ë ì´ë¯¸ ì¤ì¹ëì´ ìì´ì ì¤ì¹ê° ëì§ ììµëë¤."
@@ -3776,7 +3794,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3787,24 +3805,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "ìë¬"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "ë°ì´í° ë¶ë¬ì¤ê¸°"
@@ -3865,7 +3883,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/lo.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/lo.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/lo.po (original)
+++ trunk/libzypp/po/lo.po Mon Sep 3 13:56:27 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-01-04 08:58+0100\n"
"Last-Translator: i18n(a)suse.de\n"
"Language-Team: Lao <i18n(a)suse.de>\n"
@@ -14,77 +14,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2725,25 +2725,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2751,38 +2751,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2790,7 +2790,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2799,14 +2799,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2814,31 +2814,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2846,68 +2846,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2915,8 +2915,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2924,118 +2924,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3045,7 +3057,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3296,9 +3308,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3309,7 +3327,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3321,7 +3339,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3333,7 +3351,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3344,7 +3362,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3355,23 +3373,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3429,7 +3447,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/lt.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/lt.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/lt.po (original)
+++ trunk/libzypp/po/lt.po Mon Sep 3 13:56:27 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-05-01 15:00+0300\n"
"Last-Translator: Andrius Å tikonas <stikonas(a)gmail.com>\n"
"Language-Team: Lietuvių <komp_lt(a)konf.lt>\n"
@@ -20,77 +20,77 @@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url schema neleidžia %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Klaidingas %s komponentas â%sâ"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Klaidingas %s komponentas"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Užklausos eilutÄs nagrinÄjimas nepalaikomas Å¡iam URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url schema yra reikalingas komponentas"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Klaidingaa Url schema â%sâ"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url schema neleidžia vartotojo vardo"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url schema neleidžia slaptažodžio"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Bloga komanda %1."
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url schema neleidžia prievado"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Klaidingas prievado komponentas â%sâ"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url schema reikalauja kelio pavadinimo"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2977,25 +2977,25 @@
msgstr "%s pakeistas %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s nebus pašalintas, nes jis vis dar reikalingas"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3003,38 +3003,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Klaidinga informacija"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s reikalingas %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3042,7 +3042,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 konfliktuoja su %2"
@@ -3051,14 +3051,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s konfliktuoja su %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3068,31 +3068,31 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3100,68 +3100,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s priklauso nuo %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s priklauso nuo:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Negaliu įdiegti %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Niekas nepateikia %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Nepavyksta įdiegti %s, nes jis konfliktuoja"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s neįdiegtas ir pažymÄtas kaip neįdiegiamas"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Nepavyksta įdiegti %s dÄl priklausomybių problemų"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3169,8 +3169,8 @@
msgstr "pašalinti %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3178,120 +3178,132 @@
msgstr "neįdiegti %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s turi neišpildytų reikalavimų"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s turi trūkstamų priklausomybių"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Netenkinami ryšiai:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Nebūtina įdiegti %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Nepavyksta įdiegti %s dÄl priklausomybių problemų"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s nebus pašalintas, nes jis vis dar reikalingas"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Nepavyksta įdiegti %s, nes jis konfliktuoja"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1 konfliktuoja su %2"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "turi neišsprendžiamų reikalavimų..."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "turi neišsprendžiamų reikalavimų..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1 konfliktuoja su %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1 konfliktuoja su %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "Katalogas %1 jau yra sÄ
raše."
@@ -3302,7 +3314,7 @@
msgstr "%1 konfliktuoja su %2"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3554,8 +3566,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s pateikia %s, bet yra kitos architektūros"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s pateikia %s, bet yra kitos architektūros"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3567,7 +3585,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3579,7 +3597,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3591,7 +3609,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s yra užrakintas ir negali būti pašalintas."
@@ -3602,7 +3620,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3613,23 +3631,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "nuo %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Klaida!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Svarbu!"
@@ -3688,9 +3706,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s reikalingas %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -5095,6 +5113,10 @@
"Vis tiek naudoti bylÄ
?"
#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s reikalingas %s"
+
+#, fuzzy
#~ msgid "Unable to parse Url authority"
#~ msgstr "Neįmanoma pridÄti paslaugos"
Modified: trunk/libzypp/po/mk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/mk.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/mk.po (original)
+++ trunk/libzypp/po/mk.po Mon Sep 3 13:56:27 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2001-07-17 16:12+0200\n"
"Last-Translator: ÐоÑан ÐимовÑки <zoki.dimovski(a)gmail.com>\n"
"Language-Team: Macedonian <i18n(a)suse.de>\n"
@@ -15,77 +15,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2872,25 +2872,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2898,38 +2898,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2937,7 +2937,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2946,14 +2946,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2961,31 +2961,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2993,70 +2993,70 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
# CL
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
#, fuzzy
msgid "Child of"
msgstr "Чиле"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3064,8 +3064,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3073,118 +3073,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3194,7 +3206,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3445,9 +3457,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3458,7 +3476,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3470,7 +3488,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3482,7 +3500,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3493,7 +3511,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3504,23 +3522,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3578,7 +3596,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/mr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/mr.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/mr.po (original)
+++ trunk/libzypp/po/mr.po Mon Sep 3 13:56:27 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: Check hardware-2.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-13 12:55+0530\n"
"Last-Translator: Priyavert Sharma <priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions <linux_team(a)agreeya.com>\n"
@@ -12,77 +12,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10.2\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url सà¥à¤à¥à¤® %sला à¤
नà¥à¤®à¤¤à¥ दà¥à¤¤ नाहà¥"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "à¤
वà¥à¤§ %s à¤à¥à¤®à¥à¤ªà¥à¤¨à¤¨à¥à¤ %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "à¤
वà¥à¤§ %s à¤à¥à¤®à¥à¤ªà¥à¤¨à¤¨à¥à¤"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "या URL साठॠपाथ पà¥
रामà¥à¤à¤° पारà¥à¤¸à¤¿à¤à¤à¤à¥ समरà¥à¤¥à¤¨ नाहà¥"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "या URL साठॠà¤à¥à¤µà¥à¤°à¥ सà¥à¤à¥à¤°à¤¿à¤à¤ पारà¥à¤¸à¤¿à¤à¤à¤à¥ समरà¥à¤¥à¤¨ नाहà¥"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "URL सà¥à¤à¥à¤® हा à¤à¤ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¤¾à¤ à¤à¤¹à¥"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "à¤
वà¥à¤§ Url सà¥à¤à¥à¤® %s"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url सà¥à¤à¥à¤® à¤à¤ªà¤à¥à¤à¥à¤¤à¥à¤¯à¤¾à¤à¥à¤¯à¤¾ नावाला à¤
नà¥à¤®à¤¤à¥ दà¥à¤¤ नाहà¥"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url सà¥à¤à¥à¤® पासवरà¥à¤¡à¤²à¤¾ à¤
नà¥à¤®à¤¤à¥ दà¥à¤¤ नाहà¥"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url सà¥à¤à¥à¤®à¤²à¤¾ मà¥à¤à¥à¤¯ à¤à¤¾à¤à¤¾à¤à¥ à¤à¤°à¤ à¤
सतà¥"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url सà¥à¤à¥à¤® मà¥à¤à¥à¤¯ à¤à¤¾à¤à¤¾à¤²à¤¾ à¤
नà¥à¤®à¤¤à¥ दà¥à¤¤ नाहà¥"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "à¤
वà¥à¤§ मà¥à¤à¥à¤¯ à¤à¤¾à¤ %s"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url सà¥à¤à¥à¤® पà¥à¤°à¥à¤à¤²à¤¾ à¤
नà¥à¤®à¤¤à¥ दà¥à¤¤ नाहà¥"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "à¤
वà¥à¤§ पà¥à¤°à¥à¤ à¤à¤¾à¤ %s"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url सà¥à¤à¥à¤®à¤²à¤¾ पाथà¤à¥à¤¯à¤¾ नावाà¤à¥ à¤à¤°à¤ à¤
सतà¥"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "à¤
थà¥à¤°à¤¿à¤à¥ à¤à¤ªà¤¸à¥à¤¥à¤¿à¤¤ à¤
सà¥à¤² तर सापà¥à¤à¥à¤· पाथला à¤
नà¥à¤®à¤¤à¥ नाहà¥"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "या URL साठॠपाथ पà¥
रामà¥à¤à¤° पारà¥à¤¸à¤¿à¤à¤à¤à¥ समरà¥à¤¥à¤¨ नाहà¥"
@@ -2724,7 +2724,7 @@
msgstr "%s à¤à¥à¤¯à¤¾ à¤à¤¾à¤à¥ %s "
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2732,19 +2732,19 @@
"हॠरिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ पà¥à¤°à¤£à¤¾à¤²à¥à¤¤à¥à¤¨ पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤²à¥ à¤à¤¾à¤¤à¥à¤²"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s à¤
सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤£à¤¾à¤° नाहॠà¤à¤¾à¤°à¤£ तॠà¤
à¤à¥à¤¨ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¤¹à¥"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2752,38 +2752,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "à¤
वà¥à¤§ माहितà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "à¤à¤¤à¤° रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸à¤¨à¤¾ %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s ला %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2791,7 +2791,7 @@
msgstr "%s ला %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥:/n"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s à¤à¥ à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤²à¥à¤¬à¤¶à¥ पà¤à¤¤ नाहà¥"
@@ -2800,14 +2800,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s à¤à¥ %s शॠपà¤à¤¤ नाहà¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2817,24 +2817,24 @@
"%s शॠपà¤à¤¤ नाहà¥:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s à¤
नà¥à¤¯ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸à¤¨à¤¾ बाà¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s %s ला बाà¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s :%s ला बाà¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2843,7 +2843,7 @@
"हॠरिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ पà¥à¤°à¤£à¤¾à¤²à¥à¤¤à¥à¤¨ पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤²à¥ à¤à¤¾à¤¤à¥à¤²"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s à¤à¤¤à¤° रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸à¤µà¤° à¤
वलà¤à¤¬à¥à¤¨"
@@ -2851,38 +2851,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s %s वर à¤
वलà¤à¤¬à¥à¤¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s :%s वर à¤
वलà¤à¤¬à¥à¤¨"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "à¤à¤¾à¤à¤²à¥à¤¡ à¤à¤«"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "à¤à¥à¤£à¤¤à¥à¤¹à¥ à¤à¥à¤·à¥à¤ %s पà¥à¤°à¤µà¤¤ नाहà¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2891,32 +2891,32 @@
"\n"
"à¤
सॠà¤à¥à¤£à¤¤à¥à¤¹à¥ साधन à¤à¤ªà¤²à¤¬à¥à¤§ नाहॠà¤à¥ या à¤à¤°à¤à¥à¤²à¤¾ समरà¥à¤¥à¤¨ दà¥à¤¤à¥."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "यà¥à¤ à¤à¤¾à¤¤à¤²à¥à¤²à¥à¤¯à¤¾ समसà¥à¤¯à¤¾, à¤à¥à¤¯à¤¾ या रिà¤à¥à¤²à¥à¤¯à¥à¤¶à¤¨à¤à¥à¤¯à¤¾ वर/à¤à¤¾à¤²à¥ नमà¥à¤¦ à¤à¥à¤²à¥à¤¯à¤¾ à¤à¤¹à¥à¤¤, तà¥à¤¯à¤¾à¤¸à¤°à¥à¤µ à¤
वलà¤à¤¬à¥à¤¨ à¤à¥à¤·à¥à¤à¥ सà¥à¤¡à¤µà¤£à¤¾à¤° नाहà¥à¤¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहॠà¤à¤¾à¤°à¤£ तà¥à¤¯à¤¾à¤à¤à¥ %s शॠपà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ नाहॠव तà¥à¤¯à¤¾à¤µà¤° सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ न à¤à¤°à¤¤à¤¾ यà¥à¤£à¤¾à¤°à¤¾ à¤
शॠà¤à¥à¤£ à¤à¤¹à¥"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "à¤
वलà¤à¤¬à¥à¤¨ à¤
सणà¥à¤¯à¤¾à¤à¥à¤¯à¤¾ (डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥) समसà¥à¤¯à¥à¤®à¥à¤³à¥ %s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2924,8 +2924,8 @@
msgstr "%s पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2933,119 +2933,131 @@
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ नà¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, fuzzy, c-format
msgid "%s has unfulfilled requirements"
msgstr "à¤à¥à¤¯à¤¾ à¤à¤°à¤à¤¾ पà¥à¤°à¥à¤£ न हà¥à¤£à¤¾à¤°à¥à¤¯à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%sà¤à¥à¤¯à¤¾ à¤à¤°à¤à¤¾ पà¥à¤°à¥à¤£ न हà¥à¤£à¤¾à¤°à¥à¤¯à¤¾ à¤à¤¹à¥à¤¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s मधॠà¤à¤¾à¤¯à¤¬ डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ à¤à¤¹à¥à¤¤."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "à¤à¤¾à¤¯à¤¬ डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤¡à¤®à¥à¤³à¥ %s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s %s à¤à¥à¤¯à¤¾ डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ पà¥à¤°à¥à¤£ à¤à¤°à¤¤à¥, परà¤à¤¤à¥ à¤à¤ªà¤²à¥à¤¯à¤¾ पà¥à¤°à¤£à¤¾à¤²à¥à¤µà¤° ठà¥à¤µà¤£à¥à¤¯à¤¾à¤¤ यà¥à¤à¤²"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤£à¥à¤¯à¤¾à¤à¥ à¤à¤°à¤ नाहà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s à¤à¥à¤¯à¤¾ डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ पà¥à¤°à¥à¤£ à¤à¤°à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ ॠ%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s à¤à¥à¤¯à¤¾ डिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥à¤ पà¥à¤°à¥à¤£ à¤à¤°à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤ ॠ%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s à¤
सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤£à¤¾à¤° नाहॠà¤à¤¾à¤°à¤£ तॠà¤
à¤à¥à¤¨ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¤¹à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s %s ला बाà¤à¥à¤²à¤¾ à¤à¤¾à¤à¤¤à¥, परà¤à¤¤à¥ %s पà¥à¤¸à¤¤à¤¾ यà¥à¤¤ नाहॠà¤à¤¾à¤°à¤£ तॠलà¥à¤à¥à¤¡ à¤à¤¹à¥"
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¤à¤¾ यà¥à¤ शà¤à¤¤ नाहॠà¤à¤¾à¤°à¤£ तॠविवादासà¥à¤ªà¤¦ à¤à¤¹à¥"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¤à¤¾ यà¥à¤£à¥à¤¯à¤¾à¤¸à¤¾à¤°à¤à¥ नाहॠà¤à¤¾à¤°à¤£ तà¥à¤¯à¤¾à¤à¥ %s शॠपà¤à¤¤ नाहà¥"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "या à¤à¤°à¤à¥à¤à¤¡à¥ यà¥à¤¥à¥à¤ दà¥à¤°à¥à¤²à¤à¥à¤· à¤à¤°à¤¾"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "या à¤à¤°à¤à¥à¤à¤¡à¥ यà¥à¤¥à¥à¤ दà¥à¤°à¥à¤²à¤à¥à¤· à¤à¤°à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¾, à¤à¤°à¥ तॠसà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ बदलत à¤
सà¥à¤²"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s हॠडिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥ पà¥à¤°à¤µà¤¤à¥, परà¤à¤¤à¥ तॠसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¯à¤à¥à¤®à¤à¥ सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ बदलà¥à¤²"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "%s सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤°à¤¾, à¤à¤°à¥ तॠसà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ बदलत à¤
सà¥à¤²"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s हॠडिपà¥à¤¨à¥à¤¡à¤¨à¥à¤¸à¥ पà¥à¤°à¤µà¤¤à¥, परà¤à¤¤à¥ तॠसà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¯à¤à¥à¤®à¤à¥ सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ बदलà¥à¤²"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s à¤à¤¾ हा विवाद विसरà¥à¤¨ à¤à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr " %s मधà¥à¤² %s à¤à¤¬à¥à¤¸à¥à¤²à¥à¤à¤à¤¡à¥ दà¥à¤°à¥à¤²à¤à¥à¤· à¤à¤°à¤¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "%s याà¤à¤§à¥à¤ सà¥à¤¥à¤¾à¤ªà¤¨à¥à¤¸à¤¾à¤ ॠसà¤à¥à¤ à¤
सलà¥à¤¯à¤¾à¤à¤¡à¥ दà¥à¤°à¥à¤²à¤à¥à¤· à¤à¤°à¤¾"
@@ -3056,7 +3068,7 @@
msgstr "सà¤à¤¬à¤à¤§à¤¿à¤¤ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤¬à¤²à¥à¤¸ सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤à¤¿à¤à¤µà¤¾ पà¥à¤¸à¥à¤¨ à¤à¤¾à¤à¥ नà¤à¤¾"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s à¤à¥ à¤
पà¤à¥à¤°à¥à¤¡à¤¿à¤à¤ à¤à¤°à¤¤à¤¾à¤à¤¨à¤¾ %s साठॠ%s à¤à¥ à¤à¤°à¤"
@@ -3307,8 +3319,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s %s पà¥à¤°à¤µà¤¤à¥, परà¤à¤¤à¥ तà¥à¤¯à¤¾à¤à¥ दà¥à¤¸à¤°à¥ सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ à¤à¤¹à¥."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s %s पà¥à¤°à¤µà¤¤à¥, परà¤à¤¤à¥ तà¥à¤¯à¤¾à¤à¥ दà¥à¤¸à¤°à¥ सà¥à¤¥à¤¾à¤ªà¤¤à¥à¤¯ à¤à¤¹à¥."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s साठॠ%s à¤à¥ à¤à¤°à¤ पà¥à¤°à¥à¤£ à¤à¤°à¥ शà¤à¤¤ नाहà¥"
@@ -3320,7 +3338,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "दà¥à¤¸à¤°à¥à¤¯à¤¾ सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤£à¤¾à¤°à¥à¤¯à¤¾ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤²à¥à¤¬à¤²à¤¾ %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥, तà¥à¤¯à¤¾à¤®à¥à¤³à¥ तà¥à¤¯à¤¾à¤à¥ लिà¤à¤ à¤à¤¾à¤£à¤¾à¤° नाहà¥"
@@ -3332,7 +3350,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "दà¥à¤¸à¤°à¥à¤¯à¤¾ सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤£à¤¾à¤°à¥à¤¯à¤¾ रिà¤à¥à¤²à¥à¤µà¥à¤¹à¥à¤²à¥à¤¬à¤²à¤¾ %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥, तà¥à¤¯à¤¾à¤®à¥à¤³à¥ तà¥à¤¯à¤¾à¤à¥ लिà¤à¤ à¤à¤¾à¤£à¤¾à¤° नाहà¥"
@@ -3344,7 +3362,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s ला à¤à¥à¤²à¥à¤ª à¤à¤¹à¥ व à¤
सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤ शà¤à¤¤ नाहà¥"
@@ -3355,7 +3373,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) विषयà¥à¤à¥à¤¯à¤¾ वादामà¥à¤³à¥ सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ हà¥à¤£à¤¾à¤°à¥ %s à¤à¤¾à¤¢à¥à¤¨ à¤à¤¾à¤à¤£à¥ à¤à¤µà¤¶à¥à¤¯à¤ à¤à¤¹à¥"
@@ -3366,23 +3384,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s वरà¥à¤² विवादावरà¥à¤¨ %s à¤
सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ à¤
सलà¥à¤¯à¤¾à¤à¥ à¤à¥à¤£"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s वरà¥à¤¨"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "à¤à¥à¤!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "महतà¥à¤µà¤¾à¤à¥!"
@@ -3439,9 +3457,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s ला %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4760,6 +4778,10 @@
"à¤
पà¥à¤à¥à¤·à¤¿à¤¤ %s,à¤à¤¢à¤³à¤²à¥ %s\n"
"तरà¥à¤¹à¥ फाà¤à¤² वापरायà¤à¥?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s ला %s à¤à¥ à¤à¤°à¤ à¤à¤¹à¥"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Url à¤
थà¥à¤°à¤¿à¤à¥à¤à¤¾ सà¤à¤¬à¤à¤§ साà¤à¤à¤£à¥ à¤
शà¤à¥à¤¯"
Modified: trunk/libzypp/po/nb.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/nb.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/nb.po (original)
+++ trunk/libzypp/po/nb.po Mon Sep 3 13:56:27 2007
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: zypp.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 11:56+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 13:41+0200\n"
"Last-Translator: Rune Nordbøe Skillingstad <rune(a)skillingstad.no>\n"
"Language-Team: Norwegian\n"
"MIME-Version: 1.0\n"
@@ -20,77 +20,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Adressestrategi tillater ikke %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ugyldig %s komponent %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ugyldig %s komponent"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Analyse av baneparameter støttes ikke for denne URL-en"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Analyse av spørringsstreng støttes ikke for denne URL-en"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Adressestrategi er en obligatorisk komponent"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ugyldig adressestrategi %s"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Adressestrategi tillater ikke brukernavn"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Adressestrategi tillater ikke passord"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Adressestrategi krever en vertskomponent"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Adressestrategi tillater ikke en vertskomponent"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ugyldig vertskomponent %s"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Adressestrategi tillater ikke port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ugyldig portkomponent %s"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Adressestrategi krever banenavn"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relativ sti ikke tillatt hvis autoritet finnes"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Analyse av baneparameter støttes ikke for denne URL-en"
@@ -127,9 +127,7 @@
#: ../zypp/repo/PackageProvider.cc:303
#, c-format
msgid "Package %s fails integrity check. Do you want to retry?"
-msgstr ""
-"Pakken %s består ikke integritetskontrollen. Vil du prøve å laste den ned på "
-"nytt?"
+msgstr "Pakken %s består ikke integritetskontrollen. Vil du prøve å laste den ned på nytt?"
#: ../zypp/repo/RepoProvideFile.cc:205
msgid "No url in repository."
@@ -2777,25 +2775,25 @@
msgstr "%s erstattet av %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s blir fjernet av brukeren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s blir fjernet av et annet program. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s blir installert av brukeren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s blir installert av et annet program. (ApplLow/ApplHigh)\n"
@@ -2803,44 +2801,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Fant ingen gyldig løsning med ressurser basert på beste arktiektur."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
-msgid ""
-"With this run only resolvables with the best architecture have been "
-"regarded.\n"
+#: ../zypp/solver/detail/Resolver_problems.cc:338
+msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Benytter bare ressurser basert på beste arkitektur.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
-msgid ""
-"Regarding all possible resolvables takes time, but can come to a valid "
-"result."
-msgstr ""
-"Analyse av alle mulige ressurser tar lang tid, men kan resultere i et gyldig "
-"resultat."
+#: ../zypp/solver/detail/Resolver_problems.cc:339
+msgid "Regarding all possible resolvables takes time, but can come to a valid result."
+msgstr "Analyse av alle mulige ressurser tar lang tid, men kan resultere i et gyldig resultat."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ugyldig informasjon"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s kreves av andre nødvendige pakker"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s kreves av %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2850,7 +2842,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s er i konflikt med andre nødvendige pakker"
@@ -2859,14 +2851,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s er i konflikt med %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2876,24 +2868,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s gjør andre nødvendige pakker foreldet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s forelder %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s forelder:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2902,7 +2894,7 @@
"Disse nødvendige pakkene vil bli fjernet fra systemet."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s avhenger av andre nødvendige pakker"
@@ -2910,38 +2902,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s avhenger av %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s avhenger av:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Underordnet"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Kan ikke installere %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Ingen pakker inneholder %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2949,35 +2941,31 @@
"\n"
"Det er ingen tilgjengelig ressurs som støtter dette kravet."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
-msgid ""
-"Due to the problems described above/below, this resolution will not solve "
-"all dependencies"
-msgstr ""
-"På grunn av problemene som er beskrevet over/under, vil ikke denne løsningen "
-"løse alle avhengigheter"
+#: ../zypp/solver/detail/Resolver_problems.cc:461
+msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
+msgstr "På grunn av problemene som er beskrevet over/under, vil ikke denne løsningen løse alle avhengigheter"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Kan ikke installere %s fordi den er i konflikt med %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s er ikke installert, og er merket som ikke installerbar"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Kan ikke installere %s på grunn av problemer med nødvendige pakker"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2985,8 +2973,8 @@
msgstr "slett %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2994,122 +2982,130 @@
msgstr "Ikke installer %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s har ressurskrav som ikke er oppfylt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s mangler nødvendige pakker"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s kan ikke installeres på grunn av manglende nødvendige pakker"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s kreves av %s, men vil bli avinstallert"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s oppfyller krav om nødvendige pakker for %s men beholdes på systemet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Det er ikke nødvendig å installere %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Kan ikke installere %s, som er nødvendig for %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Kan ikke installere %s, som er nødvendig for %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s vil ikke be avinstallert fordi den fremdeles er nødvendig"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s forelder %s. Men %s kan ikke fjernes fordi den er låst."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Kan ikke installere %s fordi den skaper en konflikt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s kan ikke avinstalleres på grunn av konflikter med %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Kravet %s kan ikke løses."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorerer dette kravet, men bare her"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Ignorerer dette kravet generelt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installer %s selv om arkitekturen vil bli endret"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
-msgid ""
-"%s provides this dependency, but would change the architecture of the "
-"installed item"
-msgstr ""
-"%s oppfyller denne avhengigheten, men vil endre arkitekturen for det "
-"installerte elementet"
+msgid "%s provides this dependency, but would change the architecture of the installed item"
+msgstr "%s oppfyller denne avhengigheten, men vil endre arkitekturen for det installerte elementet"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Installer %s selv om arkitekturen vil bli endret"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s oppfyller denne avhengigheten, men vil endre leverandør av det installerte elementet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorerer denne konflikten for %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorer foreldet %s i %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorer at %s allerede er valgt for installasjon"
@@ -3119,7 +3115,7 @@
msgstr "Ikke installer eller slett berørte nødvendige ressurser"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "som krever %s for %s ved oppgradering av %s"
@@ -3204,12 +3200,8 @@
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
#, c-format
-msgid ""
-"%s is scheduled to be installed, but this is impossible due to dependency "
-"problems."
-msgstr ""
-"%s er merket for installasjon, men dette er ikke mulig på grunn av "
-"avhengighetsproblemer."
+msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
+msgstr "%s er merket for installasjon, men dette er ikke mulig på grunn av avhengighetsproblemer."
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
@@ -3353,12 +3345,8 @@
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:396
#, c-format
-msgid ""
-"%s provides %s, but it is uninstallable. Try installing it on its own for "
-"more details."
-msgstr ""
-"%s inneholder %s, men kan ikke installeres. Forsøk å installere bare denne "
-"pakken for å få mer informasjon."
+msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details."
+msgstr "%s inneholder %s, men kan ikke installeres. Forsøk å installere bare denne pakken for å få mer informasjon."
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:414
@@ -3378,9 +3366,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s inneholder %s, men har en annen arkitektur."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s inneholder %s, men har en annen leverandør (%s)"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Kan ikke oppfylle kravet %s for %s"
@@ -3391,14 +3385,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
-msgid ""
-"%s is required by another resolvable selected for installation, so it won't "
-"be unlinked."
-msgstr ""
-"%s kreves av en annen nødvendig pakke som skal installeres, så lenken vil ikke bli "
-"fjernet."
+msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
+msgstr "%s kreves av en annen nødvendig pakke som skal installeres, så lenken vil ikke bli fjernet."
#. affected() = provider of cap
#. _capability =
@@ -3407,12 +3397,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
-msgstr ""
-"%s kreves av en annen installert og nødvendig pakke, så lenken vil ikke bli "
-"fjernet."
+msgstr "%s kreves av en annen installert og nødvendig pakke, så lenken vil ikke bli fjernet."
#. affected() = to-be-uninstalled resolvable which is locked
#. _capability =
@@ -3421,7 +3409,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s er beskyttet, og kan ikke avinstalleres."
@@ -3432,14 +3420,10 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
-msgid ""
-"A conflict over %s (%s) requires the removal of %s which is scheduled for "
-"installation"
-msgstr ""
-"PÃ¥ grunn av en konflikt i forbindelse med %s (%s) vil ikke pakken %s bli "
-"installert"
+msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
+msgstr "PÃ¥ grunn av en konflikt i forbindelse med %s (%s) vil ikke pakken %s bli installert"
#. affected() = provider of capability
#. _capability = provided by provider
@@ -3447,23 +3431,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Merker %s som ikke installerbar på grunn av konflikter i forbindelse med %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "fra %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Feil!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Viktig!"
@@ -3521,8 +3505,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s oppfriskes av %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s vil bli vurder for installasjon (oppdatering) av %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/nl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/nl.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/nl.po (original)
+++ trunk/libzypp/po/nl.po Mon Sep 3 13:56:27 2007
@@ -1,4 +1,4 @@
-# translation of zypp.po to Nederlands
+# translation of zypp.po to Dutch
# Dutch message file for YaST 2 (@memory@).
# Copyright (C) 2005 SUSE Linux Products GmbH.
# Copyright (C) 2002 SuSE Linux AG.
@@ -14,87 +14,87 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-07-31 16:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 13:24+0200\n"
"Last-Translator: Rinse de Vries <rinsedevries(a)kde.nl>\n"
-"Language-Team: Nederlands <kde-i18n-nl(a)kde.org>\n"
+"Language-Team: Dutch <nl(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "%s is niet toegestaan in URL-schema "
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ongeldige %s component '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ongeldige %s component"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Parseren van padparameter wordt niet ondersteund voor deze URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Parseren van queryreeks wordt niet ondersteund voor deze URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "URL-schema is een vereist component"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ongeldig URL-schema '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Gebruikersnaam is niet toegestaan in URL-schema "
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Wachtwoord is niet toegestaan in URL-schema "
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "URL-schema vereist hostcomponent"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Hostcomponent is niet toegestaan in URL-schema "
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ongeldige hostcomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Poort is niet toegestaan in URL-schema "
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ongeldige poortcomponent '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "URL-schema vereist padnaam"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relatief pad is niet toegestaan als authority bestaat"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Parseren van padparameter wordt niet ondersteund voor deze URL"
@@ -116,9 +116,8 @@
#. TranslatorExplanation followed by the list of error messages that lead to this exception
#: ../zypp/base/Exception.cc:89
-#, fuzzy
msgid "History:"
-msgstr "XF86History"
+msgstr "Geschiedenis:"
#: ../zypp/repo/PackageProvider.cc:222
msgid "applydeltarpm check failed."
@@ -135,15 +134,14 @@
msgstr "Pakket %s voldoet niet aan integriteitscontrole. Wilt u het opnieuw proberen?"
#: ../zypp/repo/RepoProvideFile.cc:205
-#, fuzzy
msgid "No url in repository."
-msgstr "Probleem bij analyseren van installatiebrongegevens."
+msgstr "Geen url in bron."
#. iteration over urls
#: ../zypp/repo/RepoProvideFile.cc:267
-#, fuzzy, c-format
+#, c-format
msgid "Can't provide file %s from repository %s"
-msgstr "Kan %s niet leveren van %s"
+msgstr "Kan bestand %s niet leveren van bron %s"
#: ../zypp/repo/cached/RepoImpl.cc:78
#, c-format
@@ -176,7 +174,7 @@
#: ../zypp/RepoManager.cc:614
msgid "Valid metadata not found at specified URL(s)"
-msgstr ""
+msgstr "Geen geldige metadata gevonden op opgeven URL('s)"
#: ../zypp/RepoManager.cc:664
#, c-format
@@ -195,9 +193,9 @@
msgstr "Bron '%s' toevoegen"
#: ../zypp/RepoManager.cc:1004
-#, fuzzy, c-format
+#, c-format
msgid "Removing repository '%s'"
-msgstr "Bron '%s' toevoegen"
+msgstr "Bron '%s' verwijderen"
#: ../zypp/Url.cc:112
msgid "Invalid LDAP URL query string"
@@ -2654,7 +2652,7 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1913
-#, fuzzy, c-format
+#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm sloeg %s op als %s, maar het was niet mogelijk om het verschil te achterhalen"
@@ -2670,9 +2668,9 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1918
-#, fuzzy, c-format
+#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
-msgstr "rpm maakt %s aan als %s, maar het was niet mogelijk om het verschil te achterhalen"
+msgstr "rpm maakte %s aan als %s, maar het was niet mogelijk om het verschil te achterhalen"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1920
@@ -2744,25 +2742,25 @@
msgstr "%s vervangen door %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s zal worden verwijderd door de gebruiker.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s zal worden verwijderd door een ander programma (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s zal worden geïnstalleerd door de gebruiker.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s zal worden geïnstalleerd door een ander programma (ApplLow/ApplHigh)\n"
@@ -2770,41 +2768,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
-msgstr "Geen geldige oplosssing gevonden met alleen oplosbaren van de beste architectuur."
+msgstr "Geen geldige oplossing gevonden met alleen oplosbaren van de beste architectuur."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
-msgstr "Met deze draai zijn alleen oplosbaren met de beste architectuur overwogen.\n"
+msgstr "Bij deze draai zijn alleen oplosbaren met de beste architectuur overwogen.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Het overwegen van alle mogelijke oplosbaren neemt enige tijd in beslag maar kan een bruikbaar resultaat opleveren."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ongeldige informatie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s is nodig voor andere oplosbare"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s is nodig voor %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2814,7 +2809,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s is in conflict met andere oplosbaren"
@@ -2823,14 +2818,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s is in conflict met %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2840,24 +2835,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s vervangt andere oplosbaren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s vervangt %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s vervangt: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2866,7 +2861,7 @@
"Deze oplosbaren zullen worden verwijderd van het systeem."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s is afhankelijk van andere oplosbaren"
@@ -2874,72 +2869,70 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s is afhankelijk van %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s is afhankelijk van: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Subonderdeel van"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Kan %s niet installeren"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Niemand levert %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
"\n"
-"Er momenteel geen gegevensbron beschikbaar die deze vereiste aanlevert."
+"Er is momenteel geen gegevensbron beschikbaar die deze vereiste aanlevert."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Vanwege bovenstaande/onderstaande problemen zal deze oplossing niet alle afhankelijkheden verhelpen."
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
+#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Kan %s niet installeren omdat het in conflict is met %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s is niet geïnstalleerd en is gemarkeerd als deïnstalleerbaar"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "%s kan niet worden geïnstalleerd vanwege afhankelijkheidsproblemen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2947,8 +2940,8 @@
msgstr "%s verwijderen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2956,137 +2949,147 @@
msgstr "%s niet installeren"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "er is niet voldaan aan de vereisten voor %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "afhankelijkheden voor %s ontbreken"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s kan niet worden geïnstalleerd omdat afhankelijkheden ontbreken"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:714
+#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s lost de afhankelijkheden van %s op, maar zal worden gedeïnstalleerd."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:724
+#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
-msgstr "%s voldoet aan afhankelijkheden van %s maar blijft op het systeem staan"
+msgstr "%s lost de afhankelijkheden van %s op, maar zal op het systeem blijven staan"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s hoeft niet te worden geïnstalleerd"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:742
+#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Kan %s niet installeren om de afhankelijkheden van %s op te lossen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Kan %s niet installeren om de afhankelijkheden van %s op te lossen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
+#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s zal niet worden gedeïnstalleerd omdat het nog steeds vereist wordt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:826
+#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s vervangt %s. Maar %s kan niet worden verwijderd omdat het is vergrendeld."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:858
+#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Kan %s niet installeren omdat het conflicten geeft"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s kan niet worden geïnstalleerd vanwege conflicten met %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
-msgstr ""
+msgstr "Aan vereiste %s kan niet worden voldaan."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Negeer deze vereiste hier"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
-#, fuzzy
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
-msgstr "Negeer deze vereiste hier"
+msgstr "Negeer deze vereiste normaliter"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "%s installeren alhoewel het de architectuur zal wijzigen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
+#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s levert deze afhankelijkheid maar zou de architectuur van het geïnstalleerde item wijzigen."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "%s installeren alhoewel het de uitgever zal wijzigen"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s levert deze afhankelijkheid maar zou de uitgever van het geïnstalleerde item wijzigen."
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Negeer dit conflict van %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Negeer oude %s in %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Negeer dat %s al is ingesteld op installeren"
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
msgid "Do not install or delete the resolvables concerned"
msgstr "Installeer of verwijder de desbetreffende oplosbare pakketten niet"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "voor het verkrijgen van %s voor %s bij het upgraden van %s"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency
#: ../zypp/solver/detail/ResolverInfoMissingReq.cc:64
-#, fuzzy, c-format
+#, c-format
msgid "%s is lacking the requirement %s"
msgstr "%s mist de vereiste %s"
@@ -3163,16 +3166,16 @@
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
-#, fuzzy, c-format
+#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
msgstr "%s is aangemerkt voor installatie, maar dit is niet mogelijk vanwege afhankelijkheidsproblemen."
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:167
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s since it is already marked as needed to be uninstalled"
-msgstr "Kan %s niet installeren omdat deze al is gemarkeerd als 'moet worden gedeïnstalleerd'"
+msgstr "Kan %s niet installeren omdat deze al is gemarkeerd als 'zal worden gedeïnstalleerd'"
#. Translator: %s = name of patch
#. TranslatorExplanation: A patch which is not needed (does not apply) cant be installed
@@ -3181,7 +3184,7 @@
#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed
#. TranslatorExplanation: package is not installed.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:179
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because it does not apply to this system."
msgstr "Kan %s niet installeren omdat deze niet van toepassing is op dit systeem."
@@ -3191,9 +3194,9 @@
#. other_capability() =
#. Translator: %s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoMisc.cc:190
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because %s is already marked as needed to for installation"
-msgstr "Kan %s niet installeren omdat %s al is gemarkeerd voor installatie"
+msgstr "Kan %s niet installeren omdat %s al is gemarkeerd als 'nodig voor installatie'"
#. Translator: %s = name of patch,product
#: ../zypp/solver/detail/ResolverInfoMisc.cc:198
@@ -3259,9 +3262,9 @@
#. TranslatorExplanation: removal of this resolvable would therefore break dependency
#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled
#: ../zypp/solver/detail/ResolverInfoMisc.cc:292
-#, fuzzy, c-format
+#, c-format
msgid "There are no alternative providers of %s installed"
-msgstr "Er zijn geen alternatieve geïnstalleerde aanbieders van %s"
+msgstr "Er zijn geen alternatieve aanbieders van %s geïnstalleerd"
#. Translator: 1.%s = name of package,patch....
#. TranslatorExample: for bar
@@ -3290,9 +3293,9 @@
#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible
#. TranslatorExplanation: bar requires something from foo
#: ../zypp/solver/detail/ResolverInfoMisc.cc:341
-#, fuzzy, c-format
+#, c-format
msgid "Upgrading to %s to avoid removing %s is not possible."
-msgstr "Upgraden naar %s om het verwijderen van %s te vermijden is niet mogelijk."
+msgstr "Opwaarderen naar %s om de verwijdering van %s te vermijden is niet mogelijk."
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:359
@@ -3330,9 +3333,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s levert %s, maar heeft een andere architectuur."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s levert %s, maar heeft een andere uitgever %s."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Aan de vereiste %s voor %s kan niet worden voldaan"
@@ -3343,10 +3352,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
+#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
-msgstr "%s is nodig voor andere geïnstalleerde oplosbare, dus de koppeling wordt niet ongedaan gemaakt."
+msgstr "%s is nodig voor een andere oplosbare die geselecteerd is voor installatie, dus de koppeling wordt niet ongedaan gemaakt."
#. affected() = provider of cap
#. _capability =
@@ -3355,8 +3364,8 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
+#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s is nodig voor andere geïnstalleerde oplosbare, dus de koppeling wordt niet ongedaan gemaakt."
@@ -3367,7 +3376,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s is vergrendeld en kan niet worden gedeïnstalleerd."
@@ -3378,10 +3387,10 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
-msgstr "Een conflict over %s (%s) vereist het verwijderen van te installeren %s"
+msgstr "Een conflict over %s (%s) vereist het verwijderen %s, welke voor installatie is gepland"
#. affected() = provider of capability
#. _capability = provided by provider
@@ -3389,23 +3398,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Markeert van %s als niet-installeerbaar vanwege conflicten over %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "van %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Fout!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Belangrijk!"
@@ -3436,7 +3445,6 @@
msgstr "Voer een oplosbaarheidsdraai uit met ALLE mogelijkheden."
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
-#, fuzzy
msgid "Regarding all resolvables with a compatible architecture."
msgstr "Alle oplosbaren met geschikte architectuur worden overwogen."
@@ -3464,8 +3472,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s is verversd voor %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s zal opnieuw worden geëvalueerd voor installatie door %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4785,80 +4793,3 @@
"%s verwacht, %s gevonden\n"
"Wilt u het toch gebruiken?"
-#~ msgid "Unable to parse Url authority"
-#~ msgstr "Kan URL-autoriteit niet analyseren"
-
-#~ msgid "Ignore this requirement generally"
-#~ msgstr "Negeer deze vereiste overal"
-
-#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
-#~ msgstr "%s is nodig voor een andere te installeren oplosbare, dus de koppeling wordt niet ongedaan gemaakt."
-
-#~ msgid "Cannot create a file needed to perform update installation."
-#~ msgstr "Kan het bestand dat nodig is voor het installeren van de update niet maken."
-
-#~ msgid "Unable to restore all sources."
-#~ msgstr "Niet alle bronnen konden worden hersteld."
-
-#~ msgid "At least one source already registered, stored sources cannot be restored."
-#~ msgstr "Er is ten minste al één bron geregistreerd, opgeslagen bronnen kunnen niet worden hersteld."
-
-#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
-#~ msgstr "Kan %s niet installeren om de afhankelijkheden van %s op te lossen"
-
-#~ msgid "%s dependend on %s"
-#~ msgstr "%s is afhankelijk van %s"
-
-#~ msgid "Reading index files"
-#~ msgstr "Indexbestanden lezen"
-
-#~ msgid "The signed repomd.xml file failed the signature check."
-#~ msgstr "Het ondertekende bestand repomd.xml voldoet niet aan de handtekeningcontrole."
-
-#~ msgid "Reading product from %s"
-#~ msgstr "Product van %s lezen"
-
-#~ msgid "Reading filelist from %s"
-#~ msgstr "Bestandslijst van %s lezen"
-
-#~ msgid "Reading packages from %s"
-#~ msgstr "Pakketten van %s lezen"
-
-#~ msgid "Reading selection from %s"
-#~ msgstr "Selectie van %s lezen"
-
-#~ msgid "Reading pattern from %s"
-#~ msgstr "Patronen van %s lezen"
-
-#~ msgid "Reading patches index %s"
-#~ msgstr "Patch-index %s lezen"
-
-#~ msgid "Reading patch %s"
-#~ msgstr "Patch %s lezen"
-
-#~ msgid "The script file failed the checksum test."
-#~ msgstr "Het scriptbestand voldoet niet aan de checksumtest."
-
-# workflow: "Software-Auswahl"
-# -ke-
-#~ msgid "Reading packages file"
-#~ msgstr "Pakkettenbestand lezen"
-
-# progress indicator label
-#~ msgid "Reading translation: %s"
-#~ msgstr "Vertaling lezen: %s"
-
-#~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?"
-#~ msgstr "Pakket %s voldoet niet aan integriteitscontrole. Wilt u het opnieuw proberen of de installatie afbreken?"
-
-#~ msgid " miss checksum."
-#~ msgstr " controlesom ontbreekt."
-
-#~ msgid " fails checksum verification."
-#~ msgstr " komt niet door de controlesomverificatie."
-
-#~ msgid "Downloading %s"
-#~ msgstr "%s downloaden "
-
-#~ msgid "Downloaded %s from %s"
-#~ msgstr "%s gedownload van %s"
Modified: trunk/libzypp/po/pa.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pa.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/pa.po (original)
+++ trunk/libzypp/po/pa.po Mon Sep 3 13:56:27 2007
@@ -10,8 +10,8 @@
msgstr ""
"Project-Id-Version: zypp.pa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-18 09:44+0530\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 19:28+0530\n"
"Last-Translator: A S Alam <aalam(a)users.sf.net>\n"
"Language-Team: Panjabi <punjabi-l10n(a)lists.sf.net>\n"
"MIME-Version: 1.0\n"
@@ -20,77 +20,77 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url ਸà¨à©à¨® ਲਠ%s ਮਨà¨à¨¼à©à¨° ਨਹà©à¨ ਹà©"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "à¨à¨²à¨¤ %s à¨à¨¾à¨ '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "à¨à¨²à¨¤ %s à¨à¨¾à¨"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url ਸà¨à©à¨® ਲਠà¨à©±à¨ ਲà©à©à©à¨¦à¨¾ à¨à¨¾à¨ ਹà©"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "à¨à¨²à¨¤ Url ਸà¨à©à¨® '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url ਸà¨à©à¨® ਲਠà¨à©±à¨ ਯà©à¨à¨¼à¨°-ਨਾਠਮਨà¨à¨¼à©à¨° ਨਹà©à¨ ਹà©"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url ਸà¨à©à¨® ਲਠà¨à©±à¨ ਪਾਸਵਰਪ ਮਨà¨à¨¼à©à¨° ਨਹà©à¨ ਹà©"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url ਲਠà¨à©±à¨ ਹà©à¨¸à¨ à¨à¨¾à¨ ਲà©à©à©à¨¦à¨¾ ਹà©"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url ਸà¨à©à¨® ਲਠà¨à©±à¨ ਹà©à¨¸à¨ à¨à¨¾à¨ ਮਨà¨à¨¼à©à¨° ਨਹà©à¨ ਹà©à¥¤"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "à¨à¨²à¨¤ ਹà©à¨¸à¨ à¨à¨¾à¨ '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url ਸà¨à©à¨® à¨à©±à¨ ਪà©à¨°à¨ ਨਹà©à¨ ਦਿੰਦ੠ਹà©à¥¤"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "à¨à¨²à¨¤ ਪà©à¨°à¨ à¨à¨¾à¨ '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url ਸà¨à©à¨® ਲਠਮਾਰਠਨਾਠਲà©à©à©à¨¦à¨¾ ਹà©"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -817,7 +817,7 @@
#. language code: egy
#: ../zypp/LanguageCode.cc:488
msgid "Egyptian (Ancient)"
-msgstr ""
+msgstr "ਮਿਸਰ (ਪà©à¨°à¨¾à¨¤à¨¨)"
#. language code: eka
#: ../zypp/LanguageCode.cc:490
@@ -1022,12 +1022,12 @@
#. language code: grc
#: ../zypp/LanguageCode.cc:576
msgid "Greek, Ancient (to 1453)"
-msgstr ""
+msgstr "à¨à¨°à©à¨, ਪà©à¨°à¨¾à¨¤à¨¨ (1453 ਤੱà¨)"
#. language code: gre ell el
#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580
msgid "Greek, Modern (1453-)"
-msgstr ""
+msgstr "à¨à¨°à©à¨, ਮਾਡਰਨ (1453-)"
#. language code: grn gn
#: ../zypp/LanguageCode.cc:582
@@ -1738,7 +1738,7 @@
#. language code: new
#: ../zypp/LanguageCode.cc:872
msgid "Nepal Bhasa"
-msgstr "ਨà©à¨ªà¨¾à¨² à¨à¨¾à¨¸à¨¾"
+msgstr "ਨà©à¨ªà¨¾à¨² à¨à¨¾à¨¸à¨¼à¨¾"
#. language code: nia
#: ../zypp/LanguageCode.cc:874
@@ -2635,7 +2635,7 @@
#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55
#: ../zypp/target/hal/HalException.h:64
msgid "Hal Exception"
-msgstr "ਹਾਲ (Hal)à¨
ਪਵਾਦ"
+msgstr "Hal à¨
ਪਵਾਦ"
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
@@ -2715,7 +2715,7 @@
#: ../zypp/target/TargetImpl.cc:730
msgid "Installation has been aborted as directed."
-msgstr ""
+msgstr "à¨à©°à¨¸à¨à¨¾à¨²à©à¨¸à¨¼à¨¨ ਹਦਾà¨à¨¤à¨¾à¨ ਮà©à¨¤à¨¾à¨¬à¨ à¨
ਧà©à¨°à© à¨à©±à¨¡à© à¨à¨ ਹà©à¥¤"
#. Translator: all.%s = name of package,patch,....
#: ../zypp/solver/detail/ResolverInfoObsoletes.cc:55
@@ -2731,25 +2731,25 @@
msgstr "%s ਨà©à©° %s ਨਾਲ ਬਦਲਿਠà¨à¨¿à¨"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s ਨà©à©° ਯà©à¨à¨¼à¨° ਵਲà©à¨ ਹà¨à¨¾à¨à¨ à¨à¨¾à¨µà©à¨à¨¾à¥¤\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s ਨà©à©° ਹà©à¨° à¨à¨¾à¨°à¨ ਵਲà©à¨ ਹà¨à¨¾à¨à¨ à¨à¨¾à¨µà©à¨à¨¾à¥¤ (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s ਨà©à©° ਯà©à¨à¨¼à¨° ਵਲà©à¨ à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾à¨µà©à¨à¨¾à¥¤\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2757,38 +2757,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "à¨à¨²à¨¤ à¨à¨¾à¨£à¨à¨¾à¨°à©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s %s ਰਾਹà©à¨ à¨à¨¾à¨¹à©à¨¦à¨¾ ਹà©"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2798,7 +2798,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2807,14 +2807,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s ਦਾ %s ਨਾਲ à¨
ਪਵਾਦ ਹà©"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2824,24 +2824,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2850,7 +2850,7 @@
"à¨à¨¹ ਹੱਲ-à¨à¨°à¨¨-ਯà©à¨ ਸਿਸà¨à¨® ਤà©à¨ ਹà¨à¨¾à¨ à¨à¨¾à¨£à¨à©à¥¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2858,38 +2858,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s %s à¨à©±à¨¤à© ਨਿਰà¨à¨° ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ਨਿਰà¨à¨° ਹà©: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "à¨à¨¾à¨à¨²à¨¡"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "%s à¨à©à¨ ਨਹà©à¨ ਦਿੰਦਾ ਹà©"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2897,31 +2897,31 @@
"\n"
"à¨à¨¹ ਲà©à© ਨà©à©° ਪà©à¨°à© à¨à¨°à¨¨ ਲਠà¨à©à¨ ਸਰà©à¨¤ à¨à¨ªà¨²à©±à¨¬à¨§ ਨਹà©à¨ ਹà©à¥¤"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s ਨà©à©° à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾, à¨à¨¿à¨à¨à¨à¨¿ à¨à¨¸ ਦਾ %s ਨਾਲ à¨
ਪਵਾਦ ਹà©à¥¤"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ ਹ੠à¨
ਤ੠à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨²à¨¯à©à¨ ਮਾਰਠà¨à©à¨¤à¨¾ à¨à¨¿à¨"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "ਨਿਰà¨à¨°à¨¤à¨¾ ਸਮੱਸਿà¨à¨µà¨¾à¨ à¨à¨°à¨à© %s à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾ ਹà©à¥¤"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2929,8 +2929,8 @@
msgstr "%s ਹà¨à¨¾à¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2938,118 +2938,130 @@
msgstr "%s ਨà©à©° ਨਾ ਹà¨à¨¾à¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s ਲਠਨਿਰà¨à¨°à¨¤à¨¾ à¨
ਧà©à¨°à© ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s ਨà©à©° ਨਿਰà¨à¨°à¨¤à¨¾ à¨
ਧà©à¨°à© ਹà©à¨£ à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਦ੠ਲà©à© ਨਹà©à¨ ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%s ਨà©à©° %s ਦ੠ਨਿਰà¨à¨°à¨¤à¨¾ ਪà©à¨°à© ਨਾ ਹà©à¨£ à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%s ਨà©à©° %s ਦ੠ਨਿਰà¨à¨°à¨¤à¨¾ ਪà©à¨°à© ਨਾ ਹà©à¨£ à¨à¨°à¨à© à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ਨà©à©° à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾à¨µà©à¨à¨¾, à¨à¨¿à¨à¨à¨à¨¿ à¨à¨¹ ਹਾਲ੠ਵ੠ਲà©à©à©à¨¦à¨¾ ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s ਨà©à©° à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾, à¨à¨¿à¨à¨à¨à¨¿ à¨à¨¹ à¨
ਪਵਾਦ ਪà©à¨¦à¨¾ à¨à¨°à¨¦à¨¾ ਹà©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
-msgstr ""
+msgstr "%s ਲà©à© ਪà©à¨°à© ਨਹà©à¨ à¨à©à¨¤à© à¨à¨¾ ਸà¨à¨¦à© ਹà©à¥¤"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "à¨à¨¹ ਲà©à© à¨à©±à¨¥à© ਹ੠à¨
ਣਡਿੱਠ੠à¨à¨°à©"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "à¨à¨® ਤà©à¨° à¨à©±à¨¤à© à¨à¨¹ ਲà©à© à¨
ਣਡਿੱਠ੠à¨à¨°à©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "%s à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à©, à¨à¨¾à¨µà©à¨ à¨à¨¹ ਵà©à¨à¨¡à¨° ਬਦਲ ਦà©à¨µà©à¨à¨¾"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%s ਦਾ à¨à¨¹ à¨
ਪਵਾਦ à¨
ਣਡਿੱਠਾ à¨à¨°à©"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਲਠਸà©à©±à¨ à¨à©à¨¤à© à¨à¨¸ %s ਨà©à©° à¨
ਣਡਿੱਠਾ à¨à¨°à©"
@@ -3059,7 +3071,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3145,7 +3157,7 @@
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
-msgstr ""
+msgstr "%s ਨà©à©° à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਲਠਸ਼à©à¨¡à¨¿à¨à¨² à¨à©à¨¤à¨¾ à¨à¨¿à¨ ਹà©, ਪਰ ਨਿਰà¨à¨°à¨¤à¨¾ ਸਮੱਸਿਠà¨à¨°à¨à© ਸੰà¨à¨µ ਨਹà©à¨ ਹà©à¥¤"
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
@@ -3278,19 +3290,19 @@
#: ../zypp/solver/detail/ResolverInfoMisc.cc:359
#, c-format
msgid "%s provides %s, but is scheduled to be uninstalled."
-msgstr ""
+msgstr "%s %s ਦਿੰਦਾ ਹà©, ਪਰ à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਲਠਸ਼à©à¨¡à¨¿à¨à¨² ਹà©à¥¤"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s type (package, patch, ...)
#: ../zypp/solver/detail/ResolverInfoMisc.cc:377
#, c-format
msgid "%s provides %s, but another version of that %s is already installed."
-msgstr ""
+msgstr "%s %s ਦਿੰਦਾ ਹà©, ਪਰ à¨à¨¸ %s ਦਾ ਹà©à¨° ਵਰà¨à¨¨ ਪਹਿਲਾਠਹ੠à¨à©°à¨¸à¨à¨¾à¨² ਹà©à¥¤"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:396
#, c-format
msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details."
-msgstr ""
+msgstr "%s %s ਦਿੰਦਾ ਹà©, ਪਰ à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨²-ਯà©à¨ ਹà©à¥¤ ਹà©à¨° à¨à¨¾à¨£à¨à¨¾à¨°à© ਲਠà¨à©à¨¦ ਹ੠à¨à©°à¨¸à¨à¨¾à¨² à¨à¨°à¨¨ ਦ੠à¨à©à¨¸à¨¼à¨¿à¨¸à¨¼ à¨à¨°à©à¥¤"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:414
@@ -3308,13 +3320,19 @@
#: ../zypp/solver/detail/ResolverInfoMisc.cc:451
#, c-format
msgid "%s provides %s, but has another architecture."
-msgstr ""
+msgstr "%s %s ਦਿੰਦਾ ਹà©, ਪਰ à¨à¨°à¨à©à¨à©à¨à¨à¨° ਹà©à¨° ਹà©à¥¤"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s %s ਦਿੰਦਾ ਹà©, ਪਰ ਵà©à¨à¨¡à¨° (%s) ਹà©à¨° ਹà©à¥¤"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
-msgstr ""
+msgstr "%s ਦ੠ਲà©à© ਨà©à©° %s ਲਠਪà©à¨°à¨¾ ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾ ਹà©"
#. affected() = to-be-installed resolvable which was scheduled to be uninstalled
#. _capability =
@@ -3323,7 +3341,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3335,7 +3353,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3347,7 +3365,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s ਲਾਠਹ੠à¨
ਤ੠à¨
ਣ-à¨à©°à¨¸à¨à¨¾à¨² ਨਹà©à¨ à¨à©à¨¤à¨¾ à¨à¨¾ ਸà¨à¨¦à¨¾à¥¤"
@@ -3358,7 +3376,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3369,23 +3387,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%s ਤà©à¨"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " à¨à¨²à¨¤à©!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " à¨à¨¾à¨¸!"
@@ -3413,7 +3431,7 @@
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:50
msgid "Make a solver run with ALL possibilities."
-msgstr ""
+msgstr "ਸà©à¨²à¨µà¨° ਨà©à©° _ਸà¨_ ਸੰà¨à¨µà¨¾à¨¨à¨¾à¨µà¨¾à¨ ਨਾਲ à¨à¨²à¨¾à¨"
#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:51
msgid "Regarding all resolvables with a compatible architecture."
@@ -3443,15 +3461,15 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s ਨà©à©° %s ਵਲà©à¨ ਤਾà¨à¨¼à¨¾ à¨à©à¨¤à¨¾ à¨à¨¾à¨à¨¦à¨¾ ਹà©"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:128
#, c-format
msgid "%s is enhanced by %s"
-msgstr ""
+msgstr "%s %s ਵਲà©à¨ à¨à©°à¨¹à¨¾à¨à¨¸à¨¡ ਹà©"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:84
@@ -3497,11 +3515,11 @@
#: ../zypp/thread/Mutex.cc:77
msgid "Can't acquire the mutex lock"
-msgstr ""
+msgstr "mutex ਲਾਠਲਿਠਨਹà©à¨ à¨à¨¾ ਸà¨à¨¦à¨¾"
#: ../zypp/thread/Mutex.cc:87
msgid "Can't release the mutex lock"
-msgstr ""
+msgstr "mutex ਲਾਠਰà©à¨²à¨¿à¨à¨¼ ਨਹà©à¨ à¨à¨¾ ਸà¨à¨¦à¨¾"
#: ../zypp/CountryCode.cc:135
msgid "Unknown country: "
@@ -4708,6 +4726,9 @@
"%s|%s|%s\n"
"Use the file anyway?"
msgstr ""
+"ਫਾà¨à¨² %s à¨à©±à¨ à¨
ਣà¨à¨¾à¨£à© à¨à©à©°à¨à© ਨਾਲ ਸਾà¨à¨¨ à¨à©à¨¤à© à¨à¨ ਹà©:\n"
+"%s|%s|%s\n"
+"à¨à© ਫਾà¨à¨² ਵਰਤਣ੠ਹà©?"
#: ../devel/devel.mvidner/installation_sources.cc:75
#, c-format
@@ -4727,6 +4748,9 @@
"%s|%s|%s\n"
"Use the file anyway?"
msgstr ""
+"ਫਾà¨à¨² %s ਹà©à¨ ਦਿੱਤ੠à¨à©à©°à¨à© ਨਾਲ à¨à¨à¨à¨à¨°à©à¨à© à¨à©à©±à¨ ਲਠਫà©à¨²à©à¨¹ ਹà©à¨:\n"
+"%s|%s|%s\n"
+"à¨à© ਫਾà¨à¨² ਵਰਤਣ੠ਹà©?"
#: ../devel/devel.mvidner/installation_sources.cc:99
#, c-format
Modified: trunk/libzypp/po/pl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pl.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/pl.po (original)
+++ trunk/libzypp/po/pl.po Mon Sep 3 13:56:27 2007
@@ -10,88 +10,86 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-18 16:55+0100\n"
-"Last-Translator: wadim dziedzic <nikdo(a)aviary.pl>\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 08:53+0100\n"
+"Last-Translator: wadim dziedzic <wdziedzic(a)aviary.pl>\n"
"Language-Team: <pl(a)li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Schemat URL nie zezwala na %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "NieprawidÅowe %s komponentu '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "NieprawidÅowe %s komponentu"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Analiza parametru Åcieżki nie jest obsÅugiwana dla tego adresu URL"
-#: ../zypp/url/UrlBase.cc:778
-#: ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Analiza zapytania nie jest obsÅugiwana dla tego adresu URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Schemat URL to wymagany komponent"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "NieprawidÅowy schemat URL '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Schemat URL nie zezwala na nazwÄ użytkownika"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Schemat URL nie zezwala na hasÅo"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Schemat URL wymaga komponentu hosta"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Schemat URL nie zezwala na komponent hosta"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "NieprawidÅowy komponent hosta '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Schemat URL nie zezwala na port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "NieprawidÅowy komponent portu '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Schemat URL wymaga Åcieżki"
-#: ../zypp/url/UrlBase.cc:1113
-#: ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "WzglÄdna Åcieżka nie jest dozwolona, jeÅli usÅuga istnieje"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Analiza parametru Åcieżki nie jest obsÅugiwana dla tego URL"
@@ -155,13 +153,11 @@
msgid "Unsupported HTTP authentication method '%s'"
msgstr "NieobsÅugiwana metoda uwierzytelniania HTTP: \"%s\""
-#: ../zypp/media/MediaCurl.cc:715
-#: ../zypp/media/MediaCurl.cc:784
+#: ../zypp/media/MediaCurl.cc:715 ../zypp/media/MediaCurl.cc:784
msgid "Invalid user name or password."
msgstr "BÅÄdna nazwa użytkownika lub hasÅo."
-#: ../zypp/media/MediaCurl.cc:718
-#: ../zypp/media/MediaCurl.cc:787
+#: ../zypp/media/MediaCurl.cc:718 ../zypp/media/MediaCurl.cc:787
#, c-format
msgid "Authentication required for '%s'"
msgstr "Wymagane uwierzytelnienie dla \"%s\""
@@ -213,8 +209,7 @@
msgid "Invalid empty Url object reference"
msgstr "NieprawidÅowe odwoÅanie pustego adresu URL"
-#: ../zypp/Url.cc:321
-#: ../zypp/Url.cc:335
+#: ../zypp/Url.cc:321 ../zypp/Url.cc:335
msgid "Unable to parse Url components"
msgstr "Analiza komponentów URL nie powiodÅa siÄ"
@@ -224,8 +219,7 @@
#. Defined LanguageCode constants
#. Defined CountryCode constants
-#: ../zypp/LanguageCode.cc:225
-#: ../zypp/CountryCode.cc:215
+#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215
msgid "No Code"
msgstr "Bez kodu"
@@ -290,8 +284,7 @@
msgstr "akadyjski"
#. language code: alb sqi sq
-#: ../zypp/LanguageCode.cc:262
-#: ../zypp/LanguageCode.cc:264
+#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264
msgid "Albanian"
msgstr "albaÅski"
@@ -342,8 +335,7 @@
# AM
#. language code: arm hye hy
-#: ../zypp/LanguageCode.cc:284
-#: ../zypp/LanguageCode.cc:286
+#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286
msgid "Armenian"
msgstr "ormiaÅski"
@@ -448,8 +440,7 @@
msgstr "balijski"
#. language code: baq eus eu
-#: ../zypp/LanguageCode.cc:326
-#: ../zypp/LanguageCode.cc:328
+#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328
msgid "Basque"
msgstr "baskijski"
@@ -560,8 +551,7 @@
msgstr "buÅgarski"
#. language code: bur mya my
-#: ../zypp/LanguageCode.cc:372
-#: ../zypp/LanguageCode.cc:374
+#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374
msgid "Burmese"
msgstr "birmaÅski"
@@ -626,8 +616,7 @@
msgstr "czagatajski"
#. language code: chi zho zh
-#: ../zypp/LanguageCode.cc:400
-#: ../zypp/LanguageCode.cc:402
+#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402
msgid "Chinese"
msgstr "chiÅski"
@@ -737,8 +726,7 @@
msgstr "kuszyckie (inne)"
#. language code: cze ces cs
-#: ../zypp/LanguageCode.cc:446
-#: ../zypp/LanguageCode.cc:448
+#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448
msgid "Czech"
msgstr "czeski"
@@ -813,8 +801,7 @@
msgstr "Årednioholenderski (ok. 1050 - 1350)"
#. language code: dut nld nl
-#: ../zypp/LanguageCode.cc:478
-#: ../zypp/LanguageCode.cc:480
+#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480
msgid "Dutch"
msgstr "holenderski"
@@ -919,8 +906,7 @@
msgstr "fon"
#. language code: fre fra fr
-#: ../zypp/LanguageCode.cc:522
-#: ../zypp/LanguageCode.cc:524
+#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524
msgid "French"
msgstr "francuski"
@@ -970,14 +956,12 @@
msgstr "germaÅskie (inne)"
#. language code: geo kat ka
-#: ../zypp/LanguageCode.cc:544
-#: ../zypp/LanguageCode.cc:546
+#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546
msgid "Georgian"
msgstr "gruziÅski"
#. language code: ger deu de
-#: ../zypp/LanguageCode.cc:548
-#: ../zypp/LanguageCode.cc:550
+#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550
msgid "German"
msgstr "niemiecki"
@@ -1047,8 +1031,7 @@
msgstr "grecki, starożytny (do 1453)"
#. language code: gre ell el
-#: ../zypp/LanguageCode.cc:578
-#: ../zypp/LanguageCode.cc:580
+#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580
msgid "Greek, Modern (1453-)"
msgstr "grecki, wspóÅczesny (1453 -)"
@@ -1153,8 +1136,7 @@
msgstr "igbo"
#. language code: ice isl is
-#: ../zypp/LanguageCode.cc:622
-#: ../zypp/LanguageCode.cc:624
+#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624
msgid "Icelandic"
msgstr "islandzki"
@@ -1526,8 +1508,7 @@
msgstr "Lushai"
#. language code: mac mkd mk
-#: ../zypp/LanguageCode.cc:772
-#: ../zypp/LanguageCode.cc:774
+#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774
msgid "Macedonian"
msgstr "macedoÅski"
@@ -1567,8 +1548,7 @@
msgstr "mandingo"
#. language code: mao mri mi
-#: ../zypp/LanguageCode.cc:790
-#: ../zypp/LanguageCode.cc:792
+#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792
msgid "Maori"
msgstr "maoryjski"
@@ -1588,8 +1568,7 @@
msgstr "masajski"
#. language code: may msa ms
-#: ../zypp/LanguageCode.cc:800
-#: ../zypp/LanguageCode.cc:802
+#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802
msgid "Malay"
msgstr "malajski"
@@ -1732,8 +1711,7 @@
#. language code: nau na
#. :NPL:524:
-#: ../zypp/LanguageCode.cc:858
-#: ../zypp/CountryCode.cc:380
+#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:380
msgid "Nauru"
msgstr "nauru"
@@ -1935,8 +1913,7 @@
msgstr "staroperski (ok. 600 - 400 p.n.e.)"
#. language code: per fas fa
-#: ../zypp/LanguageCode.cc:938
-#: ../zypp/LanguageCode.cc:940
+#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940
msgid "Persian"
msgstr "perski"
@@ -2021,8 +1998,7 @@
msgstr "cygaÅski / romani"
#. language code: rum ron ro
-#: ../zypp/LanguageCode.cc:974
-#: ../zypp/LanguageCode.cc:976
+#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976
msgid "Romanian"
msgstr "rumuÅski"
@@ -2082,8 +2058,7 @@
msgstr "santali"
#. language code: scc srp sr
-#: ../zypp/LanguageCode.cc:1000
-#: ../zypp/LanguageCode.cc:1002
+#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002
msgid "Serbian"
msgstr "serbski"
@@ -2098,8 +2073,7 @@
msgstr "szkocki"
#. language code: scr hrv hr
-#: ../zypp/LanguageCode.cc:1008
-#: ../zypp/LanguageCode.cc:1010
+#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010
msgid "Croatian"
msgstr "chorwacki"
@@ -2154,8 +2128,7 @@
msgstr "sÅowiaÅskie (inne)"
#. language code: slo slk sk
-#: ../zypp/LanguageCode.cc:1032
-#: ../zypp/LanguageCode.cc:1034
+#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034
msgid "Slovak"
msgstr "sÅowacki"
@@ -2355,8 +2328,7 @@
# TW
#. language code: tib bod bo
-#: ../zypp/LanguageCode.cc:1112
-#: ../zypp/LanguageCode.cc:1114
+#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114
msgid "Tibetan"
msgstr "tybetaÅski"
@@ -2379,8 +2351,7 @@
#. language code: tkl
#. :TJK:762:
-#: ../zypp/LanguageCode.cc:1122
-#: ../zypp/CountryCode.cc:428
+#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:428
msgid "Tokelau"
msgstr "tokelau"
@@ -2456,8 +2427,7 @@
#. language code: tvl
#. :TTO:780:
-#: ../zypp/LanguageCode.cc:1152
-#: ../zypp/CountryCode.cc:435
+#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:435
msgid "Tuvalu"
msgstr "tuvalu"
@@ -2557,8 +2527,7 @@
msgstr "washo"
#. language code: wel cym cy
-#: ../zypp/LanguageCode.cc:1192
-#: ../zypp/LanguageCode.cc:1194
+#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194
msgid "Welsh"
msgstr "walijski"
@@ -2644,8 +2613,7 @@
msgid "Zuni"
msgstr "zuni"
-#: ../zypp/ZYppFactory.cc:279
-#: ../zypp/ZYppFactory.cc:334
+#: ../zypp/ZYppFactory.cc:279 ../zypp/ZYppFactory.cc:334
msgid "Software management is already running."
msgstr "Demon zarzÄ
dzania oprogramowaniem jest już uruchomiony"
@@ -2685,8 +2653,7 @@
msgid "Not a CDROM drive"
msgstr "Nie jest to napÄd CDROM"
-#: ../zypp/target/hal/HalException.h:46
-#: ../zypp/target/hal/HalException.h:55
+#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55
#: ../zypp/target/hal/HalException.h:64
msgid "Hal Exception"
msgstr "WyjÄ
tek Hal"
@@ -2737,8 +2704,7 @@
msgid "%s install failed"
msgstr "Instalacja %s nie powiodÅa siÄ"
-#: ../zypp/target/rpm/RpmDb.cc:1927
-#: ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
msgid "rpm output:"
msgstr "WyjÅcie rpm:"
@@ -2749,8 +2715,7 @@
msgid "%s installed ok"
msgstr "Pakiet %s poprawnie zainstalowany"
-#: ../zypp/target/rpm/RpmDb.cc:1936
-#: ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
msgid "Additional rpm output:"
msgstr "Dodatkowe wyjÅcie rpm:"
@@ -2791,25 +2756,25 @@
msgstr "%s zastÄ
piony przez %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s zostanie usuniÄty przez użytkownika.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s zostanie usuniÄty przez innÄ
aplikacjÄ. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s zostanie zainstalowany przez użytkownika.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s zostanie zainstalowany przez innÄ
aplikacjÄ. (ApplLow/ApplHigh)\n"
@@ -2817,38 +2782,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Brak rozwiÄ
zania z tylko z obiektami z najlepszÄ
architekturÄ
."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "W tym przebiegu pod uwagÄ wziÄto tylko obiekty z najlepszÄ
architekturÄ
.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "UwzglÄdnienie wszystkich obiektów może daÄ poprawne rozwiÄ
zanie, ale wymaga czasu."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "NieprawidÅowa informacja"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s jest wymagany przez inne pakiety"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s jest wymagany przez %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2858,7 +2823,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s jest w konflikcie z innymi pakietami"
@@ -2867,14 +2832,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s jest w konflikcie z %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2884,24 +2849,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s dezaktualizuje inne pakiety"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s dezaktualizuje %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s dezaktualizuje:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2910,7 +2875,7 @@
"Te pakiety zostanÄ
usuniÄte z systemu."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s zależy od innych pakietów"
@@ -2918,38 +2883,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s zależy od %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s zależy od:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Potomek"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Nie można zainstalowaÄ %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Żaden nie dostarcza %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2957,31 +2922,31 @@
"\n"
"Nie ma dostÄpnego zasobu, który speÅniaÅby te wymaganie."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Z powodu powyżej/poniżej opisanych problemów, rozwiÄ
zanie to nie bÄdzie mogÅo zaspokoiÄ wszystkich zależnoÅci"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Nie można zainstalowaÄ %s, ponieważ jest w konflikcie z %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s nie jest zainstalowany i zostaÅ oznaczony jako nie do odinstalowania"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Nie można zainstalowaÄ %s z powodu problemów z zależnoÅciami"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2989,8 +2954,8 @@
msgstr "usuÅ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2998,118 +2963,130 @@
msgstr "nie instaluj %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s ma niespeÅnione wymagania"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s ma brakujÄ
ce zależnoÅci"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s nie może zostaÄ zainstalowany z powodu brakujÄ
cych zależnoÅci"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s speÅnia zależnoÅci %s, ale zostanie odinstalowany"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s speÅnia zależnoÅci %s, ale bÄdzie pozostawiony"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Nie ma potrzeby instalowaÄ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Nie można zainstalowaÄ %s by speÅniÄ zależnoÅci %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Nie można zainstalowaÄ %s by speÅniÄ zależnoÅci %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s nie zostanie odinstalowany, ponieważ jest nadal wymagany"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s dezaktualizuje %s, ale %s nie może zostaÄ usuniÄty, ponieważ jest zablokowany."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Nie można zainstalowaÄ %s, ponieważ jest w konflikcie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s jest nie do odinstalowania z powodu konfliktu z %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Wymaganie %s nie może byÄ speÅnione."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Zignoruj ten wymóg tylko tutaj"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Zignoruj ten wymóg ogólnie"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Zainstaluj %s pomimo, że zmieniÅoby to architekturÄ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s dostarcza tÄ zależnoÅÄ, ale zmieniÅby architekturÄ zainstalowanego elementu"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Zainstaluj %s pomimo, że zmieniÅoby to dostawcÄ"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s dostarcza tÄ zależnoÅÄ, ale zmieniÅby dostawcÄ zainstalowanego elementu"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Zignoruj ten konflikt %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Zignoruj dezaktualizacjÄ %s w %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Zignoruj fakt, że %s jest już zaznaczony do instalacji"
@@ -3119,7 +3096,7 @@
msgstr "Nie instaluj ani nie usuwaj danych obiektów"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "dla wymagania %s dla %s, podczas aktualizacji %s"
@@ -3370,9 +3347,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s dostarcza %s, ale ma innÄ
architekturÄ."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s dostarcza %s, ale ma innego dostawcÄ (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Nie można speÅniÄ wymogu %s dla %s"
@@ -3383,7 +3366,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s jest wymagany przez inny wybrany do instalacji obiekt, wiÄc powiÄ
zanie nie bÄdzie usuniÄte."
@@ -3395,7 +3378,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s jest wymagany przez inny zainstalowany pakiet, wiÄc powiÄ
zanie nie bÄdzie usuniÄte."
@@ -3407,7 +3390,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s jest zablokowany i nie może byÄ odinstalowany."
@@ -3418,7 +3401,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Konflikt dotyczÄ
cy %s (%s) wymaga usuniÄcia pakietu %s planowanego do instalacji"
@@ -3429,23 +3412,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Oznaczanie %s jako nie do usuniÄcia z powodu konfliktów dotyczÄ
cych %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "z %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " BÅÄ
d!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Ważne!"
@@ -3503,8 +3486,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s jest odÅwieżany przez %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -3767,8 +3750,7 @@
#. :CCK:166:
#. :CAF:140:
-#: ../zypp/CountryCode.cc:255
-#: ../zypp/CountryCode.cc:257
+#: ../zypp/CountryCode.cc:255 ../zypp/CountryCode.cc:257
msgid "Congo"
msgstr "Kongo"
@@ -4872,42 +4854,62 @@
"Oczekiwano %s, napotkano %s\n"
"UżyÄ pliku mimo wszystko?"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s jest odÅwieżany przez %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Analiza nadrzÄdnego adresu URL nie powiodÅa siÄ"
+
#~ msgid "Ignore this requirement generally"
#~ msgstr "Zignoruj ten wymóg globalnie"
+
#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
#~ msgstr "%s jest wymagany przez inny pakiet do zainstalowania, wiÄc powiÄ
zanie nie bÄdzie usuniÄte."
+
#~ msgid "Cannot create a file needed to perform update installation."
#~ msgstr "Nie można utworzyÄ pliku wymaganego do instalacji uaktualnienia."
+
#~ msgid "Unable to restore all sources."
#~ msgstr "Nie udaÅo siÄ odtworzyÄ wszystkich źródeÅ."
+
#~ msgid "At least one source already registered, stored sources cannot be restored."
#~ msgstr "Przynajmniej jedno źródÅo jest już zarejestrowane, nie można odtworzyÄ przechowywanych źródeÅ."
+
#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
#~ msgstr "Nie można zainstalowaÄ %s by speÅniÄ zależnoÅci %s"
+
#~ msgid "%s dependend on %s"
#~ msgstr "%s zależny od %s"
+
#~ msgid "Reading index files"
#~ msgstr "Wczytywanie plików indeksu"
+
#~ msgid "The signed repomd.xml file failed the signature check."
#~ msgstr "Weryfikacja podpisu pliku repomd.xml zakoÅczona niepowodzeniem."
+
#~ msgid "Reading product from %s"
#~ msgstr "Wczytywanie produktu z %s"
+
#~ msgid "Reading filelist from %s"
#~ msgstr "Wczytywanie listy plików z %s"
+
#~ msgid "Reading packages from %s"
#~ msgstr "Wczytywanie pakietów z %s"
+
#~ msgid "Reading selection from %s"
#~ msgstr "Wczytywanie wyboru z %s"
+
#~ msgid "Reading pattern from %s"
#~ msgstr "Wczytywanie wzorców z %s"
+
#~ msgid "Reading patches index %s"
#~ msgstr "Wczytywanie indeksu poprawek %s"
+
#~ msgid "Reading patch %s"
#~ msgstr "Wczytywanie poprawki %s"
+
#~ msgid "The script file failed the checksum test."
#~ msgstr "Niepoprawna suma kontrolna pliku skryptu."
+
#~ msgid "Reading packages file"
#~ msgstr "Wczytywanie pliku pakietów"
-
Modified: trunk/libzypp/po/pt.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pt.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/pt.po (original)
+++ trunk/libzypp/po/pt.po Mon Sep 3 13:56:27 2007
@@ -12,8 +12,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 22:41+0100\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 13:47+0100\n"
"Last-Translator: Carlos Gonçalves <carlos(a)pinguix.com>\n"
"Language-Team: Portuguese <opensuse-pt(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
@@ -22,77 +22,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "O esquema url não permite um %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "componente %s inválido '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Componente %s inválido"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "A interpretação de parâmetros de caminho não são suportados para este URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Interpretação da cadeia de interrogação não é suportado para este URL."
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "O esquema de url é um componente requerido"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Esquema de Url inválido '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "O esquema do Url não permite um nome de utilizador"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "O esquema do Url não permite uma palavra passe"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "O esquema de Url requer um componente de computador (host)"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "O esquema do Url não permite um componente de computador (host)"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Componente de computador inválido '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "O esquema de Url não permite um porto"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Componente de porto inválido '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "O esquema de Url requer um nome de caminho"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Caminho relativo não é permitido se a autoridade existe"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Interpretação de parâmetros de caminho não é suportada para este URL"
@@ -2819,25 +2819,25 @@
msgstr "%s é substituÃdo por %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s será apagado pelo utilizador.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s será apagado por outra aplicação. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s será instalado pelo utilizador.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s será instalado por outra aplicação (ApplLow/ApplHigh)\n"
@@ -2845,38 +2845,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Não foi encontrada uma solução válida apenas com os resolúveis da melhor arquitectura."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Nesta execução apenas foram tomados em consideração os resolúveis com a melhor arquitectura.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "Ter em conta todos os resolúveis leva tempo, mas pode alcançar um resultado válido."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Informação Inválida"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s é necessário por outros resolúveis"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s necessita o %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2886,7 +2886,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s conflitua com outros resolúveis"
@@ -2895,14 +2895,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s em conflicto com %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2912,24 +2912,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s torna obsoletos outros resolúveis"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s obsoleto %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s obsoleto:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2938,7 +2938,7 @@
"Estes resolúveis serão apagados do sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depende de outros resolúveis"
@@ -2946,38 +2946,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s depende de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s depende de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Filho de"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Não foi possÃvel instalar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Não fornece %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2985,31 +2985,31 @@
"\n"
"Não existe nenhum recurso disponÃvel com suporte para este requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Devido aos problemas descritos acima/abaixo, esta resolução não irá solucionar todas as dependências"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Não foi possÃvel instalar %s devido a um conflicto com %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "o %s não está instalado e foi marcado como possÃvel de desinstalar"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Não foi possÃvel instalar %s devido a problemas de dependências"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3017,8 +3017,8 @@
msgstr "apagar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3026,118 +3026,130 @@
msgstr "não instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s tem requisitos não satisfeitos"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s tem dependências em falta"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s não pode ser instalado devido a dependências em falta"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s satisfaz as dependências de %s mas vai ser desinstalado"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s satisfaz as dependências de %s mas vai ser mantido no seu sistema"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Não é necessário instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Não é possÃvel instalar %s para satisfazer as dependências de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Não é possÃvel instalar %s para satisfazer as dependências de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s não irá ser desinstalado porque ainda é requerido"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s torna %s obsoleto. Mas %s não pode ser apagado porque está trancado."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Não foi possÃvel instalar %s devido a estar em conflito"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "não é possÃvel desinstalar %s devido a conflitos com %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "O requisito %s não pôde ser satisfeito."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorar este requisito apenas aqui"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "Ignorar geralmente este requisito"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "instalar %s apesar de alterar a arquitectura"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s fornece esta dependência mas alteraria a arquitectura do item instalado"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Instalar %s apesar de ir alterar o fabricante"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s fornece esta dependência mas alteraria o fabricante do item instalado"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "A ignorar este conflito de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "A ignorar o %s obsoleto por %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorar que %s já se encontra definido para instalar"
@@ -3147,7 +3159,7 @@
msgstr "Não instalar ou apagar os resolúveis em causa"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "por requerer %s para %s quando esta a actualizar %s"
@@ -3398,9 +3410,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s fornece %s, mas tem outra arquitectura."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s fornece %s, mas tem outro fabricante (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Não foi possÃvel satisfazer os requisitos %s com %s "
@@ -3411,7 +3429,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s é requerido por outro resolúvel seleccionado para instalação, pelo que não será desassociado."
@@ -3423,7 +3441,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s é requerido por outro resolúvel instalado, pelo que não será desassociado."
@@ -3435,7 +3453,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "O pacote %s está bloqueado, não pode ser desinstalado."
@@ -3446,7 +3464,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Um conflicto com %s (%s) requer a remoção de %s em que está agendado para ser instalado"
@@ -3457,24 +3475,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Marcar %s com não instalavél devido a conflictos com %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "de %s"
# /usr/lib/YaST2/clients/logcontrol.ycp:67
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Erro!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Importante!"
@@ -3532,8 +3550,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s é refrescado por %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s irá ser avaliado para instalação (actualizado) por %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/pt_BR.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pt_BR.po?rev=7083&r1=…
==============================================================================
--- trunk/libzypp/po/pt_BR.po (original)
+++ trunk/libzypp/po/pt_BR.po Mon Sep 3 13:56:27 2007
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-05-31 14:44\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -18,77 +18,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "O esquema de Url não permite %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Componente '%s' inválido %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Componente inválido %s"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "A análise de parâmetros de caminho não é suportada para este URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "A análise de strings de consulta não é suportada para este URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "O esquema de Url é um componente obrigatório"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Esquema de Url '%s' inválido"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "O esquema de Url não permite nome de usuário"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "O esquema de Url não permite senha"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "O esquema de Url requer um componente de host"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "O esquema de Url não permite componente de host"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Componente de host inválido '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "O esquema de Url não permite porta"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Componente de porta inválido '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "O esquema de Url requer nome de caminho"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Caminho relativo não permitido se existir autoridade"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Análise do Parâmetro de Caminho não suportada para este URL"
@@ -2736,7 +2736,7 @@
msgstr "%s substituÃdo por %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2744,19 +2744,19 @@
"Esses resolvÃveis serão apagados do sistema."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s não será desinstalado porque ainda é necessário"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2764,38 +2764,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Informações inválidas"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s é necessário a outros resolvÃveis"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s é necessário a %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2805,7 +2805,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s está em conflito com outros resolvÃveis"
@@ -2814,14 +2814,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s conflitos com %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2831,24 +2831,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s torna outros resolvÃveis obsoletos"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s torna obsoleto %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s torna obsoleto:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2857,7 +2857,7 @@
"Esses resolvÃveis serão apagados do sistema."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s depende de outros resolvÃveis"
@@ -2865,38 +2865,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s depende de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s depende de:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Filho de "
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Não é possÃvel instalar %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Nenhum fornece %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2905,32 +2905,32 @@
"\n"
"Não há nenhum recurso disponÃvel que atenda a esse requisito."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Devido aos problemas descritos acima/abaixo, essa solução não resolverá todas as dependências"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Não é possÃvel instalar %s porque ele entra em conflito com %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s não está instalado e foi marcado como não instalável"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Não é possÃvel instalar %s devido a problemas de dependência"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2938,8 +2938,8 @@
msgstr "apagar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2947,119 +2947,131 @@
msgstr "não instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s tem requisitos não atendidos"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s tem dependências ausentes"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s não pode ser instalado devido à ausência de dependências"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s preenche as dependências de %s, mas será desinstalado"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s preenche as dependências de %s, mas será mantido no sistema"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Não é necessário instalar %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Não é possÃvel instalar %s para preencher as dependências de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Não é possÃvel instalar %s para preencher as dependências de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s não será desinstalado porque ainda é necessário"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s torna %s obsoleto. Mas %s não pode ser apagado porque está bloqueado."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Não é possÃvel instalar %s porque ele está em conflito"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s não pode ser desinstalado devido a conflitos com %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorar este requisito apenas aqui"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Ignorar este requisito apenas aqui"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Instalar %s apesar de ele mudar a arquitetura"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s fornece esta dependência, porém mudaria a arquitetura do item instalado"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Instalar %s apesar de ele mudar a arquitetura"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s fornece esta dependência, porém mudaria a arquitetura do item instalado"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorar este conflito de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorar o(s) %s obsoleto(s) de %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorar que %s já está definido para instalação"
@@ -3070,7 +3082,7 @@
msgstr "Não instalar ou apagar resolvÃveis de interesse"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "para exigir %s para %s ao fazer o upgrade de %s"
@@ -3321,8 +3333,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s fornece %s, mas possui outra arquitetura."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s fornece %s, mas possui outra arquitetura."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Não é possÃvel atender ao requisito %s para %s"
@@ -3334,7 +3352,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s é exigido por outro resolvÃvel instalado, para não ficar desvinculado."
@@ -3346,7 +3364,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s é exigido por outro resolvÃvel instalado, para não ficar desvinculado."
@@ -3358,7 +3376,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s está bloqueado e não pode ser desinstalado."
@@ -3369,7 +3387,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Um conflito por causa de %s (%s) requer a remoção do %s a ser instalado"
@@ -3380,23 +3398,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Marcando %s como não instalável devido a conflitos por causa de %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "de %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Erro!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Importante!"
@@ -3453,9 +3471,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s é necessário a %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4774,6 +4792,10 @@
"Era esperado %s, foi encontrado %s\n"
" Deseja usar o arquivo mesmo assim?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s é necessário a %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "ImpossÃvel analisar a autoridade do Url"
Modified: trunk/libzypp/po/ro.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ro.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/ro.po (original)
+++ trunk/libzypp/po/ro.po Mon Sep 3 13:56:27 2007
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2003-02-25 15:04+0100\n"
"Last-Translator: <i18n(a)suse.de>\n"
"Language-Team: Romanian <i18n(a)suse.de>\n"
@@ -15,77 +15,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2990,25 +2990,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3016,38 +3016,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3055,7 +3055,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 intrÄ Ã®n conflict cu %2"
@@ -3064,14 +3064,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "%1 intrÄ Ã®n conflict cu %2"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3079,31 +3079,31 @@
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3111,68 +3111,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "InstaleazÄ %1"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Acest pachet nu este instalat Åi nici nu va fi instalat."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3180,8 +3180,8 @@
msgstr "Återge %1"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3189,120 +3189,132 @@
msgstr "InstaleazÄ %1"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, fuzzy, c-format
msgid "%s has missing dependencies"
msgstr "Verific dependenţele..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Verific dependenţele..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "Instalare automatÄ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Verific dependenţele..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "Verific dependenţele..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "are cerinţe nerezolvate..."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "are cerinţe nerezolvate..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "Directorul %1 se aflÄ deja în listÄ."
@@ -3313,7 +3325,7 @@
msgstr "%1 intrÄ Ã®n conflict cu %2"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3565,9 +3577,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3578,7 +3596,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3590,7 +3608,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3602,7 +3620,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Acest pachet nu este instalat Åi nici nu va fi instalat."
@@ -3613,7 +3631,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3624,24 +3642,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Eroare"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "Im&portÄ"
@@ -3702,7 +3720,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/ru.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ru.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/ru.po (original)
+++ trunk/libzypp/po/ru.po Mon Sep 3 13:56:27 2007
@@ -1,4 +1,3 @@
-# translation of zypp.ru.po to Russian
# translation of zypp.po to
# Russian message file for YaST2 (@memory@).
# Copyright (C) 2005, 2006 SUSE Linux Products GmbH.
@@ -11,93 +10,93 @@
# Nikolay Derkach <nderkach(a)gmail.com>, 2007.
msgid ""
msgstr ""
-"Project-Id-Version: zypp.ru\n"
+"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-17 15:37+0400\n"
-"Last-Translator: Aleksey Osipov <aliks-os(a)yandex.ru>\n"
-"Language-Team: Russian <i18n(a)suse.org>\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-24 14:01+0400\n"
+"Last-Translator: Nikolay Derkach <nderkach(a)gmail.com>\n"
+"Language-Team: <opensuse-ru(a)opensuse.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ %s"
# To translators: error popup
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "ÐедопÑÑÑимÑй ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ %s: '%s'"
# To translators: error popup
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "ÐедопÑÑÑимÑй ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ %s"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "ÐÐ»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ URL-адÑеÑа ÑÐ°Ð·Ð±Ð¾Ñ Ð¿Ð°ÑамеÑÑов пÑÑи не поддеÑживаеÑÑÑ"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "ÐÐ»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ URL-адÑеÑа ÑÐ°Ð·Ð±Ð¾Ñ ÑÑÑоки запÑоÑа не поддеÑживаеÑÑÑ"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "СÑ
ема Url - ÑÑебÑемÑй компоненÑ"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "ÐевеÑÐ½Ð°Ñ ÑÑ
ема URL-адÑеÑа '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ Ð¿Ð°ÑолÑ"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
-msgstr "СÑ
ема URL-адÑеÑа ÑÑебÑÐµÑ ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñа Ñ
оÑÑа"
+msgstr "СÑ
ема URL-адÑеÑа ÑÑебÑÐµÑ ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñа Ñзла"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
-msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ñ
оÑÑа"
+msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ñзла"
# To translators: error popup
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
-msgstr "ÐевеÑнÑй ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ñ
оÑÑа '%s'"
+msgstr "ÐевеÑнÑй ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ñзла '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "СÑ
ема URL-адÑеÑа не позволÑÐµÑ Ð¸ÑполÑзоваÑÑ Ð¿Ð¾ÑÑ"
# To translators: error popup
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "ÐевеÑнÑй ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð¿Ð¾ÑÑа '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "СÑ
ема URL-адÑеÑа ÑÑебÑÐµÑ ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ Ð¿ÑÑи"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "ÐÑи налиÑии компоненÑов авÑоÑизаÑии оÑноÑиÑелÑнÑе пÑÑи ÑказÑваÑÑ Ð½ÐµÐ»ÑзÑ"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "ÐÐ»Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ URL-адÑеÑа ÑÐ°Ð·Ð±Ð¾Ñ Ð¿Ð°ÑамеÑÑа пÑÑи не поддеÑживаеÑÑÑ"
@@ -2797,25 +2796,25 @@
msgstr "%s заменен на %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s бÑÐ´ÐµÑ Ñдален полÑзоваÑелем.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s бÑÐ´ÐµÑ Ñдален дÑÑгим пÑиложением. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s бÑÐ´ÐµÑ ÑÑÑановлен полÑзоваÑелем.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s бÑÐ´ÐµÑ ÑÑÑановлен дÑÑгим пÑиложением. (ApplLow/ApplHigh)\n"
@@ -2823,38 +2822,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "Ðе найдено пÑавилÑное ÑеÑÐµÐ½Ð¸Ñ Ñ Ð¾Ð±ÑекÑами ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей ÑолÑко Ñ Ð¿Ð¾Ð´Ñ
одÑÑей аÑÑ
иÑекÑÑÑой."
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "Ð ÑÑом Ñикле ÑаÑÑмаÑÑивалиÑÑ ÑолÑко обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей Ñ Ð»ÑÑÑей аÑÑ
иÑекÑÑÑой.\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "ЧÑение вÑеÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей Ð·Ð°Ð¹Ð¼ÐµÑ Ð½ÐµÐºÐ¾ÑоÑое вÑемÑ, но Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑивеÑÑи к пÑавилÑÐ½Ð¾Ð¼Ñ ÑезÑлÑÑаÑÑ."
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "ÐепÑавилÑÐ½Ð°Ñ Ð¸Ð½ÑоÑмаÑиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s необÑ
одим дÑÑгим обÑекÑам ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s необÑ
одим Ð´Ð»Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2864,7 +2863,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s конÑликÑÑÐµÑ Ñ Ð´ÑÑгими обÑекÑами ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
@@ -2873,14 +2872,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s конÑликÑÑÐµÑ Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2890,24 +2889,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑаÑевÑими дÑÑгие обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑаÑевÑим %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑаÑевÑим:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2916,7 +2915,7 @@
"ÐÑи обÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей бÑдÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ñ Ð¸Ð· ÑиÑÑемÑ."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s завиÑÐ¸Ñ Ð¾Ñ Ð´ÑÑгиÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
@@ -2924,38 +2923,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s завиÑÐ¸Ñ Ð¾Ñ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s завиÑÐ¸Ñ Ð¾Ñ:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "ÐоÑеÑнее"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Ðе ÑдалоÑÑ ÑÑÑановиÑÑ %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "ÐиÑÑо не пÑедоÑÑовлÑÐµÑ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2963,31 +2962,31 @@
"\n"
"ÐÐµÑ Ð´Ð¾ÑÑÑпнÑÑ
ÑеÑÑÑÑов, коÑоÑÑе ÑдовлеÑвоÑÑÑÑ ÑÑÐ¾Ð¼Ñ ÑÑебованиÑ."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Ðз-за пÑоблем, опиÑаннÑÑ
вÑÑе/ниже, ÑÑо ÑазÑеÑение не ÑеÑÐ¸Ñ Ð²Ñе завиÑимоÑÑи"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Ðевозможно ÑÑÑановиÑÑ %s, Ñак как конÑликÑÑÐµÑ Ñ %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
-msgstr "%s не ÑÑÑановлен и помеÑен как доÑÑÑпнÑй Ð´Ð»Ñ ÑдалениÑ"
+msgstr "%s не ÑÑÑановлен и помеÑен как неÑÑÑанавливаемÑй"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Ðевозможно ÑÑÑановиÑÑ %s из-за пÑоблем Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑÑми"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2995,8 +2994,8 @@
msgstr "ÑдалиÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3004,118 +3003,130 @@
msgstr "не ÑÑÑанавливаÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s Ð¸Ð¼ÐµÐµÑ Ð½ÐµÑдовлеÑвоÑеннÑе ÑÑебованиÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s Ð¸Ð¼ÐµÐµÑ Ð½ÐµÐ´Ð¾ÑÑаÑÑие завиÑимоÑÑи"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s: ÑÑÑановка невозможна из-за оÑÑÑÑÑÑÐ²Ð¸Ñ Ð½ÐµÐºÐ¾ÑоÑÑÑ
завиÑимоÑÑей"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s ÑдовлеÑвоÑÑÐµÑ Ð·Ð°Ð²Ð¸ÑимоÑÑи %s, однако бÑÐ´ÐµÑ Ñдален"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s ÑдовлеÑвоÑÑÐµÑ Ð·Ð°Ð²Ð¸ÑимоÑÑи %s, однако бÑÐ´ÐµÑ Ð¾ÑÑавлен в ÑиÑÑеме"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "ÐÐµÑ Ð½ÐµÐ¾Ð±Ñ
одимоÑÑи ÑÑÑанавливаÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Ðевозможно ÑÑÑановиÑÑ %s, ÑÑÐ¾Ð±Ñ ÑдовлеÑвоÑиÑÑ Ð·Ð°Ð²Ð¸ÑимоÑÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Ðевозможно ÑÑÑановиÑÑ %s, ÑÑÐ¾Ð±Ñ ÑдовлеÑвоÑиÑÑ Ð·Ð°Ð²Ð¸ÑимоÑÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s не бÑÐ´ÐµÑ Ñдален, Ñак как вÑе еÑе ÑÑебÑеÑÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s Ð´ÐµÐ»Ð°ÐµÑ ÑÑÑаÑевÑим %s. Ðо %s не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ñдален, Ñак как он заблокиÑован."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Ðевозможно ÑÑÑановиÑÑ %s Ñак как он конÑликÑÑеÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
-msgstr "%s не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÑÑановлен из-за конÑликÑа Ñ %s"
+msgstr "%s помеÑен как неÑÑÑанавливаемÑй из-за конÑликÑа Ñ %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "ÐелÑÐ·Ñ ÑдовлеÑвоÑиÑÑ ÑÑебование %s."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ÐгноÑиÑоваÑÑ ÑÑо ÑÑебование ÑолÑко здеÑÑ"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "ÐгноÑиÑоваÑÑ ÑÑо ÑÑебование ÑолÑко здеÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "УÑÑановиÑÑ %s, Ñ
оÑÑ Ð¾Ð½ Ð¼Ð¾Ð¶ÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð°ÑÑ
иÑекÑÑÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s пÑедоÑÑавлÑÐµÑ ÑÑÑ Ð·Ð°Ð²Ð¸ÑимоÑÑÑ, но бÑÐ´ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð° аÑÑ
иÑекÑÑÑа ÑÑÑановленнÑÑ
пакеÑов"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "УÑÑановиÑÑ %s, Ñ
оÑÑ Ð¾Ð½ Ð¼Ð¾Ð¶ÐµÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿ÑоизводиÑелÑ"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s пÑедоÑÑавлÑÐµÑ ÑÑÑ Ð·Ð°Ð²Ð¸ÑимоÑÑÑ, но бÑÐ´ÐµÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½ пÑоизводиÑÐµÐ»Ñ ÑÑÑановленного пакеÑа"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "ÐгноÑиÑоваÑÑ ÑÑÐ¾Ñ ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑ Ð´Ð»Ñ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "ÐгноÑиÑоваÑÑ ÑÑÑаÑевÑий %s в %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "ÐгноÑиÑоваÑÑ, ÑÑо %s Ñже опÑеделен, как подлежаÑий ÑÑÑановке"
@@ -3125,7 +3136,7 @@
msgstr "Ðе вÑполнÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÑ Ð¸Ð»Ð¸ Ñдаление заÑÑагиваемÑÑ
обÑекÑов ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "из-за необÑ
одимоÑÑи %s Ð´Ð»Ñ %s пÑи обновлении %s"
@@ -3205,7 +3216,7 @@
#: ../zypp/solver/detail/ResolverInfoMisc.cc:151
#, c-format
msgid "Marking resolvable %s as uninstallable"
-msgstr "ÐомеÑиÑÑ Ð¾Ð±ÑÐµÐºÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей %s как ÑдалÑемÑй"
+msgstr "ÐомеÑиÑÑ Ð¾Ð±ÑÐµÐºÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей %s как неÑÑÑанавливаемÑй"
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
@@ -3358,7 +3369,7 @@
#: ../zypp/solver/detail/ResolverInfoMisc.cc:396
#, c-format
msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details."
-msgstr "%s пÑедоÑÑавлÑÐµÑ %s, но его нелÑÐ·Ñ ÑÑÑановиÑÑ. ÐопÑобÑйÑе ÑÑÑановиÑÑ Ð½Ð° Ñвой ÑиÑк, ÑÑÐ¾Ð±Ñ ÑзнаÑÑ."
+msgstr "%s пÑедоÑÑавлÑÐµÑ %s, но он помеÑен как неÑÑÑанавливаемÑй. ÐопÑобÑйÑе ÑÑÑановиÑÑ Ð½Ð° Ñвой ÑиÑк, ÑÑÐ¾Ð±Ñ ÑзнаÑÑ."
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency;
#: ../zypp/solver/detail/ResolverInfoMisc.cc:414
@@ -3378,9 +3389,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s пÑедоÑÑавлÑÐµÑ %s, но Ð¸Ð¼ÐµÐµÑ Ð´ÑÑгÑÑ Ð°ÑÑ
иÑекÑÑÑÑ."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s пÑедоÑÑавлÑÐµÑ %s, но Ð¸Ð¼ÐµÐµÑ Ð´ÑÑгого пÑоизводиÑÐµÐ»Ñ (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ðевозможно ÑдовлеÑвоиÑÑÑ ÑÑебование %s Ð´Ð»Ñ %s"
@@ -3391,7 +3408,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s необÑ
одим дÑÑÐ³Ð¾Ð¼Ñ ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¼Ñ Ð¾Ð±ÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей, поÑÑÐ¾Ð¼Ñ ÑвÑÐ·Ñ Ñ Ð½Ð¸Ð¼ не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ñдалена."
@@ -3403,7 +3420,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s необÑ
одим дÑÑÐ³Ð¾Ð¼Ñ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¼Ñ Ð¾Ð±ÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей, поÑÑÐ¾Ð¼Ñ ÑвÑÐ·Ñ Ñ Ð½Ð¸Ð¼ не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ñдалена."
@@ -3415,7 +3432,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s заблокиÑован и не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ñдален."
@@ -3426,7 +3443,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "ÐонÑÐ»Ð¸ÐºÑ Ñ %s (%s) ÑÑебÑÐµÑ ÑдалиÑÑ %s, коÑоÑÑй помеÑен Ð´Ð»Ñ ÑÑÑановки"
@@ -3437,23 +3454,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
-msgstr "%s помеÑаеÑÑÑ ÐºÐ°Ðº ÑдалÑемÑй из-за конÑликÑа Ñ %s"
+msgstr "%s помеÑаеÑÑÑ ÐºÐ°Ðº неÑÑÑанавливаемÑй из-за конÑликÑа Ñ %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "из %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "ÐÑибка!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Ðажно!"
@@ -3511,8 +3528,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s обновлен %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "УÑÑановка %s бÑÐ´ÐµÑ Ð¿ÑовеÑена %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4926,11 +4943,3 @@
"ÐÐ¶Ð¸Ð´Ð°ÐµÐ¼Ð°Ñ - %s, ÑакÑиÑеÑÐºÐ°Ñ - %s\n"
" ÐÑе Ñавно иÑполÑзоваÑÑ Ñайл?"
-#~ msgid "Unable to parse Url authority"
-#~ msgstr "Ðе ÑдалоÑÑ Ð²ÑполниÑÑ ÑÐ°Ð·Ð±Ð¾Ñ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñов авÑоÑизаÑии URL-адÑеÑа"
-
-#~ msgid "Ignore this requirement generally"
-#~ msgstr "ÐгноÑиÑоваÑÑ ÑÑо ÑÑебование везде"
-
-#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
-#~ msgstr "%s необÑ
одим дÑÑÐ³Ð¾Ð¼Ñ ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÐ¼Ð¾Ð¼Ñ Ð¾Ð±ÑекÑÑ ÑазÑеÑÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑÑей, поÑÑÐ¾Ð¼Ñ ÑвÑÐ·Ñ Ñ Ð½Ð¸Ð¼ не Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ñдалена."
Modified: trunk/libzypp/po/si.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/si.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/si.po (original)
+++ trunk/libzypp/po/si.po Mon Sep 3 13:56:27 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: i18n(a)suse.de\n"
"Language-Team: Sinhala <i18n(a)suse.de>\n"
@@ -14,77 +14,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2743,25 +2743,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2769,38 +2769,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2808,7 +2808,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2817,14 +2817,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2832,31 +2832,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2864,68 +2864,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2933,8 +2933,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2942,118 +2942,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3063,7 +3075,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3314,9 +3326,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3327,7 +3345,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3339,7 +3357,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3351,7 +3369,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3362,7 +3380,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3373,23 +3391,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3447,7 +3465,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/sk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sk.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/sk.po (original)
+++ trunk/libzypp/po/sk.po Mon Sep 3 13:56:27 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp.sk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2007-03-05 10:26+0100\n"
"Last-Translator: Jan Kupec <jkupec(a)suse.cz>\n"
"Language-Team: Slovak <sk-i18n(a)lists.linux.sk>\n"
@@ -20,77 +20,77 @@
"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Zadaná URL schéma nepovoľuje %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "%s obsahuje neplatnú položku '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "%s obsahuje neplatnú položku"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Path parametre nie sú pre túto URL podporované"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Query string nie je pre túto URL povolený"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Schéma URL je povinná"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Neplatný názov URL schémy: '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Daná URL schéma nepovoľuje meno použÃvateľa"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Daná URL schéma nepovoľuje heslo"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Daná URL schéma vyžaduje názov hostiteľského poÄÃtaÄa (host component)"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Daná URL schéma nepovoľuje názov hostiteľského poÄÃtaÄa (host component)"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Neplatný názov poÄÃtaÄa '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Daná URL schéma nepovoľuje port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Neplatný port '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Daná URL schéma vyžaduje zadanú cestu"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "RelatÃvna cesta nie je povolená v prÃpade, že je zadaná autorita"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Path parametre nie sú pre túto URL podporované"
@@ -3005,7 +3005,7 @@
msgstr "%s nahradené %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -3013,19 +3013,19 @@
"Tieto balÃÄky budú zo systému odstánené."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s nie je možné odinÅ¡talovaÅ¥ pretože je stále vyžadovaný iným balÃÄkom"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3033,38 +3033,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Neplatná informácia"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s je vyžadovaný inými balÃÄkami"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s je vyžadovaný balÃÄkom %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3074,7 +3074,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s je v konflikte s inými balÃÄkami"
@@ -3083,14 +3083,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s je v konflikte s %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -3100,24 +3100,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s nahrádza iné balÃÄky"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s nahrádza %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s nahrádza: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -3126,7 +3126,7 @@
"Tieto balÃÄky budú zo systému odstánené."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s závisà na iných balÃÄkoch"
@@ -3134,38 +3134,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s závisà na %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s závisà na: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Potomok"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Nie je možné nainštalovať %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Žiaden balÃÄek neposkytuje %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -3174,32 +3174,32 @@
"\n"
"Nie je k dispozÃcii žiaden prostriedok, ktorý by mohol splniÅ¥ tento požiadavok"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Kvôli vyÅ¡Å¡ie/nižšie popÃsaným problémom nie je možné vyrieÅ¡iÅ¥ vÅ¡etky závislosti"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Nie je možné nainštalovať %s pretože je v konflikte s %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "BalÃk %s nie je nainÅ¡talovaný a je oznaÄený ako nenainÅ¡talovateľný"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Nie je možné nainštalovať %s kvôli problémom so závislosťami"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3207,8 +3207,8 @@
msgstr "odstrániť %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3216,119 +3216,131 @@
msgstr "neinštaluj %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s má nesplnené požiadavky"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "BalÃku %s chýbajú závislé balÃky"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s nie je možné nainštalovať kvôli chýbajúcim závislostiam"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s spĺÅa závislosti %s ale má byÅ¥ odinÅ¡talovaný"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s spĺÅa závislosti %s ale má byÅ¥ ponechaný v systéme"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "nie je potrebné inštalovať %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Nie je možné nainÅ¡talovaÅ¥ %s aby splnil závislosti balÃka %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Nie je možné nainÅ¡talovaÅ¥ %s aby splnil závislosti balÃka %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s nie je možné odinÅ¡talovaÅ¥ pretože je stále vyžadovaný iným balÃÄkom"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s nahradzuje %s, ale %s nie je možné odstrániť pretože je zamknutý"
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Nie je možné nainÅ¡talovaÅ¥ %s lebo je v konflikte s iným balÃkom"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s nie je možné nainštalovať kvôli konfliktom s %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignoruj túto požiadavku len pre tento prÃpad"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Ignoruj túto požiadavku len pre tento prÃpad"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Nainštaluj %s, hoci to spôsobà zmenu architektúry"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s poskytuje túto závislosť, ale zmenil by architektúru nainštalovaného systému"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Nainštaluj %s, hoci to spôsobà zmenu architektúry"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s poskytuje túto závislosť, ale zmenil by architektúru nainštalovaného systému"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignoruj tento konflikt s balÃÄkom %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignoruj nahradený %s v %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignoruj fakt, že %s je už oznaÄený pre inÅ¡taláciu"
@@ -3339,7 +3351,7 @@
msgstr "NeinÅ¡taluj ani neodstraÅuj tieto balÃÄky"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "pre vyžadovanie %s pre %s kvôli aktualizácii %s"
@@ -3592,8 +3604,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s poskytuje %s, ale má inú architektúru."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s poskytuje %s, ale má inú architektúru."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Nemôžem uspokojiť požiadavok %s na %s"
@@ -3605,7 +3623,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s je vyžadovaný iným nainÅ¡talovaným balÃÄkom, takže odkaz na neho nebude zruÅ¡ený."
@@ -3617,7 +3635,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s je vyžadovaný iným nainÅ¡talovaným balÃÄkom, takže odkaz na neho nebude zruÅ¡ený."
@@ -3629,7 +3647,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s je zamknutý, nie je možné ho odinštalovať."
@@ -3640,7 +3658,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Konflikt balÃÄka %s (%s) vyžaduje odstránenie balÃÄka %s, ktorý má byÅ¥ nainÅ¡talovaný."
@@ -3651,23 +3669,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "OznaÄujem %s ako nenainÅ¡talovateľný kvôli konfliktom s %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "z %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Chyba!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Dôležité!"
@@ -3725,9 +3743,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s je vyžadovaný balÃÄkom %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -5191,6 +5209,10 @@
"OÄakavaný: %s, nájdený %s\n"
"Chcete tento súbor napriek tomu použiť?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s je vyžadovaný balÃÄkom %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Zo zadanej URL nie je možné zÃskaÅ¥ autoritu "
Modified: trunk/libzypp/po/sl.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sl.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/sl.po (original)
+++ trunk/libzypp/po/sl.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2001-10-18 11:02+0200\n"
"Last-Translator: Janez Krek <janez.krek(a)euroteh.si>\n"
"Language-Team: Slovenian\n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3062,25 +3062,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "Potrebno je namestiti %s "
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3088,38 +3088,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3127,7 +3127,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 je v sporu s/z %2"
@@ -3136,14 +3136,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "%1 je v sporu s/z %2"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3151,31 +3151,31 @@
msgstr "%1 je v sporu s/z %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3183,68 +3183,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "NameÅ¡Äam na:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%1 je v sporu s/z %2"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Ta paket ni nameÅ¡Äen in ne bo nameÅ¡Äen."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3252,8 +3252,8 @@
msgstr "Zbriši %1"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3261,120 +3261,132 @@
msgstr "NameÅ¡Äam na:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, fuzzy, c-format
msgid "%s has missing dependencies"
msgstr "NezadoÅ¡Äene odvisnosti:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "NezadoÅ¡Äene odvisnosti:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "potrebno je ponovno namestiti"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "NezadoÅ¡Äene odvisnosti:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "NezadoÅ¡Äene odvisnosti:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1 je v sporu s/z %2"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "ima nerešene zahteve..."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ima nerešene zahteve..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1 je v sporu s/z %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1 je v sporu s/z %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "Imenik %1 je že na seznamu."
@@ -3385,7 +3397,7 @@
msgstr "%1 je v sporu s/z %2"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3637,9 +3649,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3650,7 +3668,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3662,7 +3680,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3674,7 +3692,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Ta paket ni nameÅ¡Äen in ne bo nameÅ¡Äen."
@@ -3685,7 +3703,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3696,24 +3714,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Napaka"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "Uvozi podatke"
@@ -3774,7 +3792,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/sr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sr.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/sr.po (original)
+++ trunk/libzypp/po/sr.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST2 (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2004-03-31 11:34+0200\n"
"Last-Translator: Bojan Jovanovic <bojov(a)fon.bg.ac.yu>\n"
"Language-Team: Serbian <i18n(a)suse.de>\n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : (n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2828,25 +2828,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2854,38 +2854,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2893,7 +2893,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1 je u konfliktu sa %2"
@@ -2902,14 +2902,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "%1 je u konfliktu sa %2"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -2917,31 +2917,31 @@
msgstr "%1 je u konfliktu sa %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2949,69 +2949,69 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Instaliram na:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%1 je u konfliktu sa %2"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Ovaj paket nije i neÄe biti instaliran."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3020,8 +3020,8 @@
# Frame title for installation target hard disk / partition(s)
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3029,121 +3029,133 @@
msgstr "Instaliram na:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, fuzzy, c-format
msgid "%s has missing dependencies"
msgstr "Proveravam meÄuzavisnost..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Proveravam meÄuzavisnost..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "mora da se reinstalira"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Proveravam meÄuzavisnost..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "Proveravam meÄuzavisnost..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1 je u konfliktu sa %2"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "ima neispunjene zahteve..."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ima neispunjene zahteve..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1 je u konfliktu sa %2"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1 je u konfliktu sa %2"
# error popup message
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "Direktorijum %1 je veÄ na listi."
@@ -3154,7 +3166,7 @@
msgstr "%1 je u konfliktu sa %2"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3408,9 +3420,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3421,7 +3439,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3433,7 +3451,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3445,7 +3463,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Ovaj paket nije i neÄe biti instaliran."
@@ -3456,7 +3474,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3467,24 +3485,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Greška"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "Unos podataka"
@@ -3547,7 +3565,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/sv.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sv.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/sv.po (original)
+++ trunk/libzypp/po/sv.po Mon Sep 3 13:56:27 2007
@@ -11,8 +11,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-11 09:48+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-25 11:00+0200\n"
"Last-Translator: Mattias Newzella <newzella(a)linux.se>\n"
"Language-Team: <sv(a)li.org>\n"
"MIME-Version: 1.0\n"
@@ -21,77 +21,77 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "URL-schemat tillåter inte %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "%s-komponenten %s är ogiltig"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ogiltig %s-komponent"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Analysering av sökvägsparameter stöds inte för den här URL-adressen"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Analysering av frågesträng stöds inte för den här URL-adressen"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "URL-schemat är en obligatorisk komponent"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "URL-schemat %s är ogiltigt"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "URL-schemat tillåter inte något användarnamn"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "URL-schemat tillåter inte något lösenord"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Det måste finnas en värdkomponent i URL-schemat"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Det får inte finnas någon värdkomponent i URL-schemat"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Värdkomponenten %s är ogiltig"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "URL-schemat tillåter inte någon port"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Portkomponenten %s är ogiltig"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Det måste finnas ett sökvägsnamn för URL-schemat"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Relativa sökvägar tillåts inte om det finns behörighet"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Analysering av sökvägsparameter stöds inte för den här URL-adressen"
@@ -171,7 +171,7 @@
#: ../zypp/RepoManager.cc:614
msgid "Valid metadata not found at specified URL(s)"
-msgstr ""
+msgstr "Giltig metadata hittades inte på specificerad URL"
#: ../zypp/RepoManager.cc:664
#, c-format
@@ -2711,9 +2711,9 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1913
-#, fuzzy, c-format
+#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
-msgstr "rpm sparade %s som %s men det gick inte att avgöra skillnaden"
+msgstr "rpm sparade %s som %s, men det gick inte att avgöra skillnaden"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1915
@@ -2727,9 +2727,9 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1918
-#, fuzzy, c-format
+#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
-msgstr "rpm skapade %s som %s men det gick inte att avgöra skillnaden"
+msgstr "rpm skapade %s som %s, men det gick inte att avgöra skillnaden"
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1920
@@ -2800,25 +2800,25 @@
msgstr "%s ersatt av %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s kommer att tas bort av användaren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s kommer att installeras av användaren.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2826,38 +2826,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ogiltig information"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s behövs av andra resurser"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s behövs av %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2867,7 +2867,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s är i konflikt med andra resurser"
@@ -2876,14 +2876,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s är i konflikt med %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2893,24 +2893,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s gör andra resurser inaktuella"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s gör %s inaktuell"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s gör %s inaktuell"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2919,7 +2919,7 @@
"Dessa resurser tas bort från systemet."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s beror på andra resurser"
@@ -2927,39 +2927,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s är beroende av %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s är beroende av: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Barn till"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Det går inte att installera %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Ingen tillhandahåller %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2967,32 +2966,31 @@
"\n"
"Det finns ingen resurs tillgänglig vilken stödjer det här kravet."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
-#, fuzzy
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
-msgstr "På grund av problemen som beskrivs ovan/nedan löser inte den här resursen alla beroenden"
+msgstr "På grund av problemen som beskrivs ovan/nedan, löser inte den här resursen alla beroenden"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
+#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Kan inte installera %s eftersom den är i konflikt med %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s har inte installerats och har markerats som avinstallerbar"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Kan inte installera %s på grund av beroendeproblem"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -3000,8 +2998,8 @@
msgstr "ta bort %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3009,137 +3007,147 @@
msgstr "installera inte %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s har ouppfyllda krav"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s har beroenden som saknas"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s kan inte installeras på grund av att beroenden saknas"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:714
+#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
-msgstr "%s uppfyller beroenden för %s men avinstalleras"
+msgstr "%s uppfyller beroenden för %s men kommer att avinstalleras"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:724
+#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
-msgstr "%s uppfyller beroenden för %s men lämnas kvar på systemet"
+msgstr "%s uppfyller beroenden för %s men kommer att lämnas kvar på systemet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s behöver inte installeras"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:742
+#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Det går inte att installera %s så att beroendena för %s uppfylls"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Det går inte att installera %s så att beroendena för %s uppfylls"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
+#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s kommer inte att avinstalleras eftersom den fortfarande krävs"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:826
+#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
-msgstr "%s gör %s inaktuellt. Det går dock inte att ta bort %s eftersom det är låst."
+msgstr "%s gör %s inaktuell. Det går dock inte att ta bort %s eftersom det är låst."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
-#, fuzzy, c-format
+#: ../zypp/solver/detail/Resolver_problems.cc:858
+#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Kan inte installera %s eftersom det är i konflikt"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s är avinstallerbart på grund av konflikter med %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
-msgstr ""
+msgstr "Kravet %s kan inte uppfyllas."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Ignorera det här kravet här"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
-#, fuzzy
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
-msgstr "Ignorera det här kravet här"
+msgstr "Ignorera allmänt det här kravet"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Installera %s trots att det kommer att ändra arkitekturen"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
+#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
-msgstr "%s tillhandahåller detta beroende men skulle förändra arkitekturen för det installerade objektet"
+msgstr "%s tillhandahåller detta beroende, men skulle förändra arkitekturen för det installerade objektet"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Installera %s trots att det kommer att ändra leverantören"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s tillhandahåller detta beroende, men skulle förändra leverantören för det installerade objektet"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Ignorera den här konflikten för %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ignorera det inaktuella %s i %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Ignorera att %s redan har angetts för installation"
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
msgid "Do not install or delete the resolvables concerned"
msgstr "Installera inte och ta inte bort resurser som berörs"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "för krav av %s för %s när %s uppgraderas"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency
#: ../zypp/solver/detail/ResolverInfoMissingReq.cc:64
-#, fuzzy, c-format
+#, c-format
msgid "%s is lacking the requirement %s"
msgstr "%s saknar kravet %s"
@@ -3216,14 +3224,14 @@
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
-#, fuzzy, c-format
+#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
msgstr "%s är schemalagd för installation, men det är inte möjligt på grund av beroendeproblem."
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:167
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s since it is already marked as needed to be uninstalled"
msgstr "Det går inte att installera %s eftersom det redan har markerats som att vara i behov av avinstallation"
@@ -3234,7 +3242,7 @@
#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed
#. TranslatorExplanation: package is not installed.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:179
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because it does not apply to this system."
msgstr "Kan inte installera %s eftersom det inte är tillämpligt för det här systemet."
@@ -3244,7 +3252,7 @@
#. other_capability() =
#. Translator: %s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoMisc.cc:190
-#, fuzzy, c-format
+#, c-format
msgid "Can't install %s, because %s is already marked as needed to for installation"
msgstr "Det går inte att installera %s, eftersom %s redan har markerats som att vara i behov av installation"
@@ -3312,7 +3320,7 @@
#. TranslatorExplanation: removal of this resolvable would therefore break dependency
#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled
#: ../zypp/solver/detail/ResolverInfoMisc.cc:292
-#, fuzzy, c-format
+#, c-format
msgid "There are no alternative providers of %s installed"
msgstr "Det finns inga alternativa installerade tillhandahållare för %s"
@@ -3343,7 +3351,7 @@
#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible
#. TranslatorExplanation: bar requires something from foo
#: ../zypp/solver/detail/ResolverInfoMisc.cc:341
-#, fuzzy, c-format
+#, c-format
msgid "Upgrading to %s to avoid removing %s is not possible."
msgstr "Uppdatering till %s för att undvika borttag av %s är inte möjligt."
@@ -3383,9 +3391,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s tillhandahåller %s, men har en annan arkitektur."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s tillhandahåller %s, men har en annan leverantör (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Kan inte tillfredsställa krav %s för %s"
@@ -3396,10 +3410,10 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
+#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
-msgstr "%s krävs av en annan installerad resurs, så länken tas inte bort."
+msgstr "%s krävs av en annan resurs vald för installation, så länken tas inte bort."
#. affected() = provider of cap
#. _capability =
@@ -3408,8 +3422,8 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
+#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s krävs av en annan installerad resurs, så länken tas inte bort."
@@ -3420,7 +3434,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s är låst och kan inte avinstalleras."
@@ -3431,8 +3445,8 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
-#, fuzzy, c-format
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "En konflikt över %s (%s) kräver att %s som ska installeras tas bort"
@@ -3442,23 +3456,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s markeras som avinstallerbart på grund av konflikter över %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "från %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Fel!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Viktigt!"
@@ -3516,8 +3530,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s uppdateras av %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s kommer att utvärderas för installation (uppdaterad) av %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4940,11 +4954,3 @@
"%s förväntades, men %s hittades\n"
" Vill du använda filen ändå?"
-#~ msgid "Unable to parse Url authority"
-#~ msgstr "Det gick inte att analysera URL-behörigheten"
-
-#~ msgid "Ignore this requirement generally"
-#~ msgstr "Ignorera det här kravet generellt"
-
-#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
-#~ msgstr "%s krävs av en annan resurs som ska installeras, så länken tas inte bort."
Modified: trunk/libzypp/po/ta.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ta.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/ta.po (original)
+++ trunk/libzypp/po/ta.po Mon Sep 3 13:56:27 2007
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: NetworkManager-vpnc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2005-06-26 01:20+0200\n"
"Last-Translator: Priyavert Sharma <priyavert.sharma(a)agreeya.com>\n"
"Language-Team: AgreeYa Solutions <www.agreeya.com>\n"
@@ -11,77 +11,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ %sà®à¯à®à¯ à®
னà¯à®®à®¤à®¿à®ªà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "'%s' à®à¯à®²à¯à®²à®¾à®¤ à®à®±à¯à®ªà¯à®ªà¯"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "à®à¯à®²à¯à®²à®¾à®¤ %s à®à®±à¯à®ªà¯à®ªà¯"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "à®à®¨à¯à®¤ யà¯à®à®°à¯à®à®²à¯à®²à¯à®à¯à®à¯ பாத௠à®
ளவà¯à®à¯ விளà®à¯à®à®®à¯ à®à®¤à®°à®µà®³à®¿à®à¯à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "à®à®¨à¯à®¤ யà¯à®à®°à¯à®à®²à¯à®²à¯à®à¯à®à¯ வினா வரிà®à¯ விளà®à¯à®à®®à¯ à®à®¤à®°à®µà®³à®¿à®à¯à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ à®à®°à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®®à¯ à®à®±à¯à®ªà¯à®ªà®¾à®à¯à®®à¯"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "à®à¯à®²à¯à®²à®¾à®¤ யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ பயனாளர௠பà¯à®¯à®°à¯ à®
னà¯à®®à®¤à®¿à®ªà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ à®à®à®µà¯à®à¯à®à¯à®¾à®²à¯à®²à¯ à®
னà¯à®®à®¤à®¿à®ªà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®¤à¯à®¤à®¿à®±à¯à®à¯ à®à®°à¯ à®à®¤à®¾à®° à®à®±à¯à®ªà¯à®ªà¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ à®à®°à¯ à®à®¤à®¾à®° à®à®±à¯à®ªà¯à®ªà¯ à®
னà¯à®®à®¤à®¿à®ªà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "à®à¯à®²à¯à®²à®¾à®¤ à®à®¤à®¾à®° à®à®±à¯à®ªà¯à®ªà¯'%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®®à¯ à®à®°à¯ à®®à¯à®£à¯à®¯à®¤à¯à®¤à¯ à®
னà¯à®®à®¤à®¿à®ªà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "à®à¯à®²à¯à®²à®¾à®¤ à®®à¯à®£à¯à®¯ à®à®±à¯à®ªà¯à®ªà¯'%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "யà¯à®à®°à¯à®à®²à¯ திà®à¯à®à®¤à¯à®¤à®¿à®±à¯à®à¯ à®à®°à¯ பாத௠பà¯à®¯à®°à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "à®
திà®à®¾à®°à®®à¯ à®à®°à¯à®à¯à®à¯à®®à®¾à®©à®¾à®²à¯ தà¯à®¾à®à®°à¯à®ªà¯à®ªà¯ பாத௠à®à®¤à®°à®µà®³à®¿à®à¯à®à®ªà¯à®ªà®à¯à®µà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "à®à®¨à¯à®¤ யà¯à®à®°à¯à®à®²à¯à®²à¯à®à¯à®à¯ பாத௠à®
ளவà¯à®à¯ விளà®à¯à®à®®à¯ à®à®¤à®°à®µà®³à®¿à®à¯à®à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯"
@@ -2728,7 +2728,7 @@
msgstr "%s %sà®à®²à¯ மாறà¯à®±à®¿à®¯à®®à¯à®à¯à®à®ªà¯à®ªà®à¯à®à®¤à¯"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2736,19 +2736,19 @@
"à®à®¤à¯à®¤à¯à®°à¯à®µà¯à®à®³à¯ à®
à®®à¯à®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ நà¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "à®
த௠à®à®©à¯à®©à®®à¯à®®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®µà®¤à®¾à®²à¯, %s நà¯à®à¯à®à®ªà¯à®ªà® மாà®à¯à®à®¾à®¤à¯"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2756,38 +2756,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "à®à¯à®²à¯à®²à®¾à®¤ தà®à®µà®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "மறà¯à®± தà¯à®°à¯à®µà¯à®à®³à¯à®à¯à®à¯ %s தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s, %sà®à¯à®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2797,7 +2797,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s மறà¯à®± தà¯à®°à¯à®µà¯à®à®³à¯à®à®©à¯ à®®à¯à®°à®£à¯à®ªà®à¯à®à®¿à®±à®¤à¯"
@@ -2806,14 +2806,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s %sà®à®à®©à¯ à®®à¯à®°à®£à¯à®ªà®à¯à®à®¿à®±à®¤à¯"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2823,24 +2823,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s மறà¯à®± தà¯à®°à¯à®µà¯à®à®³à¯ வழà®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s %s஠வழà®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s %s஠வழà®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à¯à®à®¿à®±à®¤à¯:"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2849,7 +2849,7 @@
"à®à®¤à¯à®¤à¯à®°à¯à®µà¯à®à®³à¯ à®
à®®à¯à®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ நà¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s மறà¯à®± தà¯à®°à¯à®µà¯à®à®³à¯ à®à®¾à®°à¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯"
@@ -2857,38 +2857,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s %sà® à®à®¾à®°à¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s %sà® à®à®¾à®°à¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯:"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "à®à®¤à®©à¯ à®à®°à¯à®µà®¾à®à¯à®à®®à¯"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "%s஠நிறà¯à®µ à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "%s யாரà¯à®®à¯ à®
ளிபà¯à®ªà®¤à®¿à®²à¯à®²à¯"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2897,32 +2897,32 @@
"\n"
"à®à®¤à¯à®¤à¯à®µà¯à®¯à¯ பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯à¯à®®à¯ à®à®¤à®¾à®°à®®à¯ à®à®¤à¯à®µà¯à®®à¯ à®à®²à¯à®²à¯"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "à®à®¤à¯à®¤à¯à®°à¯à®µà®¿à®©à¯ à®®à¯à®²à¯ மறà¯à®±à¯à®®à¯ à®à¯à®´à¯ விளà®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ பிரà®à¯à®©à¯à®à®³à¯, à®
னà¯à®¤à¯à®¤à¯ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯à®¯à¯à®®à¯ தà¯à®°à¯à®à¯à®à®à¯à®à¯à®à®¿à®¯à®µà¯ à®
லà¯à®²"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%s ஠நிறà¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯ à®à®©à¯à®©à®¿à®²à¯ à®
த௠%s à®à®à®©à¯ à®®à¯à®°à®£à¯à®ªà®à¯à®à®¿à®±à®¤à¯"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s நிறà¯à®µà®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯ மறà¯à®±à¯à®®à¯ à®
த௠நிறà¯à®µ à®à®¯à®²à®¾à®¤à®¤à®¾à® à®à¯à®±à®¿à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯ பிரà®à¯à®©à¯à®à®³à¯ à®à®¾à®°à®£à®®à®¾à® %s ஠நிறà¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2930,8 +2930,8 @@
msgstr "%s ஠நà¯à®à¯à®à®µà¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2939,119 +2939,131 @@
msgstr "%s஠நிறà¯à®µ வà¯à®£à¯à®à®¾à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s தà¯à®°à¯à®à¯à®à®ªà¯à®ªà®à®¾à®¤ தà¯à®µà¯à®à®³à¯à®à¯ à®à¯à®¾à®£à¯à®à¯à®³à¯à®³à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s à®à®¾à®£à®ªà¯à®ªà®à®¾à®¤ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯à®à¯ à®à¯à®¾à®£à¯à®à¯à®³à¯à®³à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "à®à®¾à®£à®ªà¯à®ªà®à®¾à®¤ à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ %sà® à®à®¾à®°à®£à®®à®¾à® நிறà¯à®µ à®à®¯à®²à®¾à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ %s பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯à¯à®®à¯ à®à®©à®¾à®²à¯ நிறà¯à®µà¯à®¤à®²à¯ நà¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®µà®¿à®à¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ %s பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯à¯à®®à¯ à®à®©à®¾à®²à¯ à®à®à¯à®à®³à¯ à®
à®®à¯à®ªà¯à®ªà®¿à®²à¯ வà¯à®à¯à®à®ªà¯à®ªà®à¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "%s஠நிறà¯à®µà®¤à¯ தà¯à®µà¯à®¯à®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "%sன௠à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®µà®¤à®±à¯à®à¯ %s஠நிறà¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "%sன௠à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®à®³à¯ பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®µà®¤à®±à¯à®à¯ %s஠நிறà¯à®µ à®à®¯à®²à®µà®¿à®²à¯à®²à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "à®
த௠à®à®©à¯à®©à®®à¯à®®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®µà®¤à®¾à®²à¯, %s நà¯à®à¯à®à®ªà¯à®ªà® மாà®à¯à®à®¾à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%sà® %s வழà®à¯à®à®±à¯à®±à®¤à®¾à®à¯à®à®¿à®µà®¿à®à¯à®®à¯. à®à®©à®¾à®²à¯ %s஠நà¯à®à¯à® à®®à¯à®à®¿à®¯à®¾à®¤à¯ à®à®©à¯à®©à®¿à®²à¯ à®
த௠பà¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "%s஠நிறà¯à®µ à®®à¯à®à®¿à®¯à®¾à®¤à¯ à®à®©à¯à®©à®¿à®²à¯ à®
த௠மà¯à®°à®£à®¾à®©à®¤à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s à®à®à®©à¯ à®à®³à¯à®³ à®®à¯à®°à®£à¯à®ªà®¾à®à¯ à®à®¾à®°à®£à®®à®¾à® %sன௠நிறà¯à®µà¯à®¤à®²à¯ நà¯à®à¯à® à®®à¯à®à®¿à®¯à®¾à®¤à¯"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "à®à®¤à¯à®¤à¯à®µà¯à®¯à¯ à®à®à¯à®à¯à®¯à¯ பà¯à®±à®à¯à®à®£à®¿à®à¯à®à®µà¯à®®à¯"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "à®à®¤à¯à®¤à¯à®µà¯à®¯à¯ à®à®à¯à®à¯à®¯à¯ பà¯à®±à®à¯à®à®£à®¿à®à¯à®à®µà¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "à®
த௠à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ மாறà¯à®±à®à¯à®à¯à®à¯à®®à¯à®©à¯à®±à®¾à®²à¯à®®à¯ %s஠நிறà¯à®µà®µà¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "à®à®à¯à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®¯à¯ %s à®
ளிà®à¯à®à®¿à®±à®¤à¯ à®à®©à®¾à®²à¯, நிறà¯à®µà®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ பà¯à®¾à®°à¯à®³à®¿à®©à¯ à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ மாறà¯à®±à®¿à®µà®¿à®à¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "à®
த௠à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ மாறà¯à®±à®à¯à®à¯à®à¯à®®à¯à®©à¯à®±à®¾à®²à¯à®®à¯ %s஠நிறà¯à®µà®µà¯à®®à¯"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "à®à®à¯à®à®¾à®°à¯à®ªà¯à®¤à¯à®¤à®©à¯à®®à¯à®¯à¯ %s à®
ளிà®à¯à®à®¿à®±à®¤à¯ à®à®©à®¾à®²à¯, நிறà¯à®µà®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ பà¯à®¾à®°à¯à®³à®¿à®©à¯ à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ மாறà¯à®±à®¿à®µà®¿à®à¯à®®à¯"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "%sன௠மà¯à®°à®£à¯à®ªà®¾à®à¯à®à¯ பà¯à®±à®à¯à®à®£à®¿à®à¯à®à®µà¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%sல௠à®à®³à¯à®³ வழà®à¯à®à®¿à®²à¯ à®à®²à¯à®²à®¾à®¤ %s஠பà¯à®±à®à¯à®à®£à®¿à®à¯à®à®µà¯à®®à¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "ââà®à®±à¯à®à®©à®µà¯ நிறà¯à®µà¯à®µà®¤à®±à¯à®à®¾à® à®
à®®à¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ %s஠பà¯à®±à®à¯à®à®£à®¿à®à¯à®à®µà¯à®®à¯"
@@ -3062,7 +3074,7 @@
msgstr "தà¯à®¾à®à®°à¯à®ªà¯à®³à¯à®³ தà¯à®°à¯à®µà¯à®à®³à¯ நிறà¯à®µà®µà¯à®¾ à®
லà¯à®²à®¤à¯ நà¯à®à¯à®à®µà¯à®¾ வà¯à®£à¯à®à®¾à®®à¯"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "%s஠பà¯à®¤à¯à®ªà¯à®ªà®¿à®à¯à®à¯à®®à¯à®ªà¯à®¾à®¤à¯ %sà®à¯à®à®¾à® %s தà¯à®µà¯à®ªà¯âபà®à¯à®®à¯à®ªà¯à®¾à®¤à¯"
@@ -3315,8 +3327,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s, %sà® à®
ளிà®à¯à®à®¿à®±à®¤à¯, à®à®©à®¾à®²à¯ à®
தறà¯à®à¯ வà¯à®±à¯à®¾à®°à¯ à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ à®à®³à¯à®³à®¤à¯."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s, %sà® à®
ளிà®à¯à®à®¿à®±à®¤à¯, à®à®©à®¾à®²à¯ à®
தறà¯à®à¯ வà¯à®±à¯à®¾à®°à¯ à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ à®à®³à¯à®³à®¤à¯."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "%s à®à¯à®à®¾à®© %sன௠தà¯à®µà¯à®¯à¯à®ªà¯ பà¯à®°à¯à®¤à¯à®¤à®¿ à®à¯à®¯à¯à®¯ à®à®¯à®²à®¾à®¤à¯"
@@ -3328,7 +3346,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "மறà¯à®±à¯à®¾à®°à¯ நிறà¯à®µà®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ தà¯à®°à¯à®µà¯à®à¯à®à¯ %s தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯, à®à®©à®µà¯ à®
தன à®à®£à¯à®ªà¯à®ªà¯ நà¯à®à¯à®à®ªà¯à®ªà® மாà®à¯à®à®¾à®¤à¯."
@@ -3340,7 +3358,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "மறà¯à®±à¯à®¾à®°à¯ நிறà¯à®µà®ªà¯à®ªà®à¯à®à¯à®³à¯à®³ தà¯à®°à¯à®µà¯à®à¯à®à¯ %s தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯, à®à®©à®µà¯ à®
தன à®à®£à¯à®ªà¯à®ªà¯ நà¯à®à¯à®à®ªà¯à®ªà® மாà®à¯à®à®¾à®¤à¯."
@@ -3352,7 +3370,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s பà¯à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯ மறà¯à®±à¯à®®à¯ à®
தன௠நிறà¯à®µà¯à®¤à®²à¯ நà¯à®à¯à® à®à®¯à®²à®¾à®¤à¯."
@@ -3363,7 +3381,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) à®®à¯à®¤à®¾à®© à®à®°à¯ à®®à¯à®°à®£à¯à®ªà®¾à®à¯à®à®¿à®±à¯à®à¯, நிறà¯à®µà®ªà¯à®ªà®à®ªà¯à®ªà¯à®¾à®à¯à®®à¯ %sன௠நà¯à®à¯à®à®®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯."
@@ -3374,23 +3392,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "%s à®®à¯à®¤à®¾à®© à®à®°à¯ à®®à¯à®°à®£à¯à®ªà®¾à®à¯ à®à®¾à®°à®£à®®à®¾à® %s நிறà¯à®µà®ªà¯à®ªà® à®®à¯à®à®¿à®¯à®¾à®¤à®¤à®¾à® à®à¯à®±à®¿à®à¯à®à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "%sலிரà¯à®¨à¯à®¤à¯"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "பிழà¯!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "à®®à¯à®à¯à®à®¿à®¯à®®à¯!"
@@ -3447,9 +3465,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s, %sà®à¯à®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4768,6 +4786,10 @@
"à®à®¤à®¿à®°à¯à®ªà®¾à®°à¯à®¤à¯à®¤à®¤à¯ %s, à®à®£à¯à®à®¤à¯ %s\n"
"à®
வà¯à®µà®¾à®±à®¿à®°à¯à®¨à¯à®¤à¯à®®à¯ à®
à®à¯à®à¯à®¾à®ªà¯à®ªà¯ பயனà¯à®ªà®à¯à®¤à¯à®¤à®²à®¾à®®à®¾?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s, %sà®à¯à®à¯ தà¯à®µà¯à®ªà¯à®ªà®à¯à®à®¿à®±à®¤à¯"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "யà¯à®à®°à¯à®à®²à¯ à®
திà®à®¾à®°à®¤à¯à®¤à¯ விளà®à¯à® à®à®¯à®²à®µà®¿à®²à¯à®²à¯"
Modified: trunk/libzypp/po/tr.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/tr.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/tr.po (original)
+++ trunk/libzypp/po/tr.po Mon Sep 3 13:56:27 2007
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2001-10-18 10:13+0200\n"
"Last-Translator: Görkem Ãetin <gorkem(a)gelecek.com.tr>\n"
"Language-Team: turkish <i18n(a)suse.de>\n"
@@ -19,81 +19,81 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
# include/nfs/routines.ycp:188
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, fuzzy, c-format
msgid "Invalid %s component '%s'"
msgstr "Geçersiz özellik '{0}'"
# include/nfs/routines.ycp:188
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, fuzzy, c-format
msgid "Invalid %s component"
msgstr "Geçersiz özellik '{0}'"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, fuzzy, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Geçersiz yetki '{0}'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
# include/nfs/routines.ycp:188
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Geçersiz özellik '{0}'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
# include/nfs/routines.ycp:188
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Geçersiz özellik '{0}'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -3243,25 +3243,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -3269,38 +3269,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -3308,7 +3308,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "%1, %2 ile çakıÅıyor"
@@ -3317,14 +3317,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "%1, %2 ile çakıÅıyor"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -3332,31 +3332,31 @@
msgstr "%1, %2 ile çakıÅıyor"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -3364,69 +3364,69 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
# include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "Kurulan disk:"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "%1, %2 ile çakıÅıyor"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Bu paket kurulu deÄildir ve kurulmayacaktır."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -3435,8 +3435,8 @@
# include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -3444,125 +3444,137 @@
msgstr "Kurulan disk:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
# clients/inst_sw_single.ycp:742
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, fuzzy, c-format
msgid "%s has missing dependencies"
msgstr "Yetersiz baÄımlılıklar:"
# clients/inst_sw_single.ycp:742
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, fuzzy, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "Yetersiz baÄımlılıklar:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
# clients/online_update_load.ycp:923
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "yeniden kurulmalı"
# clients/inst_sw_single.ycp:742
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Yetersiz baÄımlılıklar:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
# clients/inst_sw_single.ycp:742
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "Yetersiz baÄımlılıklar:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, fuzzy, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%1, %2 ile çakıÅıyor"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
#, fuzzy
msgid "Ignore this requirement just here"
msgstr "Åu çözülmemiÅ gereksinimlere sahip:"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Åu çözülmemiÅ gereksinimlere sahip:"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, fuzzy, c-format
msgid "Ignore this conflict of %s"
msgstr "%1, %2 ile çakıÅıyor"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, fuzzy, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "%1, %2 ile çakıÅıyor"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, fuzzy, c-format
msgid "Ignore that %s is already set to install"
msgstr "%1 dizini zaten listede."
@@ -3573,7 +3585,7 @@
msgstr "%1, %2 ile çakıÅıyor"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3829,9 +3841,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3842,7 +3860,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3854,7 +3872,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3866,7 +3884,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Bu paket kurulu deÄildir ve kurulmayacaktır."
@@ -3877,7 +3895,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3888,25 +3906,25 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
# include/ui/common_messages.ycp:95
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Hata"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "DıÅarıdan veri al"
@@ -3967,7 +3985,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/uk.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/uk.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/uk.po (original)
+++ trunk/libzypp/po/uk.po Mon Sep 3 13:56:27 2007
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: zypp.uk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-19 22:40-0700\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-23 20:52-0700\n"
"Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak(a)yahoo.com>\n"
"Language-Team: Ukrainian <translation(a)linux.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -19,77 +19,77 @@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "СÑ
ема Url не дозволÑÑ %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ðе Ñинний %s ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ \"%s\""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ðе Ñинний ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ %s"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "РозбÑÑ Ð¿Ð°ÑамеÑÑÑв ÑлÑÑ
Ñ Ð½Ðµ пÑдÑÑимÑÑÑÑÑÑ Ð´Ð»Ñ ÑÑого URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "РозбÑÑ ÑÑдка запиÑÑ Ð½Ðµ пÑдÑÑимÑÑÑÑÑÑ Ð´Ð»Ñ ÑÑого URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "СÑ
ема URL - Ñе поÑÑÑбний компоненÑ"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ðе Ñинна ÑÑ
ема URL \"%s\""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "СÑ
ема URL не дозволÑÑ ÑÐ¼ÐµÐ½Ñ ÐºÐ¾ÑиÑÑÑваÑа"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "СÑ
ема URL не дозволÑÑ Ð¿Ð°ÑолÑ"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "СÑ
ема URL поÑÑебÑÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð²Ñзла"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "СÑ
ема URL не дозволÑÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð²Ñзла"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ðе Ñинний ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð²Ñзла \"%s\""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "СÑ
ема URL не дозволÑÑ Ð¿Ð¾ÑÑ"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ðе Ñинний ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½Ñ Ð¿Ð¾ÑÑÑ \"%s\""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "СÑ
ема URL поÑÑебÑÑ Ð½Ð°Ð·Ð²Ñ ÑлÑÑ
Ñ"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "ÐÑдноÑний ÑлÑÑ
не дозволÑÑÑÑÑÑ Ð¿Ñи ÑÑнÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½Ð½Ñ"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "РозбÑÑ Ð¿Ð°ÑамеÑÑÑв ÑлÑÑ
Ñ Ð½Ðµ пÑдÑÑимÑÑÑÑÑÑ Ð´Ð»Ñ ÑÑого URL"
@@ -99,15 +99,15 @@
#: ../zypp/url/UrlUtils.cc:173
msgid "Invalid parameter array split separator character"
-msgstr ""
+msgstr "Ðе Ñинний Ñимвол ÑоздÑÐ»ÐµÐ½Ð½Ñ Ð¼Ð°ÑÐ¸Ð²Ñ Ð¿Ð°ÑамеÑÑÑв"
#: ../zypp/url/UrlUtils.cc:213
msgid "Invalid parameter map split separator character"
-msgstr ""
+msgstr "Ðе Ñинний Ñимвол ÑоздÑÐ»ÐµÐ½Ð½Ñ ÐºÐ°ÑÑи паÑамеÑÑÑв"
#: ../zypp/url/UrlUtils.cc:283
msgid "Invalid parameter array join separator character"
-msgstr ""
+msgstr "Ðе Ñинний Ñимвол ÑполÑÑÐµÐ½Ð½Ñ Ð¼Ð°ÑÐ¸Ð²Ñ Ð¿Ð°ÑамеÑÑÑв"
#. TranslatorExplanation followed by the list of error messages that lead to this exception
#: ../zypp/base/Exception.cc:89
@@ -2798,25 +2798,25 @@
msgstr "%s замÑнено %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s бÑде вилÑÑено коÑиÑÑÑваÑем.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s бÑде вилÑÑено ÑнÑÐ¾Ñ Ð¿ÑогÑамоÑ. (ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s бÑде вÑÑановлено коÑиÑÑÑваÑем.\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s бÑде вÑÑановлено ÑнÑÐ¾Ñ Ð¿ÑогамоÑ. (ApplLow/ApplHigh)\n"
@@ -2824,38 +2824,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ðе Ñинна ÑнÑоÑмаÑÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s поÑÑÑбний Ð´Ð»Ñ ÑнÑиÑ
пакÑнкÑв"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s поÑÑÑбний Ð´Ð»Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2865,7 +2865,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s конÑлÑкÑÑÑ Ð· ÑнÑими поÑÑÑбними"
@@ -2874,14 +2874,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s конÑлÑкÑÑÑ Ð· %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2891,24 +2891,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s ÑобиÑÑ Ð·Ð°ÑÑаÑÑлими ÑнÑÑ Ð¿Ð¾ÑÑÑбнÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s ÑобиÑÑ Ð·Ð°ÑÑаÑÑлим %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s ÑобиÑÑ Ð·Ð°ÑÑаÑÑлим: %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2917,7 +2917,7 @@
"Ð¦Ñ Ð¿Ð¾ÑÑÑÐ±Ð½Ñ Ð¿Ð°ÐºÑнки бÑде вилÑÑено з ÑиÑÑеми."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s залежиÑÑ Ð²Ñд ÑнÑиÑ
поÑÑÑбниÑ
пакÑнкÑв"
@@ -2925,38 +2925,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s залежиÑÑ Ð²Ñд %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s залежиÑÑ Ð²Ñд: %s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "ÐаÑадок"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Ðеможливо вÑÑановиÑи %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "ÐÑÑо не Ð½Ð°Ð´Ð°Ñ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2964,31 +2964,31 @@
"\n"
"Ðема наÑвного ÑеÑÑÑÑÑ, Ñкий пÑдÑÑимÑÑ ÑÑ Ð²Ð¸Ð¼Ð¾Ð³Ñ."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "У зв'ÑÐ·ÐºÑ Ð· пÑоблемами опиÑаними виÑе/нижÑе Ñе Ñозв'ÑÐ·Ð°Ð½Ð½Ñ Ð½Ðµ задоволÑниÑÑ Ð²ÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Ðеможливо вÑÑановиÑи %s, бо вÑн конÑлÑкÑÑÑ Ð· %s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s не вÑÑановлений Ñ Ð¿Ð¾Ð·Ð½Ð°Ñений Ñк Ñакий, Ñо його неможливо вÑÑановиÑи"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Ðеможливо вÑÑановиÑи %s ÑеÑез пÑоблеми залежноÑÑей"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2996,8 +2996,8 @@
msgstr "вилÑÑиÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -3005,118 +3005,130 @@
msgstr "не вÑÑановлÑваÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s Ð¼Ð°Ñ Ð²Ð¸Ð¼Ð¾Ð³Ð¸, ÑÐºÑ Ð½Ðµ задоволено"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s Ð¼Ð°Ñ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ, ÑÐºÑ Ð½Ðµ задоволено"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s неможливо вÑÑановиÑи ÑеÑез залежноÑÑÑ, ÑÐºÑ Ð½ÐµÐ·Ð°Ð´Ð¾Ð²Ð¾Ð»ÐµÐ½Ð¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s задоволÑнÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ %s, але його бÑде вилÑÑено"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s задоволÑнÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½Ð¾ÑÑÑ %s, але його бÑде залиÑено в ÑиÑÑемÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Ðема поÑÑеби вÑÑановлÑваÑи %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Ðеможливо вÑÑановиÑи %s, Ñоб задоволÑниÑи залежноÑÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Ðеможливо вÑÑановиÑи %s, Ñоб задоволÑниÑи залежноÑÑÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s не бÑде вилÑÑено, бо його Ñе поÑÑÑбно"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s ÑобиÑÑ Ð·Ð°ÑÑаÑÑлим %s. Ðле %s неможливо вилÑÑиÑи, бо вÑн заблокований."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Ðеможливо вÑÑановиÑи %s, бо вÑн конÑлÑкÑÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "Ðеможливо вÑÑановиÑи %s ÑеÑез конÑлÑÐºÑ Ð· %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "Ðеможливо задоволÑниÑи Ð²Ð¸Ð¼Ð¾Ð³Ñ %s."
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ÐгноÑÑваÑи ÑÑ Ð²Ð¸Ð¼Ð¾Ð³Ñ ÑÑлÑки ÑÑÑ"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "ÐгноÑÑваÑи ÑÑ Ð²Ð¸Ð¼Ð¾Ð³Ñ Ð² загалÑномÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "ÐÑÑановиÑи %s, незважаÑÑи на Ñе, Ñо Ñе змÑниÑÑ Ð°ÑÑ
ÑÑекÑÑÑÑ"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s задоволÑнÑÑ ÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½ÑÑÑÑ, але змÑниÑÑ Ð°ÑÑ
ÑÑекÑÑÑÑ Ð²ÑÑановленого"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "ÐÑÑановиÑи %s, незважаÑÑи на Ñе, Ñо Ñе змÑниÑÑ Ð²Ð¸Ñобника"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s задоволÑнÑÑ ÑÑ Ð·Ð°Ð»ÐµÐ¶Ð½ÑÑÑÑ, але змÑниÑÑ Ð²Ð¸Ñобника вÑÑановленого"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "ÐгноÑÑваÑи Ñей конÑлÑÐºÑ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "ÐгноÑÑваÑи заÑÑаÑÑлий %s в %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "ÐгноÑÑваÑи, Ñо вже заплановано вÑÑановиÑи %s"
@@ -3126,7 +3138,7 @@
msgstr "Ðе вÑÑановлÑваÑи Ñ Ð½Ðµ вилÑÑаÑи Ð´Ð°Ð½Ñ Ð¿Ð°ÐºÑнки"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "поÑÑебÑÑ %s Ð´Ð»Ñ %s, коли оновлÑÑÑÑÑÑ %s"
@@ -3377,9 +3389,15 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s Ð½Ð°Ð´Ð°Ñ %s, але Ð¼Ð°Ñ ÑнÑÑ Ð°ÑÑ
ÑÑекÑÑÑÑ."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s Ð½Ð°Ð´Ð°Ñ %s, але Ð¼Ð°Ñ ÑнÑого виÑобника (%s)."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ðеможливо задоволÑниÑи Ð²Ð¸Ð¼Ð¾Ð³Ñ %s Ð´Ð»Ñ %s"
@@ -3390,7 +3408,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s поÑÑÑбний Ð´Ð»Ñ ÑнÑого вÑÑановленого поÑÑÑбного пакÑнка, оÑже вÑн не бÑде вÑдв'Ñзаний."
@@ -3402,7 +3420,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s поÑÑÑбний Ð´Ð»Ñ ÑнÑого вÑÑановленого поÑÑÑбного пакÑнка, оÑже вÑн не бÑде вÑдв'Ñзаний."
@@ -3414,7 +3432,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s заблоковано Ñ Ð¹Ð¾Ð³Ð¾ неможливо пÑибÑаÑи."
@@ -3425,7 +3443,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "ÐонÑлÑÐºÑ ÑеÑез %s (%s) поÑÑебÑÑ Ð²Ð¸Ð»ÑÑÐµÐ½Ð½Ñ %s, Ñкий запланований Ð´Ð»Ñ Ð²ÑÑановленнÑ"
@@ -3436,23 +3454,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "ÐознаÑÐµÐ½Ð½Ñ %s Ñк Ñакого, Ñо його не можна вÑÑановлÑваÑи ÑеÑез конÑлÑÐºÑ Ð· %s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "з %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr " Ðомилка!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr " Ðажливе!"
@@ -3510,8 +3528,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s оÑвÑжений пакÑнком %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s бÑде оÑÑнено Ð´Ð»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ (оÑвÑжено): %s"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
Modified: trunk/libzypp/po/vi.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/vi.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/vi.po (original)
+++ trunk/libzypp/po/vi.po Mon Sep 3 13:56:27 2007
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-07-12 07:32+0200\n"
"Last-Translator: Phan VÄ©nh Thá»nh <teppi82(a)gmail.com>\n"
"Language-Team: Vietnamese <i18n(a)suse.de>\n"
@@ -17,77 +17,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2728,25 +2728,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2754,38 +2754,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2793,7 +2793,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr ""
@@ -2802,14 +2802,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2817,31 +2817,31 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr ""
@@ -2849,68 +2849,68 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr ""
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr ""
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2918,8 +2918,8 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2927,118 +2927,130 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3048,7 +3060,7 @@
msgstr ""
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3299,9 +3311,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3312,7 +3330,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3324,7 +3342,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3336,7 +3354,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr ""
@@ -3347,7 +3365,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3358,23 +3376,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr ""
@@ -3432,7 +3450,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/wa.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/wa.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/wa.po (original)
+++ trunk/libzypp/po/wa.po Mon Sep 3 13:56:27 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: lcn memory\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2004-04-05 17:37+0200\n"
"Last-Translator: Jean Cayron <jean.cayron(a)gmail.com>\n"
"Language-Team: Walloon <i18n(a)suse.de>\n"
@@ -16,77 +16,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr ""
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr ""
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr ""
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr ""
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, fuzzy, c-format
msgid "Invalid host component '%s'"
msgstr "Li valixhance ni clope nén pol tchuze '%1': %2"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, fuzzy, c-format
msgid "Invalid port component '%s'"
msgstr "Li valixhance ni clope nén pol tchuze '%1': %2"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr ""
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr ""
@@ -2773,25 +2773,25 @@
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2799,39 +2799,39 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
#, fuzzy
msgid "Invalid information"
msgstr "&Informåcion"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, fuzzy, c-format
msgid "%s is needed by other resolvables"
msgstr "Coridjaedjes ricomandés"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2839,7 +2839,7 @@
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, fuzzy, c-format
msgid "%s conflicts with other resolvables"
msgstr "Afrontmint etur les coridjaedjes"
@@ -2848,14 +2848,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, fuzzy, c-format
msgid "%s conflicts with %s"
msgstr "afrontmint avou..."
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, fuzzy, c-format
msgid ""
"%s conflicts with:\n"
@@ -2863,31 +2863,31 @@
msgstr "afrontmint avou..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, fuzzy, c-format
msgid "%s obsoletes other resolvables"
msgstr "Coridjaedjes di radjoutés"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, fuzzy, c-format
msgid "%s obsoletes %s"
msgstr "trop vîs..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, fuzzy, c-format
msgid "%s obsoletes:%s"
msgstr "trop vîs..."
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, fuzzy, c-format
msgid "%s depends on other resolvables"
msgstr "Coridjaedjes ricomandés"
@@ -2895,70 +2895,70 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr ""
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
#, fuzzy
msgid "Child of"
msgstr "Tchili"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, fuzzy, c-format
msgid "Cannot install %s"
msgstr "N' nén astaler"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
"There is no resource available which supports this requirement."
msgstr "Gn a pont d' eterface uzeu po ç' module."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr ""
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, fuzzy, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "Ãou paket n' est nén astalé et n' serè nén astalé."
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, fuzzy, c-format
@@ -2966,8 +2966,8 @@
msgstr "Dis&facer"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, fuzzy, c-format
@@ -2975,118 +2975,130 @@
msgstr "N' nén astaler"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, fuzzy, c-format
msgid "%s has unfulfilled requirements"
msgstr "a des dmandes nén rezoudowes..."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, fuzzy, c-format
msgid "No need to install %s"
msgstr "Copyî les fitchîs sol sistinme d' astalé"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr ""
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, c-format
+msgid "Install %s although it would change the vendor"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr ""
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr ""
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr ""
@@ -3097,7 +3109,7 @@
msgstr "Coridjaedjes di radjoutés"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr ""
@@ -3356,9 +3368,15 @@
msgid "%s provides %s, but has another architecture."
msgstr ""
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
#, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr ""
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
+#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr ""
@@ -3369,7 +3387,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr ""
@@ -3381,7 +3399,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr ""
@@ -3393,7 +3411,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, fuzzy, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "Ãou paket n' est nén astalé et n' serè nén astalé."
@@ -3404,7 +3422,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr ""
@@ -3415,24 +3433,24 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr ""
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr ""
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
#, fuzzy
msgid " Error!"
msgstr "Aroke"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
#, fuzzy
msgid " Important!"
msgstr "Abe&rweter"
@@ -3493,7 +3511,7 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
msgstr ""
#. Translator: all.%s = name of package,patch,...
Modified: trunk/libzypp/po/xh.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/xh.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/xh.po (original)
+++ trunk/libzypp/po/xh.po Mon Sep 3 13:56:27 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-03 12:03\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -13,77 +13,77 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Ulungiselelo lwe-Url aluyivumeli i-%s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ayisebenziseki %s inxalenye '%s'"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ayisebenziseki %s inxalenye"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Ukwahlula umda wenkcazelo yendlela yothungelwano awuxhaswa malunga ne-URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Ukwahlulwa komtya wokubuzisa awuxhaswa malunga nale-URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Ulungiselelo lwe-Url yinxalenye efunekayo"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Ulungiselelo olusebenzisekayo lwe-Url '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Ulungiselelo lwe-Url akulivumeli igama lomsebenzisi"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Ulungiselelo lwe-Url awulivumeli igama lokugqithisa"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Ulungiselelo lwe-Url lufuna inxalenye yomamkeli"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Ulungiselelo lwe-Url awuyivumeli inxalenye yomamkeli"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ayisebenziseki inxalenye yomamkeli ye-'%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Ulungiselelo lwe-Url awusivumeli isiqhagamshelanisi"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ayisebenziseki inxalenye yesiqhagamshelanisi se-'%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Ulungiselelo lwe-Url lufuna igama lendlela yothungelwano"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Indlela yothungelwano ethelekisekayo ayivunyelwa xa lukhona ugunyaziso"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Ukwahlula umda wenkcazelo yendlela yothungelwano awuxhaswa malunga nale-URL"
@@ -2730,7 +2730,7 @@
msgstr "%s ibuyiselwe ngo %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2738,19 +2738,19 @@
"Ezi ziconjululwa ziza kucinywa kwisixokelelwano."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s ayizukuhlohlwa kuba isafuneka"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2758,38 +2758,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "Ulwazi olungasebenzi"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s iyafunwa zezinye iziconjululwa"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s ifunwa ngu %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2799,7 +2799,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s iimpixano nezinye iziconjululwa"
@@ -2808,14 +2808,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s iimpixano ne %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2825,24 +2825,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s yenza ezinye iziconjululwa ziphelelwe lixesha"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s ziphelelwe lixehsa %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s ziphelelwe lixehsa:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2851,7 +2851,7 @@
"Ezi ziconjululwa ziza kucinywa kwisixokelelwano."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ixhomekeke kwezinye iziconjululwa"
@@ -2859,38 +2859,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s ixhomekeke kwi %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ixhomekeke kwi:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Umntwana ka"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Ayikwazi kuhlohla%s "
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Akukho nanye ebonelela ngo%s "
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2899,32 +2899,32 @@
"\n"
"Akukho vimba ufumanekayo oxhasa le mfuneko."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Ngenxa yeengxaki ezichazwe ngentla/ngezantsi kwesi sigqibo akuyikusombulula zonke izixhomekeki."
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Ayikwazi kuhlohla u%s kuba kuyaphixana ne%s "
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s ayihlohlwanga kwaye iphawulwe njengengahlohleki"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Ayikwazi kuhlohla%s ngenxa yeengxaki zoxhomekeko"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2932,8 +2932,8 @@
msgstr "Cima %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2941,119 +2941,131 @@
msgstr "ungahlohli %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s inemfuneko ezingazalisekiswanga"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s inezixhomekeki ezilahlekileyo"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s ayikwazi kuhlohla ngenxa yezixhomekeki ezilahlekikeyo"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s zalisekisa izixhomekeki zika%s kodwa aziyi kuhlohlwa"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s zaliseka izixhomekeki zika%s kodwa ziza kugcinwa kwisixokelelwano sakho"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Akukho mfuno yokuhlohla%s "
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Ayikwazi kuhlohla%s ukuzalisekisa izixhomekeki zika%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Ayikwazi kuhlohla%s ukuzalisekisa izixhomekeki zika%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ayizukuhlohlwa kuba isafuneka"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s ziphelelwe lixehsa%s . Kodwa%s ayikwazi kucima kuba itshixiwe."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Ayikwazi kuhlohla u%s kuba kuyaphixana "
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ayihlohleki ngenxa yeempixano ne %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Suhoya le mfuneko apha nje"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Suhoya le mfuneko apha nje"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Hlohla%s nangona kuza kutshintsha inzululwazi yokwakha"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s ibonelela esi sixhomekeki kodwa kuza kutshintsha inzululwazi yokwakha into ehlohliweyo"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Hlohla%s nangona kuza kutshintsha inzululwazi yokwakha"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s ibonelela esi sixhomekeki kodwa kuza kutshintsha inzululwazi yokwakha into ehlohliweyo"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Suhoya le mpixano ka%s "
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Suhoya ukuphelelwa%s lixesha kwi%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Suhoya ukuba%s sele imiselwe ukuhlohla"
@@ -3064,7 +3076,7 @@
msgstr "Ungahlohli okanye cima izicombululi ezinxulumeneyo"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ukufuna%s ka%s xa ihlaziya%s"
@@ -3315,8 +3327,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s ibonelela%s, kodwa inenye inzululwazi ngokwakha."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s ibonelela%s, kodwa inenye inzululwazi ngokwakha."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ayikwazi kwanelisa imfuneko%s ka%s"
@@ -3328,7 +3346,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s iyafunwa zezinye ukuba ihlohle izicombululi, ayizukwazi ukwenziwa inganxulumani."
@@ -3340,7 +3358,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s iyafunwa zezinye ukuba ihlohle izicombululi, ayizukwazi ukwenziwa inganxulumani."
@@ -3352,7 +3370,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s itshixiwe kwaye ayikwazi kungahlohlwa."
@@ -3363,7 +3381,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Impixano ngaphezu%s (%s) ifuna ukushenxiswa ukuba kuhlohlwe%s"
@@ -3374,23 +3392,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Ukuphawula%s njengengahlohleki ngenxa yeempixano ezingaphezu kuka%s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "Ukusuka ku%s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Imposiso!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Ibalulekile!"
@@ -3447,9 +3465,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s ifunwa ngu %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4768,6 +4786,10 @@
"Ilindeleke%s, ifunyenwe%s\n"
" Sebenzisa ifayili nakanjani?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s ifunwa ngu %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Akukwazeki ukwahlula ugunyaziso lwe-Url"
Modified: trunk/libzypp/po/zh_CN.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zh_CN.po?rev=7083&r1=…
==============================================================================
--- trunk/libzypp/po/zh_CN.po (original)
+++ trunk/libzypp/po/zh_CN.po Mon Sep 3 13:56:27 2007
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
-"PO-Revision-Date: 2007-08-01 08:54+0800\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
+"PO-Revision-Date: 2007-08-26 00:50+0800\n"
"Last-Translator: Thruth Wang <gubotruth(a)gmail.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
"MIME-Version: 1.0\n"
@@ -16,77 +16,79 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "URL 纲è¦ä¸å
è®¸ä½¿ç¨ %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "æ æç %s ç»ä»¶â%sâ"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "æ æç %s ç»ä»¶"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "ä¸æ¯æå¯¹æ¤ URL çè·¯å¾åæ°è¿è¡è¯æ³åæ"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782
+#: ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "ä¸æ¯æå¯¹æ¤ URL çæ¥è¯¢å符串è¿è¡è¯æ³åæ"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url 模å¼ä¸æ¯å¿
éç»ä»¶"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "æ æç URL 纲è¦â%sâ"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "URL 纲è¦ä¸å
许使ç¨ç¨æ·å"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "URL 纲è¦ä¸å
许使ç¨å£ä»¤"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "URL 纲è¦è¦æ±æ主æºç»ä»¶"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "URL 纲è¦ä¸å
许使ç¨ä¸»æºç»ä»¶"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "æ æç主æºç»ä»¶â%sâ"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "URL 纲è¦ä¸å
许使ç¨ç«¯å£"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "æ æç端å£ç»ä»¶â%sâ"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "URL 纲è¦è¦æ±æè·¯å¾å"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117
+#: ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "å¦æåå¨è®¤è¯ï¼åä¸å
许ç¸å¯¹è·¯å¾"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "ä¸æ¯æå¯¹æ¤ URL çè·¯å¾åæ°è¿è¡è¯æ³åæ"
@@ -108,9 +110,8 @@
#. TranslatorExplanation followed by the list of error messages that lead to this exception
#: ../zypp/base/Exception.cc:89
-#, fuzzy
msgid "History:"
-msgstr "XF86History"
+msgstr "åå²ï¼"
#: ../zypp/repo/PackageProvider.cc:222
msgid "applydeltarpm check failed."
@@ -152,11 +153,13 @@
msgid "Unsupported HTTP authentication method '%s'"
msgstr "ä¸æ¯æ HTTP 认è¯æ¹æ³ '%s'"
-#: ../zypp/media/MediaCurl.cc:715 ../zypp/media/MediaCurl.cc:784
+#: ../zypp/media/MediaCurl.cc:715
+#: ../zypp/media/MediaCurl.cc:784
msgid "Invalid user name or password."
msgstr "æ æç¨æ·åæå¯ç ã"
-#: ../zypp/media/MediaCurl.cc:718 ../zypp/media/MediaCurl.cc:787
+#: ../zypp/media/MediaCurl.cc:718
+#: ../zypp/media/MediaCurl.cc:787
#, c-format
msgid "Authentication required for '%s'"
msgstr "'%s' éè¦èº«ä»½éªè¯"
@@ -187,9 +190,9 @@
msgstr "æ£å¨æ·»å å®è£
æº '%s'"
#: ../zypp/RepoManager.cc:1004
-#, fuzzy, c-format
+#, c-format
msgid "Removing repository '%s'"
-msgstr "æ£å¨æ·»å å®è£
æº '%s'"
+msgstr "æ£å¨ç§»é¤å®è£
æº '%s'"
#: ../zypp/Url.cc:112
msgid "Invalid LDAP URL query string"
@@ -208,7 +211,8 @@
msgid "Invalid empty Url object reference"
msgstr "æ æç空 URL 对象åç
§"
-#: ../zypp/Url.cc:321 ../zypp/Url.cc:335
+#: ../zypp/Url.cc:321
+#: ../zypp/Url.cc:335
msgid "Unable to parse Url components"
msgstr "æ æ³å¯¹ URL ç»ä»¶è¿è¡è¯æ³åæ"
@@ -218,7 +222,8 @@
#. Defined LanguageCode constants
#. Defined CountryCode constants
-#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215
+#: ../zypp/LanguageCode.cc:225
+#: ../zypp/CountryCode.cc:215
msgid "No Code"
msgstr "æ 代ç "
@@ -283,7 +288,8 @@
msgstr "é¿å¡å¾·è¯"
#. language code: alb sqi sq
-#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264
+#: ../zypp/LanguageCode.cc:262
+#: ../zypp/LanguageCode.cc:264
msgid "Albanian"
msgstr "é¿å°å·´å°¼äºè¯"
@@ -333,7 +339,8 @@
msgstr "é¿æè´¡è¯"
#. language code: arm hye hy
-#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286
+#: ../zypp/LanguageCode.cc:284
+#: ../zypp/LanguageCode.cc:286
msgid "Armenian"
msgstr "äºç¾å°¼äºè¯"
@@ -433,7 +440,8 @@
msgstr "å·´åè¯"
#. language code: baq eus eu
-#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328
+#: ../zypp/LanguageCode.cc:326
+#: ../zypp/LanguageCode.cc:328
msgid "Basque"
msgstr "å·´æ¯å
è¯"
@@ -543,7 +551,8 @@
msgstr "ä¿å å©äºè¯"
#. language code: bur mya my
-#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374
+#: ../zypp/LanguageCode.cc:372
+#: ../zypp/LanguageCode.cc:374
msgid "Burmese"
msgstr "ç¼
ç¸è¯"
@@ -608,7 +617,8 @@
msgstr "æ¥å è¯"
#. language code: chi zho zh
-#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402
+#: ../zypp/LanguageCode.cc:400
+#: ../zypp/LanguageCode.cc:402
msgid "Chinese"
msgstr "ä¸æ"
@@ -718,7 +728,8 @@
msgstr "åºæ½ç¹è¯¸è¯è¨ï¼å
¶å®ï¼"
#. language code: cze ces cs
-#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448
+#: ../zypp/LanguageCode.cc:446
+#: ../zypp/LanguageCode.cc:448
msgid "Czech"
msgstr "æ·å
è¯"
@@ -793,7 +804,8 @@
msgstr "ä¸å¤è·å
°è¯ï¼çº¦ 1050-1350ï¼"
#. language code: dut nld nl
-#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480
+#: ../zypp/LanguageCode.cc:478
+#: ../zypp/LanguageCode.cc:480
msgid "Dutch"
msgstr "è·å
°è¯"
@@ -898,7 +910,8 @@
msgstr "丰è¯"
#. language code: fre fra fr
-#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524
+#: ../zypp/LanguageCode.cc:522
+#: ../zypp/LanguageCode.cc:524
msgid "French"
msgstr "æ³è¯"
@@ -948,12 +961,14 @@
msgstr "æ¥å°æ¼è¯¸è¯è¨ï¼å
¶å®ï¼"
#. language code: geo kat ka
-#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546
+#: ../zypp/LanguageCode.cc:544
+#: ../zypp/LanguageCode.cc:546
msgid "Georgian"
msgstr "ä¹æ²»äºè¯"
#. language code: ger deu de
-#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550
+#: ../zypp/LanguageCode.cc:548
+#: ../zypp/LanguageCode.cc:550
msgid "German"
msgstr "å¾·è¯"
@@ -1023,7 +1038,8 @@
msgstr "å¤å¸è
è¯ï¼1453 以åï¼"
#. language code: gre ell el
-#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580
+#: ../zypp/LanguageCode.cc:578
+#: ../zypp/LanguageCode.cc:580
msgid "Greek, Modern (1453-)"
msgstr "ç°ä»£å¸è
è¯ (1453-)"
@@ -1128,7 +1144,8 @@
msgstr "ä¼åè¯"
#. language code: ice isl is
-#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624
+#: ../zypp/LanguageCode.cc:622
+#: ../zypp/LanguageCode.cc:624
msgid "Icelandic"
msgstr "å°å²è¯"
@@ -1498,7 +1515,8 @@
msgstr "å¢è¨è¯"
#. language code: mac mkd mk
-#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774
+#: ../zypp/LanguageCode.cc:772
+#: ../zypp/LanguageCode.cc:774
msgid "Macedonian"
msgstr "马å
¶é¡¿è¯"
@@ -1538,7 +1556,8 @@
msgstr "æ¼ä¸å¥è¯"
#. language code: mao mri mi
-#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792
+#: ../zypp/LanguageCode.cc:790
+#: ../zypp/LanguageCode.cc:792
msgid "Maori"
msgstr "æ¯å©è¯"
@@ -1558,7 +1577,8 @@
msgstr "马è¨ä¼è¯"
#. language code: may msa ms
-#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802
+#: ../zypp/LanguageCode.cc:800
+#: ../zypp/LanguageCode.cc:802
msgid "Malay"
msgstr "马æ¥è¯"
@@ -1699,7 +1719,8 @@
#. language code: nau na
#. :NPL:524:
-#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:380
+#: ../zypp/LanguageCode.cc:858
+#: ../zypp/CountryCode.cc:380
msgid "Nauru"
msgstr "çé²è¯"
@@ -1899,7 +1920,8 @@
msgstr "å¤æ³¢æ¯è¯ï¼çº¦å
Œ
å 600-400ï¼"
#. language code: per fas fa
-#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940
+#: ../zypp/LanguageCode.cc:938
+#: ../zypp/LanguageCode.cc:940
msgid "Persian"
msgstr "æ³¢æ¯è¯"
@@ -1984,7 +2006,8 @@
msgstr "åæ®èµè¯"
#. language code: rum ron ro
-#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976
+#: ../zypp/LanguageCode.cc:974
+#: ../zypp/LanguageCode.cc:976
msgid "Romanian"
msgstr "ç½é©¬å°¼äºè¯"
@@ -2044,7 +2067,8 @@
msgstr "æ¡å¡å©è¯"
#. language code: scc srp sr
-#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002
+#: ../zypp/LanguageCode.cc:1000
+#: ../zypp/LanguageCode.cc:1002
msgid "Serbian"
msgstr "å¡å°ç»´äºè¯"
@@ -2059,7 +2083,8 @@
msgstr "èæ ¼å
°è¯"
#. language code: scr hrv hr
-#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010
+#: ../zypp/LanguageCode.cc:1008
+#: ../zypp/LanguageCode.cc:1010
msgid "Croatian"
msgstr "å
ç½å°äºè¯"
@@ -2114,7 +2139,8 @@
msgstr "æ¯æ夫诸è¯è¨ï¼å
¶å®ï¼"
#. language code: slo slk sk
-#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034
+#: ../zypp/LanguageCode.cc:1032
+#: ../zypp/LanguageCode.cc:1034
msgid "Slovak"
msgstr "æ¯æ´ä¼å
è¯"
@@ -2309,7 +2335,8 @@
msgstr "æ³°å½è¯"
#. language code: tib bod bo
-#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114
+#: ../zypp/LanguageCode.cc:1112
+#: ../zypp/LanguageCode.cc:1114
msgid "Tibetan"
msgstr "西èè¯"
@@ -2330,7 +2357,8 @@
#. language code: tkl
#. :TJK:762:
-#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:428
+#: ../zypp/LanguageCode.cc:1122
+#: ../zypp/CountryCode.cc:428
msgid "Tokelau"
msgstr "æå
å³è¯"
@@ -2406,7 +2434,8 @@
#. language code: tvl
#. :TTO:780:
-#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:435
+#: ../zypp/LanguageCode.cc:1152
+#: ../zypp/CountryCode.cc:435
msgid "Tuvalu"
msgstr "å¾ç¦å¢è¯"
@@ -2506,7 +2535,8 @@
msgstr "ç¦èè¯"
#. language code: wel cym cy
-#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194
+#: ../zypp/LanguageCode.cc:1192
+#: ../zypp/LanguageCode.cc:1194
msgid "Welsh"
msgstr "å¨å°å£«è¯"
@@ -2590,7 +2620,8 @@
msgid "Zuni"
msgstr "ç¥å°¼è¯"
-#: ../zypp/ZYppFactory.cc:279 ../zypp/ZYppFactory.cc:334
+#: ../zypp/ZYppFactory.cc:279
+#: ../zypp/ZYppFactory.cc:334
msgid "Software management is already running."
msgstr "软件管çå·²å¤äºè¿è¡ç¶æã"
@@ -2630,7 +2661,8 @@
msgid "Not a CDROM drive"
msgstr "ä¸æ¯ CDROM 驱å¨å¨"
-#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55
+#: ../zypp/target/hal/HalException.h:46
+#: ../zypp/target/hal/HalException.h:55
#: ../zypp/target/hal/HalException.h:64
msgid "Hal Exception"
msgstr "Hal ä¾å¤"
@@ -2681,7 +2713,8 @@
msgid "%s install failed"
msgstr "%s å®è£
失败"
-#: ../zypp/target/rpm/RpmDb.cc:1927 ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:1927
+#: ../zypp/target/rpm/RpmDb.cc:2045
msgid "rpm output:"
msgstr "rpm è¾åºï¼"
@@ -2692,7 +2725,8 @@
msgid "%s installed ok"
msgstr "%s å®è£
æå"
-#: ../zypp/target/rpm/RpmDb.cc:1936 ../zypp/target/rpm/RpmDb.cc:2053
+#: ../zypp/target/rpm/RpmDb.cc:1936
+#: ../zypp/target/rpm/RpmDb.cc:2053
msgid "Additional rpm output:"
msgstr "å
¶ä» rpm è¾åºï¼"
@@ -2733,25 +2767,25 @@
msgstr "%s æ¿æ¢ä¸º %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s å°è¢«ç¨æ·å é¤ã\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s å°è¢«å¦ä¸ä¸ªç¨åºå é¤ã(ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s å°è¢«ç¨æ·å®è£
ã\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s å°è¢«å¦ä¸ä¸ªç¨åºå®è£
ã(ApplLow/ApplHigh)\n"
@@ -2759,41 +2793,41 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
#, fuzzy
msgid "No valid solution found with just resolvables of best architecture."
msgstr "ä»
使ç¨æä½³æ¶æ解æ项æªå¾å°æææ¹æ¡ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
#, fuzzy
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "æ¤è¯ä¾ä¸ä»
使ç¨æä½³æ¶æçå¯è§£æ项ã\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
#, fuzzy
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "使ç¨ææå¯è½çå¯è§£æ项ï¼è´¹æ¶ä½ææã"
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "æ æä¿¡æ¯"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s 对äºå
¶å®å¯è§£æ项æ¯å¿
éç"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s 对äºä»¥ä¸å¯¹è±¡æ¯å¿
éçï¼ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2803,7 +2837,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ä¸å
¶å®å¯è§£æ项å²çª"
@@ -2812,14 +2846,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s å²çª %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2829,24 +2863,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s å°åºå¼å
¶å®å¯è§£æ项"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s åºå¼ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s åºå¼ï¼%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2855,7 +2889,7 @@
"å°ä»ç³»ç»å é¤è¿äºå¯è§£æ项ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s åå³äºå
¶å®å¯è§£æ项"
@@ -2863,38 +2897,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s ä¾èµäº %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ä¾èµäºï¼%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "åé"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "æ æ³å®è£
%s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "åä¸æä¾ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2903,32 +2937,32 @@
"\n"
"没ææ¯ææ¤éæ±çèµæºå¯ç¨ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "ç±äºä¸ï¼ä¸æè¿°çé®é¢ï¼æ¤è§£æå°ä¸è§£æææä¾èµæ§ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "æ æ³å®è£
%sï¼å 为å®ä¸ %s å²çª"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s æªå®è£
ï¼ä¸å·²è¢«æ 记为ä¸å¯å®è£
"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "ç±äºä¾èµæ§é®é¢ï¼æ以æ æ³å®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2936,8 +2970,8 @@
msgstr "å é¤ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2945,119 +2979,131 @@
msgstr "ä¸å®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s å
·ææªæ»¡è¶³çéæ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s 缺å°ä¾èµæ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "ç±äºç¼ºå°ä¾èµæ§ï¼æ以æ æ³å®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s å°å®ç° %s çä¾èµæ§ï¼ä½æ¯å°ä¼è¢«å¸è£
"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s å°å®ç° %s çä¾èµæ§ï¼ä½æ¯å°ä¼è¢«ä¿çå¨ç³»ç»ä¸"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "æ éå®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "æ æ³å®è£
%s 以å®ç° %s çä¾èµæ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "æ æ³å®è£
%s 以å®ç° %s çä¾èµæ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s å°ä¸å¸è£
ï¼åå æ¯å®ä»è¢«éè¦"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s åºå¼ %sãä½ %s æ æ³å é¤ï¼å 为å®æ¯éå®çã"
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "æ æ³å®è£
%sï¼å 为å²çª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ç±äºä¸ä»¥ä¸å¯¹è±¡å²çªæ以ä¸å¯å¸è£
ï¼ %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "ä»
å¨æ¤å¿½ç¥æ¤éæ±"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "ä»
å¨æ¤å¿½ç¥æ¤éæ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "尽管ä¼æ¹åç»æï¼ä»è¯·å®è£
%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s æä¾äºæ¤ä¾èµæ§ï¼ä½æ¯ä¼æ¹åå·²å®è£
项ç®çç»æã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "尽管ä¼æ¹åç»æï¼ä»è¯·å®è£
%s"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s æä¾äºæ¤ä¾èµæ§ï¼ä½æ¯ä¼æ¹åå·²å®è£
项ç®çç»æã"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "å¿½ç¥ %s çæ¤å²çª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "忽ç¥åºå¼ %sï¼%s ä¸ï¼"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "å¿½ç¥ %s 已被设置为å®è£
çå®äº"
@@ -3068,7 +3114,7 @@
msgstr "ä¸å®è£
æå é¤ç¸å
³çå¯è§£æ项"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "å 为éè¦ %sï¼å¯¹äº %sï¼ï¼ å¨å级 %s æ¶"
@@ -3319,8 +3365,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s æä¾äº %sï¼ä½å®å
·æå¦ä¸ç§ç»æã"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s æä¾äº %sï¼ä½å®å
·æå¦ä¸ç§ç»æã"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "æ æ³æ»¡è¶³éæ±\"%s\"ï¼å¯¹äº %sï¼"
@@ -3332,7 +3384,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s æ¯å
¶ä»å·²å®è£
çå¯è§£æ项æéè¦çï¼å æ¤ä¸ä¼å°å
¶åæ¶é¾æ¥ã"
@@ -3344,7 +3396,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s æ¯å
¶ä»å·²å®è£
çå¯è§£æ项æéè¦çï¼å æ¤ä¸ä¼å°å
¶åæ¶é¾æ¥ã"
@@ -3356,7 +3408,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s å·²éå®ï¼å æ¤æ æ³å°å
¶å¸è£
ã"
@@ -3367,7 +3419,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) ä¸åçå²çªï¼éè¦å»é¤å°å®è£
ç %s"
@@ -3378,23 +3430,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "å° %s æ 记为å¯å¸è½½ï¼è¿æ¯ç±äº %s ä¸åå¨å²çª"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "å件人 %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "é误ï¼"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "éè¦ä¿¡æ¯ï¼"
@@ -3453,8 +3505,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s 被以ä¸å¯¹è±¡å·æ°ï¼ %s"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -3708,7 +3760,8 @@
#. :CCK:166:
#. :CAF:140:
-#: ../zypp/CountryCode.cc:255 ../zypp/CountryCode.cc:257
+#: ../zypp/CountryCode.cc:255
+#: ../zypp/CountryCode.cc:257
msgid "Congo"
msgstr "åæ"
@@ -4772,81 +4825,44 @@
"æ件 %s å
·ææ æçæ ¡éªå ãé¢æ为 %sï¼å¾å°çæ¯ %s\n"
"ä»è¦ä½¿ç¨è¯¥æ件åï¼"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s 被以ä¸å¯¹è±¡å·æ°ï¼ %s"
#~ msgid "Unable to parse Url authority"
#~ msgstr "æ æ³å¯¹ URL ææè¿è¡è¯æ³åæ"
-
#~ msgid "Ignore this requirement generally"
#~ msgstr "é常忽ç¥æ¤éæ±"
-
#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked."
#~ msgstr "%s æ¯å
¶ä»å°å®è£
çå¯è§£æ项æéè¦çï¼å æ¤ä¸ä¼å°å
¶åæ¶é¾æ¥ã"
-
#~ msgid "Cannot create a file needed to perform update installation."
#~ msgstr "æ æ³å建æ§è¡æ´æ°å®è£
æéè¦çæ件ã"
-
#~ msgid "Unable to restore all sources."
#~ msgstr "æ æ³æ¢å¤æææº"
-
#~ msgid "At least one source already registered, stored sources cannot be restored."
#~ msgstr "è³å°å·²æ³¨åäºä¸ä¸ªæºï¼ä¿åçæºæ æ³æ¢å¤ã"
-
#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
#~ msgstr "æ æ³å®è£
%s 以å®ç° %s çä¾èµæ§"
-
#~ msgid "%s dependend on %s"
#~ msgstr "%s ä¾èµäº %s"
-
#~ msgid "Reading index files"
#~ msgstr "æ£å¨è¯»åç´¢å¼æ件"
-
#~ msgid "The signed repomd.xml file failed the signature check."
#~ msgstr "å·²ç¾åç repomd.xml æ件æªè½éè¿ç¾åæ£æ¥ã"
-
#~ msgid "Reading product from %s"
#~ msgstr "æ£å¨ä» %s 读å产å"
-
#~ msgid "Reading filelist from %s"
#~ msgstr "æ£å¨ä» %s 读åæ件å表"
-
#~ msgid "Reading packages from %s"
#~ msgstr "æ£å¨ä» %s 读åå
"
-
#~ msgid "Reading selection from %s"
#~ msgstr "æ£å¨ä» %s 读åéæ©"
-
#~ msgid "Reading pattern from %s"
#~ msgstr "æ£å¨ä» %s 读å模å¼"
-
#~ msgid "Reading patches index %s"
#~ msgstr "æ£å¨è¯»åå¢è¡¥ç¨åºç´¢å¼ %s"
-
#~ msgid "Reading patch %s"
#~ msgstr "æ£å¨è¯»åå¢è¡¥ç¨åº %s"
-
#~ msgid "The script file failed the checksum test."
#~ msgstr "èæ¬æ件æªè½éè¿æ ¡éªåæµè¯ã"
-
#~ msgid "Reading packages file"
#~ msgstr "æ£å¨è¯»åå
æ件"
-# progress indicator label
-#~ msgid "Reading translation: %s"
-#~ msgstr "æ£å¨è¯»å转æ¢ï¼ %s"
-
-#~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?"
-#~ msgstr "%s å
æªè½éè¿å®æ´æ§æ£æ¥ãè¦éè¯ä¸è½½å®è¿æ¯ä¸æ¢å®è£
ï¼"
-
-#~ msgid " miss checksum."
-#~ msgstr " 缺å°æ ¡éªåã"
-
-#~ msgid " fails checksum verification."
-#~ msgstr "æ£éªåæ ¡éªå¤±è´¥ã"
-
-#~ msgid "Downloading %s"
-#~ msgstr "æ£å¨ä¸è½½ %s"
-
-#~ msgid "Downloaded %s from %s"
-#~ msgstr "å·²ä¸è½½ %s æ¥èª %s"
-
-#~ msgid "%s needed by %s"
-#~ msgstr "%s æ¯ä»¥ä¸å¯¹è±¡éè¦ç %s"
Modified: trunk/libzypp/po/zh_TW.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zh_TW.po?rev=7083&r1=…
==============================================================================
--- trunk/libzypp/po/zh_TW.po (original)
+++ trunk/libzypp/po/zh_TW.po Mon Sep 3 13:56:27 2007
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-05-31 13:41\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -16,77 +16,77 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Url è¦åä¸å
許 %s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "ç¡æç %s å
件ã%sã"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "ç¡æç %s å
件"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "æ¤ URL ä¸æ¯æ´è·¯å¾åæ¸åæ"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "æ¤ URL ä¸æ¯æ´æ¥è©¢å串åæ"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Url è¦åçºå¿
è¦å
件"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "ç¡æç Url è¦åã%sã"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Url è¦åä¸å
許使ç¨è
å稱"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Url è¦åä¸å
許å¯ç¢¼"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Url è¦åä¸å¿
é è¦æ主æ©å
件"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Url è¦åä¸å
許主æ©å
件"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "ç¡æç主æ©å
件ã%sã"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Url è¦åä¸å
許é£æ¥å "
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "ç¡æçé£æ¥å å
件ã%sã"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Url è¦åå¿
é è¦æè·¯å¾å稱"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "å¦æææ¬åå¨ï¼åä¸å
許ç¸å°è·¯å¾"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "æ¤ URL ä¸æ¯æ´è·¯å¾åæ¸åæ"
@@ -2642,6 +2642,7 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1913
+#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm å·²å° %s å²åçº %sï¼ä½çä¸åºå·®ç°"
@@ -2657,6 +2658,7 @@
#. %s = filenames
#: ../zypp/target/rpm/RpmDb.cc:1918
+#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm å·²å° %s 建ç«çº %sï¼ä½çä¸åºå·®ç°"
@@ -2729,25 +2731,25 @@
msgstr "%s 已被 %s å代"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, c-format
msgid "%s will be deleted by the user.\n"
msgstr "%s å°è¢«ä½¿ç¨è
åªé¤ã\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr "%s å°è¢«å
¶ä»æç¨ç¨å¼åªé¤ã(ApplLow/ApplHigh)\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s å°è¢«ä½¿ç¨è
å®è£ã\n"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr "%s å°è¢«å
¶ä»æç¨ç¨å¼å®è£ã(ApplLow/ApplHigh)\n"
@@ -2755,38 +2757,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr "å¨æ¤å¯ä¸æä½³æ¶æ§ä¸æ²æå¯ç¨ç解決æ¹æ¡ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr "å¨é種å·è¡æ
æ³ä¸ï¼åªç½æ¶æ¤å¯ä¸æä½³æ¶æ§ç解決æ¹æ¡ã\n"
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr "ç½æ¶æææ¶æ§ç解決æ¹æ¡æè±è¼é·æéï¼ä½å¯è½æå¾å°å¯ç¨ççµæã"
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "ç¡æçè³è¨"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s æ¯å
¶ä»å¯è§£æ±ºæ¹æ¡çå¿
è¦é
ç®"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s æ¯ %s çå¿
è¦é
ç®"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2796,7 +2798,7 @@
"%s çå¿
è¦é
ç®ï¼"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s èå
¶ä»è§£æ±ºæ¹æ¡ç¼çè¡çª"
@@ -2805,14 +2807,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s è %s è¡çª"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2822,24 +2824,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s ææ±°æå
¶ä»è§£æ±ºæ¹æ¡"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s æ±°æ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s æ±°æï¼%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2848,7 +2850,7 @@
"éäºå¯è§£æ±ºæ¹æ¡å°å¾ç³»çµ±ä¸åªé¤ã"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s ä¾è³´æ¼å
¶ä»è§£æ±ºæ¹æ¡"
@@ -2856,38 +2858,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s ä¾è³´æ¼ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s ä¾è³´æ¼ï¼%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "å件屬æ¼"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "ç¡æ³å®è£ %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "æ²æä»»ä½æä¾ %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
msgid ""
"\n"
"There is no resource available which supports this requirement."
@@ -2895,30 +2897,31 @@
"\n"
"æ²ææ¯æ´æ¤éæ±çå¯ç¨è³æºã"
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "å çºå¦ä¸/ä¸ææè¿°çåé¡ï¼å°è´æ¤è§£æ±ºæ¹æ¡ç¡æ³è§£æ±ºææç¸ä¾æ§ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
+#, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "ç¡æ³å®è£ %sï¼å çºå®è %s è¡çª"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "æªå®è£ %s ä¸å·²å°å
¶æ¨ç¤ºçºä¸å¯å®è£"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "å çºç¸ä¾æ§åé¡ï¼å°è´ç¡æ³å®è£ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2926,8 +2929,8 @@
msgstr "åªé¤ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2935,111 +2938,128 @@
msgstr "è«å¿å®è£ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s æç¡æ³æ»¿è¶³çéæ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s 缺å°ç¸ä¾æ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "å çºç¼ºå°ç¸ä¾æ§ï¼å°è´ç¡æ³å®è£ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
+#, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s æ»¿è¶³å° %s çç¸ä¾ï¼ä½æ¯å°è¢«è§£é¤å®è£"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
+#, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s æ»¿è¶³å° %s çç¸ä¾æ§ï¼ä½æä¿çå¨æ¨ç系統ä¸"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "ä¸éè¦å®è£ %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
+#, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "ç¡æ³å®è£ %s 以滿足å°æ¼ %s çç¸ä¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "ç¡æ³å®è£ %s 以滿足å°æ¼ %s çç¸ä¾"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
+#, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "ä¸æ解é¤å®è£ %sï¼å çºä»é使ç¨å®"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
+#, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s æ±°æ %sï¼ä½ç¡æ³åªé¤ %sï¼å çºå·²ç¶è¢«éå®ã"
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
+#, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "ç¡æ³å®è£ %sï¼å çºæè¡çª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ç¡æ³å®è£ï¼å çºè %s è¡çª"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr "éæ± %s ç¡æ³è¢«æ»¿è¶³ã"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "åªå¨é裡忽ç¥æ¤éæ±"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
msgid "Generally ignore this requirement"
msgstr "å®å
¨å¿½ç¥æ¤éæ±"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "å®è£ %sï¼å³ä½¿å®æè®æ´æ¶æ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
+#, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s å¯æä¾éé
ç¸ä¾æ§ï¼ä½æ¯å®æè®æ´å·²å®è£é
ç®çæ¶æ§"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+msgid "Install %s although it would change the vendor"
+msgstr "å®è£ %sï¼å³ä½¿å®æè®æ´å» å"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s å¯æä¾éé
ç¸ä¾æ§ï¼ä½æ¯å®æè®æ´å·²å®è£é
ç®çå» å"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "å¿½ç¥ %s çè¡çª"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "忽ç¥æ·æ±° %s å¨ %s ä¸çæ
å½¢"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "å¿½ç¥ %s å·²è¨å®çºè¦å®è£"
@@ -3049,13 +3069,14 @@
msgstr "è«å¿å®è£æåªé¤ç¸é解決æ¹æ¡"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "å¿
é å
·å %s ç %sï¼æè½åç´ %s"
#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency
#: ../zypp/solver/detail/ResolverInfoMissingReq.cc:64
+#, c-format
msgid "%s is lacking the requirement %s"
msgstr "%s 缺å°éæ± %s"
@@ -3132,12 +3153,14 @@
#. Translator: %s = name of packages,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:159
+#, c-format
msgid "%s is scheduled to be installed, but this is impossible due to dependency problems."
msgstr "ç¡æ³å®è£æå®ç %sï¼ç¼çç¸ä¾æ§åé¡ã"
#. Translator: %s = name of package,patch,...
#. TranslatorExplanation: Additional information to dependency solver result.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:167
+#, c-format
msgid "Can't install %s since it is already marked as needed to be uninstalled"
msgstr "ç¡æ³å®è£ %sï¼å çºå®å·²ç¶æ¨ç¤ºçºå°è¢«è§£é¤å®è£"
@@ -3148,6 +3171,7 @@
#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed
#. TranslatorExplanation: package is not installed.
#: ../zypp/solver/detail/ResolverInfoMisc.cc:179
+#, c-format
msgid "Can't install %s, because it does not apply to this system."
msgstr "ç¡æ³å®è£ %sï¼å çºå®æ²æå¥ç¨å°æ¤ç³»çµ±ã"
@@ -3157,6 +3181,7 @@
#. other_capability() =
#. Translator: %s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoMisc.cc:190
+#, c-format
msgid "Can't install %s, because %s is already marked as needed to for installation"
msgstr "ç¡æ³å®è£ %sï¼å çº %s å·²ç¶æ¨ç¤ºçºå¿
é å®è£"
@@ -3224,6 +3249,7 @@
#. TranslatorExplanation: removal of this resolvable would therefore break dependency
#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled
#: ../zypp/solver/detail/ResolverInfoMisc.cc:292
+#, c-format
msgid "There are no alternative providers of %s installed"
msgstr "%s æ²æå
¶ä»å·²å®è£çæä¾è
"
@@ -3254,6 +3280,7 @@
#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible
#. TranslatorExplanation: bar requires something from foo
#: ../zypp/solver/detail/ResolverInfoMisc.cc:341
+#, c-format
msgid "Upgrading to %s to avoid removing %s is not possible."
msgstr "å¨åç´è³ %s æï¼è¦é¿å
ç§»é¤ %s æ¯ä¸å¯è½çã"
@@ -3293,8 +3320,13 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s å¯æä¾ %sï¼ä½å®æ¯ä¸åçæ¶æ§ã"
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s å¯æä¾ %sï¼ä½å®æ¯ä¸åå» å (%s) æä¾çã"
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "ç¡æ³æ»¿è¶³å° %sç %s éæ±"
@@ -3306,7 +3338,8 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
+#, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "å
¶ä»å·²å®è£ç解決æ¹æ¡éè¦ %sï¼æ
ç¡æ³åæ¶é£çµã"
@@ -3317,7 +3350,8 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
+#, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "å
¶ä»å·²å®è£ç解決æ¹æ¡éè¦ %sï¼æ
ç¡æ³åæ¶é£çµã"
@@ -3328,7 +3362,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s 已被éä½ï¼æ¨ç¡æ³è§£é¤å®è£ã"
@@ -3339,7 +3373,8 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "%s (%s) ç¼çè¡çªï¼å¿
é 移é¤æºåå®è£ç %s"
@@ -3349,23 +3384,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "å° %s æ¨ç¤ºçºä¸å¯å®è£æå°è´å %s ç¼çè¡çªã"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "èª %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "é¯èª¤ï¼"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "éè¦ï¼"
@@ -3423,8 +3458,8 @@
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
#, c-format
-msgid "%s is freshened by %s"
-msgstr "%s æ¯ç± %s ææ´æ°"
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr "%s å°éåå®è£è©ä¼°(éæ°æ´ç)ï¼éæ¯ç±æ¼ %s çç·£æ
"
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4743,6 +4778,9 @@
"é æçº %sï¼ä½æ¾å°çæ¯ %s\n"
"ç¡è«å¦ä½é½è¦ä½¿ç¨æ¤æªæ¡åï¼"
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s æ¯ç± %s ææ´æ°"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "ç¡æ³åæ Url ææ¬"
Modified: trunk/libzypp/po/zu.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zu.po?rev=7083&r1=708…
==============================================================================
--- trunk/libzypp/po/zu.po (original)
+++ trunk/libzypp/po/zu.po Mon Sep 3 13:56:27 2007
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-17 11:32+0200\n"
+"POT-Creation-Date: 2007-08-23 10:21+0200\n"
"PO-Revision-Date: 2006-11-03 12:03\n"
"Last-Translator: Novell Language <language(a)novell.com>\n"
"Language-Team: Novell Language <language(a)novell.com>\n"
@@ -13,77 +13,77 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../zypp/url/UrlBase.cc:150
+#: ../zypp/url/UrlBase.cc:154
#, c-format
msgid "Url scheme does not allow a %s"
msgstr "Uhlelo lwe-URL aluyivumeli i-%s"
-#: ../zypp/url/UrlBase.cc:169
+#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
msgstr "Ingxenyana '%s' engekho emthethweni %s"
-#: ../zypp/url/UrlBase.cc:176
+#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
msgstr "Ingxenyana engekho emthethweni %s"
-#: ../zypp/url/UrlBase.cc:723
+#: ../zypp/url/UrlBase.cc:727
msgid "Path parameter parsing not supported for this URL"
msgstr "Ukucazwa kwepharamitha yomgudu akusekelwa kule-URL"
-#: ../zypp/url/UrlBase.cc:778 ../zypp/url/UrlBase.cc:1225
+#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229
msgid "Query string parsing not supported for this URL"
msgstr "Ukucazwa kohlu lwemibuzo akusekelwa kule-URL"
-#: ../zypp/url/UrlBase.cc:816
+#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
msgstr "Uhlelo lwe-Url luyingxenyana edingekayo"
-#: ../zypp/url/UrlBase.cc:822
+#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
msgstr "Uhlelo lwe-Url olungekho emthethweni '%s'"
-#: ../zypp/url/UrlBase.cc:943
+#: ../zypp/url/UrlBase.cc:947
msgid "Url scheme does not allow a username"
msgstr "Uhlelo lwe-URL alulivumeli igama lomsebenzisi"
-#: ../zypp/url/UrlBase.cc:977
+#: ../zypp/url/UrlBase.cc:981
msgid "Url scheme does not allow a password"
msgstr "Uhlelo lwe-URL aluyivumeli iphasiwedi"
-#: ../zypp/url/UrlBase.cc:1006
+#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
msgstr "Uhlelo lwe-Url ludinga ingxenyana yesiphakeli"
-#: ../zypp/url/UrlBase.cc:1016
+#: ../zypp/url/UrlBase.cc:1020
msgid "Url scheme does not allow a host component"
msgstr "Uhlelo lwe-URL aluyivumeli ingxenyana yesiphakeli"
-#: ../zypp/url/UrlBase.cc:1043
+#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
msgstr "Ingxenyana engekho emthethweni '%s'"
-#: ../zypp/url/UrlBase.cc:1064
+#: ../zypp/url/UrlBase.cc:1068
msgid "Url scheme does not allow a port"
msgstr "Uhlelo lwe-URL aluyivumeli iphasiwedi"
-#: ../zypp/url/UrlBase.cc:1075
+#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
msgstr "Ingxenyana engekho emthethweni '%s'"
-#: ../zypp/url/UrlBase.cc:1092
+#: ../zypp/url/UrlBase.cc:1096
msgid "Url scheme requires path name"
msgstr "Uhlelo lwe-Url ludinga igama lomgudu"
-#: ../zypp/url/UrlBase.cc:1113 ../zypp/url/UrlBase.cc:1127
+#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
msgstr "Umgudu ongaphelele awuvunyelwe uma kunegunya"
-#: ../zypp/url/UrlBase.cc:1180
+#: ../zypp/url/UrlBase.cc:1184
msgid "Path Parameter parsing not supported for this URL"
msgstr "Ukucazwa kwepharamitha yomgudu akusekelwa kule-URL"
@@ -2731,7 +2731,7 @@
msgstr "%s ingenelwe esikhundleni yi- %s"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:247
+#: ../zypp/solver/detail/Resolver_problems.cc:262
#, fuzzy, c-format
msgid "%s will be deleted by the user.\n"
msgstr ""
@@ -2739,19 +2739,19 @@
"Lezi zixazululi zizosulwa kwisistimu."
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:252
+#: ../zypp/solver/detail/Resolver_problems.cc:267
#, c-format
msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
msgstr ""
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:258
+#: ../zypp/solver/detail/Resolver_problems.cc:273
#, fuzzy, c-format
msgid "%s will be installed by the user.\n"
msgstr "%s ayinakukhishwa ngoba isadingeka namanje"
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:263
+#: ../zypp/solver/detail/Resolver_problems.cc:278
#, c-format
msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
msgstr ""
@@ -2759,38 +2759,38 @@
#. a second run with ALL possibilities has not been tried
#. possible other solutions skipped
#. give the user an additional solution for trying all branches
-#: ../zypp/solver/detail/Resolver_problems.cc:322
+#: ../zypp/solver/detail/Resolver_problems.cc:337
msgid "No valid solution found with just resolvables of best architecture."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:323
+#: ../zypp/solver/detail/Resolver_problems.cc:338
msgid "With this run only resolvables with the best architecture have been regarded.\n"
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:324
+#: ../zypp/solver/detail/Resolver_problems.cc:339
msgid "Regarding all possible resolvables takes time, but can come to a valid result."
msgstr ""
-#: ../zypp/solver/detail/Resolver_problems.cc:350
+#: ../zypp/solver/detail/Resolver_problems.cc:365
msgid "Invalid information"
msgstr "ukwaziswa okungasebenzi"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:357
+#: ../zypp/solver/detail/Resolver_problems.cc:372
#, c-format
msgid "%s is needed by other resolvables"
msgstr "%s idingwa ezinye izixazululi"
#. TranslatorExplanation %s = name of package, patch, selection ...
#. Translator: all.%s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:360
+#: ../zypp/solver/detail/Resolver_problems.cc:375
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140
#, c-format
msgid "%s is needed by %s"
msgstr "%s idingwa yi- %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:361
+#: ../zypp/solver/detail/Resolver_problems.cc:376
#, c-format
msgid ""
"%s is needed by:\n"
@@ -2800,7 +2800,7 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:368
+#: ../zypp/solver/detail/Resolver_problems.cc:383
#, c-format
msgid "%s conflicts with other resolvables"
msgstr "%s ixabana nezinye izixazululi"
@@ -2809,14 +2809,14 @@
#. Translator: all.%s = name of package, patch,...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is conflicting with multiple others
-#: ../zypp/solver/detail/Resolver_problems.cc:371
+#: ../zypp/solver/detail/Resolver_problems.cc:386
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55
#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70
#, c-format
msgid "%s conflicts with %s"
msgstr "%s ixabana ne- %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:373
+#: ../zypp/solver/detail/Resolver_problems.cc:388
#, c-format
msgid ""
"%s conflicts with:\n"
@@ -2826,24 +2826,24 @@
"%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:402
+#: ../zypp/solver/detail/Resolver_problems.cc:417
#, c-format
msgid "%s obsoletes other resolvables"
msgstr "%s yenza ezinye izixazululi zingasebenzi"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:405
+#: ../zypp/solver/detail/Resolver_problems.cc:420
#, c-format
msgid "%s obsoletes %s"
msgstr "%s yenza zingasebenzi %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:407
+#: ../zypp/solver/detail/Resolver_problems.cc:422
#, c-format
msgid "%s obsoletes:%s"
msgstr "%s yenza zingasebenzi:%s"
-#: ../zypp/solver/detail/Resolver_problems.cc:408
+#: ../zypp/solver/detail/Resolver_problems.cc:423
msgid ""
"\n"
"These resolvables will be deleted from the system."
@@ -2852,7 +2852,7 @@
"Lezi zixazululi zizosulwa kwisistimu."
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:416
+#: ../zypp/solver/detail/Resolver_problems.cc:431
#, c-format
msgid "%s depends on other resolvables"
msgstr "%s yenzike kwezinye izixazululi"
@@ -2860,38 +2860,38 @@
#. TranslatorExplanation %s = name of package, patch, selection ...
#. TranslatorExplanation: 1.%s name of package, 2.%s list of names
#. TranslatorExplanation: 1.%s is dependent on list of names
-#: ../zypp/solver/detail/Resolver_problems.cc:420
+#: ../zypp/solver/detail/Resolver_problems.cc:435
#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69
#, c-format
msgid "%s depends on %s"
msgstr "%s yencike kwi- %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:423
+#: ../zypp/solver/detail/Resolver_problems.cc:438
#, c-format
msgid "%s depends on:%s"
msgstr "%s yencike kwi-:%s"
#. TranslatorExplanation: currently it is unused.
-#: ../zypp/solver/detail/Resolver_problems.cc:429
+#: ../zypp/solver/detail/Resolver_problems.cc:444
msgid "Child of"
msgstr "Ingane ka-"
#. TranslatorExplanation %s = dependency
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:435
-#: ../zypp/solver/detail/Resolver_problems.cc:519
+#: ../zypp/solver/detail/Resolver_problems.cc:450
+#: ../zypp/solver/detail/Resolver_problems.cc:534
#, c-format
msgid "Cannot install %s"
msgstr "Ayikwazi ukufaka %s"
#. TranslatorExplanation %s = capability
-#: ../zypp/solver/detail/Resolver_problems.cc:437
+#: ../zypp/solver/detail/Resolver_problems.cc:452
#, c-format
msgid "None provides %s"
msgstr "Akukho okunikeza %s"
-#: ../zypp/solver/detail/Resolver_problems.cc:438
+#: ../zypp/solver/detail/Resolver_problems.cc:453
#, fuzzy
msgid ""
"\n"
@@ -2900,32 +2900,32 @@
"\n"
"Awukho umthombo otholakalayo osekela lemfuneko."
-#: ../zypp/solver/detail/Resolver_problems.cc:446
+#: ../zypp/solver/detail/Resolver_problems.cc:461
#, fuzzy
msgid "Due to the problems described above/below, this resolution will not solve all dependencies"
msgstr "Izinkinga ezidlulelwe yisikhathi ezichazwe ngenhla/ngezansi kwalokhu ngeke zixazulule zonke izinhlelo okuncikwe kuzo."
-#: ../zypp/solver/detail/Resolver_problems.cc:457
-#: ../zypp/solver/detail/Resolver_problems.cc:831
+#: ../zypp/solver/detail/Resolver_problems.cc:472
+#: ../zypp/solver/detail/Resolver_problems.cc:854
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting with %s"
msgstr "Ayikwazi ukufaka %s ngoba ixabana ne-%s"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:475
+#: ../zypp/solver/detail/Resolver_problems.cc:490
#, c-format
msgid "%s is not installed and has been marked as uninstallable"
msgstr "%s ayifakwanga futhi iye yaphawulwa njengengafakeki"
#. TranslatorExplanation %s = name of package,patch,...
-#: ../zypp/solver/detail/Resolver_problems.cc:487
+#: ../zypp/solver/detail/Resolver_problems.cc:502
#, c-format
msgid "Cannot install %s due to dependency problems"
msgstr "Ayikwazi ukufaka %s ngenxa yezinkinga zohlelo oluncike kwezinye"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:529
-#: ../zypp/solver/detail/Resolver_problems.cc:539
+#: ../zypp/solver/detail/Resolver_problems.cc:544
+#: ../zypp/solver/detail/Resolver_problems.cc:554
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
#, c-format
@@ -2933,8 +2933,8 @@
msgstr "Susa %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:532
-#: ../zypp/solver/detail/Resolver_problems.cc:542
+#: ../zypp/solver/detail/Resolver_problems.cc:547
+#: ../zypp/solver/detail/Resolver_problems.cc:557
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
#, c-format
@@ -2942,119 +2942,131 @@
msgstr "ungafaki %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:555
+#: ../zypp/solver/detail/Resolver_problems.cc:570
#, c-format
msgid "%s has unfulfilled requirements"
msgstr "%s inezimfuneko ezingagcwalisiwe"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:594
+#: ../zypp/solver/detail/Resolver_problems.cc:609
#, c-format
msgid "%s has missing dependencies"
msgstr "%s inezinhlelo encike kuzo ezilahlekile"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:642
+#: ../zypp/solver/detail/Resolver_problems.cc:657
#, c-format
msgid "%s cannot be installed due to missing dependencies"
msgstr "%s ayikwazi ukufkwa ngenxa yezinhlelo encike kuzo ezilahlekile"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:691
+#: ../zypp/solver/detail/Resolver_problems.cc:714
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be uninstalled"
msgstr "%s igcwalisa izinhlelo okuncikwe kuzo ze-%s kodwa izokhishwa"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:701
+#: ../zypp/solver/detail/Resolver_problems.cc:724
#, fuzzy, c-format
msgid "%s fulfills dependencies of %s but will be kept on your system"
msgstr "%s igcwalisa izinhlelo okuncikwe kuzo ze-%s kodwa izogcinwa kwisistimu yakho"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:711
+#: ../zypp/solver/detail/Resolver_problems.cc:734
#, c-format
msgid "No need to install %s"
msgstr "Asikho isidingo sokuyifaka %s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:719
+#: ../zypp/solver/detail/Resolver_problems.cc:742
#, fuzzy, c-format
msgid "Cannot install %s to fulfill the dependencies of %s"
msgstr "Ayikwazi ukufaka %s ukuze igcwalise izinhlelo okuncikwe kuzo ze-%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:734
+#: ../zypp/solver/detail/Resolver_problems.cc:757
#, c-format
msgid "Cannot install %s to fulfil the dependencies of %s"
msgstr "Ayikwazi ukufaka %s ukuze igcwalise izinhlelo okuncikwe kuzo ze-%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:772
-#: ../zypp/solver/detail/Resolver_problems.cc:780
+#: ../zypp/solver/detail/Resolver_problems.cc:795
+#: ../zypp/solver/detail/Resolver_problems.cc:803
#, fuzzy, c-format
msgid "%s will not be uninstalled, because it is still required"
msgstr "%s ayinakukhishwa ngoba isadingeka namanje"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:803
+#: ../zypp/solver/detail/Resolver_problems.cc:826
#, fuzzy, c-format
msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked."
msgstr "%s yenza ingasebenzi i-%s. Kodwa %s ayikwazi ukususwa ngoba ihluthulelwe."
-#: ../zypp/solver/detail/Resolver_problems.cc:835
+#: ../zypp/solver/detail/Resolver_problems.cc:858
#, fuzzy, c-format
msgid "Cannot install %s, because it is conflicting"
msgstr "Ayikwazi ukufaka %s ngoba iyaxabana"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/Resolver_problems.cc:857
+#: ../zypp/solver/detail/Resolver_problems.cc:880
#, c-format
msgid "%s is uninstallable due to conflicts with %s"
msgstr "%s ayifakeki ngenxa yokuxabana ne- %s"
#. TranslatorExplanation %s = name requirement ...
-#: ../zypp/solver/detail/Resolver_problems.cc:871
+#: ../zypp/solver/detail/Resolver_problems.cc:894
#, c-format
msgid "Requirememt %s cannot be fulfilled."
msgstr ""
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:54
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55
msgid "Ignore this requirement just here"
msgstr "Sishaye indiva lesi sidingo lapha nje kuphela"
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:63
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64
#, fuzzy
msgid "Generally ignore this requirement"
msgstr "Sishaye indiva lesi sidingo lapha nje kuphela"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:75
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76
#, c-format
msgid "Install %s although it would change the architecture"
msgstr "Faka %s nakuba izoshintsha ubuciko bomklamo"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:78
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79
#, fuzzy, c-format
msgid "%s provides this dependency, but would change the architecture of the installed item"
msgstr "%s ihlinzeka ngalolu hlelo okuncikwe kulo kodwa ingabushintsha ubuciko bomklamo bento efakiwe"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:102
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89
+#, fuzzy, c-format
+msgid "Install %s although it would change the vendor"
+msgstr "Faka %s nakuba izoshintsha ubuciko bomklamo"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92
+#, fuzzy, c-format
+msgid "%s provides this dependency, but would change the vendor of the installed item"
+msgstr "%s ihlinzeka ngalolu hlelo okuncikwe kulo kodwa ingabushintsha ubuciko bomklamo bento efakiwe"
+
+#. TranslatorExplanation %s = name of package, patch, selection ...
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116
#, c-format
msgid "Ignore this conflict of %s"
msgstr "Kushaye indiva lokhu kuxabana kwe-%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131
#, c-format
msgid "Ignore the obsolete %s in %s"
msgstr "Ishaye indiva into engasebenzi i-%s e-%s"
#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:130
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144
#, c-format
msgid "Ignore that %s is already set to install"
msgstr "Kushaye indiva ukuthi i-%s isisethelwe ukufakwa kakade"
@@ -3065,7 +3077,7 @@
msgstr "Ungafaki noma ususe maqondana nezixazululi"
#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,...
-#: ../zypp/solver/detail/QueueItemRequire.cc:738
+#: ../zypp/solver/detail/QueueItemRequire.cc:763
#, c-format
msgid "for requiring %s for %s when upgrading %s"
msgstr "ngokudinga i-%s ye-%s lapho kuvuselelwa uhlelo %s"
@@ -3316,8 +3328,14 @@
msgid "%s provides %s, but has another architecture."
msgstr "%s ihlinzeka nge-%s, kodwa inobunye ubuciko bomklamo."
-#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID
#: ../zypp/solver/detail/ResolverInfoMisc.cc:469
+#, fuzzy, c-format
+msgid "%s provides %s, but has another vendor (%s)."
+msgstr "%s ihlinzeka nge-%s, kodwa inobunye ubuciko bomklamo."
+
+#. Translator: 1.%s = dependency. 2.%s name of package, patch, ...
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:487
#, c-format
msgid "Can't satisfy requirement %s for %s"
msgstr "Ayikwazi ukwanelisa isidingo se-%s ye-%s"
@@ -3329,7 +3347,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:490
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:508
#, fuzzy, c-format
msgid "%s is required by another resolvable selected for installation, so it won't be unlinked."
msgstr "%s idingwa ngesinye isixazululi esifakiwe, ngakho ngeke ingalinkeki."
@@ -3341,7 +3359,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked.
#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:507
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:525
#, fuzzy, c-format
msgid "%s is required by another installed resolvable, so it won't be unlinked."
msgstr "%s idingwa ngesinye isixazululi esifakiwe, ngakho ngeke ingalinkeki."
@@ -3353,7 +3371,7 @@
#. Translator: %s = name of package,patch,...
#. TranslatorExample: foo is locked and cannot be uninstalled.
#. TranslatorExplanation: foo is to-be-uninstalled but it is locked
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:524
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:542
#, c-format
msgid "%s is locked and cannot be uninstalled."
msgstr "%s ihluthulelwe futhi ngeke ikwazi ukukhipheka."
@@ -3364,7 +3382,7 @@
#. other_capability() = conflict capability
#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,...
#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:543
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
#, fuzzy, c-format
msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation"
msgstr "Ingxabano nge-%s (%s) idinga ukususwa kwe-%s ezofakwa "
@@ -3375,23 +3393,23 @@
#. other_capability() = conflict capability from issuer
#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency;
#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar)
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:561
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:579
#, c-format
msgid "Marking %s as uninstallable due to conflicts over %s"
msgstr "Ukuphawula i-%s njengengafakeki ngenxa yezingxabano nge-%s"
#. Translator: %s = name of package,patch
#. TranslatorExample: from abc
-#: ../zypp/solver/detail/ResolverInfoMisc.cc:569
+#: ../zypp/solver/detail/ResolverInfoMisc.cc:587
#, c-format
msgid "from %s"
msgstr "ivela %s"
-#: ../zypp/solver/detail/ResolverInfo.cc:194
+#: ../zypp/solver/detail/ResolverInfo.cc:195
msgid " Error!"
msgstr "Iphutha!"
-#: ../zypp/solver/detail/ResolverInfo.cc:195
+#: ../zypp/solver/detail/ResolverInfo.cc:196
msgid " Important!"
msgstr "Kubalulekile!"
@@ -3448,9 +3466,9 @@
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122
-#, fuzzy, c-format
-msgid "%s is freshened by %s"
-msgstr "%s idingwa yi- %s"
+#, c-format
+msgid "%s will be evaluated for installation (freshened) by %s"
+msgstr ""
#. Translator: all.%s = name of package,patch,...
#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78
@@ -4769,6 +4787,10 @@
"Bekulindeleke %s, kwatholakala %s\n"
" Nokho yisebenzise ifayela?"
+#, fuzzy
+#~ msgid "%s is freshened by %s"
+#~ msgstr "%s idingwa yi- %s"
+
#~ msgid "Unable to parse Url authority"
#~ msgstr "Ayikwazi ukucaza igunya le-Url"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7082 - /trunk/updater-gnome/package/opensuse-updater-gnome.changes
by joshkress@svn.opensuse.org 03 Sep '07
by joshkress@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: joshkress
Date: Mon Sep 3 12:58:09 2007
New Revision: 7082
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7082&view=rev
Log:
changes
Modified:
trunk/updater-gnome/package/opensuse-updater-gnome.changes
Modified: trunk/updater-gnome/package/opensuse-updater-gnome.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/package/opensuse-u…
==============================================================================
--- trunk/updater-gnome/package/opensuse-updater-gnome.changes (original)
+++ trunk/updater-gnome/package/opensuse-updater-gnome.changes Mon Sep 3 12:58:09 2007
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Tue Sep 3 12:49:55 CEST 2007 - jkress(a)suse.de
+
+- took care of yet another Gtk-CRITICAL
+
+-------------------------------------------------------------------
Tue Sep 3 11:40:21 CEST 2007 - jkress(a)suse.de
- fixed bug #306700
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7081 - in /trunk/updater-gnome/src: updater-callbacks.c updater.c
by joshkress@svn.opensuse.org 03 Sep '07
by joshkress@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: joshkress
Date: Mon Sep 3 12:55:52 2007
New Revision: 7081
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7081&view=rev
Log:
- took care of another Gtk-Critical
Modified:
trunk/updater-gnome/src/updater-callbacks.c
trunk/updater-gnome/src/updater.c
Modified: trunk/updater-gnome/src/updater-callbacks.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-callba…
==============================================================================
--- trunk/updater-gnome/src/updater-callbacks.c (original)
+++ trunk/updater-gnome/src/updater-callbacks.c Mon Sep 3 12:55:52 2007
@@ -286,7 +286,7 @@
{
SUSEUpdater *updater = user_data;
- gtk_widget_hide(widget);
+ gtk_widget_hide (widget);
updater->preferences_win_shown = FALSE;
updater_ui_update(updater);
return TRUE;
Modified: trunk/updater-gnome/src/updater.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater.c?rev=…
==============================================================================
--- trunk/updater-gnome/src/updater.c (original)
+++ trunk/updater-gnome/src/updater.c Mon Sep 3 12:55:52 2007
@@ -95,11 +95,13 @@
// g_print ("Destroying backend.\n");
backend_destroy (updater->backend);
}
+ /*
if (updater->preferences_window)
{
- // g_print ("Destroying preferces window.\n");
+ g_print ("Destroying preferces window.\n");
gtk_widget_destroy (updater->preferences_window);
}
+ */
if (updater->update_timer)
g_timer_destroy (updater->update_timer);
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7080 - /trunk/updater-kde/package/opensuse-updater-kde.changes
by tgoettlicher@svn.opensuse.org 03 Sep '07
by tgoettlicher@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: tgoettlicher
Date: Mon Sep 3 12:52:40 2007
New Revision: 7080
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7080&view=rev
Log:
changes
Modified:
trunk/updater-kde/package/opensuse-updater-kde.changes
Modified: trunk/updater-kde/package/opensuse-updater-kde.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/package/opensuse-upd…
==============================================================================
--- trunk/updater-kde/package/opensuse-updater-kde.changes (original)
+++ trunk/updater-kde/package/opensuse-updater-kde.changes Mon Sep 3 12:52:40 2007
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Mon Sep 3 12:49:17 CEST 2007 - tgoettlicher(a)suse.de
+
+- updated translations
+- r7079
+
+-------------------------------------------------------------------
+Mon Sep 3 12:40:00 CEST 2007 - tgoettlicher(a)suse.de
+
+- fixed bug that prevented install of pkg-mgr-patch
+- r7078
+
+-------------------------------------------------------------------
Fri Aug 31 09:38:46 CEST 2007 - tgoettlicher(a)suse.de
- improved error handling
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
03 Sep '07
Author: tgoettlicher
Date: Mon Sep 3 12:50:16 2007
New Revision: 7079
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7079&view=rev
Log:
updated translations
Modified:
trunk/updater-kde/po/zh_TW.po
Modified: trunk/updater-kde/po/zh_TW.po
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/po/zh_TW.po?rev=7079…
==============================================================================
--- trunk/updater-kde/po/zh_TW.po (original)
+++ trunk/updater-kde/po/zh_TW.po Mon Sep 3 12:50:16 2007
@@ -3,6 +3,7 @@
#
msgid ""
msgstr ""
+"Plural-Forms: nplurals=1; plural=0;\n"
"Project-Id-Version: opensuseupdater\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-08-27 16:28+0200\n"
@@ -14,9 +15,8 @@
"Content-Transfer-Encoding: 8bit\n"
#: ../po/rc.cpp:3
-#, fuzzy, no-c-format
msgid "Check for updates every:"
-msgstr "檢æ¥æ´æ°æ¯é "
+msgstr "檢æ¥æ´æ°æ¯éï¼"
#: ../po/rc.cpp:6
#, no-c-format
@@ -24,9 +24,8 @@
msgstr "å°æ"
#: ../po/rc.cpp:8
-#, fuzzy, no-c-format
msgid "Show recurring notification when updates are available every:"
-msgstr "ç¶æå¯ç¨çæ´æ°ï¼ééå¤ä¹
顯示ä¸æ¬¡è¦åã"
+msgstr "ç¶æå¯ç¨çæ´æ°ï¼ééå¤ä¹
顯示ä¸æ¬¡è¦åï¼"
#: ../po/rc.cpp:11
#, no-c-format
@@ -79,9 +78,8 @@
msgstr "顯示å¯ç¨åç´(å
æä¾å°å®¶ä½¿ç¨)ã"
#: ../po/rc.cpp:35
-#, fuzzy, no-c-format
msgid "Show notifications."
-msgstr "顯示éç¥"
+msgstr "顯示éç¥ã"
#: ../updater/simpleview.cpp:39 ../updater/simpleview.cpp:200
#: ../updater/simpleview.cpp:217
@@ -94,11 +92,9 @@
#: ../updater/simpleview.cpp:50 ../updater/simpleview.cpp:55
#: ../updater/simpleview.cpp:225
-#, fuzzy, c-format
msgid "Install %n recommended update additionally"
msgid_plural "Install %n recommended updates additionally"
-msgstr[0] "éå å®è£ %s å建è°çæ´æ°"
-msgstr[1] "éå å®è£ %s å建è°çæ´æ°"
+msgstr[0] "éå å®è£ %n å建è°çæ´æ°"
#: ../updater/simpleview.cpp:58
msgid "Don't install updates that require a restart"
@@ -131,21 +127,16 @@
msgstr "æéæ¼æ¨çæ´æ°ç¨å¼çæ´æ°ã"
#: ../updater/simpleview.cpp:218
-#, fuzzy, c-format
msgid "%n security update is available"
msgid_plural "%n security updates are available"
-msgstr[0] "æ %1 åå®å
¨æ§æ´æ°"
-msgstr[1] "æ %1 åå®å
¨æ§æ´æ°"
+msgstr[0] "æ %n åå®å
¨æ§æ´æ°"
#: ../updater/simpleview.cpp:232
-#, fuzzy, c-format
msgid "%n recommended update is available"
msgid_plural "%n recommended updates are available"
-msgstr[0] "æ %1 å建è°çæ´æ°"
-msgstr[1] "æ %1 å建è°çæ´æ°"
+msgstr[0] "æ %n å建è°çæ´æ°"
#: ../updater/simpleview.cpp:261
-#, fuzzy, c-format
msgid ""
"%n optional update is available.\n"
"You can select optional updates in the detailed dialog."
@@ -153,10 +144,7 @@
"%n optional updates are available.\n"
"You can select optional updates in the detailed dialog."
msgstr[0] ""
-"æ %1 åå¯é¸çæ´æ°ã\n"
-"æ¨å¯ä»¥å¨è©³ç´°è³æå°è©±æ¡ä¸é¸æå¯é¸çæ´æ°ã"
-msgstr[1] ""
-"æ %1 åå¯é¸çæ´æ°ã\n"
+"æ %n åå¯é¸çæ´æ°ã\n"
"æ¨å¯ä»¥å¨è©³ç´°è³æå°è©±æ¡ä¸é¸æå¯é¸çæ´æ°ã"
#: ../updater/simpleview.cpp:268
@@ -168,12 +156,11 @@
msgstr "<b>ç¡æ³æª¢æ¥æ¯å¦æå¯ç¨çæ´æ°ã</b>"
#: ../updater/simpleview.cpp:280
-#, fuzzy
msgid ""
"Please use \"Add/Remove Update Sources...\"\n"
"from the tray icon menu to define an update repository."
msgstr ""
-"è«ç±ç³»çµ±å¤¾å示é¸å®ä¸ä½¿ç¨\n"
+"è«ç±ç³»çµ±å£å示é¸å®ä¸ä½¿ç¨\n"
"\"æ°å¢/移é¤æ´æ°ä¾æº...\"ä¾å®ç¾©æ´æ°å¥ä»¶åº«ã"
#: ../updater/UpdaterApplication.cpp:83
@@ -334,9 +321,8 @@
msgstr "ç«å»æª¢æ¥"
#: ../updater/MainWindow.cpp:126
-#, fuzzy
msgid "The following official patches for openSUSE either fix security holes or errors in the software."
-msgstr "ä¸å openSUSE çå®æ¹ä¿®æ£ç¨å¼åçºä¿®æ£è»é«çå®å
¨æ¼æ´æå´éé¯èª¤ã<br>å¼·ç建è°æ¨å®è£ä»åã"
+msgstr "ä¸å openSUSE çå®æ¹ä¿®æ£ç¨å¼åçºä¿®æ£è»é«çå®å
¨æ¼æ´æå´éé¯èª¤ã"
#: ../updater/MainWindow.cpp:128 ../updater/MainWindow.cpp:166
msgid "Name"
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7078 - in /trunk/updater-kde/updater: MainWindow.cpp simpleview.cpp zypp/ZYppUpdater.cpp
by tgoettlicher@svn.opensuse.org 03 Sep '07
by tgoettlicher@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: tgoettlicher
Date: Mon Sep 3 12:46:57 2007
New Revision: 7078
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7078&view=rev
Log:
fixed bug that prevented install of pkg-mgr-patches
Modified:
trunk/updater-kde/updater/MainWindow.cpp
trunk/updater-kde/updater/simpleview.cpp
trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
Modified: trunk/updater-kde/updater/MainWindow.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.c…
==============================================================================
--- trunk/updater-kde/updater/MainWindow.cpp (original)
+++ trunk/updater-kde/updater/MainWindow.cpp Mon Sep 3 12:46:57 2007
@@ -631,7 +631,8 @@
QCheckListItem *item = (QCheckListItem*)patchList->firstChild();
while (item != NULL) {
- if (item->text(COLUMN_TYPE).lower() == "recommended" &&
+ if ((item->text(COLUMN_TYPE).lower() == "recommended" ||
+ item->text(COLUMN_TYPE).lower() == "packagemanager" ) &&
(!onlySelected || item->isOn()))
count++;
Modified: trunk/updater-kde/updater/simpleview.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.c…
==============================================================================
--- trunk/updater-kde/updater/simpleview.cpp (original)
+++ trunk/updater-kde/updater/simpleview.cpp Mon Sep 3 12:46:57 2007
@@ -152,6 +152,10 @@
QTimer::singleShot(0, this, SLOT(hide()));
}
+
+ // perhaps someone has changed selection within detail view
+ // => update button selection
+ updateSelection();
}
void SimpleView::setDetailWindow(MainWindow * detailWindow)
Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpd…
==============================================================================
--- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original)
+++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Mon Sep 3 12:46:57 2007
@@ -449,6 +449,12 @@
kdDebug() << "_process" << endl;
_process = new KProcess;
+
+ kdDebug() << "patches:" << installPatchList << endl;
+ kdDebug() << "packages:" << installPackageList << endl;
+
+
+
QString command="/usr/sbin/zypper_install";
*_process << command << "--patch" << installPatchList << "--package" << installPackageList;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7077 - in /trunk/zypper: package/zypper.changes src/zypper-misc.cc
by kkaempf@svn.opensuse.org 03 Sep '07
by kkaempf@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: kkaempf
Date: Mon Sep 3 12:35:11 2007
New Revision: 7077
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7077&view=rev
Log:
- make (r)etry (c)ancel answer case-insensitive (#307122)
Modified:
trunk/zypper/package/zypper.changes
trunk/zypper/src/zypper-misc.cc
Modified: trunk/zypper/package/zypper.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re…
==============================================================================
--- trunk/zypper/package/zypper.changes (original)
+++ trunk/zypper/package/zypper.changes Mon Sep 3 12:35:11 2007
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Mon Sep 3 12:34:35 CEST 2007 - kkaempf(a)suse.de
+
+- make (r)etry (c)ancel answer case-insensitive (#307122)
+
+-------------------------------------------------------------------
Fri Aug 31 14:35:01 CEST 2007 - jkupec(a)suse.cz
- fixed error message of zypper ar -r (#306667)
Modified: trunk/zypper/src/zypper-misc.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=70…
==============================================================================
--- trunk/zypper/src/zypper-misc.cc (original)
+++ trunk/zypper/src/zypper-misc.cc Mon Sep 3 12:35:11 2007
@@ -1,5 +1,6 @@
#include <fstream>
#include <sstream>
+#include <ctype.h>
#include <boost/format.hpp>
#include <boost/logic/tribool_io.hpp>
@@ -453,6 +454,9 @@
cerr_v << "cin: " << cin.rdstate() << endl;
return false;
}
+ if (isupper( reply_s[0] ))
+ reply_s[0] = tolower( reply_s[0] );
+
// translators: corresponds to (r)etry
if (reply_s == _("r"))
return true;
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7076 - /trunk/updater-gnome/package/opensuse-updater-gnome.changes
by joshkress@svn.opensuse.org 03 Sep '07
by joshkress@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: joshkress
Date: Mon Sep 3 11:48:28 2007
New Revision: 7076
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7076&view=rev
Log:
changes
Modified:
trunk/updater-gnome/package/opensuse-updater-gnome.changes
Modified: trunk/updater-gnome/package/opensuse-updater-gnome.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/package/opensuse-u…
==============================================================================
--- trunk/updater-gnome/package/opensuse-updater-gnome.changes (original)
+++ trunk/updater-gnome/package/opensuse-updater-gnome.changes Mon Sep 3 11:48:28 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Sep 3 11:40:21 CEST 2007 - jkress(a)suse.de
+
+- fixed bug #306700
+- r7075
+
+-------------------------------------------------------------------
Tue Sep 3 11:08:22 CEST 2007 - jkress(a)suse.de
- fixed bug #300461: No more SIGABRT on quitting
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7075 - in /trunk/updater-gnome/src: updater-support.c updater.c
by joshkress@svn.opensuse.org 03 Sep '07
by joshkress@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: joshkress
Date: Mon Sep 3 11:47:00 2007
New Revision: 7075
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7075&view=rev
Log:
- fixed bug #306700 actually not so minor
Modified:
trunk/updater-gnome/src/updater-support.c
trunk/updater-gnome/src/updater.c
Modified: trunk/updater-gnome/src/updater-support.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-suppor…
==============================================================================
--- trunk/updater-gnome/src/updater-support.c (original)
+++ trunk/updater-gnome/src/updater-support.c Mon Sep 3 11:47:00 2007
@@ -334,7 +334,7 @@
g_free(str);
/* We have only additional updates */
- if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended)) && (mandatory_count == 0))
+ if ((mandatory_count == 0) && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (updater->simple_window_checkbuttonRecommended)))
{
/* Only additional available and they are deselected */
gtk_widget_set_sensitive (updater->simple_window_buttonInstall, FALSE);
Modified: trunk/updater-gnome/src/updater.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater.c?rev=…
==============================================================================
--- trunk/updater-gnome/src/updater.c (original)
+++ trunk/updater-gnome/src/updater.c Mon Sep 3 11:47:00 2007
@@ -211,9 +211,9 @@
updater->simple_window_checkbuttonRestart = glade_xml_get_widget(updater->simple_window_xml,
"checkbuttonRestart");
updater->simple_window_buttonDetails = glade_xml_get_widget(updater->simple_window_xml,
- "SimpleInstallButton");
- updater->simple_window_buttonInstall = glade_xml_get_widget(updater->simple_window_xml,
"DetailsButton");
+ updater->simple_window_buttonInstall = glade_xml_get_widget(updater->simple_window_xml,
+ "SimpleInstallButton");
/* autoconnect the signals in the interface */
glade_xml_signal_autoconnect(updater->simple_window_xml);
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7074 - /trunk/updater-gnome/package/opensuse-updater-gnome.changes
by joshkress@svn.opensuse.org 03 Sep '07
by joshkress@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: joshkress
Date: Mon Sep 3 11:09:59 2007
New Revision: 7074
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7074&view=rev
Log:
changes
Modified:
trunk/updater-gnome/package/opensuse-updater-gnome.changes
Modified: trunk/updater-gnome/package/opensuse-updater-gnome.changes
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/package/opensuse-u…
==============================================================================
--- trunk/updater-gnome/package/opensuse-updater-gnome.changes (original)
+++ trunk/updater-gnome/package/opensuse-updater-gnome.changes Mon Sep 3 11:09:59 2007
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Tue Sep 3 11:08:22 CEST 2007 - jkress(a)suse.de
+
+- fixed bug #300461: No more SIGABRT on quitting
+- fixed all Gtk-CRITICAL messages on quitting
+- fixed all GLib-critical messages on quitting
+- removed all g_prints connected to these problems
+- r7073
+
+-------------------------------------------------------------------
Fri Aug 30 18:48:59 CEST 2007 - jkress(a)suse.de
- fixed segfault
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7073 - in /trunk/updater-gnome/src: updater-applet-callbacks.c updater-applet.c updater-backend.c updater.c zypp/updater-zypp.c
by joshkress@svn.opensuse.org 03 Sep '07
by joshkress@svn.opensuse.org 03 Sep '07
03 Sep '07
Author: joshkress
Date: Mon Sep 3 11:07:36 2007
New Revision: 7073
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7073&view=rev
Log:
- fixed bug #300461: No more SIGABRT on quitting
- fixed all Gtk-CRITICAL messages on quitting
- fixed all GLib-critical messages on quitting
- removed all g_prints connected to these problems
Modified:
trunk/updater-gnome/src/updater-applet-callbacks.c
trunk/updater-gnome/src/updater-applet.c
trunk/updater-gnome/src/updater-backend.c
trunk/updater-gnome/src/updater.c
trunk/updater-gnome/src/zypp/updater-zypp.c
Modified: trunk/updater-gnome/src/updater-applet-callbacks.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet…
==============================================================================
--- trunk/updater-gnome/src/updater-applet-callbacks.c (original)
+++ trunk/updater-gnome/src/updater-applet-callbacks.c Mon Sep 3 11:07:36 2007
@@ -57,8 +57,8 @@
// TODO add debug message
// TODO properly destroy
-
- updater_destroy(applet->updater);
+ if (applet->updater)
+ updater_destroy(applet->updater);
return TRUE;
}
@@ -171,9 +171,11 @@
guint action,
GtkWidget *widget)
{
- // UpdaterApplet *applet = (UpdaterApplet *) callback_data;
- // updater_destroy(applet->updater);
- g_printf("We are now calling gtk_main_quit from the callback function.\n");
+ // g_print ("We're now in the applet_quit callback.\n");
+ UpdaterApplet *applet = (UpdaterApplet *) callback_data;
+ // g_print ("applet_quit: calling updater_destroy!\n");
+ updater_destroy(applet->updater);
+ // g_print ("applet_quit: calling gtk_main_quit!\n");
gtk_main_quit ();
}
Modified: trunk/updater-gnome/src/updater-applet.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-applet…
==============================================================================
--- trunk/updater-gnome/src/updater-applet.c (original)
+++ trunk/updater-gnome/src/updater-applet.c Mon Sep 3 11:07:36 2007
@@ -207,7 +207,9 @@
static void
destroy_applet (UpdaterApplet *applet)
{
- updater_destroy (applet->updater);
+ // g_print ("updater-applet.c: destroy applet!\n");
+ // if (applet->updater)
+ // updater_destroy (applet->updater);
g_free (applet);
}
@@ -275,7 +277,7 @@
applet = create_applet ();
gtk_main ();
- g_printf("updater-applet-main: Did we get here?\n");
+ // g_printf("updater-applet-main: Did we get here?\n");
destroy_applet (applet);
return 0;
Modified: trunk/updater-gnome/src/updater-backend.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-backen…
==============================================================================
--- trunk/updater-gnome/src/updater-backend.c (original)
+++ trunk/updater-gnome/src/updater-backend.c Mon Sep 3 11:07:36 2007
@@ -20,7 +20,7 @@
void backend_destroy(UpdaterBackend *backend)
{
- zypp_backend_destroy(backend);
+ // zypp_backend_destroy(backend);
// (*(backend->destroy)) (backend);
if (backend->poutbuf)
@@ -29,7 +29,29 @@
g_free(backend->perrbuf);
backend_free_update_list(backend);
-
+
+ /* Freeing the update list strings */
+ if (backend->updates_list_security)
+ g_string_free(backend->updates_list_security, TRUE);
+
+ if (backend->updates_list_security_needrestart)
+ g_string_free(backend->updates_list_security_needrestart, TRUE);
+
+ if (backend->updates_list_recommended_patches)
+ g_string_free(backend->updates_list_recommended_patches, TRUE);
+
+ if (backend->updates_list_recommended_patches_needrestart)
+ g_string_free(backend->updates_list_recommended_patches_needrestart, TRUE);
+
+ if (backend->updates_list_optional_patches)
+ g_string_free(backend->updates_list_optional_patches, TRUE);
+
+ if (backend->updates_list_optional_patches_needrestart)
+ g_string_free(backend->updates_list_optional_patches_needrestart, TRUE);
+
+ if (backend->updates_list_third_party_packages)
+ g_string_free(backend->updates_list_third_party_packages, TRUE);
+
g_free(backend);
}
Modified: trunk/updater-gnome/src/updater.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater.c?rev=…
==============================================================================
--- trunk/updater-gnome/src/updater.c (original)
+++ trunk/updater-gnome/src/updater.c Mon Sep 3 11:07:36 2007
@@ -76,16 +76,32 @@
void updater_destroy(SUSEUpdater *updater)
{
+ // g_print ("We're in updater_destroy now.\n");
if (updater)
{
+ // g_print ("We have an updater object. Destroying now.\n");
if (updater->main_window)
+ {
+ // g_print ("Destroying main window.\n");
gtk_widget_destroy (updater->main_window);
+ }
if (updater->simple_window)
+ {
+ // g_print ("Destroying simple window.\n");
gtk_widget_destroy (updater->simple_window);
+ }
if (updater->backend)
+ {
+ // g_print ("Destroying backend.\n");
backend_destroy (updater->backend);
+ }
if (updater->preferences_window)
+ {
+ // g_print ("Destroying preferces window.\n");
gtk_widget_destroy (updater->preferences_window);
+ }
+ if (updater->update_timer)
+ g_timer_destroy (updater->update_timer);
g_free(updater);
}
Modified: trunk/updater-gnome/src/zypp/updater-zypp.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/zypp/updater-z…
==============================================================================
--- trunk/updater-gnome/src/zypp/updater-zypp.c (original)
+++ trunk/updater-gnome/src/zypp/updater-zypp.c Mon Sep 3 11:07:36 2007
@@ -291,8 +291,6 @@
GPid zypp_install_start(UpdaterBackend *backend)
{
GPid pid;
- GString *zypper_cmd_patches;
- GString *zypper_cmd_packages;
GString *zypper_gui_cmd = g_string_new("/usr/sbin/updater-zypper-gui ");
GError *error = NULL;
gchar *tmp;
@@ -469,6 +467,7 @@
if (!gnomesu_spawn_command_async("root", install_argv, &pid))
return 0;
+ g_string_free(zypper_gui_cmd, TRUE);
g_free(install_argv);
return pid;
}
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0
[zypp-commit] r7072 - /trunk/libzypp/zypp/repo/RepoProvideFile.cc
by dmacvicar@svn.opensuse.org 02 Sep '07
by dmacvicar@svn.opensuse.org 02 Sep '07
02 Sep '07
Author: dmacvicar
Date: Sun Sep 2 17:48:48 2007
New Revision: 7072
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7072&view=rev
Log:
missing quote
Modified:
trunk/libzypp/zypp/repo/RepoProvideFile.cc
Modified: trunk/libzypp/zypp/repo/RepoProvideFile.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoProvideFil…
==============================================================================
--- trunk/libzypp/zypp/repo/RepoProvideFile.cc (original)
+++ trunk/libzypp/zypp/repo/RepoProvideFile.cc Sun Sep 2 17:48:48 2007
@@ -158,7 +158,7 @@
}
else
{
- WAR << "No media verifier for repo '" << info.alias() << endl;
+ WAR << "No media verifier for repo '" << info.alias() << "'" << endl;
}
}
else
--
To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: zypp-commit+help(a)opensuse.org
1
0