Mailinglist Archive: zypp-commit (606 mails)

< Previous

Next >

Author: schubi2
Date: Mon Apr 28 15:25:19 2008
New Revision: 9860

URL: http://svn.opensuse.org/viewcvs/zypp?rev=9860&view=rev
Log:
latest 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=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/af.po (original)
+++ trunk/libzypp/po/af.po Mon Apr 28 15:25:19 2008
@@ -5,7 +5,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
"PO-Revision-Date: 2006-11-03 12:03\n"
"Last-Translator: Novell Language <language@xxxxxxxxxx>\n"
"Language-Team: Novell Language <language@xxxxxxxxxx>\n"
@@ -13,7 +13,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

-#: ../zypp/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:933
#, fuzzy
msgid ""
"\n"
@@ -25,61 +25,49 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:880
#, fuzzy, c-format
msgid "%s conflicts with %s provided by %s"
msgstr "%s verkeer in konflik met %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "%s installasie misluk"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "%s geÃ¯nstalleer is goed"

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:866
#, fuzzy, c-format
msgid "%s is not installable"
msgstr "nie geÃ¯nstalleer nie"

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, fuzzy, c-format
msgid "%s obsoletes %s provided by %s"
msgstr "%s uitgediendes %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, 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:93
-#, 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"
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "%s verwyder het misluk"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "%s verwyder is goed"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -104,12 +92,12 @@
msgid "Adangme"
msgstr "Adangme"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
msgstr ""

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "Bykomende rpm-uitset:"

@@ -322,7 +310,7 @@
msgid "Austronesian (Other)"
msgstr "Austronesies (ander)"

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr ""
@@ -586,7 +574,7 @@
msgid "Buginese"
msgstr "Boeginees"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
@@ -636,7 +624,7 @@
msgid "Cameroon"
msgstr "Kameroen"

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:147
#, fuzzy
msgid "Can not create sat-pool."
msgstr "Kan die lÃªer nie skep nie."
@@ -645,10 +633,6 @@
msgid "Can't acquire the mutex lock"
msgstr "Kan die mutex-slot nie verkry nie"

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
@@ -678,6 +662,11 @@
msgid "Can't initialize recursive mutex"
msgstr "Kan terugkerende mutex nie inisialiseer nie"

+#: ../zypp/base/InterProcessMutex.cc:79
+#, fuzzy, c-format
+msgid "Can't open lock file: %s"
+msgstr "Kan lÃªer '%1' nie open nie."
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -688,12 +677,7 @@
msgid "Can't open pty (%s)."
msgstr "Couldn't open file: %s."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "Kan lÃªer '%1' nie open nie."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, fuzzy, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr "Kan %s vanaf %s nie voorsien nie"
@@ -702,10 +686,6 @@
msgid "Can't release the mutex lock"
msgstr "Kan die mutex-slot nie ontsluit nie"

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr "Kan terugkerende mutex-eienskappe nie stel nie"
@@ -801,7 +781,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Gewysigde konfigurasielÃªers vir %s:"
@@ -1067,11 +1047,6 @@
msgid "Djibouti"
msgstr "Djiboeti"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
-msgid "Do not install or delete the resolvables concerned"
-msgstr "Moenie waar oplossings ter sprake is, installeer of skrap nie"
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1117,7 +1092,7 @@
msgstr "Duala"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1230,11 +1205,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""

-#: ../zypp/Repository.cc:141
-#, fuzzy
-msgid "Error reading solv-file: "
-msgstr "Fout tydens lees van sektor %u."
-
#. language code: myv
#: ../zypp/LanguageCode.cc:850
msgid "Erzya"
@@ -1275,7 +1245,7 @@
msgid "Failed to delete key."
msgstr "Misluk om die SM te begin."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1285,7 +1255,7 @@
msgid "Failed to mount %s on %s"
msgstr "Kan %s - %s nie open nie\n"

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, fuzzy, c-format
msgid "Failed to remove public key %s: %s"
msgstr "Kan die openbare sleutel nie kry nie."
@@ -1524,9 +1494,9 @@
msgid "Geez"
msgstr "Geez"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
#, fuzzy
-msgid "Generally ignore this requirement"
+msgid "Generally ignore of some dependecies"
msgstr "Ignoreer diÃ© vereiste net hier"

#. :GRD:308:
@@ -1817,27 +1787,10 @@
msgstr "Igbo"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr "Ignoreer dat %s reeds gestel is om te installeer"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
-#, 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:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr "Ignoreer hierdie konflik van %s"
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
-msgstr "Ignoreer diÃ© vereiste net hier"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
+#, fuzzy, c-format
+msgid "Ignore some dependencies of %s"
+msgstr "kon afhanklikhede nie oplos nie"

#. language code: ijo
#: ../zypp/LanguageCode.cc:630
@@ -1884,23 +1837,7 @@
msgid "Ingush"
msgstr "Ingush"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, 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:90
-#, fuzzy, c-format
-msgid "Install %s although it would change the vendor"
-msgstr "Installeer %s, hoewel dit die argitektuur kan verander"
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr "Installeer ontbrekende oplossings"
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr "Installasie is gestaak soos gelas."

@@ -1974,7 +1911,12 @@
msgid "Invalid port component '%s'"
msgstr "Ongeldige poortkomponent '%s'"

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr ""
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
#, fuzzy
msgid "Invalid user name or password."
msgstr "Wysig u wagwoord"
@@ -2024,11 +1966,6 @@
msgid "Israel"
msgstr "Israel"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "Kan lÃªer '%1' nie open nie."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2154,10 +2091,6 @@
msgid "Kazakhstan"
msgstr "Kazakstan"

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr "Hou oplossings"
-
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
msgid "Kenya"
@@ -2873,7 +2806,7 @@
msgid "No Code"
msgstr "Geen kode nie"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
#, fuzzy
msgid "No url in repository."
msgstr "LÃªer %1 nie in die bewaarplek gevind nie."
@@ -3097,14 +3030,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr ""

-#: ../zypp/url/UrlBase.cc:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr "Padparameter-ontleding nie vir hierdie URL ondersteun nie"
-
-#: ../zypp/url/UrlBase.cc:727
-msgid "Path parameter parsing not supported for this URL"
-msgstr "Padparameter-ontleding nie vir hierdie URL ondersteun nie"
-
#: ../zypp/media/MediaException.cc:200
#, fuzzy, c-format
msgid "Permission to access '%s' denied."
@@ -3205,8 +3130,8 @@
msgstr "Navraagstring-ontleding nie vir hierdie URL ondersteun nie"

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
#, fuzzy
msgid "RPM failed: "
msgstr "het misluk"
@@ -3235,16 +3160,11 @@
msgid "Relative path not allowed if authority exists"
msgstr "Relatiewe pad nie toegelaat indien magtiging bestaan nie"

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Terugstel van hulpbronne"

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr ""
@@ -3544,6 +3464,11 @@
msgid "Solomon Islands"
msgstr "Solomon-eilande"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, fuzzy, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr "%s verkeer in konflik met %s"
+
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
msgid "Somali"
@@ -3779,7 +3704,7 @@
msgid "Thailand"
msgstr "Thailand"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4019,10 +3944,6 @@
msgid "Unknown language: "
msgstr "Onbekende taal:"

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr "Ontsluit hierdie oplossings"
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4285,90 +4206,74 @@
msgid "applydeltarpm failed."
msgstr "applydeltarpm het misluk."

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:875
#, fuzzy, c-format
msgid "cannot install both %s and %s"
msgstr "Kan %s nie installeer nie"

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:859
#, fuzzy
msgid "conflicting requests"
msgstr "Verbindingsversoek aan:"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr "geskepte rugsteun %s"

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "Installasie"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
-#, c-format
-msgid "delete %s"
-msgstr "skrap %s?"
-
-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:923
#, fuzzy
msgid "deleted providers: "
msgstr "Geen voorsiening %s nie"

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, fuzzy, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr "Moenie waar oplossings ter sprake is, installeer of skrap nie"

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, fuzzy, c-format
msgid "do not ask to install a solvable providing %s"
msgstr "Daar is geen installeerbare verskaffers van %s nie"

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "moenie %s installeer nie"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr "moenie %s installeer nie"

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:989
#, fuzzy, c-format
msgid "do not keep %s installed"
msgstr "nie geÃ¯nstalleer nie"

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, fuzzy, c-format
msgid "downgrade of %s to %s"
msgstr "%s afgelaai vanaf %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, c-format
-msgid "install %s"
-msgstr "installeer %s"
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4377,10 +4282,8 @@
" %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr "hou %s"
@@ -4393,34 +4296,34 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection: Kan dbus-verbinding nie stel nie"

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:870
#, fuzzy, c-format
msgid "nothing provides %s needed by %s"
msgstr "%s word benodig deur %s"

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:862
#, fuzzy, c-format
msgid "nothing provides requested %s"
msgstr "Geen voorsiening %s nie"

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:856
#, fuzzy, c-format
msgid "problem with installed package %s"
msgstr "opdrag om pakkette te oninstalleer"

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, 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:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -4429,18 +4332,18 @@
"rpm geskep %s as %s.\n"
"Hier is die eerste 25 rÃ«els van verskil:\n"

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr "rpm-uitset:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, 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:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4449,20 +4352,76 @@
"rpm geberg %s as %s.\n"
"Hier is die eerste 25 rÃ«els van verskil:\n"

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:935
#, fuzzy
msgid "uninstallable providers: "
msgstr "Daar is geen installeerbare verskaffers van %s nie"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr "ontsluit %s"
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Do not install or delete the resolvables concerned"
+#~ msgstr "Moenie waar oplossings ter sprake is, installeer of skrap nie"
+
+#~ msgid "Ignore that %s is already set to install"
+#~ msgstr "Ignoreer dat %s reeds gestel is om te installeer"
+
+#~ msgid "Ignore the obsolete %s in %s"
+#~ msgstr "Ignoreer die uitgediende %s in %s"
+
+#~ msgid "Ignore this conflict of %s"
+#~ msgstr "Ignoreer hierdie konflik van %s"
+
+#~ msgid "Ignore this requirement just here"
+#~ msgstr "Ignoreer diÃ© vereiste net hier"
+
+#~ msgid "Install %s although it would change the architecture"
+#~ msgstr "Installeer %s, hoewel dit die argitektuur kan verander"
+
+#, fuzzy
+#~ msgid "Install %s although it would change the vendor"
+#~ msgstr "Installeer %s, hoewel dit die argitektuur kan verander"
+
+#~ msgid "Install missing resolvables"
+#~ msgstr "Installeer ontbrekende oplossings"
+
+#~ msgid "Keep resolvables"
+#~ msgstr "Hou oplossings"
+
+#~ msgid "Unlock these resolvables"
+#~ msgstr "Ontsluit hierdie oplossings"
+
+#~ msgid "delete %s"
+#~ msgstr "skrap %s?"
+
+#~ msgid "install %s"
+#~ msgstr "installeer %s"
+
+#~ msgid "unlock %s"
+#~ msgstr "ontsluit %s"
+
+#~ msgid "unlock all resolvables"
+#~ msgstr "ontsluit alle oplossings"
+
+#, fuzzy
+#~ msgid "Can't open solv-file: "
+#~ msgstr "Kan lÃªer '%1' nie open nie."
+
+#, fuzzy
+#~ msgid "Error reading solv-file: "
+#~ msgstr "Fout tydens lees van sektor %u."
+
+#~ msgid "Path Parameter parsing not supported for this URL"
+#~ msgstr "Padparameter-ontleding nie vir hierdie URL ondersteun nie"

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr "ontsluit alle oplossings"
+#~ msgid "Path parameter parsing not supported for this URL"
+#~ msgstr "Padparameter-ontleding nie vir hierdie URL ondersteun nie"

#~ msgid "Software management is already running."
#~ msgstr "Sagtewarebestuur loop reeds."

Modified: trunk/libzypp/po/ar.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ar.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/ar.po (original)
+++ trunk/libzypp/po/ar.po Mon Apr 28 15:25:19 2008
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
"PO-Revision-Date: 2006-09-27 09:57+0200\n"
"Last-Translator: Novell Language <language@xxxxxxxxxx>\n"
"Language-Team: Novell Language <language@xxxxxxxxxx>\n"
@@ -18,7 +18,7 @@
"X-Language-Local: Arabic*\n"
"X-Generator: poTranslator\n"

-#: ../zypp/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:933
#, fuzzy
msgid ""
"\n"
@@ -30,61 +30,49 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:880
#, fuzzy, c-format
msgid "%s conflicts with %s provided by %s"
msgstr "%s ÙØªØ¹Ø§Ø±Ø¶ ÙØ¹ %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "ÙØ´Ù ØªØ«Ø¨ÙØª %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "ØªÙ ØªØ«Ø¨ÙØª %s Ø¨ÙØ¬Ø§Ø"

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:866
#, fuzzy, c-format
msgid "%s is not installable"
msgstr "ØºÙØ± ÙØ«Ø¨Øª"

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, fuzzy, c-format
msgid "%s obsoletes %s provided by %s"
msgstr "%s ÙØ¬Ø¹Ù Ø§ÙØ¹ÙØµØ± Ø§ÙØªØ§ÙÙ ÙØ¯ÙÙÙØ§ %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, 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:93
-#, fuzzy, c-format
-msgid "%s provides this dependency, but would change the vendor of the
installed item"
-msgstr "ÙÙÙØ± %s ÙØ°Ù Ø§ÙØªØ¨Ø¹ÙØ©Ø ÙÙÙÙ Ø³ÙØ¤Ø¯Ù Ø¥ÙÙ
ØªØºÙÙØ± ÙÙÙÙ Ø§ÙØ¹ÙØµØ± Ø§ÙÙØ«Ø¨ÙÙØª"
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "ÙØ´ÙØª Ø¥Ø²Ø§ÙØ© %s"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "ØªÙØª Ø¥Ø²Ø§ÙØ© %s Ø¨ÙØ¬Ø§Ø"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -109,12 +97,12 @@
msgid "Adangme"
msgstr "Ø§ÙØ£Ø¯Ø§ÙØ¬ÙÙØ©"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "ÙØªÙ Ø§ÙØ¢Ù Ø¥Ø¶Ø§ÙØ© Ø§ÙÙÙØ§Ø±Ø¯"

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "ÙØ®Ø±Ø¬Ø§Øª rpm Ø§ÙØ¥Ø¶Ø§ÙÙØ©:"

@@ -327,7 +315,7 @@
msgid "Austronesian (Other)"
msgstr "Ø§ÙØ£ÙØ³ØªØ±ÙÙÙØ³ÙØ§Ù (Ø£Ø®Ø±Ù)"

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr ""
@@ -591,7 +579,7 @@
msgid "Buginese"
msgstr "Ø§ÙØ¨Ø¬ÙÙÙØ²ÙØ©"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
@@ -641,7 +629,7 @@
msgid "Cameroon"
msgstr "Ø§ÙÙØ§ÙÙØ±ÙÙ"

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:147
#, fuzzy
msgid "Can not create sat-pool."
msgstr "ØªØ¹Ø°Ø± Ø¥ÙØ´Ø§Ø¡ Ø§ÙÙÙÙ."
@@ -650,10 +638,6 @@
msgid "Can't acquire the mutex lock"
msgstr "ØªØ¹Ø°Ø± Ø§ÙØØµÙÙ Ø¹ÙÙ ÙÙÙ mutex"

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
@@ -683,6 +667,11 @@
msgid "Can't initialize recursive mutex"
msgstr "ØªØ¹Ø°Ø±Øª ØªÙÙØ¦Ø© mutex ÙØªÙØ±Ø±"

+#: ../zypp/base/InterProcessMutex.cc:79
+#, fuzzy, c-format
+msgid "Can't open lock file: %s"
+msgstr "ØªØ¹Ø°Ø± ÙØªØ Ø§ÙÙÙÙ %1."
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -693,12 +682,7 @@
msgid "Can't open pty (%s)."
msgstr "ØªØ¹Ø°Ø± ÙØªØ Ø§ÙÙÙÙ: %s."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "ØªØ¹Ø°Ø± ÙØªØ Ø§ÙÙÙÙ %1."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, fuzzy, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr "ØªØ¹Ø°Ø± ØªÙÙÙØ± %s ÙÙ %s"
@@ -707,10 +691,6 @@
msgid "Can't release the mutex lock"
msgstr "ØªØ¹Ø°Ø± ØªØØ±ÙØ± ÙÙÙ mutex"

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr "ØªØ¹Ø°Ø± ØªØ¹ÙÙÙ Ø³ÙØ© mutex Ø§ÙÙØªÙØ±Ø±Ø©"
@@ -806,7 +786,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr "ÙÙÙØ§Øª ØªÙÙÙÙ %s Ø§ÙØªÙ ØªÙ ØªØºÙÙØ±ÙØ§:"
@@ -1072,11 +1052,6 @@
msgid "Djibouti"
msgstr "Ø¬ÙØ¨ÙØªÙ"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
-msgid "Do not install or delete the resolvables concerned"
-msgstr "Ø¹Ø¯Ù ØªØ«Ø¨ÙØª Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ
Ø§ÙÙØªØ¹ÙÙØ© Ø£Ù ØØ°ÙÙØ§"
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1122,7 +1097,7 @@
msgstr "Ø§ÙØ¯ÙÙÙØ§"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1235,11 +1210,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""

-#: ../zypp/Repository.cc:141
-#, fuzzy
-msgid "Error reading solv-file: "
-msgstr "ØªØ¹Ø°Ø±Øª ÙØ±Ø§Ø¡Ø© Ø§ÙÙØ·Ø§Ø¹ %u."
-
#. language code: myv
#: ../zypp/LanguageCode.cc:850
msgid "Erzya"
@@ -1280,7 +1250,7 @@
msgid "Failed to delete key."
msgstr "ÙØ´Ù Ø§ÙØªØÙÙÙ: %s."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1290,7 +1260,7 @@
msgid "Failed to mount %s on %s"
msgstr "ØªØ¹Ø°Ø± ÙØªØ %s - %s\n"

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, fuzzy, c-format
msgid "Failed to remove public key %s: %s"
msgstr "ØªØ¹Ø°Ø± Ø§ÙØØµÙÙ Ø¹ÙÙ Ø§ÙÙÙØªØ§Ø Ø§ÙØ¹Ø§Ù."
@@ -1529,9 +1499,9 @@
msgid "Geez"
msgstr "Ø§ÙØ¬ÙØ²"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
#, fuzzy
-msgid "Generally ignore this requirement"
+msgid "Generally ignore of some dependecies"
msgstr "ØªØ¬Ø§ÙÙ ÙØ°Ø§ Ø§ÙÙØªØ·ÙØ¨ ÙÙØ§ ÙÙØ·"

#. :GRD:308:
@@ -1823,27 +1793,10 @@
msgstr "Ø§ÙØ¥ÙØ¬Ø¨Ù"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr "ØªØ¬Ø§ÙÙ Ø£ÙÙ ØªÙ ØªØ¹ÙÙÙ %s Ø¨Ø§ÙÙØ¹Ù ÙØªØ«Ø¨ÙØªÙ"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
-#, c-format
-msgid "Ignore the obsolete %s in %s"
-msgstr "ØªØ¬Ø§ÙÙ %s Ø§ÙÙØ¯ÙÙ ÙÙ %s"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr "ØªØ¬Ø§ÙÙ ØªØ¹Ø§Ø±Ø¶ %s ÙØ°Ø§"
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
-msgstr "ØªØ¬Ø§ÙÙ ÙØ°Ø§ Ø§ÙÙØªØ·ÙØ¨ ÙÙØ§ ÙÙØ·"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
+#, fuzzy, c-format
+msgid "Ignore some dependencies of %s"
+msgstr "ØªØ¹Ø°Ø± ØÙ Ø§ÙØªØ¨Ø¹ÙØ§Øª"

#. language code: ijo
#: ../zypp/LanguageCode.cc:630
@@ -1890,23 +1843,7 @@
msgid "Ingush"
msgstr "Ø§ÙØ¥ÙØ¬ÙØ´ÙØ©"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, 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:90
-#, fuzzy, c-format
-msgid "Install %s although it would change the vendor"
-msgstr "ÙÙ Ø¨ØªØ«Ø¨ÙØª %s Ø¨Ø§ÙØ±ØºÙ ÙÙ Ø£ÙÙ ÙØ¯ ÙØ¤Ø¯Ù Ø¥ÙÙ
ØªØºÙÙØ± Ø§ÙÙÙÙÙ"
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr "ØªØ«Ø¨ÙØª Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ
Ø§ÙÙÙÙÙØ¯Ø©"
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr "ØªÙ Ø¥ÙÙØ§Ù Ø§ÙØªØ«Ø¨ÙØª ÙÙÙÙØ§ ÙÙØªØ¹ÙÙÙØ§Øª."

@@ -1980,7 +1917,12 @@
msgid "Invalid port component '%s'"
msgstr "ÙÙÙÙ Ø§ÙÙÙÙØ° '%s' ØºÙØ± ØµØ§ÙØ"

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr ""
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
#, fuzzy
msgid "Invalid user name or password."
msgstr "ÙÙÙØ© Ø§ÙØ³Ø± CA ØºÙØ± ØµØ§ÙØØ©."
@@ -2030,11 +1972,6 @@
msgid "Israel"
msgstr "Ø§Ø³Ø±Ø§Ø¦ÙÙ"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "ØªØ¹Ø°Ø± ÙØªØ Ø§ÙÙÙÙ %1."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2160,10 +2097,6 @@
msgid "Kazakhstan"
msgstr "ÙØ§Ø²Ø§Ø®Ø³ØªØ§Ù"

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr "Ø§ÙØ§ØØªÙØ§Ø¸ Ø¨Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ"
-
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
msgid "Kenya"
@@ -2879,7 +2812,7 @@
msgid "No Code"
msgstr "Ø¨Ø¯ÙÙ Ø±ÙØ²"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
#, fuzzy
msgid "No url in repository."
msgstr "ÙÙ ÙØªÙ Ø§ÙØ¹Ø«ÙØ± Ø¹ÙÙ Ø§ÙÙÙÙ %1 ÙÙ Ø§ÙÙØ®Ø²Ù."
@@ -3103,14 +3036,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr ""

-#: ../zypp/url/UrlBase.cc:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr "ØªØÙÙÙ ÙØ¹ÙÙØ© Ø§ÙÙØ³Ø§Ø± ØºÙØ± ÙØ¯Ø¹ÙÙ ÙØ¹ÙÙØ§Ù URL
ÙØ°Ø§"
-
-#: ../zypp/url/UrlBase.cc:727
-msgid "Path parameter parsing not supported for this URL"
-msgstr "ØªØÙÙÙ ÙØ¹ÙÙØ© Ø§ÙÙØ³Ø§Ø± ØºÙØ± ÙØ¯Ø¹ÙÙ ÙØ¹ÙÙØ§Ù URL
ÙØ°Ø§"
-
#: ../zypp/media/MediaException.cc:200
#, fuzzy, c-format
msgid "Permission to access '%s' denied."
@@ -3211,8 +3136,8 @@
msgstr "ØªØÙÙÙ Ø³ÙØ³ÙØ© Ø§ÙØ§Ø³ØªØ¹ÙØ§Ù ØºÙØ± ÙØ¯Ø¹ÙÙ
ÙØ¹ÙÙØ§Ù URL ÙØ°Ø§"

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
#, fuzzy
msgid "RPM failed: "
msgstr "ÙØ´Ù"
@@ -3241,16 +3166,11 @@
msgid "Relative path not allowed if authority exists"
msgstr "ØºÙØ± ÙØ³ÙÙØ Ø¨Ø§ÙÙØ³Ø§Ø± Ø§ÙÙØ³Ø¨Ù ÙÙ ØØ§ÙØ© ÙØ¬ÙØ¯
Ø³ÙØ·Ø©"

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "ÙØªÙ Ø§ÙØ¢Ù Ø¥Ø¶Ø§ÙØ© Ø§ÙÙÙØ§Ø±Ø¯"

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr ""
@@ -3550,6 +3470,11 @@
msgid "Solomon Islands"
msgstr "Ø¬Ø²Ø± Ø³ÙÙÙØ§Ù"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, fuzzy, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr "%s ÙØªØ¹Ø§Ø±Ø¶ ÙØ¹ %s"
+
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
msgid "Somali"
@@ -3785,7 +3710,7 @@
msgid "Thailand"
msgstr "ØªØ§ÙÙØ§ÙØ¯"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4025,10 +3950,6 @@
msgid "Unknown language: "
msgstr "ÙØºØ© ØºÙØ± ÙØ¹Ø±ÙÙØ©:"

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr "Ø¥ÙØºØ§Ø¡ ÙÙÙ Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ
ÙØ°Ù"
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4291,90 +4212,74 @@
msgid "applydeltarpm failed."
msgstr "ÙØ´Ù applydeltarpm."

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:875
#, fuzzy, c-format
msgid "cannot install both %s and %s"
msgstr "ØªØ¹Ø°Ø± ØªØ«Ø¨ÙØª %s"

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:859
#, fuzzy
msgid "conflicting requests"
msgstr "Ø·ÙØ¨ Ø§ÙØ§ØªØµØ§Ù Ø¨Ù:"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr "ØªÙ Ø¥ÙØ´Ø§Ø¡ Ø§ÙÙØ³Ø®Ø© Ø§ÙØ§ØØªÙØ§Ø·ÙØ© %s"

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "Ø§ÙØªØ«Ø¨ÙØª"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
-#, c-format
-msgid "delete %s"
-msgstr "ØØ°Ù %s"
-
-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:923
#, fuzzy
msgid "deleted providers: "
msgstr "ÙØ§ ÙÙØ¬Ø¯ Ø£Ù Ø´ÙØ¡ ÙÙÙØ± %s"

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, fuzzy, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr "Ø¹Ø¯Ù ØªØ«Ø¨ÙØª Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ
Ø§ÙÙØªØ¹ÙÙØ© Ø£Ù ØØ°ÙÙØ§"

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, fuzzy, c-format
msgid "do not ask to install a solvable providing %s"
msgstr "ÙØ§ ÙÙØ¬Ø¯ Ø£Ù ÙÙÙØ±ÙÙ ÙØ§Ø¨ÙÙÙ ÙÙØªØ«Ø¨ÙØª ÙÙ %s"

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "Ø¹Ø¯Ù ØªØ«Ø¨ÙØª %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr "Ø¹Ø¯Ù ØªØ«Ø¨ÙØª %s"

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:989
#, fuzzy, c-format
msgid "do not keep %s installed"
msgstr "ØºÙØ± ÙØ«Ø¨Øª"

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, fuzzy, c-format
msgid "downgrade of %s to %s"
msgstr "ØªÙ Ø¥ÙØ²Ø§Ù %s ÙÙ %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, c-format
-msgid "install %s"
-msgstr "ØªØ«Ø¨ÙØª %s"
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4383,10 +4288,8 @@
" %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr "Ø§ÙØ§ØØªÙØ§Ø¸ Ø¨Ù %s"
@@ -4399,34 +4302,34 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection: ØªØ¹Ø°Ø± ØªØ¹ÙÙÙ Ø§ØªØµØ§Ù dbus"

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:870
#, fuzzy, c-format
msgid "nothing provides %s needed by %s"
msgstr "%s ÙØ·ÙÙØ¨ Ø¨ÙØ§Ø³Ø·Ø© %s"

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:862
#, fuzzy, c-format
msgid "nothing provides requested %s"
msgstr "ÙØ§ ÙÙØ¬Ø¯ Ø£Ù Ø´ÙØ¡ ÙÙÙØ± %s"

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:856
#, fuzzy, c-format
msgid "problem with installed package %s"
msgstr "Ø£ÙØ± ÙØ¥ÙØºØ§Ø¡ ØªØ«Ø¨ÙØª Ø§ÙØØ²Ù"

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, 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:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -4435,18 +4338,18 @@
"ØªÙ Ø¥ÙØ´Ø§Ø¡ rpm %s Ø¨Ø§Ø¹ØªØ¨Ø§Ø±ÙØ§ %s.\n"
"ÙÙÙØ§ ÙÙÙ Ø£ÙÙ 25 Ø³Ø·Ø±ÙØ§ ÙÙ Ø³Ø·ÙØ± Ø§ÙÙØ±Ù:\n"

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr "ÙØ®Ø±Ø¬Ø§Øª rpm:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, 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:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4455,20 +4358,76 @@
"ØªÙ ØÙØ¸ rpm %s Ø¨Ø§Ø¹ØªØ¨Ø§Ø±ÙØ§ %s.\n"
"ÙÙÙØ§ ÙÙÙ Ø£ÙÙ 25 Ø³Ø·Ø±ÙØ§ ÙÙ Ø³Ø·ÙØ± Ø§ÙÙØ±Ù:\n"

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:935
#, fuzzy
msgid "uninstallable providers: "
msgstr "ÙØ§ ÙÙØ¬Ø¯ Ø£Ù ÙÙÙØ±ÙÙ ÙØ§Ø¨ÙÙÙ ÙÙØªØ«Ø¨ÙØª ÙÙ %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr "Ø¥ÙØºØ§Ø¡ ÙÙÙ %s"
+#, fuzzy
+#~ msgid "%s provides this dependency, but would change the architecture of
the installed item"
+#~ msgstr "ÙÙÙØ± %s ÙØ°Ù Ø§ÙØªØ¨Ø¹ÙØ©Ø ÙÙÙÙ Ø³ÙØ¤Ø¯Ù Ø¥ÙÙ
ØªØºÙÙØ± ÙÙÙÙ Ø§ÙØ¹ÙØµØ± Ø§ÙÙØ«Ø¨ÙÙØª"
+
+#, fuzzy
+#~ msgid "%s provides this dependency, but would change the vendor of the
installed item"
+#~ msgstr "ÙÙÙØ± %s ÙØ°Ù Ø§ÙØªØ¨Ø¹ÙØ©Ø ÙÙÙÙ Ø³ÙØ¤Ø¯Ù Ø¥ÙÙ
ØªØºÙÙØ± ÙÙÙÙ Ø§ÙØ¹ÙØµØ± Ø§ÙÙØ«Ø¨ÙÙØª"
+
+#, fuzzy
+#~ msgid "Do not install or delete the resolvables concerned"
+#~ msgstr "Ø¹Ø¯Ù ØªØ«Ø¨ÙØª Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ
Ø§ÙÙØªØ¹ÙÙØ© Ø£Ù ØØ°ÙÙØ§"
+
+#~ msgid "Ignore that %s is already set to install"
+#~ msgstr "ØªØ¬Ø§ÙÙ Ø£ÙÙ ØªÙ ØªØ¹ÙÙÙ %s Ø¨Ø§ÙÙØ¹Ù ÙØªØ«Ø¨ÙØªÙ"
+
+#~ msgid "Ignore the obsolete %s in %s"
+#~ msgstr "ØªØ¬Ø§ÙÙ %s Ø§ÙÙØ¯ÙÙ ÙÙ %s"
+
+#~ msgid "Ignore this conflict of %s"
+#~ msgstr "ØªØ¬Ø§ÙÙ ØªØ¹Ø§Ø±Ø¶ %s ÙØ°Ø§"
+
+#~ msgid "Ignore this requirement just here"
+#~ msgstr "ØªØ¬Ø§ÙÙ ÙØ°Ø§ Ø§ÙÙØªØ·ÙØ¨ ÙÙØ§ ÙÙØ·"
+
+#~ msgid "Install %s although it would change the architecture"
+#~ msgstr "ÙÙ Ø¨ØªØ«Ø¨ÙØª %s Ø¨Ø§ÙØ±ØºÙ ÙÙ Ø£ÙÙ ÙØ¯ ÙØ¤Ø¯Ù Ø¥ÙÙ
ØªØºÙÙØ± Ø§ÙÙÙÙÙ"
+
+#, fuzzy
+#~ msgid "Install %s although it would change the vendor"
+#~ msgstr "ÙÙ Ø¨ØªØ«Ø¨ÙØª %s Ø¨Ø§ÙØ±ØºÙ ÙÙ Ø£ÙÙ ÙØ¯ ÙØ¤Ø¯Ù Ø¥ÙÙ
ØªØºÙÙØ± Ø§ÙÙÙÙÙ"
+
+#~ msgid "Install missing resolvables"
+#~ msgstr "ØªØ«Ø¨ÙØª Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ
Ø§ÙÙÙÙÙØ¯Ø©"
+
+#~ msgid "Keep resolvables"
+#~ msgstr "Ø§ÙØ§ØØªÙØ§Ø¸ Ø¨Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ"
+
+#~ msgid "Unlock these resolvables"
+#~ msgstr "Ø¥ÙØºØ§Ø¡ ÙÙÙ Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ© ÙÙØªØÙÙÙ
ÙØ°Ù"
+
+#~ msgid "delete %s"
+#~ msgstr "ØØ°Ù %s"
+
+#~ msgid "install %s"
+#~ msgstr "ØªØ«Ø¨ÙØª %s"
+
+#~ msgid "unlock %s"
+#~ msgstr "Ø¥ÙØºØ§Ø¡ ÙÙÙ %s"
+
+#~ msgid "unlock all resolvables"
+#~ msgstr "Ø¥ÙØºØ§Ø¡ ÙÙÙ ÙØ§ÙØ© Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ©
ÙÙØªØÙÙÙ"
+
+#, fuzzy
+#~ msgid "Can't open solv-file: "
+#~ msgstr "ØªØ¹Ø°Ø± ÙØªØ Ø§ÙÙÙÙ %1."
+
+#, fuzzy
+#~ msgid "Error reading solv-file: "
+#~ msgstr "ØªØ¹Ø°Ø±Øª ÙØ±Ø§Ø¡Ø© Ø§ÙÙØ·Ø§Ø¹ %u."
+
+#~ msgid "Path Parameter parsing not supported for this URL"
+#~ msgstr "ØªØÙÙÙ ÙØ¹ÙÙØ© Ø§ÙÙØ³Ø§Ø± ØºÙØ± ÙØ¯Ø¹ÙÙ ÙØ¹ÙÙØ§Ù
URL ÙØ°Ø§"

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr "Ø¥ÙØºØ§Ø¡ ÙÙÙ ÙØ§ÙØ© Ø§ÙØªØ¨Ø¹ÙØ§Øª Ø§ÙÙØ§Ø¨ÙØ©
ÙÙØªØÙÙÙ"
+#~ msgid "Path parameter parsing not supported for this URL"
+#~ msgstr "ØªØÙÙÙ ÙØ¹ÙÙØ© Ø§ÙÙØ³Ø§Ø± ØºÙØ± ÙØ¯Ø¹ÙÙ ÙØ¹ÙÙØ§Ù
URL ÙØ°Ø§"

#~ msgid "Software management is already running."
#~ msgstr "Ø¥Ø¯Ø§Ø±Ø© Ø§ÙØ¨Ø±Ø§ÙØ¬ ÙÙØ¯ Ø§ÙØªØ´ØºÙÙ Ø¨Ø§ÙÙØ¹Ù."

Modified: trunk/libzypp/po/bg.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bg.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/bg.po (original)
+++ trunk/libzypp/po/bg.po Mon Apr 28 15:25:19 2008
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: zypp.bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
"PO-Revision-Date: 2006-11-09 18:05+0200\n"
"Last-Translator: Borislav Mitev <morbid_viper@xxxxxxxx>\n"
"Language-Team: Bulgarian <bg@xxxxxx>\n"
@@ -22,7 +22,7 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.10.2\n"

-#: ../zypp/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:933
#, fuzzy
msgid ""
"\n"
@@ -34,61 +34,49 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:880
#, fuzzy, c-format
msgid "%s conflicts with %s provided by %s"
msgstr "%s Ðµ Ð² ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑ Ñ %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ÐµÑÐ¾ Ð½Ð° %s Ð±Ðµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ÐµÑÐ¾ Ð½Ð° %s Ð±Ðµ ÑÑÐ¿ÐµÑÐ½Ð¾"

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:866
#, fuzzy, c-format
msgid "%s is not installable"
msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ÐµÑÐ¾ Ð½Ð° %s Ð±Ðµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾"

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, fuzzy, c-format
msgid "%s obsoletes %s provided by %s"
msgstr "%s Ð¿ÑÐ°Ð²Ð¸ Ð½ÐµÐ½ÑÐ¶Ð½Ð¾ %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, 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:93
-#, fuzzy, c-format
-msgid "%s provides this dependency, but would change the vendor of the
installed item"
-msgstr "%s Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ²Ð° ÑÐ°Ð·Ð¸ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ, Ð½Ð¾ ÑÐµ
Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÐ°ÑÐ° Ð½Ð° Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ð¸Ñ
Ð¿Ð°ÐºÐµÑ"
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "ÐÑÐµÐ¼Ð°ÑÐ²Ð°Ð½ÐµÑÐ¾ Ð½Ð° %s Ð±Ðµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "ÐÑÐµÐ¼Ð°ÑÐ²Ð°Ð½ÐµÑÐ¾ Ð½Ð° %s Ð±Ðµ ÑÑÐ¿ÐµÑÐ½Ð¾"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -113,12 +101,12 @@
msgid "Adangme"
msgstr "ÐÐ´Ð°Ð½Ð³Ð¼Ðµ"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
msgstr ""

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "ÐÐ¾Ð¿ÑÐ»Ð½Ð¸ÑÐµÐ»ÐµÐ½ Ð¸Ð·ÑÐ¾Ð´ Ð¾Ñ rpm:"

@@ -346,7 +334,7 @@
msgid "Austronesian (Other)"
msgstr "ÐÐ²ÑÑÑÐ¾Ð½ÐµÐ·Ð¸Ð¹ÑÐºÐ¸ (Ð´ÑÑÐ³)"

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr ""
@@ -628,7 +616,7 @@
msgid "Buginese"
msgstr "ÐÑÐ³Ð¸Ð½ÐµÑÐºÐ¸"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
@@ -682,7 +670,7 @@
msgid "Cameroon"
msgstr "ÐÐ°Ð¼ÐµÑÑÐ½"

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:147
#, fuzzy
msgid "Can not create sat-pool."
msgstr "ÐÑÐ·Ð½Ð¸ÐºÐ½Ð°Ð»Ð° Ðµ Ð³ÑÐµÑÐºÐ° Ð¿ÑÐ¸ ÑÑÐ·Ð´Ð°Ð²Ð°Ð½ÐµÑÐ¾
Ð½Ð° Ð²ÑÐµÐ¼ÐµÐ½Ð½Ð¸Ñ ÑÐ°Ð¹Ð» %s: %m"
@@ -692,10 +680,6 @@
msgid "Can't acquire the mutex lock"
msgstr "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¿ÑÐ¸Ð´Ð¾Ð±Ð¸Ðµ Ð·Ð°ÐºÐ»ÑÑÐ²Ð°Ð½ÐµÑÐ¾ Ð½Ð°
zypp."

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
@@ -725,6 +709,11 @@
msgid "Can't initialize recursive mutex"
msgstr ""

+#: ../zypp/base/InterProcessMutex.cc:79
+#, fuzzy, c-format
+msgid "Can't open lock file: %s"
+msgstr "ÐÑÐ·Ð½Ð¸ÐºÐ½Ð°Ð»Ð° Ðµ Ð³ÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÐ²Ð°ÑÑÐ½ÐµÑÐ¾ Ð½Ð°
%s: %m"
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -735,12 +724,7 @@
msgid "Can't open pty (%s)."
msgstr "ÐÑÐ·Ð½Ð¸ÐºÐ½Ð°Ð»Ð° Ðµ Ð³ÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÐ²Ð°ÑÑÐ½ÐµÑÐ¾ Ð½Ð°
%s: %m"

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "ÐÑÐ·Ð½Ð¸ÐºÐ½Ð°Ð»Ð° Ðµ Ð³ÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÐ²Ð°ÑÑÐ½ÐµÑÐ¾ Ð½Ð°
%s: %m"
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, fuzzy, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr "ÐÐ¸ÐºÐ¾Ð¹ Ð½Ðµ Ð´Ð¾ÑÑÐ°Ð²Ñ %s"
@@ -749,10 +733,6 @@
msgid "Can't release the mutex lock"
msgstr ""

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr ""
@@ -855,7 +835,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr "ÐÑÐ¾Ð¼ÐµÐ½ÐµÐ½Ð¸ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ Ñ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð·Ð° %s:"
@@ -1135,11 +1115,6 @@
msgid "Djibouti"
msgstr "ÐÐ¶Ð¸Ð±ÑÑÐ¸"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
-msgid "Do not install or delete the resolvables concerned"
-msgstr "ÐÐµÐ· Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð¸Ð»Ð¸ Ð¿ÑÐµÐ¼Ð°ÑÐ²Ð°Ð½Ðµ Ð½Ð°
ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÐ½Ð¸ÑÐµ Ð¿Ð°ÐºÐµÑÐ¸"
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1185,7 +1160,7 @@
msgstr "ÐÑÐ°Ð»Ð°ÐÑ"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1300,11 +1275,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""

-#: ../zypp/Repository.cc:141
-#, fuzzy
-msgid "Error reading solv-file: "
-msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ ÑÐµÑÐµÐ½ÐµÑÐ¾ Ð½Ð° ÑÐµÐºÑÐ¾Ñ %u."
-
# SY
# fuzzy
#. language code: myv
@@ -1348,7 +1318,7 @@
msgid "Failed to delete key."
msgstr "ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ð¼Ð¾Ð´ÑÐ»Ð° \"%s\"."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1358,7 +1328,7 @@
msgid "Failed to mount %s on %s"
msgstr "ÐÐµÑÑÐ¿ÐµÑÐ½Ð¾ Ð·Ð°ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð½Ð° Ð¼Ð¾Ð´ÑÐ»Ð° \"%s\"."

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, c-format
msgid "Failed to remove public key %s: %s"
msgstr ""
@@ -1592,9 +1562,9 @@
msgid "Geez"
msgstr "ÐÐ¸Ð¸Ð·"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
#, fuzzy
-msgid "Generally ignore this requirement"
+msgid "Generally ignore of some dependecies"
msgstr "ÐÑÐµÐ½ÐµÐ±ÑÐµÐ³Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ¾Ð²Ð° Ð¸Ð·Ð¸ÑÐºÐ²Ð°Ð½Ðµ ÑÐ°Ð¼Ð¾
ÑÑÐº"

#. :GRD:308:
@@ -1901,27 +1871,10 @@
msgstr "ÐÐ³Ð±Ð¾"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr "ÐÑÐµÐ½ÐµÐ±ÑÐµÐ³Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ¾Ð²Ð°, ÑÐµ %s Ðµ Ð·Ð°Ð´Ð°Ð´ÐµÐ½
Ð²ÐµÑÐµ Ð·Ð° Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
-#, c-format
-msgid "Ignore the obsolete %s in %s"
-msgstr "ÐÑÐµÐ½ÐµÐ±ÑÐµÐ³Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾ÑÑÐ°ÑÐµÐ»Ð¸ÑÐµ %s Ð² %s"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr "ÐÑÐµÐ½ÐµÐ±ÑÐµÐ³Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÐ° Ð½Ð° %s"
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
-msgstr "ÐÑÐµÐ½ÐµÐ±ÑÐµÐ³Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ¾Ð²Ð° Ð¸Ð·Ð¸ÑÐºÐ²Ð°Ð½Ðµ ÑÐ°Ð¼Ð¾
ÑÑÐº"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
+#, fuzzy, c-format
+msgid "Ignore some dependencies of %s"
+msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ Ð·Ð°
Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° %s"

#. language code: ijo
#: ../zypp/LanguageCode.cc:630
@@ -1968,23 +1921,7 @@
msgid "Ingush"
msgstr "ÐÐ½Ð³ÑÑ"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, 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:90
-#, fuzzy, c-format
-msgid "Install %s although it would change the vendor"
-msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° %s, Ð²ÑÐ¿ÑÐµÐºÐ¸ ÑÐµ ÑÐµ
Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÐ°ÑÐ°"
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° Ð»Ð¸Ð¿ÑÐ²Ð°ÑÐ¸ÑÐµ Ð¿Ð°ÐºÐµÑÐ¸"
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr ""

@@ -2059,7 +1996,12 @@
msgid "Invalid port component '%s'"
msgstr ""

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr ""
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
#, fuzzy
msgid "Invalid user name or password."
msgstr "ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð¾ Ð¸Ð¼Ðµ Ð½Ð° ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾."
@@ -2112,11 +2054,6 @@
msgid "Israel"
msgstr "ÐÐ·ÑÐ°ÐµÐ»"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "ÐÑÐ·Ð½Ð¸ÐºÐ½Ð°Ð»Ð° Ðµ Ð³ÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÐ²Ð°ÑÑÐ½ÐµÑÐ¾ Ð½Ð°
%s: %m"
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2247,10 +2184,6 @@
msgid "Kazakhstan"
msgstr "ÐÐ°Ð·Ð°ÑÑÑÐ°Ð½"

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr "ÐÐ°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°ÐºÐµÑÐ¸ÑÐµ"
-
# KE
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
@@ -3025,7 +2958,7 @@
msgid "No Code"
msgstr "Ð±ÐµÐ· ÐºÐ¾Ð´"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
msgid "No url in repository."
msgstr ""

@@ -3258,14 +3191,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr ""

-#: ../zypp/url/UrlBase.cc:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr ""
-
-#: ../zypp/url/UrlBase.cc:727
-msgid "Path parameter parsing not supported for this URL"
-msgstr ""
-
#: ../zypp/media/MediaException.cc:200
#, c-format
msgid "Permission to access '%s' denied."
@@ -3367,8 +3292,8 @@
msgstr ""

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
#, fuzzy
msgid "RPM failed: "
msgstr "Ð¿ÑÐ¾Ð¿Ð°Ð´Ð½Ð°."
@@ -3399,16 +3324,11 @@
msgid "Relative path not allowed if authority exists"
msgstr ""

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, c-format
msgid "Removing repository '%s'"
msgstr ""

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr ""
@@ -3732,6 +3652,11 @@
msgid "Solomon Islands"
msgstr "Ð¡Ð¾Ð»Ð¾Ð¼Ð¾Ð½Ð¾Ð²Ð¸ ÐÑÑÑÐ¾Ð²Ð¸"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, fuzzy, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr "%s Ðµ Ð² ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑ Ñ %s"
+
# SO
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
@@ -3983,7 +3908,7 @@
msgid "Thailand"
msgstr "Ð¢Ð°Ð¹Ð»Ð°Ð½Ð´"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4242,10 +4167,6 @@
msgid "Unknown language: "
msgstr "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐµÐ½ ÐµÐ·Ð¸Ðº: "

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr "ÐÑÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐµÐ·Ð¸ Ð¿Ð°ÐºÐµÑÐ¸"
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4519,89 +4440,73 @@
msgid "applydeltarpm failed."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:875
#, fuzzy, c-format
msgid "cannot install both %s and %s"
msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½"

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:859
msgid "conflicting requests"
msgstr ""

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr "ÑÑÐ·Ð´Ð°Ð´ÐµÐ½Ð¾ ÑÐµÐ·ÐµÑÐ²Ð½Ð¾ ÐºÐ¾Ð¿Ð¸Ðµ %s"

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
-#, c-format
-msgid "delete %s"
-msgstr "Ð¸Ð·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° %s"
-
-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:923
#, fuzzy
msgid "deleted providers: "
msgstr "ÐÐ¸ÐºÐ¾Ð¹ Ð½Ðµ Ð´Ð¾ÑÑÐ°Ð²Ñ %s"

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, fuzzy, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr "ÐÐµÐ· Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð¸Ð»Ð¸ Ð¿ÑÐµÐ¼Ð°ÑÐ²Ð°Ð½Ðµ Ð½Ð°
ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÐ½Ð¸ÑÐµ Ð¿Ð°ÐºÐµÑÐ¸"

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, fuzzy, c-format
msgid "do not ask to install a solvable providing %s"
msgstr "ÐÑÐ¼Ð° Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÑÐµÐ¼Ð¸ Ð´Ð¾ÑÑÐ°Ð²ÑÐ¸ÑÐ¸ Ð½Ð° %s"

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "Ð±ÐµÐ· Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr "Ð±ÐµÐ· Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° %s"

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:989
#, fuzzy, c-format
msgid "do not keep %s installed"
msgstr "Ð±ÐµÐ· Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° %s"

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, fuzzy, c-format
msgid "downgrade of %s to %s"
msgstr "ÐÐ±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° %s ÐºÑÐ¼ %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, c-format
-msgid "install %s"
-msgstr "Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° %s"
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4610,10 +4515,8 @@
" %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr "Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° %s"
@@ -4626,34 +4529,34 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:870
#, fuzzy, c-format
msgid "nothing provides %s needed by %s"
msgstr "%s Ðµ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼ Ð½Ð° %s"

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:862
#, fuzzy, c-format
msgid "nothing provides requested %s"
msgstr "ÐÐ¸ÐºÐ¾Ð¹ Ð½Ðµ Ð´Ð¾ÑÑÐ°Ð²Ñ %s"

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:856
#, c-format
msgid "problem with installed package %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, 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:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -4662,18 +4565,18 @@
"rpm ÑÑÐ·Ð´Ð°Ð´Ðµ %s ÐºÐ°ÑÐ¾ %s.\n"
"ÐÑÐ¾ Ð¿ÑÑÐ²Ð¸ÑÐµ 25 ÑÐµÐ´Ð° Ð¾Ñ ÑÐ°Ð·Ð»Ð¸ÐºÐ¸ÑÐµ:\n"

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr "ÐÐ·ÑÐ¾Ð´ Ð¾Ñ rpm:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, 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:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4682,20 +4585,70 @@
"rpm Ð·Ð°Ð¿Ð°Ð·Ð¸ %s ÐºÐ°ÑÐ¾ %s.\n"
"ÐÑÐ¾ Ð¿ÑÑÐ²Ð¸ÑÐµ 25 ÑÐµÐ´Ð° Ð¾Ñ ÑÐ°Ð·Ð»Ð¸ÐºÐ¸ÑÐµ:\n"

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:935
#, fuzzy
msgid "uninstallable providers: "
msgstr "ÐÑÐ¼Ð° Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÑÐµÐ¼Ð¸ Ð´Ð¾ÑÑÐ°Ð²ÑÐ¸ÑÐ¸ Ð½Ð° %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr "Ð¾ÑÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° %s"
+#, fuzzy
+#~ msgid "%s provides this dependency, but would change the architecture of
the installed item"
+#~ msgstr "%s Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ²Ð° ÑÐ°Ð·Ð¸ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ, Ð½Ð¾ ÑÐµ
Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÐ°ÑÐ° Ð½Ð° Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ð¸Ñ
Ð¿Ð°ÐºÐµÑ"

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr "Ð¾ÑÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ Ð¿Ð°ÐºÐµÑÐ¸"
+#, fuzzy
+#~ msgid "%s provides this dependency, but would change the vendor of the
installed item"
+#~ msgstr "%s Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ²Ð° ÑÐ°Ð·Ð¸ Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑ, Ð½Ð¾ ÑÐµ
Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÐ°ÑÐ° Ð½Ð° Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ð¸Ñ
Ð¿Ð°ÐºÐµÑ"
+
+#, fuzzy
+#~ msgid "Do not install or delete the resolvables concerned"
+#~ msgstr "ÐÐµÐ· Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð¸Ð»Ð¸ Ð¿ÑÐµÐ¼Ð°ÑÐ²Ð°Ð½Ðµ Ð½Ð°
ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÐ½Ð¸ÑÐµ Ð¿Ð°ÐºÐµÑÐ¸"
+
+#~ msgid "Ignore that %s is already set to install"
+#~ msgstr "ÐÑÐµÐ½ÐµÐ±ÑÐµÐ³Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ¾Ð²Ð°, ÑÐµ %s Ðµ Ð·Ð°Ð´Ð°Ð´ÐµÐ½
Ð²ÐµÑÐµ Ð·Ð° Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ"
+
+#~ msgid "Ignore the obsolete %s in %s"
+#~ msgstr "ÐÑÐµÐ½ÐµÐ±ÑÐµÐ³Ð²Ð°Ð½Ðµ Ð½Ð° Ð¾ÑÑÐ°ÑÐµÐ»Ð¸ÑÐµ %s Ð² %s"
+
+#~ msgid "Ignore this conflict of %s"
+#~ msgstr "ÐÑÐµÐ½ÐµÐ±ÑÐµÐ³Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÐ° Ð½Ð° %s"
+
+#~ msgid "Ignore this requirement just here"
+#~ msgstr "ÐÑÐµÐ½ÐµÐ±ÑÐµÐ³Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ¾Ð²Ð° Ð¸Ð·Ð¸ÑÐºÐ²Ð°Ð½Ðµ
ÑÐ°Ð¼Ð¾ ÑÑÐº"
+
+#~ msgid "Install %s although it would change the architecture"
+#~ msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° %s, Ð²ÑÐ¿ÑÐµÐºÐ¸ ÑÐµ ÑÐµ
Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÐ°ÑÐ°"
+
+#, fuzzy
+#~ msgid "Install %s although it would change the vendor"
+#~ msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° %s, Ð²ÑÐ¿ÑÐµÐºÐ¸ ÑÐµ ÑÐµ
Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ Ð°ÑÑÐ¸ÑÐµÐºÑÑÑÐ°ÑÐ°"
+
+#~ msgid "Install missing resolvables"
+#~ msgstr "ÐÐ½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° Ð»Ð¸Ð¿ÑÐ²Ð°ÑÐ¸ÑÐµ Ð¿Ð°ÐºÐµÑÐ¸"
+
+#~ msgid "Keep resolvables"
+#~ msgstr "ÐÐ°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð°ÐºÐµÑÐ¸ÑÐµ"
+
+#~ msgid "Unlock these resolvables"
+#~ msgstr "ÐÑÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐµÐ·Ð¸ Ð¿Ð°ÐºÐµÑÐ¸"
+
+#~ msgid "delete %s"
+#~ msgstr "Ð¸Ð·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° %s"
+
+#~ msgid "install %s"
+#~ msgstr "Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð½Ð° %s"
+
+#~ msgid "unlock %s"
+#~ msgstr "Ð¾ÑÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° %s"
+
+#~ msgid "unlock all resolvables"
+#~ msgstr "Ð¾ÑÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ Ð¿Ð°ÐºÐµÑÐ¸"
+
+#, fuzzy
+#~ msgid "Can't open solv-file: "
+#~ msgstr "ÐÑÐ·Ð½Ð¸ÐºÐ½Ð°Ð»Ð° Ðµ Ð³ÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÐ²Ð°ÑÑÐ½ÐµÑÐ¾
Ð½Ð° %s: %m"
+
+#, fuzzy
+#~ msgid "Error reading solv-file: "
+#~ msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ ÑÐµÑÐµÐ½ÐµÑÐ¾ Ð½Ð° ÑÐµÐºÑÐ¾Ñ %u."

#, fuzzy
#~ msgid "Software management is already running."
@@ -5002,9 +4955,6 @@
#~ msgid "%s is required by other to-be-installed resolvable, so it won't be
unlinked."
#~ msgstr "%s ÑÐµ Ð¸Ð·Ð¸ÑÐºÐ²Ð° Ð¾Ñ Ð´ÑÑÐ³, Ð¼Ð°ÑÐºÐ¸ÑÐ°Ð½ Ð·Ð°
Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½Ðµ Ð¿Ð°ÐºÐµÑ Ð¸ Ð½ÑÐ¼Ð° Ð´Ð° Ð±ÑÐ´Ðµ Ð¿ÑÐµÐ¼Ð°ÑÐ½Ð°Ñ."

-#~ msgid "Cannot be install %s to fulfil the dependencies of %s"
-#~ msgstr "%s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±ÑÐ´Ðµ Ð¸Ð½ÑÑÐ°Ð»Ð¸ÑÐ°Ð½ Ð·Ð°
Ð·Ð°Ð´Ð¾Ð²Ð¾Ð»ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð·Ð°Ð²Ð¸ÑÐ¸Ð¼Ð¾ÑÑÐ¸ÑÐµ Ð½Ð° %s"
-
#~ msgid "%s dependend on %s"
#~ msgstr "Ð¾Ñ %s Ð·Ð°Ð²Ð¸ÑÐ¸ %s"

Modified: trunk/libzypp/po/bn.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bn.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/bn.po (original)
+++ trunk/libzypp/po/bn.po Mon Apr 28 15:25:19 2008
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: @PACKAGE@\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
"PO-Revision-Date: 2005-07-29 15:37+0530\n"
"Last-Translator: Priyavert Sharma<priyavert.sharma@xxxxxxxxxxx>\n"
"Language-Team: AgreeYa Solutions <linux_team@xxxxxxxxxxx>\n"
@@ -12,7 +12,7 @@
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
"\n"

-#: ../zypp/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:933
#, fuzzy
msgid ""
"\n"
@@ -24,61 +24,49 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:880
#, fuzzy, c-format
msgid "%s conflicts with %s provided by %s"
msgstr "%s-à¦à¦° à¦¸à¦à§à¦à§ %s-à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à§à§à¦à§ "

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦ à¦¿à¦ à¦à¦à§"

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:866
#, fuzzy, c-format
msgid "%s is not installable"
msgstr "à¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾ à¦¹à§ à¦¨à¦¿"

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, fuzzy, c-format
msgid "%s obsoletes %s provided by %s"
msgstr "%s %sà¦à§ à¦ªà§à¦°à¦¾à¦à§à¦¨ à¦à¦°à§ à¦¦à¦¿à§à§à¦à§"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, 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:93
-#, fuzzy, c-format
-msgid "%s provides this dependency, but would change the vendor of the
installed item"
-msgstr "%s à¦à¦ à¦¨à¦¿à¦°à§à¦à¦°à¦¤à¦¾ à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§
à¦à¦¿à¦¨à§à¦¤à§ à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦à¦à¦à§à¦®à§à¦°
à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° à¦ªà¦¾à¦²à¦à§ à¦¦à§à¦¬à§ "
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "%s à¦à¦ªà¦¸à¦¾à¦°à¦£ à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à§à§à¦à§"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "%s à¦à¦ªà¦¸à¦¾à¦°à¦£ à¦ à¦¿à¦ à¦à¦à§"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -103,12 +91,12 @@
msgid "Adangme"
msgstr "à¦ªà¦°à¦¿à¦¸à§à¦®à¦¾"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
msgstr ""

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "à¦à¦¤à¦¿à¦°à¦¿à¦à§à¦¤ à¦¤à¦¥à§à¦¯"

@@ -321,7 +309,7 @@
msgid "Austronesian (Other)"
msgstr "à¦à¦¸à§à¦à§à¦°à§à¦¨à§à¦¶à¦¿à§à¦¾à¦¨ (à¦à¦¨à§à¦¯à¦¾à¦¨à§à¦¯)"

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, fuzzy, c-format
msgid "Authentication required for '%s'"
msgstr "à¦¸à¦¤à§à¦¯à¦¤à¦¾ à¦¯à¦¾à¦à¦¾à¦à§à§à¦° à¦§à¦°à¦¨"
@@ -585,7 +573,7 @@
msgid "Buginese"
msgstr "à¦¬à§à¦à¦¿à¦¨à¦¿à¦"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
@@ -635,7 +623,7 @@
msgid "Cameroon"
msgstr "à¦à§à¦¯à¦¾à¦®à§à¦°à¦¾"

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:147
#, fuzzy
msgid "Can not create sat-pool."
msgstr "à¦«à¦¾à¦à¦² à¦¤à§à¦°à§ à¦à¦°à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾"
@@ -644,10 +632,6 @@
msgid "Can't acquire the mutex lock"
msgstr "à¦®à¦¿à¦à¦à§à¦à§à¦¸ à¦²à¦ à¦à¦°à§à¦à¦¨ à¦à¦°à¦¤à§
à¦ªà¦¾à¦°à§ à¦¨à¦¾"

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
@@ -677,6 +661,11 @@
msgid "Can't initialize recursive mutex"
msgstr "à¦°à¦¿à¦à¦¾à¦°à§à¦¸à¦¿à¦ à¦®à¦¿à¦à¦à§à¦à§à¦¸ à¦à¦¾à¦²à§
à¦à¦°à¦¤à§ à¦ªà¦¾à¦°à§ à¦¨à¦¾"

+#: ../zypp/base/InterProcessMutex.cc:79
+#, fuzzy, c-format
+msgid "Can't open lock file: %s"
+msgstr "à¦«à¦¾à¦à¦² à¦à§à¦²à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾ %1."
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -687,12 +676,7 @@
msgid "Can't open pty (%s)."
msgstr "Couldn't open file: %s."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "à¦«à¦¾à¦à¦² à¦à§à¦²à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾ %1."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, fuzzy, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr "%s à¦¥à§à¦à§ %s à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à¦¤à§ à¦ªà¦¾à¦°à§ à¦¨à¦¾"
@@ -701,10 +685,6 @@
msgid "Can't release the mutex lock"
msgstr "à¦®à¦¿à¦à¦à§à¦à§à¦¸ à¦²à¦ à¦®à§à¦à§à¦¤ à¦à¦°à¦¤à§
à¦ªà¦¾à¦°à§ à¦¨à¦¾"

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr "à¦°à¦¿à¦à¦¾à¦°à§à¦¸à¦¿à¦ à¦®à¦¿à¦à¦à§à¦à§à¦¸
à¦¬à§à¦¶à¦¿à¦·à§à¦à§à¦¯ à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦ à¦à¦°à¦¤à§
à¦ªà¦¾à¦°à§ à¦¨à¦¾"
@@ -800,7 +780,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr " %s-à¦à¦° à¦à¦¨à§à¦¯ à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¿à¦¤
à¦à¦¨à¦«à¦¿à¦à¦¾à¦°à§à¦¶à¦¨ à¦«à¦¾à¦à¦²à¦¸à¦®à§à¦¹ :"
@@ -1066,11 +1046,6 @@
msgid "Djibouti"
msgstr "à¦à¦¿à¦¬à§à¦à¦¿"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
-msgid "Do not install or delete the resolvables concerned"
-msgstr "%1 à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° à¦¸à¦¾à¦¥à§"
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1116,7 +1091,7 @@
msgstr "à¦®à¦¾à¦²à¦à¦¾"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1229,11 +1204,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""

-#: ../zypp/Repository.cc:141
-#, fuzzy
-msgid "Error reading solv-file: "
-msgstr "à¦¸à§à¦à§à¦à¦° %u à¦ªà§à¦¾à§ à¦¤à§à¦°à§à¦à¦¿à¥¤"
-
#. language code: myv
#: ../zypp/LanguageCode.cc:850
msgid "Erzya"
@@ -1274,7 +1244,7 @@
msgid "Failed to delete key."
msgstr "Failed to parse: %s."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1284,7 +1254,7 @@
msgid "Failed to mount %s on %s"
msgstr "%s à¦à§à¦²à¦¤à§ à¦ªà¦¾à¦°à§ à¦¨à¦¿ - %s\n"

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, fuzzy, c-format
msgid "Failed to remove public key %s: %s"
msgstr "à¦ªà¦¾à¦¬à§à¦²à¦¿à¦ à¦à§ à¦ªà¦¾à¦à§à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾"
@@ -1522,9 +1492,9 @@
msgid "Geez"
msgstr "à¦à§à¦°à§à¦"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
#, fuzzy
-msgid "Generally ignore this requirement"
+msgid "Generally ignore of some dependecies"
msgstr "à¦à¦¿à¦à§ à¦à¦®à§à¦®à¦¾à¦à¦¸à¦¿à¦¤ à¦à¦¬à¦¶à§à¦¯à¦à¦¤à¦¾
à¦à¦à§..."

#. :GRD:308:
@@ -1815,27 +1785,10 @@
msgstr "à¦à¦à¦¬à§"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr "%s à¦à¦¤à§à¦®à¦§à§à¦¯à§à¦ à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦¹à¦à§à¦¾
à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦ à¦°à§à§à¦à§, à¦à¦ à¦¬à¦¿à¦·à§à¦à¦¿
à¦à¦ªà§à¦à§à¦·à¦¾ à¦à¦°à§à¦¨"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
-#, c-format
-msgid "Ignore the obsolete %s in %s"
-msgstr "%s-à¦ à¦à¦ªà§à¦°à¦à¦²à¦¿à¦¤ %s à¦à¦à§à¦°à¦¾à¦¹à§à¦¯
à¦à¦°à§à¦¨"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr "%s à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬ à¦à¦à§à¦°à¦¾à¦¹à§à¦¯
à¦à¦°à§à¦¨"
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
-msgstr "à¦à¦¿à¦à§ à¦à¦®à§à¦®à¦¾à¦à¦¸à¦¿à¦¤ à¦à¦¬à¦¶à§à¦¯à¦à¦¤à¦¾
à¦à¦à§..."
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
+#, fuzzy, c-format
+msgid "Ignore some dependencies of %s"
+msgstr "à¦¨à¦¿à¦°à§à¦à¦°à¦¤à¦¾à¦à§à¦²à¦¿à¦° à¦¸à¦®à¦¾à¦§à¦¾à¦¨
à¦à¦°à¦¤à§ à¦ªà¦¾à¦°à§ à¦¨à¦¿"

#. language code: ijo
#: ../zypp/LanguageCode.cc:630
@@ -1882,23 +1835,7 @@
msgid "Ingush"
msgstr "à¦à¦à§à¦à§à¦¶"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, 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:90
-#, fuzzy, c-format
-msgid "Install %s although it would change the vendor"
-msgstr "%s à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à§à¦¨ à¦¯à¦¦à¦¿à¦ à¦à¦à¦¾
à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° à¦ªà¦¾à¦²à¦à§ à¦¦à§à¦¬à§"
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr "à¦¡à§à¦°à¦¾à¦à¦à¦¾à¦° à¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾
à¦¹à¦à§à¦à§..."
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr "à¦¨à¦¿à¦°à§à¦¦à§à¦¶à¦®à¦¤ à¦¸à§à¦¥à¦¾à¦ªà¦¨à¦¾ à¦¬à¦¾à¦¤à¦¿à¦²
à¦à¦°à¦¾ à¦¹à§à§à¦à§à¥¤"

@@ -1972,7 +1909,12 @@
msgid "Invalid port component '%s'"
msgstr "à¦à¦¬à§à¦§ à¦ªà§à¦°à§à¦ à¦à¦®à§à¦ªà§à¦¨à§à¦¨à§à¦ '%s' "

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr ""
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
#, fuzzy
msgid "Invalid user name or password."
msgstr "à¦ªà¦¾à¦¸à¦à§à¦¾à¦°à§à¦¡ à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨"
@@ -2022,11 +1964,6 @@
msgid "Israel"
msgstr "à¦à¦¸à¦°à¦¾à¦à¦²"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "à¦«à¦¾à¦à¦² à¦à§à¦²à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾ %1."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2152,10 +2089,6 @@
msgid "Kazakhstan"
msgstr "à¦ªà¦¾à¦à¦¿à¦¸à§à¦¤à¦¾à¦¨"

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr "à¦¡à§à¦°à¦¾à¦à¦à¦¾à¦° à¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾
à¦¹à¦à§à¦à§..."
-
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
msgid "Kenya"
@@ -2871,7 +2804,7 @@
msgid "No Code"
msgstr "à¦à§à¦¡"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
#, fuzzy
msgid "No url in repository."
msgstr "à¦°à¦¿à¦ªà§à¦¸à¦¿à¦à¦¾à¦°à¦¿à¦¤à§ à¦«à¦¾à¦à¦² %1 à¦ªà¦¾à¦à§à¦¾
à¦¯à¦¾à§à¦¨à¦¿"
@@ -3095,14 +3028,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr ""

-#: ../zypp/url/UrlBase.cc:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr "à¦à¦ URL à¦à¦° à¦à¦¨à§à¦¯à§ à¦ªà¦¥
à¦ªà§à¦¯à¦¾à¦°à¦¾à¦®à¦¿à¦à¦¾à¦° à¦ªà¦¾à¦°à§à¦¸à¦¿à¦ à¦¸à¦®à¦°à§à¦¥à¦¿à¦¤
à¦¨à§"
-
-#: ../zypp/url/UrlBase.cc:727
-msgid "Path parameter parsing not supported for this URL"
-msgstr "à¦à¦ URL à¦à¦° à¦à¦¨à§à¦¯à§ à¦ªà¦¥
à¦ªà§à¦¯à¦¾à¦°à¦¾à¦®à¦¿à¦à¦¾à¦° à¦ªà¦¾à¦°à§à¦¸à¦¿à¦ à¦¸à¦®à¦°à§à¦¥à¦¿à¦¤
à¦¨à§"
-
#: ../zypp/media/MediaException.cc:200
#, fuzzy, c-format
msgid "Permission to access '%s' denied."
@@ -3203,8 +3128,8 @@
msgstr "à¦à¦ URL à¦à¦° à¦à¦¨à§à¦¯à§ à¦¸à§à¦à§à¦°à¦¿à¦
à¦ªà¦¾à¦°à§à¦¸à¦¿à¦ à¦¸à¦®à¦°à§à¦¥à¦¿à¦¤ à¦¨à§"

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
#, fuzzy
msgid "RPM failed: "
msgstr "à¦¬à§à¦¯à¦°à§à¦¥"
@@ -3233,16 +3158,11 @@
msgid "Relative path not allowed if authority exists"
msgstr "à¦à¦¥à¦°à¦¿à¦à¦¿ à¦¬à¦¿à¦¦à§à¦¯à¦®à¦¾à¦¨ à¦¥à¦¾à¦à¦²à§
à¦°à¦¿à¦²à§à¦à¦¿à¦ à¦ªà¦¥à§à¦° à¦à¦¨à§à¦®à¦¤à¦¿ à¦¨à§à¦"

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "à¦¸à¦à¦¸à§à¦¥à¦¾à¦¨ à¦ªà§à¦¨à¦à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à¦à§"

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr ""
@@ -3542,6 +3462,11 @@
msgid "Solomon Islands"
msgstr "à¦«à¦¾à¦°à§ à¦¦à§à¦¬à§à¦ªà¦ªà§à¦à§à¦"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, fuzzy, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr "%s-à¦à¦° à¦¸à¦à§à¦à§ %s-à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬"
+
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
msgid "Somali"
@@ -3777,7 +3702,7 @@
msgid "Thailand"
msgstr "à¦¥à¦¾à¦à¦²à§à¦¯à¦¾à¦¨à§à¦¡"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4017,10 +3942,6 @@
msgid "Unknown language: "
msgstr "à¦à¦à§à¦à¦¾à¦¤ à¦à¦¾à¦·à¦¾: "

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr "%1 à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° à¦¸à¦¾à¦¥à§"
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4283,90 +4204,74 @@
msgid "applydeltarpm failed."
msgstr "applydeltarpm à¦¬à§à¦¯à¦°à§à¦¥ à¦¹à§à§à¦à§à¥¤"

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:875
#, fuzzy, c-format
msgid "cannot install both %s and %s"
msgstr "in/ssTklà¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾ à¦¯à¦¾à¦¬à§ à¦¨à¦¾"

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:859
#, fuzzy
msgid "conflicting requests"
msgstr "à¦à¦° à¦¸à¦¾à¦¥à§ à¦¸à¦à¦¯à§à¦à§à¦° à¦à¦¨à§à¦°à§à¦§: "

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr "%s à¦¬à§à¦¯à¦¾à¦à¦à¦ª à¦¤à§à¦°à§ à¦à¦°à¦à§"

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "à¦¸à§à¦¥à¦¾à¦ªà¦¨"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
-#, c-format
-msgid "delete %s"
-msgstr "%s à¦®à§à¦à§ à¦«à§à¦²à§à¦¨"
-
-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:923
#, fuzzy
msgid "deleted providers: "
msgstr "à¦à§à¦¨à¦à¦à¦¾à¦ %s à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§ à¦¨à¦¾"

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, fuzzy, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr "%1 à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° à¦¸à¦¾à¦¥à§"

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, fuzzy, c-format
msgid "do not ask to install a solvable providing %s"
msgstr "%s à¦à¦° à¦à§à¦¨à¦ à¦¬à¦¿à¦à¦²à§à¦ª
à¦¸à§à¦¥à¦¾à¦ªà¦¨à¦¯à§à¦à§à¦¯ à¦ªà§à¦°à¦¦à¦¾à¦¨à¦à¦¾à¦°à§ à¦¨à§à¦"

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à§ à¦¨à¦¾"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr "%s à¦à¦¨à§à¦¸à¦à¦² à¦à¦°à§ à¦¨à¦¾"

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:989
#, fuzzy, c-format
msgid "do not keep %s installed"
msgstr "à¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾ à¦¹à§ à¦¨à¦¿"

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, fuzzy, c-format
msgid "downgrade of %s to %s"
msgstr "%s à¦¥à§à¦à§ %s à¦¡à¦¾à¦à¦¨à¦²à§à¦¡ à¦à¦°à§à¦à§"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, c-format
-msgid "install %s"
-msgstr "%s à¦à¦¨à¦¸à§à¦à¦² à¦à¦°à§à¦¨"
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4375,10 +4280,8 @@
" %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr "%s à¦°à¦¾à¦à§à¦¨"
@@ -4391,34 +4294,34 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection: dbus à¦¸à¦à¦¯à§à¦
à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦ à¦à¦°à¦¤à§ à¦ªà¦¾à¦°à§ à¦¨à¦¾"

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:870
#, fuzzy, c-format
msgid "nothing provides %s needed by %s"
msgstr "%s à¦à¦° %s à¦¦à¦°à¦à¦¾à¦°"

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:862
#, fuzzy, c-format
msgid "nothing provides requested %s"
msgstr "à¦à§à¦¨à¦à¦à¦¾à¦ %s à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§ à¦¨à¦¾"

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:856
#, fuzzy, c-format
msgid "problem with installed package %s"
msgstr "à¦ªà§à¦¯à¦¾à¦à§à¦ à¦à¦¨à¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾à¦°
à¦à¦¦à§à¦¶"

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, 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:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -4427,18 +4330,18 @@
"rpm %s à¦à§ %sà¦°à§à¦ªà§ à¦¤à§à¦°à¦¿ à¦à¦°à§à¦à¦¿à¦²à¥¤\n"
"à¦à¦à¦¾à¦¨à§ à¦ªà¦¾à¦°à§à¦¥à¦à§à¦¯à§à¦° à¦ªà§à¦°à¦¥à¦® à§¨à§« à¦à¦¿
à¦²à¦¾à¦à¦¨ à¦¦à§à¦à§à¦¾ à¦à¦à§:\n"

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr "rpm à¦à¦à¦à¦ªà§à¦"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, 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:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4447,20 +4350,76 @@
"rpm %s à¦à§ %sà¦°à§à¦ªà§ à¦¸à¦à¦°à¦à§à¦·à¦£ à¦à¦°à§à¦à¦¿à¦²à¥¤\n"
"à¦à¦à¦¾à¦¨à§ à¦ªà¦¾à¦°à§à¦¥à¦à§à¦¯à§à¦° à¦ªà§à¦°à¦¥à¦® à§¨à§« à¦à¦¿
à¦²à¦¾à¦à¦¨ à¦¦à§à¦à§à¦¾ à¦à¦à§:\n"

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:935
#, fuzzy
msgid "uninstallable providers: "
msgstr "%s à¦à¦° à¦à§à¦¨à¦ à¦¬à¦¿à¦à¦²à§à¦ª
à¦¸à§à¦¥à¦¾à¦ªà¦¨à¦¯à§à¦à§à¦¯ à¦ªà§à¦°à¦¦à¦¾à¦¨à¦à¦¾à¦°à§ à¦¨à§à¦"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr "%s à¦à¦¨à¦²à¦ à¦à¦°à§"
+#, fuzzy
+#~ msgid "%s provides this dependency, but would change the architecture of
the installed item"
+#~ msgstr "%s à¦à¦ à¦¨à¦¿à¦°à§à¦à¦°à¦¤à¦¾ à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§
à¦à¦¿à¦¨à§à¦¤à§ à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦à¦à¦à§à¦®à§à¦°
à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° à¦ªà¦¾à¦²à¦à§ à¦¦à§à¦¬à§ "

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr "%1 à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° à¦¸à¦¾à¦¥à§"
+#, fuzzy
+#~ msgid "%s provides this dependency, but would change the vendor of the
installed item"
+#~ msgstr "%s à¦à¦ à¦¨à¦¿à¦°à§à¦à¦°à¦¤à¦¾ à¦ªà§à¦°à¦¦à¦¾à¦¨ à¦à¦°à§
à¦à¦¿à¦¨à§à¦¤à§ à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦à¦à¦à§à¦®à§à¦°
à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° à¦ªà¦¾à¦²à¦à§ à¦¦à§à¦¬à§ "
+
+#, fuzzy
+#~ msgid "Do not install or delete the resolvables concerned"
+#~ msgstr "%1 à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° à¦¸à¦¾à¦¥à§"
+
+#~ msgid "Ignore that %s is already set to install"
+#~ msgstr "%s à¦à¦¤à§à¦®à¦§à§à¦¯à§à¦ à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦¹à¦à§à¦¾
à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦ à¦°à§à§à¦à§, à¦à¦ à¦¬à¦¿à¦·à§à¦à¦¿
à¦à¦ªà§à¦à§à¦·à¦¾ à¦à¦°à§à¦¨"
+
+#~ msgid "Ignore the obsolete %s in %s"
+#~ msgstr "%s-à¦ à¦à¦ªà§à¦°à¦à¦²à¦¿à¦¤ %s à¦à¦à§à¦°à¦¾à¦¹à§à¦¯
à¦à¦°à§à¦¨"
+
+#~ msgid "Ignore this conflict of %s"
+#~ msgstr "%s à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬ à¦à¦à§à¦°à¦¾à¦¹à§à¦¯
à¦à¦°à§à¦¨"
+
+#~ msgid "Ignore this requirement just here"
+#~ msgstr "à¦à¦¿à¦à§ à¦à¦®à§à¦®à¦¾à¦à¦¸à¦¿à¦¤ à¦à¦¬à¦¶à§à¦¯à¦à¦¤à¦¾
à¦à¦à§..."
+
+#~ msgid "Install %s although it would change the architecture"
+#~ msgstr "%s à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à§à¦¨ à¦¯à¦¦à¦¿à¦ à¦à¦à¦¾
à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° à¦ªà¦¾à¦²à¦à§ à¦¦à§à¦¬à§"
+
+#, fuzzy
+#~ msgid "Install %s although it would change the vendor"
+#~ msgstr "%s à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦à¦°à§à¦¨ à¦¯à¦¦à¦¿à¦ à¦à¦à¦¾
à¦à¦°à§à¦à¦¿à¦à§à¦à¦à¦¾à¦° à¦ªà¦¾à¦²à¦à§ à¦¦à§à¦¬à§"
+
+#~ msgid "Install missing resolvables"
+#~ msgstr "à¦¡à§à¦°à¦¾à¦à¦à¦¾à¦° à¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾
à¦¹à¦à§à¦à§..."
+
+#~ msgid "Keep resolvables"
+#~ msgstr "à¦¡à§à¦°à¦¾à¦à¦à¦¾à¦° à¦à¦¨à¦¸à§à¦à¦² à¦à¦°à¦¾
à¦¹à¦à§à¦à§..."
+
+#~ msgid "Unlock these resolvables"
+#~ msgstr "%1 à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° à¦¸à¦¾à¦¥à§"
+
+#~ msgid "delete %s"
+#~ msgstr "%s à¦®à§à¦à§ à¦«à§à¦²à§à¦¨"
+
+#~ msgid "install %s"
+#~ msgstr "%s à¦à¦¨à¦¸à§à¦à¦² à¦à¦°à§à¦¨"
+
+#~ msgid "unlock %s"
+#~ msgstr "%s à¦à¦¨à¦²à¦ à¦à¦°à§"
+
+#~ msgid "unlock all resolvables"
+#~ msgstr "%1 à¦à¦° à¦¦à§à¦¬à¦¨à§à¦¦à§à¦¬ %2 à¦à¦° à¦¸à¦¾à¦¥à§"
+
+#, fuzzy
+#~ msgid "Can't open solv-file: "
+#~ msgstr "à¦«à¦¾à¦à¦² à¦à§à¦²à¦¾ à¦¯à¦¾à¦à§à¦à§ à¦¨à¦¾ %1."
+
+#, fuzzy
+#~ msgid "Error reading solv-file: "
+#~ msgstr "à¦¸à§à¦à§à¦à¦° %u à¦ªà§à¦¾à§ à¦¤à§à¦°à§à¦à¦¿à¥¤"
+
+#~ msgid "Path Parameter parsing not supported for this URL"
+#~ msgstr "à¦à¦ URL à¦à¦° à¦à¦¨à§à¦¯à§ à¦ªà¦¥
à¦ªà§à¦¯à¦¾à¦°à¦¾à¦®à¦¿à¦à¦¾à¦° à¦ªà¦¾à¦°à§à¦¸à¦¿à¦ à¦¸à¦®à¦°à§à¦¥à¦¿à¦¤
à¦¨à§"
+
+#~ msgid "Path parameter parsing not supported for this URL"
+#~ msgstr "à¦à¦ URL à¦à¦° à¦à¦¨à§à¦¯à§ à¦ªà¦¥
à¦ªà§à¦¯à¦¾à¦°à¦¾à¦®à¦¿à¦à¦¾à¦° à¦ªà¦¾à¦°à§à¦¸à¦¿à¦ à¦¸à¦®à¦°à§à¦¥à¦¿à¦¤
à¦¨à§"

#~ msgid "Software management is already running."
#~ msgstr "à¦¸à¦«à§à¦à¦à§à§à¦¯à¦¾à¦° à¦®à§à¦¯à¦¾à¦¨à§à¦à¦®à§à¦¨à§à¦
à¦à¦¤à§à¦®à¦§à§à¦¯à§à¦ à¦à¦²à¦à§à¥¤"

Modified: trunk/libzypp/po/bs.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/bs.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/bs.po (original)
+++ trunk/libzypp/po/bs.po Mon Apr 28 15:25:19 2008
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
"PO-Revision-Date: 2002-07-23 18:27+0200\n"
"Last-Translator: Damir Bjelobradic <Nagual@xxxxxxxxxx>\n"
"Language-Team: Bosnian <i18n@xxxxxxx>\n"
@@ -18,7 +18,7 @@
"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/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:933
msgid ""
"\n"
"uninstallable providers: "
@@ -29,61 +29,49 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:880
#, c-format
msgid "%s conflicts with %s provided by %s"
msgstr ""

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, fuzzy, c-format
msgid "%s install failed"
msgstr "Nova instalacija"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, fuzzy, c-format
msgid "%s installed ok"
msgstr "&Da, instaliraj"

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:866
#, fuzzy, c-format
msgid "%s is not installable"
msgstr "Nova instalacija"

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, c-format
msgid "%s obsoletes %s provided by %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, 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:93
-#, c-format
-msgid "%s provides this dependency, but would change the vendor of the
installed item"
-msgstr ""
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr ""

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -109,12 +97,12 @@
msgid "Adangme"
msgstr ""

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
msgstr ""

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
#, fuzzy
msgid "Additional rpm output:"
msgstr "&Dodatne informacije za korisnika"
@@ -356,7 +344,7 @@
msgid "Austronesian (Other)"
msgstr ""

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr ""
@@ -657,7 +645,7 @@
msgid "Buginese"
msgstr "Kineski"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
@@ -714,7 +702,7 @@
msgid "Cameroon"
msgstr "Kamerun"

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:147
msgid "Can not create sat-pool."
msgstr ""

@@ -722,10 +710,6 @@
msgid "Can't acquire the mutex lock"
msgstr ""

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
@@ -755,6 +739,11 @@
msgid "Can't initialize recursive mutex"
msgstr ""

+#: ../zypp/base/InterProcessMutex.cc:79
+#, fuzzy, c-format
+msgid "Can't open lock file: %s"
+msgstr "Couldn't open file: %s."
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -765,12 +754,7 @@
msgid "Can't open pty (%s)."
msgstr "Couldn't open file: %s."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "Couldn't open file: %s."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr ""
@@ -779,10 +763,6 @@
msgid "Can't release the mutex lock"
msgstr ""

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr ""
@@ -889,7 +869,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "Editor konfiguracijskih datoteka"
@@ -1180,11 +1160,6 @@
msgid "Djibouti"
msgstr "DÅ¾ibuti"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
-msgid "Do not install or delete the resolvables concerned"
-msgstr "Instaliram driver..."
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
#, fuzzy
@@ -1232,7 +1207,7 @@
msgstr "Palau"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1349,10 +1324,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""

-#: ../zypp/Repository.cc:141
-msgid "Error reading solv-file: "
-msgstr ""
-
#. language code: myv
#: ../zypp/LanguageCode.cc:850
msgid "Erzya"
@@ -1394,7 +1365,7 @@
msgid "Failed to delete key."
msgstr "Failed to parse: %s."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1404,7 +1375,7 @@
msgid "Failed to mount %s on %s"
msgstr "Failed to parse: %s."

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, c-format
msgid "Failed to remove public key %s: %s"
msgstr ""
@@ -1655,8 +1626,8 @@
msgid "Geez"
msgstr "GrÄki"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
-msgid "Generally ignore this requirement"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
+msgid "Generally ignore of some dependecies"
msgstr ""

#. :GRD:308:
@@ -1979,26 +1950,9 @@
msgstr ""

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
-#, c-format
-msgid "Ignore the obsolete %s in %s"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr ""
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
+msgid "Ignore some dependencies of %s"
msgstr ""

#. language code: ijo
@@ -2048,24 +2002,7 @@
msgid "Ingush"
msgstr "Engleski"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, c-format
-msgid "Install %s although it would change the architecture"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#, c-format
-msgid "Install %s although it would change the vendor"
-msgstr ""
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-#, fuzzy
-msgid "Install missing resolvables"
-msgstr "Instaliram driver..."
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr ""

@@ -2141,7 +2078,12 @@
msgid "Invalid port component '%s'"
msgstr ""

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr ""
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
msgid "Invalid user name or password."
msgstr ""

@@ -2193,11 +2135,6 @@
msgid "Israel"
msgstr "Izrael"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "Couldn't open file: %s."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2340,11 +2277,6 @@
msgid "Kazakhstan"
msgstr "Kazahstan"

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-#, fuzzy
-msgid "Keep resolvables"
-msgstr "Instaliram driver..."
-
# KE
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
@@ -3171,7 +3103,7 @@
msgid "No Code"
msgstr "nobody"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
msgid "No url in repository."
msgstr ""

@@ -3425,14 +3357,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr ""

-#: ../zypp/url/UrlBase.cc:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr ""
-
-#: ../zypp/url/UrlBase.cc:727
-msgid "Path parameter parsing not supported for this URL"
-msgstr ""
-
#: ../zypp/media/MediaException.cc:200
#, c-format
msgid "Permission to access '%s' denied."
@@ -3539,8 +3463,8 @@
msgstr ""

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
msgid "RPM failed: "
msgstr ""

@@ -3572,16 +3496,11 @@
msgid "Relative path not allowed if authority exists"
msgstr ""

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, c-format
msgid "Removing repository '%s'"
msgstr ""

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr ""
@@ -3927,6 +3846,11 @@
msgid "Solomon Islands"
msgstr "Solomoska ostrva"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr ""
+
# SO
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
@@ -4198,7 +4122,7 @@
msgid "Thailand"
msgstr "Tajland"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4472,11 +4396,6 @@
msgid "Unknown language: "
msgstr ""

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-#, fuzzy
-msgid "Unlock these resolvables"
-msgstr "Instaliram driver..."
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4764,88 +4683,72 @@
msgid "applydeltarpm failed."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:875
#, fuzzy, c-format
msgid "cannot install both %s and %s"
msgstr "Instaliram driver..."

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:859
msgid "conflicting requests"
msgstr ""

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "Instaliram driver..."

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
-#, fuzzy, c-format
-msgid "delete %s"
-msgstr "Izbrii"
-
-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:923
msgid "deleted providers: "
msgstr ""

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, fuzzy, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr "Instaliram driver..."

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, c-format
msgid "do not ask to install a solvable providing %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "Instaliram driver..."

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, fuzzy, c-format
msgid "do not install %s"
msgstr "Instaliram driver..."

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:989
#, fuzzy, c-format
msgid "do not keep %s installed"
msgstr "Instaliram driver..."

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, c-format
msgid "downgrade of %s to %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, fuzzy, c-format
-msgid "install %s"
-msgstr "Instaliram driver..."
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4854,10 +4757,8 @@
" %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr ""
@@ -4870,41 +4771,41 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:870
#, c-format
msgid "nothing provides %s needed by %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:862
#, c-format
msgid "nothing provides requested %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:856
#, c-format
msgid "problem with installed package %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
#, fuzzy
msgid "rpm output:"
msgstr ""
@@ -4912,34 +4813,55 @@
"IzvjeÅ¡taj:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:935
#, fuzzy
msgid "uninstallable providers: "
msgstr "&Nemoj instalirati"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr ""
+#, fuzzy
+#~ msgid "Do not install or delete the resolvables concerned"
+#~ msgstr "Instaliram driver..."

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
#, fuzzy
-msgid "unlock all resolvables"
-msgstr "Instaliram driver..."
+#~ msgid "Install missing resolvables"
+#~ msgstr "Instaliram driver..."
+
+#, fuzzy
+#~ msgid "Keep resolvables"
+#~ msgstr "Instaliram driver..."
+
+#, fuzzy
+#~ msgid "Unlock these resolvables"
+#~ msgstr "Instaliram driver..."
+
+#, fuzzy
+#~ msgid "delete %s"
+#~ msgstr "Izbrii"
+
+#, fuzzy
+#~ msgid "install %s"
+#~ msgstr "Instaliram driver..."
+
+#, fuzzy
+#~ msgid "unlock all resolvables"
+#~ msgstr "Instaliram driver..."
+
+#, fuzzy
+#~ msgid "Can't open solv-file: "
+#~ msgstr "Couldn't open file: %s."

#, fuzzy
#~ msgid "No need to install %s"

Modified: trunk/libzypp/po/ca.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ca.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/ca.po (original)
+++ trunk/libzypp/po/ca.po Mon Apr 28 15:25:19 2008
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
"PO-Revision-Date: 2007-02-26 19:15+0100\n"
"Last-Translator: Olga LÃ³pez\n"
"Language-Team: Catalan\n"
@@ -17,7 +17,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

-#: ../zypp/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:933
#, fuzzy
msgid ""
"\n"
@@ -29,61 +29,49 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:880
#, fuzzy, c-format
msgid "%s conflicts with %s provided by %s"
msgstr "%s entra en conflicte amb %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "S'ha produÃ¯t un error en instalÂ·lar %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "%s s'ha instalÂ·lat correctament"

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:866
#, fuzzy, c-format
msgid "%s is not installable"
msgstr "no instalÂ·lat"

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, fuzzy, c-format
msgid "%s obsoletes %s provided by %s"
msgstr "%s desactualitza %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, 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:93
-#, 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"
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "S'ha produÃ¯t un error en suprimir %s"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "%s s'ha suprimit correctament"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -108,12 +96,12 @@
msgid "Adangme"
msgstr "Adangme"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "S'estan afegint recursos"

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "Sortida addicional de l'rpm:"

@@ -344,7 +332,7 @@
msgid "Austronesian (Other)"
msgstr "LlengÃ¼es autronÃ¨sies (altres)"

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, fuzzy, c-format
msgid "Authentication required for '%s'"
msgstr "Cal autenticaciÃ³"
@@ -638,7 +626,7 @@
msgid "Buginese"
msgstr "Bugui"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
@@ -695,7 +683,7 @@
msgid "Cameroon"
msgstr "Camerun"

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:147
#, fuzzy
msgid "Can not create sat-pool."
msgstr "No es pot crear el fitxer."
@@ -704,10 +692,6 @@
msgid "Can't acquire the mutex lock"
msgstr "No es pot obtenir el bloqueig de mutex"

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
@@ -737,6 +721,11 @@
msgid "Can't initialize recursive mutex"
msgstr "No es pot inicialitzar el mutex recursiu"

+#: ../zypp/base/InterProcessMutex.cc:79
+#, fuzzy, c-format
+msgid "Can't open lock file: %s"
+msgstr "No es pot obrir el fitxer %1."
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -747,12 +736,7 @@
msgid "Can't open pty (%s)."
msgstr "Couldn't open file: %s."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "No es pot obrir el fitxer %1."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, fuzzy, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr "No es pot proporcionar %s des de %s"
@@ -761,10 +745,6 @@
msgid "Can't release the mutex lock"
msgstr "No es pot alliberar el bloqueig de mutex"

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr "No es pot definir l'atribut de mutex recursiu"
@@ -867,7 +847,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Fitxers de configuraciÃ³ modificats per a %s:"
@@ -1153,11 +1133,6 @@
msgid "Djibouti"
msgstr "Djibouti"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
-msgid "Do not install or delete the resolvables concerned"
-msgstr "No instalÂ·lis ni suprimeixis els Ãtems amb dependÃ¨ncies relacionats"
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1206,7 +1181,7 @@
msgstr "Duala"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1325,11 +1300,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""

-#: ../zypp/Repository.cc:141
-#, fuzzy
-msgid "Error reading solv-file: "
-msgstr "Error en llegir el sector %u."
-
#. language code: myv
#: ../zypp/LanguageCode.cc:850
msgid "Erzya"
@@ -1372,7 +1342,7 @@
msgid "Failed to delete key."
msgstr "No s'ha pogut iniciar la mÃ quina virtual."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1382,7 +1352,7 @@
msgid "Failed to mount %s on %s"
msgstr "No es pot obrir %s - %s\n"

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, fuzzy, c-format
msgid "Failed to remove public key %s: %s"
msgstr "No s'ha pogut obtenir la clau pÃºblica."
@@ -1643,9 +1613,9 @@
msgid "Geez"
msgstr "Gueez"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
#, fuzzy
-msgid "Generally ignore this requirement"
+msgid "Generally ignore of some dependecies"
msgstr "Ignora aquest requisit nomÃ©s en aquest cas"

# GE
@@ -1968,27 +1938,10 @@
msgstr "Igbo"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr "Ignora que %s ja s'ha definit per a instalÂ·lar-se"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
-#, 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:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr "Ignora aquest conflicte de %s"
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
-msgstr "Ignora aquest requisit nomÃ©s en aquest cas"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
+#, fuzzy, c-format
+msgid "Ignore some dependencies of %s"
+msgstr "no s'han pogut resoldre dependÃ¨ncies"

#. language code: ijo
#: ../zypp/LanguageCode.cc:630
@@ -2037,23 +1990,7 @@
msgid "Ingush"
msgstr "IngÃºix"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, 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:90
-#, fuzzy, c-format
-msgid "Install %s although it would change the vendor"
-msgstr "InstalÂ·la %s, encara que canviÃ¯ l'arquitectura"
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr "InstalÂ·la els Ãtems amb dependÃ¨ncies que falten"
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr "La instalÂ·laciÃ³ s'ha avortat tal com heu indicat."

@@ -2128,7 +2065,12 @@
msgid "Invalid port component '%s'"
msgstr "El component de port '%s' no Ã©s vÃ lid"

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr ""
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
#, fuzzy
msgid "Invalid user name or password."
msgstr "La contrasenya de la CA no Ã©s vÃ lida."
@@ -2183,11 +2125,6 @@
msgid "Israel"
msgstr "Israel"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "No es pot obrir el fitxer %1."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2326,10 +2263,6 @@
msgid "Kazakhstan"
msgstr "Kazakhstan"

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr "Conserva els Ãtems amb dependÃ¨ncies"
-
# KE
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
@@ -3133,7 +3066,7 @@
msgid "No Code"
msgstr "Sense codi"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
#, fuzzy
msgid "No url in repository."
msgstr "No s'ha trobat el fitxer %1 al dipÃ²sit."
@@ -3376,14 +3309,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr ""

-#: ../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"
-
-#: ../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/media/MediaException.cc:200
#, fuzzy, c-format
msgid "Permission to access '%s' denied."
@@ -3492,8 +3417,8 @@
msgstr "No s'admet l'anÃ lisi de cadenes de consulta per a aquesta URL"

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
#, fuzzy
msgid "RPM failed: "
msgstr "ha fallat"
@@ -3524,16 +3449,11 @@
msgid "Relative path not allowed if authority exists"
msgstr "No es permet un camÃ relatiu si existeix una autoritat"

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "S'estan afegint recursos"

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr ""
@@ -3868,6 +3788,11 @@
msgid "Solomon Islands"
msgstr "Illes SalomÃ³"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, fuzzy, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr "%s entra en conflicte amb %s"
+
# SO
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
@@ -4136,7 +4061,7 @@
msgid "Thailand"
msgstr "TailÃ ndia"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4402,10 +4327,6 @@
msgid "Unknown language: "
msgstr "L'idioma Ã©s desconegut: "

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr "Desbloqueja aquests Ãtems amb dependÃ¨ncies"
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4688,90 +4609,74 @@
msgid "applydeltarpm failed."
msgstr "L'applydeltarpm ha fallat."

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:875
#, fuzzy, c-format
msgid "cannot install both %s and %s"
msgstr "No es pot instalÂ·lar %s"

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:859
#, fuzzy
msgid "conflicting requests"
msgstr "La solÂ·licitud de connexiÃ³ a:"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr "cÃ²pia de seguretat creada %s"

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "InstalÂ·laciÃ³"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
-#, c-format
-msgid "delete %s"
-msgstr "suprimeix %s"
-
-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:923
#, fuzzy
msgid "deleted providers: "
msgstr "No es proporciona %s"

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, fuzzy, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr "No instalÂ·lis ni suprimeixis els Ãtems amb dependÃ¨ncies relacionats"

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, fuzzy, c-format
msgid "do not ask to install a solvable providing %s"
msgstr "No hi ha proveÃ¯dors instalÂ·lables de %s"

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "no instalÂ·lis %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr "no instalÂ·lis %s"

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:989
#, fuzzy, c-format
msgid "do not keep %s installed"
msgstr "no instalÂ·lat"

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, fuzzy, c-format
msgid "downgrade of %s to %s"
msgstr "S'ha baixat %s de %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, c-format
-msgid "install %s"
-msgstr "instalÂ·la %s"
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4780,10 +4685,8 @@
" %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr "conserva %s"
@@ -4796,34 +4699,34 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection: No es pot definir la connexiÃ³ de dbus"

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:870
#, fuzzy, c-format
msgid "nothing provides %s needed by %s"
msgstr "%s requereix %s"

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:862
#, fuzzy, c-format
msgid "nothing provides requested %s"
msgstr "No es proporciona %s"

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:856
#, fuzzy, c-format
msgid "problem with installed package %s"
msgstr "ordre per a desinstalÂ·lar paquets"

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, 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:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -4832,18 +4735,18 @@
"L'rpm ha creat %s com a %s.\n"
"Aquestes sÃ³n les primeres 25 lÃnies de diferÃ¨ncia:\n"

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr "Sortida de l'rpm:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, 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:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4852,20 +4755,76 @@
"L'rpm ha desat %s com a %s.\n"
"Aquestes sÃ³n les primeres 25 lÃnies de diferÃ¨ncia:\n"

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:935
#, fuzzy
msgid "uninstallable providers: "
msgstr "No hi ha proveÃ¯dors instalÂ·lables de %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr "desbloqueja %s"
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Do not install or delete the resolvables concerned"
+#~ msgstr "No instalÂ·lis ni suprimeixis els Ãtems amb dependÃ¨ncies
relacionats"
+
+#~ msgid "Ignore that %s is already set to install"
+#~ msgstr "Ignora que %s ja s'ha definit per a instalÂ·lar-se"
+
+#~ msgid "Ignore the obsolete %s in %s"
+#~ msgstr "Ignora l'obsolet %s a %s"
+
+#~ msgid "Ignore this conflict of %s"
+#~ msgstr "Ignora aquest conflicte de %s"
+
+#~ msgid "Ignore this requirement just here"
+#~ msgstr "Ignora aquest requisit nomÃ©s en aquest cas"
+
+#~ msgid "Install %s although it would change the architecture"
+#~ msgstr "InstalÂ·la %s, encara que canviÃ¯ l'arquitectura"
+
+#, fuzzy
+#~ msgid "Install %s although it would change the vendor"
+#~ msgstr "InstalÂ·la %s, encara que canviÃ¯ l'arquitectura"
+
+#~ msgid "Install missing resolvables"
+#~ msgstr "InstalÂ·la els Ãtems amb dependÃ¨ncies que falten"
+
+#~ msgid "Keep resolvables"
+#~ msgstr "Conserva els Ãtems amb dependÃ¨ncies"
+
+#~ msgid "Unlock these resolvables"
+#~ msgstr "Desbloqueja aquests Ãtems amb dependÃ¨ncies"
+
+#~ msgid "delete %s"
+#~ msgstr "suprimeix %s"
+
+#~ msgid "install %s"
+#~ msgstr "instalÂ·la %s"
+
+#~ msgid "unlock %s"
+#~ msgstr "desbloqueja %s"
+
+#~ msgid "unlock all resolvables"
+#~ msgstr "desbloqueja tots els Ãtems amb dependÃ¨ncies"
+
+#, fuzzy
+#~ msgid "Can't open solv-file: "
+#~ msgstr "No es pot obrir el fitxer %1."
+
+#, fuzzy
+#~ msgid "Error reading solv-file: "
+#~ msgstr "Error en llegir el sector %u."
+
+#~ 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/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr "desbloqueja tots els Ãtems amb dependÃ¨ncies"
+#~ 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"

#~ msgid "Software management is already running."
#~ msgstr "Ja s'estÃ executant la gestiÃ³ del programari."

Modified: trunk/libzypp/po/cs.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/cs.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/cs.po (original)
+++ trunk/libzypp/po/cs.po Mon Apr 28 15:25:19 2008
@@ -13,8 +13,8 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
-"PO-Revision-Date: 2008-02-15 15:15+0100\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
+"PO-Revision-Date: 2008-04-21 21:36+0200\n"
"Last-Translator: Marek Stopka <marekstopka@xxxxxxxxx>\n"
"Language-Team: czech <cs@xxxxxx>\n"
"MIME-Version: 1.0\n"
@@ -23,26 +23,27 @@
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: KBabel 1.11.4\n"

-#: ../zypp/sat/SATResolver.cc:757
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:933
msgid ""
"\n"
"uninstallable providers: "
-msgstr "K dispozici nenÃ Å¾Ã¡dnÃ½ balÃÄek obsahujÃcÃ %s"
+msgstr ""
+"\n"
+"neodinstalovatelnÃ poskytovatelÃ©: "

#: ../zypp/media/MediaException.cc:214
#, c-format
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
-msgstr ""
+msgstr "ProblÃ©m s SSL certifikÃ¡tem, ovÄÅte, Å¾e je certifikÃ¡t
certifikaÄnÃ autority pro '%s' v poÅÃ¡dku "

-#: ../zypp/sat/SATResolver.cc:709
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:880
+#, c-format
msgid "%s conflicts with %s provided by %s"
-msgstr "%s koliduje s %s"
+msgstr "%s koliduje s %s, kterÃ½ poskytuje %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "Instalace %s selhala"
@@ -50,50 +51,38 @@
#
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "%s nainstalovÃ¡n ok"

-#: ../zypp/sat/SATResolver.cc:695
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:866
+#, c-format
msgid "%s is not installable"
-msgstr "nenÃ nainstalovÃ¡no"
+msgstr "%s nelze nainstalovat"

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, fuzzy, c-format
msgid "%s obsoletes %s provided by %s"
msgstr "%s je novÄjÅ¡Ã neÅ¾ %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, c-format
-msgid "%s provides this dependency, but would change the architecture of the
installed item"
-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:93
-#, 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"
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "OdstranÄnÃ %s se nezdaÅilo"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "%s odstranÄnÃ ok"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
-msgstr ""
+msgstr "%s vyÅ¾aduje %s, ale tento poÅ¾adavek nemÅ¯Å¾e bÃ½t splnÄn"

#. language code: abk ab
#: ../zypp/LanguageCode.cc:240
@@ -115,12 +104,12 @@
msgid "Adangme"
msgstr "Adangme"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
msgstr "PÅidÃ¡vÃ¡ se repozitÃ¡Å '%s'"

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "DalÅ¡Ã vÃ½stup programu rpm:"

@@ -345,7 +334,7 @@
msgid "Austronesian (Other)"
msgstr "AustronÃ©skÃ© (jinÃ©)"

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr "Pro '%s' je vyÅ¾adovÃ¡no ovÄÅovÃ¡nÃ"
@@ -386,11 +375,11 @@
#: ../zypp/media/MediaException.cc:47
#, c-format
msgid "Bad file name: %s"
-msgstr ""
+msgstr "Å patnÃ½ nÃ¡zev souboru: %s"

#: ../zypp/media/MediaException.cc:77
msgid "Bad media attach point"
-msgstr ""
+msgstr "Å patnÃ½ bod pÅipojenÃ mÃ©dia"

# BS
#. :BRA:076:
@@ -625,7 +614,7 @@
msgid "Buginese"
msgstr "BugiÅ¡tina"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr "VytvÃ¡ÅÃ se vyrovnÃ¡vacÃ pamÄÅ¥ repozitÃ¡Åe '%s'"
@@ -679,34 +668,29 @@
msgid "Cameroon"
msgstr "Cameroon"

-#: ../zypp/sat/detail/PoolImpl.cc:100
-#, fuzzy
+#: ../zypp/sat/detail/PoolImpl.cc:147
msgid "Can not create sat-pool."
-msgstr "Nelze vytvoÅit soubor."
+msgstr ""

#: ../zypp/thread/Mutex.cc:77
msgid "Can't acquire the mutex lock"
msgstr "Nelze zÃskat zÃ¡mek mutex."

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
-msgstr ""
+msgstr "NemÅ¯Å¾u zmÄnit adresÃ¡Å na '/' uvnitÅ chrootu (%s)."

#: ../zypp/ExternalProgram.cc:238
#, c-format
msgid "Can't chroot to '%s' (%s)."
-msgstr ""
+msgstr "NemÅ¯Å¾u zmÄnit koÅenovÃ½ adresÃ¡Å na '%s' (%s)."

#. don't want to get here
#: ../zypp/ExternalProgram.cc:259
#, c-format
msgid "Can't exec '%s' (%s)."
-msgstr ""
+msgstr "NemÅ¯Å¾u spustit '%s' (%s)."

#: ../zypp/ExternalProgram.cc:267
#, fuzzy, c-format
@@ -721,6 +705,11 @@
msgid "Can't initialize recursive mutex"
msgstr "Nelze inicializovat rekurzivnÃ mutex."

+#: ../zypp/base/InterProcessMutex.cc:79
+#, c-format
+msgid "Can't open lock file: %s"
+msgstr "Nelze otevÅÃt soubor zÃ¡mku: %s"
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -731,24 +720,15 @@
msgid "Can't open pty (%s)."
msgstr "Nelze otevÅÃt soubor: %s."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "Nelze otevÅÃt soubor: %1."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
-#, fuzzy, c-format
+#: ../zypp/repo/RepoProvideFile.cc:216
+#, c-format
msgid "Can't provide file '%s' from repository '%s'"
-msgstr "Nelze poskytnout soubor %s z repozitÃ¡Åe %s"
+msgstr "Nelze poskytnout soubor '%s' z repozitÃ¡Åe '%s'"

#: ../zypp/thread/Mutex.cc:87
msgid "Can't release the mutex lock"
msgstr "Nelze uvolnit zÃ¡mek mutex."

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr "Nelze nastavit rekurzivnÃ atribut mutex."
@@ -761,22 +741,21 @@
#: ../zypp/KeyRing.cc:276
#, c-format
msgid "Cannot create public key %s from %s keyring to file %s"
-msgstr ""
+msgstr "NemÅ¯Å¾u vytvoÅit veÅejnÃ½ klÃÄ %s z klÃÄenky %s do souboru %s"

#: ../zypp/media/MediaException.cc:182
-#, fuzzy
msgid "Cannot eject any media"
-msgstr "Nemohu najÃt Å¾Ã¡dnÃ© schÃ©ma."
+msgstr "NemÅ¯Å¾u vysunout Å¾Ã¡dnÃ© mÃ©dium"

#: ../zypp/media/MediaException.cc:184
-#, fuzzy, c-format
+#, c-format
msgid "Cannot eject media '%s'"
-msgstr "Nelze otevÅÃt poloÅ¾ku plochy '%s'"
+msgstr "NemÅ¯Å¾u vysunout mÃ©dium '%s'"

#: ../zypp/media/MediaException.cc:67
-#, fuzzy, c-format
+#, c-format
msgid "Cannot write file '%s'."
-msgstr "Nelze zapisovat do souboru %1."
+msgstr "NemÅ¯Å¾u zapsat do souboru '%s'."

# CV
#. :CUB:192:
@@ -850,7 +829,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr "ZmÄnÄnÃ© konfiguraÄnÃ soubory pro %s:"
@@ -953,14 +932,13 @@
msgstr ""

#: ../zypp/ExternalProgram.cc:371
-#, fuzzy
msgid "Command exited with unknown error."
-msgstr "PÅÃkaz spouÅ¡tÄnÃ pÅi pÅipojovÃ¡nÃ"
+msgstr "PÅÃkaz byl ukonÄen s neznÃ¡mou chybou."

#: ../zypp/ExternalProgram.cc:366
#, c-format
msgid "Command was killed by signal %d (%s)."
-msgstr ""
+msgstr "PÅÃkaz byl zabit signÃ¡lem %d (%s)."

# KM
#. :KIR:296:
@@ -1125,10 +1103,6 @@
msgid "Djibouti"
msgstr "DÅ¾ibuti"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-msgid "Do not install or delete the resolvables concerned"
-msgstr "Neinstalovat a nemazat pÅÃsluÅ¡nÃ© zÃ¡vislosti"
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1174,7 +1148,7 @@
msgstr "Duala"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1242,16 +1216,15 @@

#: ../zypp/media/MediaException.cc:135
msgid "Empty destination in URI"
-msgstr ""
+msgstr "ChybÃ cÃl v URI"

#: ../zypp/media/MediaException.cc:130
msgid "Empty filesystem in URI"
-msgstr ""
+msgstr "PrÃ¡zdnÃ½ souborovÃ½ systÃ©m v URI"

#: ../zypp/media/MediaException.cc:125
-#, fuzzy
msgid "Empty host name in URI"
-msgstr "PrÃ¡zdnÃ© jmÃ©no CA."
+msgstr "NenÃ vyplnÄno hostname v URI"

#: ../zypp/url/UrlUtils.cc:111
msgid "Encoded string contains a NUL byte"
@@ -1290,11 +1263,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""

-#: ../zypp/Repository.cc:141
-#, fuzzy
-msgid "Error reading solv-file: "
-msgstr "Chyba pÅi ÄtenÃ repozitÃ¡ÅÅ¯:"
-
# SY
# fuzzy
#. language code: myv
@@ -1334,29 +1302,28 @@
msgstr "Ewondo"

#: ../zypp/KeyRing.cc:558
-#, fuzzy
msgid "Failed to delete key."
-msgstr "NepodaÅilo se spustit virtuÃ¡lnÃ stroj."
+msgstr "NepodaÅilo se smazat klÃÄ."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
-msgstr ""
+msgstr "NepodaÅilo se importovat klÃÄ ze souboru %s: %s"

#: ../zypp/media/MediaException.cc:31
-#, fuzzy, c-format
+#, c-format
msgid "Failed to mount %s on %s"
-msgstr "Chyba parsovÃ¡nÃ: %s."
+msgstr "NepodaÅilo se pÅipojit %s do %s"

-#: ../zypp/target/rpm/RpmDb.cc:1124
-#, fuzzy, c-format
+#: ../zypp/target/rpm/RpmDb.cc:1122
+#, c-format
msgid "Failed to remove public key %s: %s"
-msgstr "Nelze zÃskat veÅejnÃ½ klÃÄ."
+msgstr "NepodaÅilo se smazat veÅejnÃ½ klÃÄ %s: %s"

#: ../zypp/media/MediaException.cc:41
-#, fuzzy, c-format
+#, c-format
msgid "Failed to unmount %s"
-msgstr "Chyba pÅi zavÃ¡dÄnÃ modulu \"%s\"."
+msgstr "NepodaÅilo se odpojit %s"

# FK
#. :FJI:242:
@@ -1460,9 +1427,9 @@
" Chcete soubor pÅesto pouÅ¾Ãt?"

#: ../zypp/media/MediaException.cc:60
-#, fuzzy, c-format
+#, c-format
msgid "File '%s' not found on medium '%s'"
-msgstr "Soubor '%1' nebyl nalezen v repozitÃ¡Åi."
+msgstr "Soubor '%s' nebyl nalezen na mÃ©diu '%s'"

#. language code: fil
#: ../zypp/LanguageCode.cc:514
@@ -1485,9 +1452,8 @@
msgstr "UgrofinskÃ© (jinÃ©)"

#: ../zypp/solver/detail/ProblemSolutionCombi.cc:73
-#, fuzzy
msgid "Following actions will be done:"
-msgstr "NÃ¡sledujÃcÃ balÃÄky budou aktualizovÃ¡ny:\n"
+msgstr "Budou provedeny nÃ¡sledujÃcÃ akce:"

#. language code: fon
#: ../zypp/LanguageCode.cc:520
@@ -1598,8 +1564,9 @@
msgid "Geez"
msgstr "Giiz"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
-msgid "Generally ignore this requirement"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
+#, fuzzy
+msgid "Generally ignore of some dependecies"
msgstr "ObecnÄ ignorovat tento poÅ¾adavek"

#. :GRD:308:
@@ -1904,27 +1871,10 @@
msgstr "Igbo"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr "Ignorovat nastavenÃ %s k instalaci"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
-#, 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:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr "Ignorovat konflikt %s"
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
-msgstr "Ignorovat poÅ¾adavky pouze nynÃ"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
+#, fuzzy, c-format
+msgid "Ignore some dependencies of %s"
+msgstr "zÃ¡vislosti nelze vyÅeÅ¡it"

#. language code: ijo
#: ../zypp/LanguageCode.cc:630
@@ -1971,23 +1921,7 @@
msgid "Ingush"
msgstr "Ingush"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, 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:90
-#, c-format
-msgid "Install %s although it would change the vendor"
-msgstr "Instalovat %s i pÅes zmÄnu dodavatele"
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr "Nainstalovat chybÄjÃcÃ zÃ¡vislosti"
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr "Instalace byla zruÅ¡ena podle pÅÃkazu."

@@ -2061,7 +1995,12 @@
msgid "Invalid port component '%s'"
msgstr "NeplatnÃ¡ souÄÃ¡st portu %s"

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr "ChybnÃ½ regulÃ¡rnÃ vÃ½raz '%s': regcomp vrÃ¡til %d"
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
msgid "Invalid user name or password."
msgstr "NeplatnÃ© uÅ¾ivatelskÃ© jmÃ©no nebo heslo."

@@ -2112,11 +2051,6 @@
msgid "Israel"
msgstr "Izrael"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "Nelze otevÅÃt soubor: %1."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2246,10 +2180,6 @@
msgid "Kazakhstan"
msgstr "Kazakhstan"

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr "Ponechat"
-
# KE
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
@@ -2747,7 +2677,7 @@
#: ../zypp/media/MediaException.cc:175
#, c-format
msgid "Medium '%s' is in use by another instance"
-msgstr ""
+msgstr "MÃ©dium '%s' je pouÅ¾ÃvÃ¡no jinou instancÃ"

#: ../zypp/media/MediaException.cc:72
msgid "Medium not attached"
@@ -3019,7 +2949,7 @@
msgid "No Code"
msgstr "Å½Ã¡dnÃ½ kÃ³d"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
msgid "No url in repository."
msgstr "Adresa URL nebyla nalezena v repozitÃ¡Åi."

@@ -3135,9 +3065,8 @@
msgstr "OmÃ¡n"

#: ../zypp/media/MediaException.cc:145
-#, fuzzy
msgid "Operation not supported by medium"
-msgstr "Verze profilu nenÃ podporovÃ¡na modulem Apparmor\n"
+msgstr "Operace nenÃ mÃ©diem podporovÃ¡na"

# SY
# fuzzy
@@ -3245,27 +3174,19 @@
msgstr "Paraguay"

#: ../zypp/media/MediaException.cc:106
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' on medium '%s' is not a directory."
-msgstr "'%1' nenÃ adresÃ¡Å."
+msgstr "Cesta '%s' na mÃ©diu '%s' nenÃ adresÃ¡Åem."

#: ../zypp/media/MediaException.cc:98
#, c-format
msgid "Path '%s' on medium '%s' is not a file."
-msgstr ""
-
-#: ../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."
-
-#: ../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."
+msgstr "Cesta '%s' na mÃ©diu '%s' nenÃ souborem."

#: ../zypp/media/MediaException.cc:200
-#, fuzzy, c-format
+#, c-format
msgid "Permission to access '%s' denied."
-msgstr "PÅÃstup nepovolen"
+msgstr "PÅÃstup k '%s' byl zamÃtnut."

#. language code: per fas fa
#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940
@@ -3362,11 +3283,10 @@
msgstr "Pro toto URL nenÃ podporovÃ¡na analÃ½za ÅetÄzce dotazu."

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
-#, fuzzy
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
msgid "RPM failed: "
-msgstr "chyba"
+msgstr "RPM selhalo: "

#. language code: roh rm
#: ../zypp/LanguageCode.cc:970
@@ -3394,16 +3314,11 @@
msgid "Relative path not allowed if authority exists"
msgstr "RelativnÃ cesta nenÃ povolena, pokud existuje autorita"

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, c-format
msgid "Removing repository '%s'"
msgstr "OdebÃrÃ¡ se repozitÃ¡Å '%s'"

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr "ChybÃ vyÅ¾adovanÃ½ soubor: "
@@ -3642,9 +3557,9 @@
msgstr "ZnakovÃ© ÅeÄi"

#: ../zypp/KeyRing.cc:568
-#, fuzzy, c-format
+#, c-format
msgid "Signature file %s not found"
-msgstr "ZdrojovÃ½ balÃk '%s' nebyl nalezen."
+msgstr "Soubor s podpisem %s nebyl nalezen"

#. language code: bla
#: ../zypp/LanguageCode.cc:354
@@ -3723,6 +3638,11 @@
msgid "Solomon Islands"
msgstr "Solomon Islands"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, fuzzy, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr "%s koliduje s %s, kterÃ½ poskytuje %s"
+
# SO
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
@@ -3891,12 +3811,12 @@
#: ../zypp/media/MediaException.cc:91
#, c-format
msgid "System exception '%s' on medium '%s'."
-msgstr ""
+msgstr "SystÃ©movÃ¡ vyjÃmka '%s' na mÃ©diu '%s'."

#: ../zypp/ZYppFactory.cc:354
#, c-format
msgid "System management is locked by the application with pid %d. Please
close this application before trying again."
-msgstr ""
+msgstr "SystÃ©movÃ¡ sprÃ¡va je zamknut aplikacÃ, kterÃ¡ mÃ¡ pid %d. ProsÃm
uzavÅete tuto aplikaci, neÅ¾ se budete znovu pokouÅ¡et o prÃ¡ci se systÃ©movou
sprÃ¡vou."

#. language code: tgl tl
#: ../zypp/LanguageCode.cc:1108
@@ -3973,7 +3893,7 @@
msgid "Thailand"
msgstr "Thajsko"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4227,19 +4147,15 @@
msgid "Unknown language: "
msgstr "NeznÃ¡mÃ½ jazyk: "

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr "Odemknout"
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
msgstr "NepodporovanÃ¡ HTTP ovÄÅovacÃ metoda '%s'"

#: ../zypp/media/MediaException.cc:140
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported URI scheme in '%s'."
-msgstr "NeplatnÃ© schÃ©ma URL '%1'."
+msgstr "NepodporovanÃ© URI ve schÃ©matu '%s'."

#: ../devel/devel.mvidner/installation_sources.cc:75
#, c-format
@@ -4504,90 +4420,72 @@
msgid "applydeltarpm failed."
msgstr "AplikovÃ¡nÃ delta RPM se nezdaÅilo."

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
-msgstr ""
+msgstr "zmÄna architektury z %s na %s"

-#: ../zypp/sat/SATResolver.cc:704
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:875
+#, c-format
msgid "cannot install both %s and %s"
-msgstr "Nelze nainstalovat %s"
+msgstr "Nelze nainstalovat %s a zÃ¡roveÅ %s"

-#: ../zypp/sat/SATResolver.cc:688
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:859
msgid "conflicting requests"
-msgstr "PoÅ¾adavek na pÅipojenÃ k: "
+msgstr "protichÅ¯dnÃ© poÅ¾adavky"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr "vytvoÅena zÃ¡loha %s"

-#: ../zypp/sat/SATResolver.cc:978
-#, fuzzy, c-format
-msgid "deinstallation of %s"
-msgstr "Instalace %s selhala:"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, c-format
-msgid "delete %s"
-msgstr "smazat %s"
+msgid "deinstallation of %s"
+msgstr "odstraÅovÃ¡nÃ %s"

-#: ../zypp/sat/SATResolver.cc:747
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:923
msgid "deleted providers: "
-msgstr "Å½Ã¡dnÃ½ balÃÄek neposkytuje %s"
+msgstr "odstranÄnÃ poskytovatelÃ©:"

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, fuzzy, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr "Neinstalovat a nemazat pÅÃsluÅ¡nÃ© zÃ¡vislosti"

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, fuzzy, c-format
msgid "do not ask to install a solvable providing %s"
msgstr "K dispozici nenÃ Å¾Ã¡dnÃ½ balÃÄek obsahujÃcÃ %s"

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "neinstalovat %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr "neinstalovat %s"

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
-msgstr ""
+msgstr "neinstalovat moc novou verzi %s"

-#: ../zypp/sat/SATResolver.cc:811
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:989
+#, c-format
msgid "do not keep %s installed"
-msgstr "nenÃ nainstalovÃ¡no"
+msgstr "neudrÅ¾ovat %s nainstalovÃ¡n"

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, fuzzy, c-format
msgid "downgrade of %s to %s"
msgstr "Aktualizace %s na %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, c-format
-msgid "install %s"
-msgstr "instalovat %s"
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4595,11 +4493,13 @@
"-->\n"
" %s"
msgstr ""
+"instalovat %s (i se zmÄnou poskytovatele)\n"
+" %s\n"
+"-->\n"
+" %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr "ponechat %s"
@@ -4612,34 +4512,34 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection: Nelze nastavit pÅipojenÃ dbus."

-#: ../zypp/sat/SATResolver.cc:699
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:870
+#, c-format
msgid "nothing provides %s needed by %s"
-msgstr "%s je poÅ¾adovÃ¡n pro %s"
+msgstr "nic neposkytuje %s, kterÃ½ je poÅ¾adovÃ¡n %s"

-#: ../zypp/sat/SATResolver.cc:691
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:862
+#, c-format
msgid "nothing provides requested %s"
-msgstr "Å½Ã¡dnÃ½ balÃÄek neposkytuje %s"
+msgstr "nic neposkytuje vyÅ¾Ã¡danÃ½ %s"

-#: ../zypp/sat/SATResolver.cc:685
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:856
+#, c-format
msgid "problem with installed package %s"
-msgstr "ProblÃ©m pÅi instalaci zdrojovÃ©ho balÃku %s-%s:"
+msgstr "problÃ©m s nainstalovanÃ½m balÃÄkem %s"

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, 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:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -4648,18 +4548,18 @@
"Program rpm vytvoÅil %s jako %s.\n"
"PrvnÃch odliÅ¡nÃ½ch 25 ÅÃ¡dek:\n"

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr "VÃ½stup programu rpm:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, 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:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4668,336 +4568,54 @@
"Program rpm uloÅ¾il %s jako %s.\n"
"PrvnÃch 25 ÅÃ¡dek rozdÃlÅ¯:\n"

-#: ../zypp/sat/SATResolver.cc:759
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:935
msgid "uninstallable providers: "
-msgstr "K dispozici nenÃ Å¾Ã¡dnÃ½ balÃÄek obsahujÃcÃ %s"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr "odemknout %s"
-
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr "odemknout vÅ¡echny zÃ¡visejÃcÃ balÃÄky"
-
-#~ msgid "Reading '%s' repository cache"
-#~ msgstr "NaÄÃtÃ¡ se vyrovnÃ¡vacÃ pamÄÅ¥ repozitÃ¡Åe '%s'"
-
-#~ 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'"
-
-#~ msgid "Cleaning repository '%s' cache"
-#~ msgstr "ProbÃhÃ¡ ÄistÄnÃ vyrovnÃ¡vacÃ pamÄti repozitÃ¡Åe '%s'."
-
-#~ msgid "Reading repository '%s' cache"
-#~ msgstr "NaÄÃtÃ¡ se vyrovnÃ¡vacÃ pamÄÅ¥ repozitÃ¡Åe '%s'"
-
-#~ msgid "Software management is already running."
-#~ msgstr "SprÃ¡va softwaru jiÅ¾ je spuÅ¡tÄna."
-
-#~ msgid "%s is replaced by %s"
-#~ msgstr "%s je nahrazen %s"
-
-#~ msgid "%s replaced by %s"
-#~ msgstr "%s nahrazen %s"
-
-#~ msgid "%s will be deleted by the user.\n"
-#~ msgstr "%s bude odstranÄn uÅ¾ivatelem.\n"
-
-#~ msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
-#~ msgstr "%s bude odstranÄn jinou aplikacÃ. (ApplLow/ApplHigh)\n"
-
-#~ msgid "%s will be installed by the user.\n"
-#~ msgstr "%s bude nainstalovÃ¡n uÅ¾ivatelem.\n"
-
-#~ msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
-#~ msgstr "%s bude nainstalovÃ¡n jinou aplikacÃ. (ApplLow/ApplHigh)\n"
-
-#~ msgid "No valid solution found within %d seconds"
-#~ msgstr "V ÄasovÃ©m limitu %d s nebylo nalezeno Å¾Ã¡dnÃ© platnÃ© ÅeÅ¡enÃ"
-
-#~ msgid "The solver has reached a defined timout"
-#~ msgstr "ÅeÅ¡itel vyÄerpal zadanÃ½ ÄasovÃ½ limit"
-
-#~ msgid "No valid solution found with just resolvables of best architecture."
-#~ msgstr "Nebylo nalezeno Å¾Ã¡dnÃ© platnÃ© ÅeÅ¡enÃ se zÃ¡vislostmi pouze
nejlepÅ¡Ã architektury."
-
-#~ 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"
-
-#~ 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."
-
-#~ msgid "Invalid information"
-#~ msgstr "ChybnÃ¡ informace"
-
-#~ msgid "%s is needed by other resolvables"
-#~ msgstr "%s je poÅ¾adovÃ¡n jinÃ½mi balÃÄky"
-
-#~ msgid ""
-#~ "%s is needed by:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s je poÅ¾adovÃ¡n pro:\n"
-#~ "%s"
-
-#~ msgid "%s conflicts with other resolvables"
-#~ msgstr "%s koliduje"
-
-#~ msgid ""
-#~ "%s conflicts with:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s koliduje s:\n"
-#~ "%s"
-
-#~ msgid "%s obsoletes other resolvables"
-#~ msgstr "%s je novÄjÅ¡Ã neÅ¾ jinÃ© zÃ¡visejÃcÃ balÃÄky"
-
-#~ msgid "%s obsoletes:%s"
-#~ msgstr "%s je novÄjÅ¡Ã neÅ¾: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "These resolvables will be deleted from the system."
-#~ msgstr ""
-#~ "\n"
-#~ "Tyto balÃÄky budou smazÃ¡ny."
-
-#~ msgid "%s depends on other resolvables"
-#~ msgstr "%s zÃ¡vislÃ na jinÃ½ch balÃÄcÃch"
-
-#~ msgid "%s depends on %s"
-#~ msgstr "%s zÃ¡visÃ na %s"
-
-#~ msgid "%s depends on:%s"
-#~ msgstr "%s zÃ¡visÃ na: %s"
-
-#~ msgid "Child of"
-#~ msgstr "Potomek"
-
-#~ msgid ""
-#~ "\n"
-#~ "There is no resource available which supports this requirement."
-#~ msgstr ""
-#~ "\n"
-#~ "PoÅ¾adavky nelze uspokojit z Å¾Ã¡dnÃ©ho dostupnÃ©ho zdroje."
-
-#~ 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"
-
-#~ msgid "Cannot install %s, because it is conflicting with %s"
-#~ msgstr "Nelze nainstalovat %s, protoÅ¾e zpÅ¯sobuje konflikt s %s"
-
-#~ msgid "%s is not installed and has been marked as uninstallable"
-#~ msgstr "%s nebude nainstalovÃ¡n a byl oznaÄen jako nenainstalovatelnÃ½"
-
-#~ msgid "Cannot install %s due to dependency problems"
-#~ msgstr "Vzhledem k problÃ©mÅ¯m se zÃ¡vislostÃ nelze nainstalovat %s"
-
-#~ msgid "%s has unfulfilled requirements"
-#~ msgstr "%s obsahuje nevyÅeÅ¡enÃ© zÃ¡vislosti"
-
-#~ msgid "%s has missing dependencies"
-#~ msgstr "%s mÃ¡ nesplnÄnÃ© zÃ¡vislosti"
-
-#~ msgid "%s cannot be installed due to missing dependencies"
-#~ msgstr "%s nelze nainstalovat kvÅ¯li nesplnÄnÃ½m zÃ¡vislostem"
-
-#~ msgid "%s fulfills dependencies of %s but will be uninstalled"
-#~ msgstr "%s splÅuje zÃ¡vislosti %s, bude vÅ¡ak odinstalovÃ¡n"
-
-#~ 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"
-
-#~ msgid "No need to install %s"
-#~ msgstr "NenÃ potÅeba instalovat %s"
-
-#~ msgid "Cannot install %s to fulfill the dependencies of %s"
-#~ msgstr "Nelze nainstalovat %s ke splnÄnÃ zÃ¡vislostÃ %s"
-
-#~ msgid "Cannot install %s to fulfil the dependencies of %s"
-#~ msgstr "Nelze nainstalovat %s ke splnÄnÃ zÃ¡vislostÃ %s"
-
-#~ msgid "%s will not be uninstalled, because it is still required"
-#~ msgstr "%s nebude odinstalovÃ¡n, protoÅ¾e je stÃ¡le vyÅ¾adovÃ¡n"
-
-#~ 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Ã½."
-
-#~ msgid "Cannot install %s, because it is conflicting"
-#~ msgstr "Nelze nainstalovat %s, protoÅ¾e zpÅ¯sobuje konflikt"
-
-#~ msgid "%s is uninstallable due to conflicts with %s"
-#~ msgstr "%s nelze nainstalovat, koliduje s %s"
-
-#~ msgid "Requirememt %s cannot be fulfilled."
-#~ msgstr "PoÅ¾adavek %s nelze splnit."
-
-#~ msgid "for requiring %s for %s when upgrading %s"
-#~ msgstr "vyÅ¾adujÃcÃ %s pro %s pÅi aktualizaci %s"
-
-#~ msgid "%s is lacking the requirement %s"
-#~ msgstr "Pro %s nenÃ splnÄn poÅ¾adavek %s"
-
-#~ msgid ", Action: "
-#~ msgstr ", Akce: "
-
-#~ msgid ", Trigger: "
-#~ msgstr ", spouÅ¡tÄÄ: "
-
-#~ msgid "package"
-#~ msgstr "balÃÄek"
-
-#~ msgid "selection"
-#~ msgstr "vÃ½bÄr"
-
-#~ msgid "pattern"
-#~ msgstr "vzor"
-
-#~ msgid "product"
-#~ msgstr "produkt"
-
-#~ msgid "patch"
-#~ msgstr "aktualizace"
-
-#~ msgid "script"
-#~ msgstr "skript"
-
-#~ msgid "message"
-#~ msgstr "zprÃ¡va"
-
-#~ msgid "atom"
-#~ msgstr "atom"
-
-#~ msgid "system"
-#~ msgstr "systÃ©m"
-
-#~ msgid "Resolvable"
-#~ msgstr "RozhodnutÃ©"
-
-#~ msgid "Marking this resolution attempt as invalid."
-#~ msgstr "OznaÄit toto ÅeÅ¡enÃ jako chybnÃ©."
-
-#~ msgid "Marking resolvable %s as uninstallable"
-#~ msgstr "Nastavuje se %s jako neinstalovatelnÃ½"
-
-#~ msgid "%s is scheduled to be installed, but this is impossible due to
dependency problems."
-#~ msgstr "%s ÄekÃ¡ na instalaci, ale instalaci nelze provÃ©st kvÅ¯li
problÃ©mÅ¯m se zÃ¡vislostmi."
-
-#~ msgid "Can't install %s since it is already marked as needed to be
uninstalled"
-#~ msgstr "Nelze nainstalovat %s, je jiÅ¾ oznaÄen jako urÄenÃ½ k
odinstalovÃ¡nÃ"
-
-#~ msgid "Can't install %s, because it does not apply to this system."
-#~ msgstr "Nelze nainstalovat %s, protoÅ¾e ho nelze pouÅ¾Ãt pro tento
systÃ©m."
-
-#~ msgid "Can't install %s, because %s is already marked as needed to for
installation"
-#~ msgstr "Nelze nainstalovat %s, protoÅ¾e %s je jiÅ¾ oznaÄen jako potÅebnÃ½
k instalaci"
-
-#~ msgid "This would invalidate %s."
-#~ msgstr "TÃm poÅ¡kodÃte %s."
-
-#~ msgid "Establishing %s"
-#~ msgstr "Navazuje se %s"
-
-#~ msgid "Installing %s"
-#~ msgstr "Instaluje se %s"
-
-#~ msgid "Skipping %s: already installed"
-#~ msgstr "PÅeskakuji %s: je jiÅ¾ nainstalovÃ¡n"
-
-#~ msgid "There are no alternative providers of %s installed"
-#~ msgstr "Neexistuje Å¾Ã¡dnÃ½ alternativnÃ poskytovatel nainstalovanÃ©
zÃ¡vislosti %s"
-
-#~ msgid "for %s"
-#~ msgstr "pro %s"
-
-#~ msgid "Upgrading to %s to avoid removing %s is not possible."
-#~ msgstr "Aktualizaci %s s cÃlem vyhnout se odinstalovÃ¡nÃ %s nelze
provÃ©st."
-
-#~ msgid "%s provides %s, but is scheduled to be uninstalled."
-#~ msgstr "%s poskytuje %s, ale ÄekÃ¡ na odinstalovÃ¡nÃ."
-
-#~ msgid "%s provides %s, but another version of that %s is already installed."
-#~ msgstr "%s poskytuje %s, ale je jiÅ¾ nainstalovÃ¡na jinÃ¡ verze %s."
-
-#~ msgid "%s provides %s, but it is uninstallable. Try installing it on its
own for more details."
-#~ msgstr "%s poskytuje %s, ale je neinstalovatelnÃ½. VÃce informacÃ
zÃskÃ¡te pÅi ruÄnÃ instalaci."
-
-#~ msgid "%s provides %s, but it is locked."
-#~ msgstr "%s poskytuje %s, ale je uzamÄen."
-
-#~ msgid "%s provides %s, but is scheduled to be kept."
-#~ msgstr "%s poskytuje %s, ale je naplÃ¡novÃ¡no, Å¾e bude ponechÃ¡n."
-
-#~ msgid "%s provides %s, but has another architecture."
-#~ msgstr "%s poskytuje %s, ale je urÄen pro jinou architekturu."
-
-#~ msgid "%s provides %s, but has another vendor (%s)."
-#~ msgstr "%s poskytuje %s, poskytuje ho vÅ¡ak jinÃ½ dodavatel (%s)."
-
-#~ msgid "Can't satisfy requirement %s for %s"
-#~ msgstr "Nelze splnit poÅ¾adavky %s pro %s"
-
-#~ msgid "%s is required by another resolvable selected for installation, so
it won't be unlinked."
-#~ msgstr "%s je poÅ¾adovÃ¡n jinou zÃ¡vislostÃ urÄenou k instalaci, proto na
nÄj nebude zruÅ¡en odkaz."
-
-#~ msgid "%s is required by another installed resolvable, so it won't be
unlinked."
-#~ msgstr "%s je poÅ¾adovÃ¡n jinou nainstalovanou zÃ¡vislostÃ, proto na nÄj
nebude zruÅ¡en odkaz."
-
-#~ msgid "%s is locked and cannot be uninstalled."
-#~ msgstr "%s je uzamÄen a nelze odinstalovat."
-
-#~ 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Ã zÃ¡vislosti %s, kterÃ¡
ÄekÃ¡ na instalaci"
+msgstr "neodinstalovatelnÃ poskytovatelÃ©:"

-#~ msgid "Marking %s as uninstallable due to conflicts over %s"
-#~ msgstr "%s oznaÄen jako neinstalovatelnÃ½ kvÅ¯li konfliktu s %s"
+#~ msgid "%s provides this dependency, but would change the architecture of
the installed item"
+#~ msgstr "%s poskytuje tuto zÃ¡vislost, ale zmÄnÃ architekturu
nainstalovanÃ© poloÅ¾ky"

-#~ msgid "from %s"
-#~ msgstr "z %s"
+#~ 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"

-#~ msgid " Error!"
-#~ msgstr " Chyba!"
+#~ msgid "Do not install or delete the resolvables concerned"
+#~ msgstr "Neinstalovat a nemazat pÅÃsluÅ¡nÃ© zÃ¡vislosti"

-#~ msgid " Important!"
-#~ msgstr " DÅ¯leÅ¾itÃ©!"
+#~ msgid "Ignore that %s is already set to install"
+#~ msgstr "Ignorovat nastavenÃ %s k instalaci"

-#~ msgid "Make a solver run with ALL possibilities."
-#~ msgstr "SpustÃ ÅeÅ¡itel se zvÃ¡Å¾enÃm VÅ ECH moÅ¾nostÃ"
+#~ msgid "Ignore the obsolete %s in %s"
+#~ msgstr "Ignorovat zastaralÃ© %s v %s"

-#~ msgid "Regarding all resolvables with a compatible architecture."
-#~ msgstr "V Ãºvahu jsou brÃ¡ny vÅ¡echny zÃ¡vislosti s kompatibilnÃ
architekturou."
+#~ msgid "Ignore this conflict of %s"
+#~ msgstr "Ignorovat konflikt %s"

-#~ msgid "Make a solver run with best architecture only."
-#~ msgstr "SpustÃ ÅeÅ¡itel pouze pro nejlepÅ¡Ã architekturu."
+#~ msgid "Ignore this requirement just here"
+#~ msgstr "Ignorovat poÅ¾adavky pouze nynÃ"

-#~ msgid "Regarding resolvables with best architecture only."
-#~ msgstr "V Ãºvahu jsou brÃ¡ny pouze zÃ¡vislosti s nejlepÅ¡Ã architekturou."
+#~ msgid "Install %s although it would change the architecture"
+#~ msgstr "Instalovat %s i pÅes zmÄnu architektury"

-#~ msgid "%s depended on %s"
-#~ msgstr "%s zÃ¡visÃ na %s"
+#~ msgid "Install %s although it would change the vendor"
+#~ msgstr "Instalovat %s i pÅes zmÄnu dodavatele"

-#~ msgid "%s is recommended by %s"
-#~ msgstr "%s je doporuÄen zÃ¡vislostÃ %s"
+#~ msgid "Install missing resolvables"
+#~ msgstr "Nainstalovat chybÄjÃcÃ zÃ¡vislosti"

-#~ msgid "%s is suggested by %s"
-#~ msgstr "%s je navrhovÃ¡n zÃ¡vislostÃ %s"
+#~ msgid "Keep resolvables"
+#~ msgstr "Ponechat"

-#~ msgid "%s is enhanced by %s"
-#~ msgstr "%s je vylepÅ¡en %s"
+#~ msgid "Unlock these resolvables"
+#~ msgstr "Odemknout"

-#~ msgid "%s is supplemented by %s"
-#~ msgstr "%s je doplnÄn %s"
+#~ msgid "delete %s"
+#~ msgstr "smazat %s"

-#~ msgid "%s part of %s"
-#~ msgstr "%s ÄÃ¡st ze %s"
+#~ msgid "install %s"
+#~ msgstr "instalovat %s"

-#~ msgid "Double timeout"
-#~ msgstr "DvojnÃ¡sobnÃ½ ÄasovÃ½ limit"
+#~ msgid "unlock %s"
+#~ msgstr "odemknout %s"

-#~ msgid "Start the next solver run with doubled timeout."
-#~ msgstr "PÅÃÅ¡tÄ spustÃ ÅeÅ¡itel s dvojnÃ¡sobnÃ½m ÄasovÃ½m limitem."
+#~ 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=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/cy.po (original)
+++ trunk/libzypp/po/cy.po Mon Apr 28 15:25:19 2008
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
"PO-Revision-Date: 2003-09-23 10:33+0200\n"
"Last-Translator: Kevin Donnelly <kevin@xxxxxxxxxx>\n"
"Language-Team: Welsh <i18n@xxxxxxx>\n"
@@ -16,7 +16,7 @@
"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/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:933
msgid ""
"\n"
"uninstallable providers: "
@@ -27,61 +27,49 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:880
#, c-format
msgid "%s conflicts with %s provided by %s"
msgstr ""

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, fuzzy, c-format
msgid "%s install failed"
msgstr "Methodd yr arsefydliad."

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, fuzzy, c-format
msgid "%s installed ok"
msgstr "&Ie, gosod"

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:866
#, fuzzy, c-format
msgid "%s is not installable"
msgstr "Methodd yr arsefydliad."

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, c-format
msgid "%s obsoletes %s provided by %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, 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:93
-#, c-format
-msgid "%s provides this dependency, but would change the vendor of the
installed item"
-msgstr ""
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, fuzzy, c-format
msgid "%s remove failed"
msgstr "Methodd rpm."

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -108,12 +96,12 @@
msgid "Adangme"
msgstr "&Uwch"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
msgstr ""

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr ""

@@ -347,7 +335,7 @@
msgid "Austronesian (Other)"
msgstr ""

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr ""
@@ -630,7 +618,7 @@
msgid "Buginese"
msgstr ""

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
@@ -686,7 +674,7 @@
msgid "Cameroon"
msgstr "Cairo"

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:147
msgid "Can not create sat-pool."
msgstr ""

@@ -694,10 +682,6 @@
msgid "Can't acquire the mutex lock"
msgstr ""

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
@@ -727,6 +711,11 @@
msgid "Can't initialize recursive mutex"
msgstr ""

+#: ../zypp/base/InterProcessMutex.cc:79
+#, fuzzy, c-format
+msgid "Can't open lock file: %s"
+msgstr "Couldn't open file: %s."
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -737,12 +726,7 @@
msgid "Can't open pty (%s)."
msgstr "Couldn't open file: %s."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "Couldn't open file: %s."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr ""
@@ -751,10 +735,6 @@
msgid "Can't release the mutex lock"
msgstr ""

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr ""
@@ -858,7 +838,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, fuzzy, c-format
msgid "Changed configuration files for %s:"
msgstr "CopÃ¯o ffeiliau ffurfweddu i'r cysawd a osodwyd"
@@ -1143,11 +1123,6 @@
msgid "Djibouti"
msgstr "Djibouti"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
-msgid "Do not install or delete the resolvables concerned"
-msgstr "Gosod gyrrydd..."
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1195,7 +1170,7 @@
msgstr "Palau"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1309,10 +1284,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""

-#: ../zypp/Repository.cc:141
-msgid "Error reading solv-file: "
-msgstr ""
-
#. language code: myv
#: ../zypp/LanguageCode.cc:850
msgid "Erzya"
@@ -1356,7 +1327,7 @@
msgid "Failed to delete key."
msgstr "Failed to parse: %s."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1366,7 +1337,7 @@
msgid "Failed to mount %s on %s"
msgstr "Failed to parse: %s."

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, c-format
msgid "Failed to remove public key %s: %s"
msgstr ""
@@ -1605,8 +1576,8 @@
msgid "Geez"
msgstr "Groeg"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
-msgid "Generally ignore this requirement"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
+msgid "Generally ignore of some dependecies"
msgstr ""

#. :GRD:308:
@@ -1915,26 +1886,9 @@
msgstr ""

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
-#, c-format
-msgid "Ignore the obsolete %s in %s"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr ""
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
+msgid "Ignore some dependencies of %s"
msgstr ""

#. language code: ijo
@@ -1984,24 +1938,7 @@
msgid "Ingush"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, c-format
-msgid "Install %s although it would change the architecture"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#, c-format
-msgid "Install %s although it would change the vendor"
-msgstr ""
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-#, fuzzy
-msgid "Install missing resolvables"
-msgstr "Gosod gyrrydd..."
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr ""

@@ -2076,7 +2013,12 @@
msgid "Invalid port component '%s'"
msgstr ""

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr ""
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
msgid "Invalid user name or password."
msgstr ""

@@ -2128,11 +2070,6 @@
msgid "Israel"
msgstr "Israel"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "Couldn't open file: %s."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
#, fuzzy
@@ -2268,11 +2205,6 @@
msgid "Kazakhstan"
msgstr ""

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-#, fuzzy
-msgid "Keep resolvables"
-msgstr "Gosod gyrrydd..."
-
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
#, fuzzy
@@ -3051,7 +2983,7 @@
msgid "No Code"
msgstr "Modd"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
msgid "No url in repository."
msgstr ""

@@ -3296,14 +3228,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr ""

-#: ../zypp/url/UrlBase.cc:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr ""
-
-#: ../zypp/url/UrlBase.cc:727
-msgid "Path parameter parsing not supported for this URL"
-msgstr ""
-
#: ../zypp/media/MediaException.cc:200
#, c-format
msgid "Permission to access '%s' denied."
@@ -3408,8 +3332,8 @@
msgstr ""

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
msgid "RPM failed: "
msgstr ""

@@ -3438,16 +3362,11 @@
msgid "Relative path not allowed if authority exists"
msgstr ""

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, c-format
msgid "Removing repository '%s'"
msgstr ""

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr ""
@@ -3774,6 +3693,11 @@
msgid "Solomon Islands"
msgstr ""

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr ""
+
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
#, fuzzy
@@ -4036,7 +3960,7 @@
msgid "Thailand"
msgstr "Ffindir"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4288,11 +4212,6 @@
msgid "Unknown language: "
msgstr ""

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-#, fuzzy
-msgid "Unlock these resolvables"
-msgstr "Gosod gyrrydd..."
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4563,88 +4482,72 @@
msgid "applydeltarpm failed."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:875
#, fuzzy, c-format
msgid "cannot install both %s and %s"
msgstr "Arsefydlu %s: \"%s\""

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:859
msgid "conflicting requests"
msgstr ""

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "Arsefydlu %s: \"%s\""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
-#, fuzzy, c-format
-msgid "delete %s"
-msgstr "&Dileu"
-
-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:923
msgid "deleted providers: "
msgstr ""

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, fuzzy, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr "Gosod gyrrydd..."

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, c-format
msgid "do not ask to install a solvable providing %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "Arsefydlu %s: \"%s\""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, fuzzy, c-format
msgid "do not install %s"
msgstr "Arsefydlu %s: \"%s\""

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:989
#, fuzzy, c-format
msgid "do not keep %s installed"
msgstr "Arsefydlu %s: \"%s\""

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, c-format
msgid "downgrade of %s to %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, fuzzy, c-format
-msgid "install %s"
-msgstr "Arsefydlu %s: \"%s\""
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4653,10 +4556,8 @@
" %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr ""
@@ -4669,73 +4570,94 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:870
#, c-format
msgid "nothing provides %s needed by %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:862
#, c-format
msgid "nothing provides requested %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:856
#, c-format
msgid "problem with installed package %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:935
#, fuzzy
msgid "uninstallable providers: "
msgstr "Arsefydlu"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr ""
+#, fuzzy
+#~ msgid "Do not install or delete the resolvables concerned"
+#~ msgstr "Gosod gyrrydd..."

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
#, fuzzy
-msgid "unlock all resolvables"
-msgstr "Gosod gyrrydd..."
+#~ msgid "Install missing resolvables"
+#~ msgstr "Gosod gyrrydd..."
+
+#, fuzzy
+#~ msgid "Keep resolvables"
+#~ msgstr "Gosod gyrrydd..."
+
+#, fuzzy
+#~ msgid "Unlock these resolvables"
+#~ msgstr "Gosod gyrrydd..."
+
+#, fuzzy
+#~ msgid "delete %s"
+#~ msgstr "&Dileu"
+
+#, fuzzy
+#~ msgid "install %s"
+#~ msgstr "Arsefydlu %s: \"%s\""
+
+#, fuzzy
+#~ msgid "unlock all resolvables"
+#~ msgstr "Gosod gyrrydd..."
+
+#, fuzzy
+#~ msgid "Can't open solv-file: "
+#~ msgstr "Couldn't open file: %s."

#, fuzzy
#~ msgid "%s is not installed and has been marked as uninstallable"

Modified: trunk/libzypp/po/da.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/da.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/da.po (original)
+++ trunk/libzypp/po/da.po Mon Apr 28 15:25:19 2008
@@ -7,13 +7,15 @@
# H. Merethe Eriksen <djinni@xxxxxxxxxxxxxxxxx>, 2001.
# Martin Schlander <suse@xxxxxxxxxx>, 2007.
# Ib Larsen <i.la@xxxxxxxxxxxx>, 2007.
+# Jan Madsen <jan.madsen.pt@xxxxxxxxx>, 2008.
+# Martin Schlander <mschlander@xxxxxxxxxxxx>, 2008.
msgid ""
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
-"PO-Revision-Date: 2007-09-07 14:07+0200\n"
-"Last-Translator: Martin Schlander <suse@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
+"PO-Revision-Date: 2008-04-23 17:20+0200\n"
+"Last-Translator: Martin Schlander <mschlander@xxxxxxxxxxxx>\n"
"Language-Team: <opensuse-translation@xxxxxxxxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,76 +23,65 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"

-#: ../zypp/sat/SATResolver.cc:757
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:933
msgid ""
"\n"
"uninstallable providers: "
-msgstr "Der er intet installerbart, der tilbyder %s"
+msgstr ""
+"\n"
+"ikke-installÃ©rbare tilbydere: "

#: ../zypp/media/MediaException.cc:214
#, c-format
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
-msgstr ""
+msgstr " SSL-certifikatproblem. Tjek at CA-certifikatet er OK for '%s'."

-#: ../zypp/sat/SATResolver.cc:709
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:880
+#, c-format
msgid "%s conflicts with %s provided by %s"
-msgstr "%s konflikter med %s"
+msgstr "%s konflikter med %s, der tilbydes af %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "Installation af %s mislykkedes"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "%s blev installeret"

-#: ../zypp/sat/SATResolver.cc:695
-#, fuzzy, c-format
-msgid "%s is not installable"
-msgstr "ikke installeret"
-
-#: ../zypp/sat/SATResolver.cc:714
-#, fuzzy, c-format
-msgid "%s obsoletes %s provided by %s"
-msgstr "%s forÃ¦lder %s"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
+#: ../zypp/solver/detail/SATResolver.cc:866
#, 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"
+msgid "%s is not installable"
+msgstr "%s er ikke installÃ©rbar"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:93
+#: ../zypp/solver/detail/SATResolver.cc:885
#, 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"
+msgid "%s obsoletes %s provided by %s"
+msgstr "%s forÃ¦lder %s, der tilbydes af %s"

#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "Fjernelse af %s mislykkedes"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "%s fjernelse ok"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
-msgstr ""
+msgstr "%s krÃ¦ver %s, men dette krav kan ikke tilbydes"

#. language code: abk ab
#: ../zypp/LanguageCode.cc:240
@@ -112,12 +103,12 @@
msgid "Adangme"
msgstr "Adangme"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
msgstr "TilfÃ¸jer softwarekilden '%s'"

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "Yderligere rpm output:"

@@ -341,7 +332,7 @@
msgid "Austronesian (Other)"
msgstr "Austronesisk (Malayo-Polynesisk)"

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr "Autentificering pÃ¥krÃ¦vet for '%s'"
@@ -382,11 +373,11 @@
#: ../zypp/media/MediaException.cc:47
#, c-format
msgid "Bad file name: %s"
-msgstr ""
+msgstr "DÃ¥rligt filnavn: %s"

#: ../zypp/media/MediaException.cc:77
msgid "Bad media attach point"
-msgstr ""
+msgstr "DÃ¥rligt tilknytningspunkt for medie"

# BS
#. :BRA:076:
@@ -622,7 +613,7 @@
msgid "Buginese"
msgstr "Buginesisk"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr "Opbygger cache for softwarekilden '%s'"
@@ -676,39 +667,34 @@
msgid "Cameroon"
msgstr "Cameroun"

-#: ../zypp/sat/detail/PoolImpl.cc:100
-#, fuzzy
+#: ../zypp/sat/detail/PoolImpl.cc:147
msgid "Can not create sat-pool."
-msgstr "Filen kan ikke oprettes."
+msgstr "Kan ikke oprette sat-pulje."

#: ../zypp/thread/Mutex.cc:77
msgid "Can't acquire the mutex lock"
msgstr "Mutex-lÃ¥s kan ikke hentes"

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
-msgstr ""
+msgstr "Kan ikke skifte mappe til '/' indenfor chroot (%s)."

#: ../zypp/ExternalProgram.cc:238
#, c-format
msgid "Can't chroot to '%s' (%s)."
-msgstr ""
+msgstr "Kan ikke skifte rodmappe til '%s' (%s)."

#. don't want to get here
#: ../zypp/ExternalProgram.cc:259
#, c-format
msgid "Can't exec '%s' (%s)."
-msgstr ""
+msgstr "Kan ikke eksekvere '%s' (%s)."

#: ../zypp/ExternalProgram.cc:267
-#, fuzzy, c-format
+#, c-format
msgid "Can't fork (%s)."
-msgstr "Kan ikke finde %s."
+msgstr "Kan ikke forgrene (%s)."

#: ../zypp/thread/Mutex.cc:33
msgid "Can't initialize mutex attributes"
@@ -718,34 +704,30 @@
msgid "Can't initialize recursive mutex"
msgstr "Rekursive mutex-attributter kan ikke initialiseres"

+#: ../zypp/base/InterProcessMutex.cc:79
+#, c-format
+msgid "Can't open lock file: %s"
+msgstr "Kan ikke Ã¥bne lÃ¥sefilen: %s"
+
#: ../zypp/ExternalProgram.cc:174
-#, fuzzy, c-format
+#, c-format
msgid "Can't open pipe (%s)."
-msgstr "Kan ikke Ã¥bne filen %1."
+msgstr "Kan ikke Ã¥bne dataledning (%s)."

#: ../zypp/ExternalProgram.cc:163
-#, fuzzy, c-format
+#, c-format
msgid "Can't open pty (%s)."
-msgstr "Kunne ikke Ã¥bne fil: %s."
-
-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "Kan ikke Ã¥bne filen %1."
+msgstr "Kunne ikke Ã¥bne pseudo-terminal: %s."

-#: ../zypp/repo/RepoProvideFile.cc:207
-#, fuzzy, c-format
+#: ../zypp/repo/RepoProvideFile.cc:216
+#, c-format
msgid "Can't provide file '%s' from repository '%s'"
-msgstr "Kan ikke levere filen %s fra softwarekilden %s"
+msgstr "Kan ikke levere filen '%s' fra softwarekilden '%s'"

#: ../zypp/thread/Mutex.cc:87
msgid "Can't release the mutex lock"
msgstr "Mutex-lÃ¥s kan ikke frigives"

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr "Rekursive mutex-attributter kan ikke angives"
@@ -758,22 +740,21 @@
#: ../zypp/KeyRing.cc:276
#, c-format
msgid "Cannot create public key %s from %s keyring to file %s"
-msgstr ""
+msgstr "Kan ikke oprette den offentlige nÃ¸gle %s fra %s til filen %s"

#: ../zypp/media/MediaException.cc:182
-#, fuzzy
msgid "Cannot eject any media"
-msgstr "Kan ikke finde nogen profiler."
+msgstr "Kan ikke skubbe noget medie ud"

#: ../zypp/media/MediaException.cc:184
-#, fuzzy, c-format
+#, c-format
msgid "Cannot eject media '%s'"
-msgstr "Skrivebordselementet '%s' kan ikke Ã¥bnes"
+msgstr "Kan ikke skubbe mediet '%s' ud"

#: ../zypp/media/MediaException.cc:67
-#, fuzzy, c-format
+#, c-format
msgid "Cannot write file '%s'."
-msgstr "Kan ikke skrive til fil %1."
+msgstr "Kan ikke skrive filen '%s'."

# CV
#. :CUB:192:
@@ -848,7 +829,7 @@
#
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Konfigurationsfiler er Ã¦ndret for %s:"
@@ -948,17 +929,16 @@
#: ../zypp/ExternalProgram.cc:346
#, c-format
msgid "Command exited with status %d."
-msgstr ""
+msgstr "Kommando afsluttet med status %d."

#: ../zypp/ExternalProgram.cc:371
-#, fuzzy
msgid "Command exited with unknown error."
-msgstr "Kommando der kÃ¸res ved tilkobling"
+msgstr "Kommando afsluttet med ukendt fejl"

#: ../zypp/ExternalProgram.cc:366
#, c-format
msgid "Command was killed by signal %d (%s)."
-msgstr ""
+msgstr "Kommando drÃ¦btes af signalet %d (%s)."

# KM
#. :KIR:296:
@@ -1125,10 +1105,6 @@
msgid "Djibouti"
msgstr "Djibouti"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-msgid "Do not install or delete the resolvables concerned"
-msgstr "InstallÃ©r ikke, eller slet de pÃ¥gÃ¦ldende resolvables"
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1156,12 +1132,15 @@
"Error code: %s\n"
"Error message: %s\n"
msgstr ""
+"Download (curl)-fejl for '%s':\n"
+"Fejlkode: %s\n"
+"Fejlmeddelelse: %s\n"

#. TranslatorExplanation: curl is the name of a library, don't translate
#: ../zypp/media/MediaException.cc:84
#, c-format
msgid "Download (curl) initialization failed for '%s'"
-msgstr ""
+msgstr "Download (curl) initialisering fejlede for '%s'"

#. language code: dra
#: ../zypp/LanguageCode.cc:470
@@ -1174,10 +1153,10 @@
msgstr "Duala"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
-msgstr ""
+msgstr "Tvivlsom type '%s' for %u byte tjeksum '%s'"

#. language code: dut nld nl
#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480
@@ -1243,16 +1222,15 @@

#: ../zypp/media/MediaException.cc:135
msgid "Empty destination in URI"
-msgstr ""
+msgstr "Tom destination i URI"

#: ../zypp/media/MediaException.cc:130
msgid "Empty filesystem in URI"
-msgstr ""
+msgstr "Tomt filsystem i URI"

#: ../zypp/media/MediaException.cc:125
-#, fuzzy
msgid "Empty host name in URI"
-msgstr "Tomt CA-navn."
+msgstr "Tomt vÃ¦rtsmaskinenavn i URI"

#: ../zypp/url/UrlUtils.cc:111
msgid "Encoded string contains a NUL byte"
@@ -1289,12 +1267,7 @@
#: ../zypp/media/MediaException.cc:161
#, c-format
msgid "Error occurred while setting download (curl) options for '%s':"
-msgstr ""
-
-#: ../zypp/Repository.cc:141
-#, fuzzy
-msgid "Error reading solv-file: "
-msgstr "Fejl under lÃ¦sning af softwarekilder:"
+msgstr "Fejl opstod under indstilling af download (curl)-valgmuligheder for
'%s':"

# SY
# fuzzy
@@ -1336,29 +1309,28 @@
msgstr "Ewondo"

#: ../zypp/KeyRing.cc:558
-#, fuzzy
msgid "Failed to delete key."
-msgstr "Kunne ikke starte VM'en."
+msgstr "Sletning af nÃ¸gle fejlede."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
-msgstr ""
+msgstr "Import af offentlig nÃ¸gle fra filen %s fejlede: %s"

#: ../zypp/media/MediaException.cc:31
-#, fuzzy, c-format
+#, c-format
msgid "Failed to mount %s on %s"
-msgstr "Fejl under tolkning af: %s."
+msgstr "Montering af %s fejlede pÃ¥ %s."

-#: ../zypp/target/rpm/RpmDb.cc:1124
-#, fuzzy, c-format
+#: ../zypp/target/rpm/RpmDb.cc:1122
+#, c-format
msgid "Failed to remove public key %s: %s"
-msgstr "Kunne ikke hente den offentlige nÃ¸gle."
+msgstr "Fjernelse af den offentlige nÃ¸gle %s fejlede: %s"

#: ../zypp/media/MediaException.cc:41
-#, fuzzy, c-format
+#, c-format
msgid "Failed to unmount %s"
-msgstr "Kunne ikke indlÃ¦se \"%s\" modulet."
+msgstr "Afmontering af %s fejlede"

# FK
#. :FJI:242:
@@ -1460,9 +1432,9 @@
" Vil du bruge den alligevel?"

#: ../zypp/media/MediaException.cc:60
-#, fuzzy, c-format
+#, c-format
msgid "File '%s' not found on medium '%s'"
-msgstr "Filen %1 blev ikke fundet i depotet."
+msgstr "Filen %s blev ikke fundet pÃ¥ mediet '%s'"

#. language code: fil
#: ../zypp/LanguageCode.cc:514
@@ -1485,9 +1457,8 @@
msgstr "Finno-Ugrisk (Andre)"

#: ../zypp/solver/detail/ProblemSolutionCombi.cc:73
-#, fuzzy
msgid "Following actions will be done:"
-msgstr "FÃ¸lgende pakker bliver opdateret:\n"
+msgstr "FÃ¸lgende handlinger udfÃ¸res:"

#. language code: fon
#: ../zypp/LanguageCode.cc:520
@@ -1598,9 +1569,9 @@
msgid "Geez"
msgstr "Geez"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
-msgid "Generally ignore this requirement"
-msgstr "IgnorÃ©r dette krav generelt"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
+msgid "Generally ignore of some dependecies"
+msgstr "IgnorÃ©r generelt visse afhÃ¦ngigheder"

#. :GRD:308:
#: ../zypp/CountryCode.cc:302
@@ -1904,27 +1875,10 @@
msgstr "Igbo"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr "IgnorÃ©r, at %s allerede er angivet til installation"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
-#, 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:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
#, c-format
-msgid "Ignore this conflict of %s"
-msgstr "Ignorer denne konflikt med %s"
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
-msgstr "IgnorÃ©r dette krav her"
+msgid "Ignore some dependencies of %s"
+msgstr "IgnorÃ©r visse afhÃ¦ngigheder for %s"

#. language code: ijo
#: ../zypp/LanguageCode.cc:630
@@ -1971,24 +1925,7 @@
msgid "Ingush"
msgstr "Ingush"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, 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:90
-#, c-format
-msgid "Install %s although it would change the vendor"
-msgstr "InstallÃ©r %s selvom det Ã¦ndrer 'leverandÃ¸r'"
-
-#
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr "Installer manglende resolvables"
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr "Installation er blevet afbrudt som Ã¸nsket."

@@ -2062,7 +1999,12 @@
msgid "Invalid port component '%s'"
msgstr "Ugyldig portkomponent '%s'"

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr "Ugyldigt regulÃ¦rt udtryk '%s': Regcomp returnerede %d"
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
msgid "Invalid user name or password."
msgstr "Ugyldigt brugernavn eller adgangskode."

@@ -2113,11 +2055,6 @@
msgid "Israel"
msgstr "Israel"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "Kan ikke Ã¥bne filen %1."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2248,11 +2185,6 @@
msgid "Kazakhstan"
msgstr "Kasakhstan"

-#
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr "Bevar resolvables"
-
# KE
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
@@ -2624,7 +2556,7 @@

#: ../zypp/media/MediaException.cc:115
msgid "Malformed URI"
-msgstr ""
+msgstr "DÃ¥rligt formeret URI"

# ML
#. :MKD:807:
@@ -2745,21 +2677,21 @@
#: ../zypp/media/MediaException.cc:169
#, c-format
msgid "Media source '%s' does not contain the desired medium"
-msgstr ""
+msgstr "Mediekilden '%s' indeholder ikke det Ã¸nskede medie"

#: ../zypp/media/MediaException.cc:175
#, c-format
msgid "Medium '%s' is in use by another instance"
-msgstr ""
+msgstr "Mediet '%s' er i brug af en anden instans"

#: ../zypp/media/MediaException.cc:72
msgid "Medium not attached"
-msgstr ""
+msgstr "Medie er ikke tilknyttet"

#: ../zypp/media/MediaException.cc:53
#, c-format
msgid "Medium not opened when trying to perform action '%s'."
-msgstr ""
+msgstr "Mediet Ã¥bnede ikke under forsÃ¸g pÃ¥ at udfÃ¸re handlingen '%s'."

#. language code: men
#: ../zypp/LanguageCode.cc:808
@@ -3020,7 +2952,7 @@
msgid "No Code"
msgstr "Ingen kode"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
msgid "No url in repository."
msgstr "Ingen URL i softwarekilden."

@@ -3132,9 +3064,8 @@
msgstr "Oman"

#: ../zypp/media/MediaException.cc:145
-#, fuzzy
msgid "Operation not supported by medium"
-msgstr "Profilversion er ikke understÃ¸ttet af AppArmor-modulet\n"
+msgstr "Operationen understÃ¸ttes ikke af medie"

# SY
# fuzzy
@@ -3244,27 +3175,19 @@
msgstr "Paraguay"

#: ../zypp/media/MediaException.cc:106
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' on medium '%s' is not a directory."
-msgstr "%1 er ikke en mappe."
+msgstr "Stien '%s' pÃ¥ mediet '%s' er ikke en mappe."

#: ../zypp/media/MediaException.cc:98
#, c-format
msgid "Path '%s' on medium '%s' is not a file."
-msgstr ""
-
-#: ../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"
-
-#: ../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"
+msgstr "Stien '%s' pÃ¥ mediet '%s' er ikke en fil."

#: ../zypp/media/MediaException.cc:200
-#, fuzzy, c-format
+#, c-format
msgid "Permission to access '%s' denied."
-msgstr "Tilladelse nÃ¦gtet"
+msgstr "Adgangstilladelse til '%s' nÃ¦gtet."

#. language code: per fas fa
#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940
@@ -3362,11 +3285,10 @@
msgstr "Fortolkning af forespÃ¸rgselsstreng er ikke understÃ¸ttet af denne URL"

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
-#, fuzzy
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
msgid "RPM failed: "
-msgstr "fejlede"
+msgstr "RPM fejlede: "

#. language code: roh rm
#: ../zypp/LanguageCode.cc:970
@@ -3395,16 +3317,11 @@
msgid "Relative path not allowed if authority exists"
msgstr "Relativ sti er ikke tilladt hvis autoritet eksisterer"

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, c-format
msgid "Removing repository '%s'"
msgstr "Fjerner softwarekilden '%s'"

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr "PÃ¥krÃ¦vet fil mangler: "
@@ -3645,9 +3562,9 @@
msgstr "Tegnsprog"

#: ../zypp/KeyRing.cc:568
-#, fuzzy, c-format
+#, c-format
msgid "Signature file %s not found"
-msgstr "Kildepakken '%s' blev ikke fundet."
+msgstr "Signaturfilen %s blev ikke fundet."

#. language code: bla
#: ../zypp/LanguageCode.cc:354
@@ -3726,6 +3643,11 @@
msgid "Solomon Islands"
msgstr "SalomonÃ¸erne"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr "Solvable %s konflikter med %s, der tilbydes af sig selv"
+
# SO
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
@@ -3894,12 +3816,12 @@
#: ../zypp/media/MediaException.cc:91
#, c-format
msgid "System exception '%s' on medium '%s'."
-msgstr ""
+msgstr "Systemundtagelse '%s' pÃ¥ mediet '%s'."

#: ../zypp/ZYppFactory.cc:354
#, c-format
msgid "System management is locked by the application with pid %d. Please
close this application before trying again."
-msgstr ""
+msgstr "SystemhÃ¥ndtering lÃ¥ses af programmet med pid %d. Luk dette program,
fÃ¸r du prÃ¸ver igen."

#. language code: tgl tl
#: ../zypp/LanguageCode.cc:1108
@@ -3976,9 +3898,9 @@
msgid "Thailand"
msgstr "Thailand"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
-msgstr ""
+msgstr "Denne handling kÃ¸res allerede af et andet program."

# TW
# fuzzy
@@ -4002,7 +3924,7 @@
#: ../zypp/media/MediaException.cc:207
#, c-format
msgid "Timeout exceed when access '%s'."
-msgstr ""
+msgstr "Tidsfrist udlÃ¸ber, nÃ¥r '%s' tilgÃ¥s."

#. language code: tem
#: ../zypp/LanguageCode.cc:1100
@@ -4058,7 +3980,7 @@
#: ../zypp/KeyRing.cc:507
#, c-format
msgid "Tried to import not existant key %s into keyring %s"
-msgstr ""
+msgstr "PrÃ¸vede at importere ikke-eksisterende nÃ¸gle %s ind i nÃ¸gleringen
%s"

# TT
#. :TUR:792:
@@ -4235,19 +4157,15 @@
msgid "Unknown language: "
msgstr "Ukendt sprog: "

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr "LÃ¥s disse resolvables op"
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
msgstr "Ikke understÃ¸ttet HTTP autentificeringsmetode '%s'"

#: ../zypp/media/MediaException.cc:140
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported URI scheme in '%s'."
-msgstr "Ugyldigt URL-skema '%1'."
+msgstr "Ikke-understÃ¸ttet URI-skema i '%s'."

#: ../devel/devel.mvidner/installation_sources.cc:75
#, c-format
@@ -4514,90 +4432,72 @@
msgid "applydeltarpm failed."
msgstr "applydeltarpm mislykkedes."

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
-msgstr ""
+msgstr "arkitekturÃ¦ndring af %s til %s"

-#: ../zypp/sat/SATResolver.cc:704
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:875
+#, c-format
msgid "cannot install both %s and %s"
-msgstr "%s kan ikke installeres"
+msgstr "kan ikke installere bÃ¥de %s og %s"

-#: ../zypp/sat/SATResolver.cc:688
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:859
msgid "conflicting requests"
-msgstr "Anmodning om forbindelse til: "
+msgstr "modstridende forespÃ¸rgsler"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr "backup %s blev oprettet"

-#: ../zypp/sat/SATResolver.cc:978
-#, fuzzy, c-format
-msgid "deinstallation of %s"
-msgstr "Installation af %s fejlede:"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, c-format
-msgid "delete %s"
-msgstr "slet %s"
+msgid "deinstallation of %s"
+msgstr "afinstallation af %s"

-#: ../zypp/sat/SATResolver.cc:747
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:923
msgid "deleted providers: "
-msgstr "Ingen tilbyder %s"
+msgstr "slettede udbydere: "

-#: ../zypp/sat/SATResolver.cc:899
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:1077
+#, c-format
msgid "do not ask to delete all solvables providing %s"
-msgstr "InstallÃ©r ikke, eller slet de pÃ¥gÃ¦ldende resolvables"
+msgstr "spÃ¸rg ikke efter at slette alle lÃ¸selige, der tilbyder %s"

-#: ../zypp/sat/SATResolver.cc:884
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:1062
+#, c-format
msgid "do not ask to install a solvable providing %s"
-msgstr "Der er intet installerbart, der tilbyder %s"
+msgstr "spÃ¸rg ikke efter at installere en lÃ¸selig, der tilbyder %s"

-#: ../zypp/sat/SATResolver.cc:837
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:1015
+#, c-format
msgid "do not forbid installation of %s"
-msgstr "installÃ©r ikke %s"
+msgstr "forbyd ikke installation af %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr "installÃ©r ikke %s"

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
-msgstr ""
+msgstr "installÃ©r ikke sidste nye version af %s"

-#: ../zypp/sat/SATResolver.cc:811
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:989
+#, c-format
msgid "do not keep %s installed"
-msgstr "ikke installeret"
-
-#: ../zypp/sat/SATResolver.cc:944
-#, fuzzy, c-format
-msgid "downgrade of %s to %s"
-msgstr "Opdaterer %s til %s"
+msgstr "behold ikke %s installeret"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, c-format
-msgid "install %s"
-msgstr "installer %s"
+msgid "downgrade of %s to %s"
+msgstr "nedgradering af %s til %s"

-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4605,11 +4505,13 @@
"-->\n"
" %s"
msgstr ""
+"installÃ©r %s (med leverandÃ¸rÃ¦ndring)\n"
+" %s\n"
+"-->\n"
+" %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr "behold %s"
@@ -4622,34 +4524,34 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection: dbus-tilslutning kan ikke indstilles"

-#: ../zypp/sat/SATResolver.cc:699
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:870
+#, c-format
msgid "nothing provides %s needed by %s"
-msgstr "%s er nÃ¸dvendig for %s"
+msgstr "intet tilbyder%s, der er nÃ¸dvendig for %s"

-#: ../zypp/sat/SATResolver.cc:691
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:862
+#, c-format
msgid "nothing provides requested %s"
-msgstr "Ingen tilbyder %s"
+msgstr "intet tilbyder forespurgt %s"

-#: ../zypp/sat/SATResolver.cc:685
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:856
+#, c-format
msgid "problem with installed package %s"
-msgstr "Problem med installation af kildepakke %s-%s:"
+msgstr "problem med den installerede pakke %s"

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
-msgstr ""
+msgstr "udskiftning af %s med %s"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, 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:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -4658,18 +4560,18 @@
"rpm oprettet %s som %s.\n"
"Her er de fÃ¸rste 25 linjer af forskelle:\n"

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr "rpm output:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, 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:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4678,342 +4580,7 @@
"rpm gemt %s som %s.\n"
"Her er de fÃ¸rste 25 linjer af forskelle:\n"

-#: ../zypp/sat/SATResolver.cc:759
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:935
msgid "uninstallable providers: "
-msgstr "Der er intet installerbart, der tilbyder %s"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr "LÃ¥s %s op"
-
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr "LÃ¥s alle resolvables op"
-
-#~ msgid "Reading '%s' repository cache"
-#~ msgstr "LÃ¦ser '%s' softwarekilde-cache"
-
-#~ msgid "Reading patch and delta rpms from '%s' repository cache"
-#~ msgstr "LÃ¦ser rettelses- og deltarpms fra '%s' softwarekilde-cache"
-
-#~ msgid "Cleaning repository '%s' cache"
-#~ msgstr "TÃ¸mmer cache for softwarekilden '%s'"
-
-#~ msgid "Reading repository '%s' cache"
-#~ msgstr "LÃ¦ser cache for softwarekilden '%s'"
-
-#~ msgid "Software management is already running."
-#~ msgstr "Softwareadministration kÃ¸rer allerede."
-
-#~ msgid "%s is replaced by %s"
-#~ msgstr "%s erstattes af %s"
-
-#~ msgid "%s replaced by %s"
-#~ msgstr "%s erstattet af %s"
-
-#~ msgid "%s will be deleted by the user.\n"
-#~ msgstr "%s vil blive slettet af brugeren.\n"
-
-#~ msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n"
-#~ msgstr "%s vil blive slettet af et andet program (ApplLow/ApplHigh)\n"
-
-#~ msgid "%s will be installed by the user.\n"
-#~ msgstr "%s vil blive installeret af brugeren.\n"
-
-#~ msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n"
-#~ msgstr "%s vil blive installeret af et andet program. (ApplLow/ApplHigh)\n"
-
-#~ msgid "No valid solution found within %d seconds"
-#~ msgstr "Ingen gyldig lÃ¸sning fundet indenfor %d sekunder"
-
-#~ msgid "The solver has reached a defined timout"
-#~ msgstr "AfhÃ¦ngighedslÃ¸seren har nÃ¥et en defineret timeout"
-
-#~ msgid "No valid solution found with just resolvables of best architecture."
-#~ msgstr "Ingen gyldig lÃ¸sning fundet udelukkende med resolvables fra bedste
arktitektur."
-
-#~ 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"
-
-#~ 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."
-
-#~ msgid "Invalid information"
-#~ msgstr "Ugyldig information"
-
-#~ msgid "%s is needed by other resolvables"
-#~ msgstr "%s behÃ¸ves af andre Ã¦ndringer"
-
-#~ msgid ""
-#~ "%s is needed by:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s er nÃ¸dvendig for:\n"
-#~ "%s"
-
-#~ msgid "%s conflicts with other resolvables"
-#~ msgstr "%s konflikter med andre Ã¦ndringer"
-
-#~ msgid ""
-#~ "%s conflicts with:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s konflikter med:\n"
-#~ "%s"
-
-#~ msgid "%s obsoletes other resolvables"
-#~ msgstr "%s forÃ¦lder andre Ã¦ndringer"
-
-#~ msgid "%s obsoletes:%s"
-#~ msgstr "%s forÃ¦lder %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "These resolvables will be deleted from the system."
-#~ msgstr ""
-#~ "\n"
-#~ "Disse resolvables vil blive slettet fra systemet."
-
-#~ msgid "%s depends on other resolvables"
-#~ msgstr "%s afhÃ¦nger af andre resolvables"
-
-#~ msgid "%s depends on %s"
-#~ msgstr "%s afhÃ¦nger af %s"
-
-#~ msgid "%s depends on:%s"
-#~ msgstr "%s afhÃ¦nger af %s"
-
-#~ msgid "Child of"
-#~ msgstr "Barn af"
-
-#~ msgid ""
-#~ "\n"
-#~ "There is no resource available which supports this requirement."
-#~ msgstr ""
-#~ "\n"
-#~ "Der er ingen tilgÃ¦ngelige ressourcer, der understÃ¸tter dette krav."
-
-#~ 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"
-
-#~ msgid "Cannot install %s, because it is conflicting with %s"
-#~ msgstr "Kan ikke installere %s, fordi den konflikter med %s"
-
-#~ msgid "%s is not installed and has been marked as uninstallable"
-#~ msgstr "%s er ikke blevet installeret og er markeret som ikke-installerbar"
-
-#~ msgid "Cannot install %s due to dependency problems"
-#~ msgstr "Kan ikke installere %s grundet afhÃ¦ngighedsproblemer"
-
-#~ msgid "%s has unfulfilled requirements"
-#~ msgstr "%s har ikke-opfyldte krav"
-
-#
-#~ msgid "%s has missing dependencies"
-#~ msgstr "%s har manglende afhÃ¦ngigheder"
-
-#
-#~ msgid "%s cannot be installed due to missing dependencies"
-#~ msgstr "Kan ikke installere %s grundet afhÃ¦ngighedsproblemer"
-
-#~ msgid "%s fulfills dependencies of %s but will be uninstalled"
-#~ msgstr "%s opfylder afhÃ¦ngighedskravene til %s, men vil blive
afinstalleret"
-
-#~ 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"
-
-#~ msgid "No need to install %s"
-#~ msgstr "Det er ikke nÃ¸dvendigt at installere %s"
-
-#~ msgid "Cannot install %s to fulfill the dependencies of %s"
-#~ msgstr "Kan ikke installere %s, for at opfylde afhÃ¦ngighedskravene til %s"
-
-#~ msgid "Cannot install %s to fulfil the dependencies of %s"
-#~ msgstr "Kan ikke installere %s, for at opfylde afhÃ¦ngighedskravene til %s"
-
-#~ msgid "%s will not be uninstalled, because it is still required"
-#~ msgstr "%s vil ikke blive afinstalleret, da den stadig krÃ¦ves"
-
-#~ 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."
-
-#~ msgid "Cannot install %s, because it is conflicting"
-#~ msgstr "Kan ikke installere %s, fordi den konflikter"
-
-#~ msgid "%s is uninstallable due to conflicts with %s"
-#~ msgstr "%s kan ikke installeres pÃ¥ grund af konflikter med %s"
-
-#~ msgid "Requirememt %s cannot be fulfilled."
-#~ msgstr "Kravet %s kan ikke opfyldes."
-
-#~ msgid "for requiring %s for %s when upgrading %s"
-#~ msgstr "for at krÃ¦ve %s til %s nÃ¥r du opgraderer %s"
-
-#~ msgid "%s is lacking the requirement %s"
-#~ msgstr "%s mangler den krÃ¦vede %s"
-
-#~ msgid ", Action: "
-#~ msgstr ", handling:"
-
-#~ msgid ", Trigger: "
-#~ msgstr ", UdlÃ¸ser. "
-
-#~ msgid "package"
-#~ msgstr "pakke"
-
-#~ msgid "selection"
-#~ msgstr "udvalg"
-
-#~ msgid "pattern"
-#~ msgstr "mÃ¸nster"
-
-#~ msgid "product"
-#~ msgstr "produkt"
-
-#
-#~ msgid "patch"
-#~ msgstr "rettelse"
-
-#~ msgid "script"
-#~ msgstr "script"
-
-#~ msgid "message"
-#~ msgstr "besked"
-
-#~ msgid "atom"
-#~ msgstr "atom"
-
-#~ msgid "system"
-#~ msgstr "system"
-
-#~ msgid "Resolvable"
-#~ msgstr "Resolvable"
-
-#~ msgid "Marking this resolution attempt as invalid."
-#~ msgstr "Markerer dette lÃ¸sningsforslag som ugyldigt."
-
-#~ msgid "Marking resolvable %s as uninstallable"
-#~ msgstr "Markerer resolvable %s som ikke-installÃ©rbar"
-
-#~ msgid "%s is scheduled to be installed, but this is impossible due to
dependency problems."
-#~ msgstr "%s er planlagt til installation. Grundet afhÃ¦ngighedsproblemer er
dette imidlertid ikke muligt."
-
-#~ msgid "Can't install %s since it is already marked as needed to be
uninstalled"
-#~ msgstr "Kan ikke installere %s, da det allerede er markeret som nÃ¸dvendigt
at afinstallere"
-
-#~ msgid "Can't install %s, because it does not apply to this system."
-#~ msgstr "Kan ikke installere %s, da det ikke kan anvendes pÃ¥ dette system."
-
-#~ msgid "Can't install %s, because %s is already marked as needed to for
installation"
-#~ msgstr "Kan ikke installere %s, siden %s allerede er markeret som
nÃ¸dvendigt at installere"
-
-#~ msgid "This would invalidate %s."
-#~ msgstr "Dette ville gÃ¸re %s ugyldig."
-
-#~ msgid "Establishing %s"
-#~ msgstr "Etablerer %s"
-
-#~ msgid "Installing %s"
-#~ msgstr "Installerer %s"
-
-#~ msgid "Skipping %s: already installed"
-#~ msgstr "Undlader %s: er allerede installeret"
-
-#~ msgid "There are no alternative providers of %s installed"
-#~ msgstr "Der er intet installeret, som alternativt tilbyder %s"
-
-#~ msgid "for %s"
-#~ msgstr "for %s"
-
-#~ msgid "Upgrading to %s to avoid removing %s is not possible."
-#~ msgstr "Opgradering til %s, for at undgÃ¥ at fjerne %s, er ikke muligt."
-
-#~ msgid "%s provides %s, but is scheduled to be uninstalled."
-#~ msgstr "%s tilbyder %s, men er planlagt til afinstallation."
-
-#~ msgid "%s provides %s, but another version of that %s is already installed."
-#~ msgstr "%s tilbyder %s, men en anden version af denne %s er allerede
installeret."
-
-#~ msgid "%s provides %s, but it is uninstallable. Try installing it on its
own for more details."
-#~ msgstr "%s tilbyder %s, men kan ikke installeres. PrÃ¸v at installere den
alene for at fÃ¥ flere detaljer."
-
-#~ msgid "%s provides %s, but it is locked."
-#~ msgstr "%s tilbyder %s, men er lÃ¥st."
-
-#~ msgid "%s provides %s, but is scheduled to be kept."
-#~ msgstr "%s tilbyder %s, men er planlagt til at blive bevaret."
-
-#~ msgid "%s provides %s, but has another architecture."
-#~ msgstr "%s tilbyder %s, men har en anden arkitektur."
-
-#~ msgid "%s provides %s, but has another vendor (%s)."
-#~ msgstr "%s tilbyder %s, men har en anden 'leverandÃ¸r' (%s)."
-
-#~ msgid "Can't satisfy requirement %s for %s"
-#~ msgstr "Kan ikke tilfredsstille kravet %s for %s"
-
-#~ 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."
-
-#~ 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."
-
-#~ msgid "%s is locked and cannot be uninstalled."
-#~ msgstr "%s er lÃ¥st og kan ikke afinstalleres."
-
-#~ 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."
-
-#~ msgid "Marking %s as uninstallable due to conflicts over %s"
-#~ msgstr "Markerer %s som ikke-installerbar grundet konflikter over %s"
-
-#~ msgid "from %s"
-#~ msgstr "fra %s"
-
-#~ msgid " Error!"
-#~ msgstr "Fejl!"
-
-#~ msgid " Important!"
-#~ msgstr "Vigtigt!"
-
-#~ msgid "Make a solver run with ALL possibilities."
-#~ msgstr "FÃ¥ afhÃ¦ngighedslÃ¸seren til at kÃ¸re med ALLE muligheder."
-
-#~ msgid "Regarding all resolvables with a compatible architecture."
-#~ msgstr "Tager alle resolvables med kompatibel arkitektur i betragtning."
-
-#~ msgid "Make a solver run with best architecture only."
-#~ msgstr "FÃ¥ afhÃ¦ngighedslÃ¸seren til kun at kÃ¸re med bedste arkitektur."
-
-#~ msgid "Regarding resolvables with best architecture only."
-#~ msgstr "Tager kun resolvables med bedste arkitektur i betragtning."
-
-#~ msgid "%s depended on %s"
-#~ msgstr "%s var afhÃ¦ngig af %s"
-
-#~ msgid "%s is recommended by %s"
-#~ msgstr "%s anbefales af %s"
-
-#~ msgid "%s is suggested by %s"
-#~ msgstr "%s foreslÃ¥s af %s"
-
-#~ msgid "%s will be evaluated for installation (freshened) by %s"
-#~ msgstr "%s vil blive evalueret til installation (genopfrisket) af %s"
-
-#~ msgid "%s is enhanced by %s"
-#~ msgstr "%s forbedres af %s"
-
-#~ msgid "%s is supplemented by %s"
-#~ msgstr "%s suppleres af %s"
-
-#~ msgid "%s part of %s"
-#~ msgstr "%s del af %s"
-
-#~ msgid "Double timeout"
-#~ msgstr "Dobbel timeout"
+msgstr "ikke-installÃ©rbare tilbydere: "

-#~ msgid "Start the next solver run with doubled timeout."
-#~ msgstr "Start nÃ¦ste kÃ¸rsel af afhÃ¦ngighedslÃ¸seren med fordoblet
timeout."

Modified: trunk/libzypp/po/de.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/de.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/de.po (original)
+++ trunk/libzypp/po/de.po Mon Apr 28 15:25:19 2008
@@ -10,86 +10,74 @@
msgstr ""
"Project-Id-Version: zypp.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
-"PO-Revision-Date: 2007-09-15 15:14+0200\n"
-"Last-Translator: Stephan Kulow <coolo@xxxxxxx>\n"
-"Language-Team: <en@xxxxxx>\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
+"PO-Revision-Date: Wed Apr 23 19:50:43 UTC 2008\n"
+"Last-Translator: Marko Schugardt <mail.sapex@xxxxxx>\n"
+"Language-Team: German <opensuse-translation-de@xxxxxxxxxxxx>\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/sat/SATResolver.cc:757
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:933
msgid ""
"\n"
"uninstallable providers: "
-msgstr "Es sind keine installierbaren Anbieter von %s verfÃ¼gbar"
+msgstr ""
+"\n"
+"Uninstallierbare Anbieter: "

#: ../zypp/media/MediaException.cc:214
#, c-format
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
-msgstr ""
+msgstr " SSL-Zertifikat-Problem, Ã¼berprÃ¼fen Sie, ob das CA-Zertifikat fÃ¼r
'%s' OK ist."

-#: ../zypp/sat/SATResolver.cc:709
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:880
+#, c-format
msgid "%s conflicts with %s provided by %s"
-msgstr "%s steht in Konflikt mit %s"
+msgstr "%s steht in Konflikt mit %s angeboten von %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "Fehler bei der Installation von %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "%s ordnungsgemÃ¤Ã installiert"

-#: ../zypp/sat/SATResolver.cc:695
-#, fuzzy, c-format
-msgid "%s is not installable"
-msgstr "Nicht installiert"
-
-#: ../zypp/sat/SATResolver.cc:714
-#, fuzzy, c-format
-msgid "%s obsoletes %s provided by %s"
-msgstr "%s ersetzt %s"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
+#: ../zypp/solver/detail/SATResolver.cc:866
#, 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"
+msgid "%s is not installable"
+msgstr "%s ist nicht installierbar"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:93
+#: ../zypp/solver/detail/SATResolver.cc:885
#, 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 den
Anbieter des installierten Elements"
+msgid "%s obsoletes %s provided by %s"
+msgstr "%s macht %s obsolet durch Anbieten von %s"

#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "Fehler beim Entfernen von %s"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "%s ordnungsgemÃ¤Ã entfernt"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
-msgstr ""
+msgstr "%s benÃ¶tigt %s, aber dieses kann nicht angeboten werden"

#. language code: abk ab
#: ../zypp/LanguageCode.cc:240
@@ -111,12 +99,12 @@
msgid "Adangme"
msgstr "Adangme-Sprache"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
-msgstr "FÃ¼ge Repository '%s' hinzu"
+msgstr "FÃ¼ge Repositorium '%s' hinzu"

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "ZusÃ¤tzliche rpm-Ausgabe:"

@@ -329,7 +317,7 @@
msgid "Austronesian (Other)"
msgstr "Andere austronesische Sprachen"

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr "Authentifizierung benÃ¶tigt fÃ¼r '%s'"
@@ -367,11 +355,11 @@
#: ../zypp/media/MediaException.cc:47
#, c-format
msgid "Bad file name: %s"
-msgstr ""
+msgstr "Schlechter Dateiname: %s"

#: ../zypp/media/MediaException.cc:77
msgid "Bad media attach point"
-msgstr ""
+msgstr "Schlechter Medienanhangspunkt"

#. :BRA:076:
#: ../zypp/CountryCode.cc:254
@@ -593,10 +581,10 @@
msgid "Buginese"
msgstr "Bugi-Sprache"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
-msgstr "Erzeuge Cache fÃ¼r Repository '%s'"
+msgstr "Erzeuge Zwischenspeicher fÃ¼r Repositorium '%s'"

#. :BFA:854:
#: ../zypp/CountryCode.cc:246
@@ -643,39 +631,34 @@
msgid "Cameroon"
msgstr "Kamerun"

-#: ../zypp/sat/detail/PoolImpl.cc:100
-#, fuzzy
+#: ../zypp/sat/detail/PoolImpl.cc:147
msgid "Can not create sat-pool."
-msgstr "Datei kann nicht erstellt werden."
+msgstr "Kann keinen Sat-Pool erstellen."

#: ../zypp/thread/Mutex.cc:77
msgid "Can't acquire the mutex lock"
msgstr "Mutex-Sperre kann nicht abgerufen werden"

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
-msgstr ""
+msgstr "Kann nicht zu '/' innerhalb des Chroot (%s) wechseln."

#: ../zypp/ExternalProgram.cc:238
#, c-format
msgid "Can't chroot to '%s' (%s)."
-msgstr ""
+msgstr "Kann nicht zu '%s' (%s) chroot'en."

#. don't want to get here
#: ../zypp/ExternalProgram.cc:259
#, c-format
msgid "Can't exec '%s' (%s)."
-msgstr ""
+msgstr "Kann '%s' (%s) nicht ausfÃ¼hren."

#: ../zypp/ExternalProgram.cc:267
-#, fuzzy, c-format
+#, c-format
msgid "Can't fork (%s)."
-msgstr "%s kann nicht gefunden werden."
+msgstr "Kann nicht abzweigen (%s)."

#: ../zypp/thread/Mutex.cc:33
msgid "Can't initialize mutex attributes"
@@ -685,34 +668,30 @@
msgid "Can't initialize recursive mutex"
msgstr "Rekursiver Mutex kann initialisiert werden"

+#: ../zypp/base/InterProcessMutex.cc:79
+#, c-format
+msgid "Can't open lock file: %s"
+msgstr "Kann Sperrdatei %s nicht Ã¶ffnen"
+
#: ../zypp/ExternalProgram.cc:174
-#, fuzzy, c-format
+#, c-format
msgid "Can't open pipe (%s)."
-msgstr "Datei %1 kann nicht geÃ¶ffnet werden."
+msgstr "Kann die Pipe nicht Ã¶ffnen (%s)."

#: ../zypp/ExternalProgram.cc:163
-#, fuzzy, c-format
+#, c-format
msgid "Can't open pty (%s)."
-msgstr "Datei konnte nicht geÃ¶ffnet werden: %s."
+msgstr "Kann PTY nicht Ã¶ffnen (%s)."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "Datei %1 kann nicht geÃ¶ffnet werden."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
-#, fuzzy, c-format
+#: ../zypp/repo/RepoProvideFile.cc:216
+#, c-format
msgid "Can't provide file '%s' from repository '%s'"
-msgstr "%s kann nicht vom Repository %s bereitgestellt werden."
+msgstr "Kann Datei '%s' aus Repositorium '%s' nicht anbieten."

#: ../zypp/thread/Mutex.cc:87
msgid "Can't release the mutex lock"
msgstr "Mutex-Sperre kann nicht aufgehoben werden"

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr "Rekursives Mutex-Attribut kann nicht festgelegt werden"
@@ -725,22 +704,21 @@
#: ../zypp/KeyRing.cc:276
#, c-format
msgid "Cannot create public key %s from %s keyring to file %s"
-msgstr ""
+msgstr "Kann den Ã¶ffentlichen SchlÃ¼ssel %s vom SchlÃ¼sselring %s zu Datei %s
nicht erstellen"

#: ../zypp/media/MediaException.cc:182
-#, fuzzy
msgid "Cannot eject any media"
msgstr "Konnte kein Schema finden."

#: ../zypp/media/MediaException.cc:184
-#, fuzzy, c-format
+#, c-format
msgid "Cannot eject media '%s'"
-msgstr "Desktop-Element '%s' kann nicht geÃ¶ffnet werden"
+msgstr "Kann Medium '%s' nicht auswerfen"

#: ../zypp/media/MediaException.cc:67
-#, fuzzy, c-format
+#, c-format
msgid "Cannot write file '%s'."
-msgstr "In Datei %1 kann nicht geschrieben werden."
+msgstr "Kann Datei '%s' nicht schreiben."

#. :CUB:192:
#: ../zypp/CountryCode.cc:275
@@ -809,7 +787,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr "GeÃ¤nderte Konfigurationsdateien fÃ¼r %s:"
@@ -907,17 +885,16 @@
#: ../zypp/ExternalProgram.cc:346
#, c-format
msgid "Command exited with status %d."
-msgstr ""
+msgstr "Kommando mit Status %d abgebrochen."

#: ../zypp/ExternalProgram.cc:371
-#, fuzzy
msgid "Command exited with unknown error."
-msgstr "Beim Aufbauen der Verbindung ausgefÃ¼hrter Befehl"
+msgstr "Kommando mit unbekanntem Fehler abgebrochen."

#: ../zypp/ExternalProgram.cc:366
#, c-format
msgid "Command was killed by signal %d (%s)."
-msgstr ""
+msgstr "Kommando wurde mit Signal %d (%s) beendet."

#. :KIR:296:
#: ../zypp/CountryCode.cc:339
@@ -1075,10 +1052,6 @@
msgid "Djibouti"
msgstr "Dschibuti"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-msgid "Do not install or delete the resolvables concerned"
-msgstr "Betreffende auflÃ¶sbare Objekte nicht installieren oder lÃ¶schen"
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1106,12 +1079,15 @@
"Error code: %s\n"
"Error message: %s\n"
msgstr ""
+"Fehler beim Herunterladen (curl) fÃ¼r '%s':\n"
+"Fehlerkode: %s\n"
+"Fehlernachricht: %s\n"

#. TranslatorExplanation: curl is the name of a library, don't translate
#: ../zypp/media/MediaException.cc:84
#, c-format
msgid "Download (curl) initialization failed for '%s'"
-msgstr ""
+msgstr "Download-Initialisierung (curl) fÃ¼r '%s' fehlgeschlagen"

#. language code: dra
#: ../zypp/LanguageCode.cc:470
@@ -1124,10 +1100,10 @@
msgstr "Duala-Sprachen"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
-msgstr ""
+msgstr "Dubioser Typ '%s' fÃ¼r %u-Byte-Checksumme '%s'"

#. language code: dut nld nl
#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480
@@ -1191,16 +1167,15 @@

#: ../zypp/media/MediaException.cc:135
msgid "Empty destination in URI"
-msgstr ""
+msgstr "Leerer Ursprung in URI"

#: ../zypp/media/MediaException.cc:130
msgid "Empty filesystem in URI"
-msgstr ""
+msgstr "Leeres Dateisystem in URI"

#: ../zypp/media/MediaException.cc:125
-#, fuzzy
msgid "Empty host name in URI"
-msgstr "Leerer CA-Name."
+msgstr "Leerer Hostname in URI"

#: ../zypp/url/UrlUtils.cc:111
msgid "Encoded string contains a NUL byte"
@@ -1235,12 +1210,7 @@
#: ../zypp/media/MediaException.cc:161
#, c-format
msgid "Error occurred while setting download (curl) options for '%s':"
-msgstr ""
-
-#: ../zypp/Repository.cc:141
-#, fuzzy
-msgid "Error reading solv-file: "
-msgstr "Fehler beim Lesen von Repositories: "
+msgstr "Fehler passierte beim Setzen der Herunterladen(curl)-Optionen fÃ¼r
'%s':"

#. language code: myv
#: ../zypp/LanguageCode.cc:850
@@ -1278,29 +1248,28 @@
msgstr "Ewondo"

#: ../zypp/KeyRing.cc:558
-#, fuzzy
msgid "Failed to delete key."
-msgstr "Konnte die VM nicht starten."
+msgstr "LÃ¶schen des SchlÃ¼ssels fehlgeschlagen."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
-msgstr ""
+msgstr "Importieren des Ã¶ffentlichen SchlÃ¼ssels aus Datei %s: %s
fehlgeschlagen"

#: ../zypp/media/MediaException.cc:31
-#, fuzzy, c-format
+#, c-format
msgid "Failed to mount %s on %s"
-msgstr "Fehler beim Analysieren: %s."
+msgstr "Mounten von %s auf %s fehlgeschlagen"

-#: ../zypp/target/rpm/RpmDb.cc:1124
-#, fuzzy, c-format
+#: ../zypp/target/rpm/RpmDb.cc:1122
+#, c-format
msgid "Failed to remove public key %s: %s"
-msgstr "Der Ã¶ffentliche SchlÃ¼ssel konnte nicht abgerufen werden."
+msgstr "Entfernen des Ã¶ffentlichen SchlÃ¼ssels %s: %s fehlgeschlagen"

#: ../zypp/media/MediaException.cc:41
-#, fuzzy, c-format
+#, c-format
msgid "Failed to unmount %s"
-msgstr "Das Laden des Moduls \"%s\" ist fehlgeschlagen."
+msgstr "Unmount von %s fehlgeschlagen."

#. :FJI:242:
#: ../zypp/CountryCode.cc:294
@@ -1401,9 +1370,9 @@
" Datei trotzdem verwenden?"

#: ../zypp/media/MediaException.cc:60
-#, fuzzy, c-format
+#, c-format
msgid "File '%s' not found on medium '%s'"
-msgstr "Datei %1 wurde im Repository nicht gefunden."
+msgstr "Datei '%s' nicht auf dem Medium '%s' gefunden."

#. language code: fil
#: ../zypp/LanguageCode.cc:514
@@ -1426,9 +1395,8 @@
msgstr "Andere finnougrische Sprachen"

#: ../zypp/solver/detail/ProblemSolutionCombi.cc:73
-#, fuzzy
msgid "Following actions will be done:"
-msgstr "Folgende Pakete werden aktualisiert:\n"
+msgstr "Folgende Aktionen werden ausgefÃ¼hrt:"

#. language code: fon
#: ../zypp/LanguageCode.cc:520
@@ -1530,9 +1498,9 @@
msgid "Geez"
msgstr "AltÃ¤thiopisch"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
-msgid "Generally ignore this requirement"
-msgstr "Im Allgemeinen Anforderung ignorieren"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
+msgid "Generally ignore of some dependecies"
+msgstr "Generelles Ignorieren einiger AbhÃ¤ngigkeiten"

#. :GRD:308:
#: ../zypp/CountryCode.cc:302
@@ -1822,27 +1790,10 @@
msgstr "Ibo-Sprache"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr "Ignorieren, dass %s bereits fÃ¼r die Installation festgelegt wurde"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
#, 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:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr "Diesen Konflikt von %s ignorieren"
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
-msgstr "Anforderung nur hier ignorieren"
+msgid "Ignore some dependencies of %s"
+msgstr "Ignoriere einige AbhÃ¤ngigkeiten von %s"

#. language code: ijo
#: ../zypp/LanguageCode.cc:630
@@ -1889,23 +1840,7 @@
msgid "Ingush"
msgstr "Inguschisch"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, 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:90
-#, c-format
-msgid "Install %s although it would change the vendor"
-msgstr "%s installieren, auch wenn sich der Anbieter dadurch Ã¤ndert"
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr "Fehlende auflÃ¶sbare Objekte installieren"
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr "Die Installation wurde gemÃ¤Ã Anweisung abgebrochen."

@@ -1979,7 +1914,12 @@
msgid "Invalid port component '%s'"
msgstr "UnzulÃ¤ssige Portkomponente: '%s'"

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr "UngÃ¼ltiger regulÃ¤rer Ausdruck '%s': regcomp gab %d wieder"
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
msgid "Invalid user name or password."
msgstr "UngÃ¼ltiger Benutzername oder ungÃ¼ltiges Passwort."

@@ -2028,11 +1968,6 @@
msgid "Israel"
msgstr "Israel"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "Datei %1 kann nicht geÃ¶ffnet werden."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2158,10 +2093,6 @@
msgid "Kazakhstan"
msgstr "Kasachstan"

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr "AuflÃ¶sbare Objekte behalten"
-
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
msgid "Kenya"
@@ -2514,7 +2445,7 @@

#: ../zypp/media/MediaException.cc:115
msgid "Malformed URI"
-msgstr ""
+msgstr "Missgebildete URI"

#. :MKD:807:
#: ../zypp/CountryCode.cc:363
@@ -2624,21 +2555,21 @@
#: ../zypp/media/MediaException.cc:169
#, c-format
msgid "Media source '%s' does not contain the desired medium"
-msgstr ""
+msgstr "Medienquelle '%s' enthÃ¤lt nicht das gewÃ¼nschte Medium"

#: ../zypp/media/MediaException.cc:175
#, c-format
msgid "Medium '%s' is in use by another instance"
-msgstr ""
+msgstr "Medium '%s' wird gerade von einer anderen Instanz benutzt"

#: ../zypp/media/MediaException.cc:72
msgid "Medium not attached"
-msgstr ""
+msgstr "Medium nicht angehÃ¤ngt"

#: ../zypp/media/MediaException.cc:53
#, c-format
msgid "Medium not opened when trying to perform action '%s'."
-msgstr ""
+msgstr "Medium nicht geÃ¶ffnet beim Versuch eine Aktion '%s' durchzufÃ¼hren."

#. language code: men
#: ../zypp/LanguageCode.cc:808
@@ -2877,9 +2808,9 @@
msgid "No Code"
msgstr "Kein Code"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
msgid "No url in repository."
-msgstr "Das Repository enthÃ¤lt keine URL."
+msgstr "Das Repositorium enthÃ¤lt keine URL."

#. language code: nog
#: ../zypp/LanguageCode.cc:884
@@ -2986,9 +2917,8 @@
msgstr "Oman"

#: ../zypp/media/MediaException.cc:145
-#, fuzzy
msgid "Operation not supported by medium"
-msgstr "Die Profilversion wird vom Apparmor-Modul nicht unterstÃ¼tzt.\n"
+msgstr "Operation wird durch das Medium nicht unterstÃ¼tzt"

#. language code: ori or
#: ../zypp/LanguageCode.cc:910
@@ -3092,27 +3022,19 @@
msgstr "Paraguay"

#: ../zypp/media/MediaException.cc:106
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' on medium '%s' is not a directory."
-msgstr "%1 ist kein Verzeichnis."
+msgstr "Pfad '%s' auf Medium '%s' ist kein Verzeichnis."

#: ../zypp/media/MediaException.cc:98
#, c-format
msgid "Path '%s' on medium '%s' is not a file."
-msgstr ""
-
-#: ../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"
-
-#: ../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"
+msgstr "Pfad '%s' auf Medium '%s' ist keine Datei."

#: ../zypp/media/MediaException.cc:200
-#, fuzzy, c-format
+#, c-format
msgid "Permission to access '%s' denied."
-msgstr "Berechtigungen verweigert"
+msgstr "Berechtigungen fÃ¼r Zugriff auf '%s' verweigert."

#. language code: per fas fa
#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940
@@ -3209,11 +3131,10 @@
msgstr "Die Analyse von Abfragezeichenketten wird fÃ¼r diese URL nicht
unterstÃ¼tzt"

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
-#, fuzzy
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
msgid "RPM failed: "
-msgstr "fehlgeschlagen"
+msgstr "RPM fehlgeschlagen: "

#. language code: roh rm
#: ../zypp/LanguageCode.cc:970
@@ -3239,15 +3160,10 @@
msgid "Relative path not allowed if authority exists"
msgstr "Die Angabe des relativen Pfads ist nicht erlaubt, wenn die
Zertifizierungsstelle vorhanden ist"

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, c-format
msgid "Removing repository '%s'"
-msgstr "Entferne Repository '%s'"
-
-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
+msgstr "Entferne Repositorium '%s'"

#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
@@ -3469,9 +3385,9 @@
msgstr "Zeichensprachen"

#: ../zypp/KeyRing.cc:568
-#, fuzzy, c-format
+#, c-format
msgid "Signature file %s not found"
-msgstr "Quellpaket '%s' nicht gefunden."
+msgstr "Signaturdatei %s nicht gefunden"

#. language code: bla
#: ../zypp/LanguageCode.cc:354
@@ -3548,6 +3464,12 @@
msgid "Solomon Islands"
msgstr "Salomonen"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr ""
+"Die auflÃ¶sbare AbhÃ¤ngigkeit %s steht in Konflikt mit dem selbst angebotenen
%s"
+
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
msgid "Somali"
@@ -3701,12 +3623,12 @@
#: ../zypp/media/MediaException.cc:91
#, c-format
msgid "System exception '%s' on medium '%s'."
-msgstr ""
+msgstr "Systemausnahme '%s' auf Medium '%s'."

#: ../zypp/ZYppFactory.cc:354
#, c-format
msgid "System management is locked by the application with pid %d. Please
close this application before trying again."
-msgstr ""
+msgstr "Systemmanagement ist verschlossen durch die Anwendung mit PID %d.
Bitte schlieÃen Sie dies Anwendung bevor Sie es erneut probieren."

#. language code: tgl tl
#: ../zypp/LanguageCode.cc:1108
@@ -3783,9 +3705,9 @@
msgid "Thailand"
msgstr "Thailand"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
-msgstr ""
+msgstr "Die Aktion wird bereits von einem anderen Programm ausgefÃ¼hrt."

#. language code: tib bod bo
#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114
@@ -3805,7 +3727,7 @@
#: ../zypp/media/MediaException.cc:207
#, c-format
msgid "Timeout exceed when access '%s'."
-msgstr ""
+msgstr "Auszeit Ã¼berschritten bei Zugang '%s'."

#. language code: tem
#: ../zypp/LanguageCode.cc:1100
@@ -3856,7 +3778,7 @@
#: ../zypp/KeyRing.cc:507
#, c-format
msgid "Tried to import not existant key %s into keyring %s"
-msgstr ""
+msgstr "Versuchte nicht existierenden SchlÃ¼ssel %s in SchlÃ¼sselring %s zu
importieren"

#. :TUR:792:
#: ../zypp/CountryCode.cc:441
@@ -4023,19 +3945,15 @@
msgid "Unknown language: "
msgstr "Unbekannte Sprache: "

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr "Entsperren dieser auflÃ¶sbaren Objekte"
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
msgstr "Nicht unterstÃ¼tzte HTTP Authentifizierungsmethode: '%s'"

#: ../zypp/media/MediaException.cc:140
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported URI scheme in '%s'."
-msgstr "'%1' ist ein unzulÃ¤ssiges URL-Schema."
+msgstr "Nicht unterstÃ¼tztes URI-Schema in '%s'."

#: ../devel/devel.mvidner/installation_sources.cc:75
#, c-format
@@ -4289,90 +4207,72 @@
msgid "applydeltarpm failed."
msgstr "Fehler bei applydeltarpm"

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
-msgstr ""
+msgstr "Architekturwechsel von %s zu %s"

-#: ../zypp/sat/SATResolver.cc:704
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:875
+#, c-format
msgid "cannot install both %s and %s"
-msgstr "Installation von %s nicht mÃ¶glich"
+msgstr "Kann beides nicht installieren, %s und %s"

-#: ../zypp/sat/SATResolver.cc:688
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:859
msgid "conflicting requests"
-msgstr "Verbindungsanforderung an:"
+msgstr "kollidierende Anfragen"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr "Sicherung %s erstellt"

-#: ../zypp/sat/SATResolver.cc:978
-#, fuzzy, c-format
-msgid "deinstallation of %s"
-msgstr "Installation von %s ist fehlgeschlagen:"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, c-format
-msgid "delete %s"
-msgstr "%s lÃ¶schen"
+msgid "deinstallation of %s"
+msgstr "Deinstallation von %s"

-#: ../zypp/sat/SATResolver.cc:747
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:923
msgid "deleted providers: "
-msgstr "Kein Objekt stellt %s bereit."
+msgstr "gelÃ¶schte Anbieter: "

-#: ../zypp/sat/SATResolver.cc:899
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:1077
+#, c-format
msgid "do not ask to delete all solvables providing %s"
-msgstr "Betreffende auflÃ¶sbare Objekte nicht installieren oder lÃ¶schen"
+msgstr "fragen Sie nicht nach der LÃ¶schung aller auflÃ¶sbaren Objekte, welche
%s anbieten"

-#: ../zypp/sat/SATResolver.cc:884
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:1062
+#, c-format
msgid "do not ask to install a solvable providing %s"
-msgstr "Es sind keine installierbaren Anbieter von %s verfÃ¼gbar"
+msgstr "fragen Sie nicht nach der Installation eines auflÃ¶sbaren Objekts,
welches %s anbietet"

-#: ../zypp/sat/SATResolver.cc:837
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:1015
+#, c-format
msgid "do not forbid installation of %s"
-msgstr "%s nicht installieren"
+msgstr "verbieten Sie nicht die Installation von %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr "%s nicht installieren"

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
-msgstr ""
+msgstr "Installieren Sie nicht die neueste Version von %s"

-#: ../zypp/sat/SATResolver.cc:811
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:989
+#, c-format
msgid "do not keep %s installed"
-msgstr "Nicht installiert"
-
-#: ../zypp/sat/SATResolver.cc:944
-#, fuzzy, c-format
-msgid "downgrade of %s to %s"
-msgstr "Aktualisierung von %s auf %s"
+msgstr "behalten Sie %s nicht installiert"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, c-format
-msgid "install %s"
-msgstr "Installation von %s"
+msgid "downgrade of %s to %s"
+msgstr "Downgrade von %s zu %s"

-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4380,11 +4280,13 @@
"-->\n"
" %s"
msgstr ""
+"Installiere %s (mit Anbieterwechsel)\n"
+" %s\n"
+"-->\n"
+" %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr "%s behalten"
@@ -4397,34 +4299,34 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection: Festlegen der dbus-Verbindung nicht
mÃ¶glich"

-#: ../zypp/sat/SATResolver.cc:699
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:870
+#, c-format
msgid "nothing provides %s needed by %s"
-msgstr "%s wird benÃ¶tigt von %s"
+msgstr "nichts bietet %s benÃ¶tigt von %s"

-#: ../zypp/sat/SATResolver.cc:691
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:862
+#, c-format
msgid "nothing provides requested %s"
-msgstr "Kein Objekt stellt %s bereit."
+msgstr "nichts bietet angefragtes %s"

-#: ../zypp/sat/SATResolver.cc:685
-#, fuzzy, c-format
+#: ../zypp/solver/detail/SATResolver.cc:856
+#, c-format
msgid "problem with installed package %s"
-msgstr "Problem beim Installieren des Quellpakets %s-%s:"
+msgstr "Problem mit installiertem Paket %s"

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
-msgstr ""
+msgstr "Ersatz von %s mit %s"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, 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:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -4433,18 +4335,18 @@
"rpm hat %s als %s erstellt.\n"
"Hier die ersten 25 Zeilen mit Unterschieden:\n"

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr "rpm-Ausgabe:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, 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:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4453,20 +4355,78 @@
"rpm hat %s als %s gespeichert.\n"
"Hier die ersten 25 Zeilen mit Unterschieden:\n"

-#: ../zypp/sat/SATResolver.cc:759
-#, fuzzy
+#: ../zypp/solver/detail/SATResolver.cc:935
msgid "uninstallable providers: "
-msgstr "Es sind keine installierbaren Anbieter von %s verfÃ¼gbar"
+msgstr "uninstallierbare Anbieter: "

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr "%s entsperren"
+#~ 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"
+
+#~ 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 den
Anbieter des installierten Elements"
+
+#~ msgid "Do not install or delete the resolvables concerned"
+#~ msgstr "Betreffende auflÃ¶sbare Objekte nicht installieren oder lÃ¶schen"
+
+#~ msgid "Ignore that %s is already set to install"
+#~ msgstr "Ignorieren, dass %s bereits fÃ¼r die Installation festgelegt wurde"
+
+#~ msgid "Ignore the obsolete %s in %s"
+#~ msgstr "Veraltete %s in %s ignorieren"
+
+#~ msgid "Ignore this conflict of %s"
+#~ msgstr "Diesen Konflikt von %s ignorieren"
+
+#~ msgid "Ignore this requirement just here"
+#~ msgstr "Anforderung nur hier ignorieren"
+
+#~ msgid "Install %s although it would change the architecture"
+#~ msgstr "%s installieren, auch wenn sich die Architektur dadurch Ã¤ndert"
+
+#~ msgid "Install %s although it would change the vendor"
+#~ msgstr "%s installieren, auch wenn sich der Anbieter dadurch Ã¤ndert"
+
+#~ msgid "Install missing resolvables"
+#~ msgstr "Fehlende auflÃ¶sbare Objekte installieren"
+
+#~ msgid "Keep resolvables"
+#~ msgstr "AuflÃ¶sbare Objekte behalten"
+
+#~ msgid "Unlock these resolvables"
+#~ msgstr "Entsperren dieser auflÃ¶sbaren Objekte"
+
+#~ msgid "delete %s"
+#~ msgstr "%s lÃ¶schen"
+
+#~ msgid "install %s"
+#~ msgstr "Installation von %s"
+
+#~ msgid "unlock %s"
+#~ msgstr "%s entsperren"
+
+#~ msgid "unlock all resolvables"
+#~ msgstr "Entsperren aller auflÃ¶sbaren Objekte"
+
+#~ msgid "Can't add solvables to norepo."
+#~ msgstr "Kann die auflÃ¶sbaren Objekte nicht zu norepo hinzufÃ¼gen."
+
+#~ msgid "Can't open solv-file: "
+#~ msgstr "Kann die Solv-Datei nicht Ã¶ffnen."
+
+#~ msgid "Can't set RepoInfo for norepo."
+#~ msgstr "Kann kein RepoInfo fÃ¼r norepo setzen."
+
+#~ msgid "Error reading solv-file: "
+#~ msgstr "Fehler beim Lesen der Solv-Datei: "
+
+#~ msgid "Path Parameter parsing not supported for this URL"
+#~ msgstr "Die Analyse von Pfadparametern wird fÃ¼r diese URL nicht
unterstÃ¼tzt"
+
+#~ msgid "Path parameter parsing not supported for this URL"
+#~ msgstr "Die Analyse von Pfadparametern wird fÃ¼r diese URL nicht
unterstÃ¼tzt"

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr "Entsperren aller auflÃ¶sbaren Objekte"
+#~ msgid "RepoInfo alias (%s) does not match repository name (%s)"
+#~ msgstr "RepoInfo-Alias (%s) passt nicht zum Namen des Repositorium (%s)"

#~ msgid "Reading '%s' repository cache"
#~ msgstr "Lese '%s' Repository Cache"

Modified: trunk/libzypp/po/el.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/el.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/el.po (original)
+++ trunk/libzypp/po/el.po Mon Apr 28 15:25:19 2008
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: zypp.el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
"PO-Revision-Date: 2008-03-31 11:20+0100\n"
"Last-Translator: Vasileios Giannakopoulos <billg@xxxxxxxx>\n"
"Language-Team: Hellenic <billg@xxxxxxxx>\n"
@@ -22,7 +22,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"

-#: ../zypp/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:933
#, fuzzy
msgid ""
"\n"
@@ -34,61 +34,49 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:880
#, fuzzy, c-format
msgid "%s conflicts with %s provided by %s"
msgstr "Î¤Î¿ %s ÏÏÎ³ÎºÏÎ¿ÏÎµÏÎ±Î¹ Î¼Îµ %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "%s ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î±ÏÎÏÏÏÎµ"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "%s ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ok"

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:866
#, fuzzy, c-format
msgid "%s is not installable"
msgstr "Î¼Î· ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·Î¼ÎÎ½Î¿"

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, fuzzy, c-format
msgid "%s obsoletes %s provided by %s"
msgstr "Î¤Î¿ %s ÏÎµÏÎ±Î»Î±Î¹ÏÎ½ÎµÎ¹ %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, 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:93
-#, fuzzy, c-format
-msgid "%s provides this dependency, but would change the vendor of the
installed item"
-msgstr "Î¤Î¿ %s ÏÎ±ÏÎÏÎµÎ¹ Î±ÏÏÎ® ÏÎ·Î½ ÎµÎ¾Î¬ÏÏÎ·ÏÎ· Î±Î»Î»Î¬ Î¸Î±
Î±Î»Î»Î¬Î¾ÎµÎ¹ ÏÎ·Î½ Î±ÏÏÎ¹ÏÎµÎºÏÎ¿Î½Î¹ÎºÎ® ÏÎ¿Ï
ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·Î¼ÎÎ½Î¿Ï Î±Î½ÏÎ¹ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï"
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "%s Î±ÏÎ±Î¯ÏÎµÏÎ· Î±ÏÎÏÏÏÎµ"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "%s Î±ÏÎ±Î¯ÏÎµÏÎ· ok"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -114,12 +102,12 @@
msgid "Adangme"
msgstr "Adangme"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, fuzzy, c-format
msgid "Adding repository '%s'"
msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï '%s'."

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "ÎÏÎ¹ÏÏÏÏÎ¸ÎµÏÎ¿ Î±ÏÎ¿ÏÎÎ»ÎµÏÎ¼Î± rpm:"

@@ -332,7 +320,7 @@
msgid "Austronesian (Other)"
msgstr "Austronesian (Other)"

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr "ÎÏÎ±Î¹ÏÎµÎ¯ÏÎ±Î¹ ÏÎ¹ÏÏÎ¿ÏÎ¿Î¯Î·ÏÎ· Î³Î¹Î± '%s'"
@@ -597,7 +585,7 @@
msgid "Buginese"
msgstr "Buginese"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, fuzzy, c-format
msgid "Building repository '%s' cache"
msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï '%s'."
@@ -647,7 +635,7 @@
msgid "Cameroon"
msgstr "ÎÎ±Î¼ÎµÏÎ¿ÏÎ½"

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:147
#, fuzzy
msgid "Can not create sat-pool."
msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î±Ï ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï."
@@ -656,10 +644,6 @@
msgid "Can't acquire the mutex lock"
msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î»Î®ÏÎ·Ï ÎºÎ»ÎµÎ¹Î´Î±ÏÎ¹Î¬Ï mutex"

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
@@ -689,6 +673,11 @@
msgid "Can't initialize recursive mutex"
msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±ÏÏÎ¹ÎºÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï ÏÎ±Î»Î¹Î½Î´ÏÎ¿Î¼Î¹ÎºÎ®Ï
mutex"

+#: ../zypp/base/InterProcessMutex.cc:79
+#, fuzzy, c-format
+msgid "Can't open lock file: %s"
+msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±Î½Î¿Î¯Î³Î¼Î±ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï %1."
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -699,12 +688,7 @@
msgid "Can't open pty (%s)."
msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±Î½Î¿Î¯Î³Î¼Î±ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï: %s."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±Î½Î¿Î¯Î³Î¼Î±ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï %1."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, fuzzy, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÏÎ±ÏÎ¿ÏÎ®Ï %s Î±ÏÏ %s"
@@ -713,10 +697,6 @@
msgid "Can't release the mutex lock"
msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎµÎ»ÎµÏÎ¸ÎÏÏÏÎ·Ï ÎºÎ»ÎµÎ¹Î´Î±ÏÎ¹Î¬Ï mutex"

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î¿ÏÎ¹ÏÎ¼Î¿Ï ÏÎ±Î»Î¹Î½Î´ÏÎ¿Î¼Î¹ÎºÎ®Ï
Î¹Î´Î¹ÏÏÎ·ÏÎ±Ï mutex"
@@ -813,7 +793,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr "ÎÎ»Î»Î±Î³Î® Î±ÏÏÎµÎ¯ÏÎ½ ÏÏÎ¸Î¼Î¹ÏÎ·Ï Î³Î¹Î± %s:"
@@ -1079,11 +1059,6 @@
msgid "Djibouti"
msgstr "Î¤Î¶Î¹Î¼ÏÎ¿ÏÏÎ¯"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-#, fuzzy
-msgid "Do not install or delete the resolvables concerned"
-msgstr "ÎÎ± Î¼Î·Î½ Î³Î¯Î½ÎµÎ¹ ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î® Î´Î¹Î±Î³ÏÎ±ÏÎ®
ÏÎ¿Ï Î±ÏÎ¿ÏÎ¬ ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±"
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1129,7 +1104,7 @@
msgstr "Duala"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1244,11 +1219,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr "Î£ÏÎ¬Î»Î¼Î±:"

-#: ../zypp/Repository.cc:141
-#, fuzzy
-msgid "Error reading solv-file: "
-msgstr "Î£ÏÎ¬Î»Î¼Î± ÎºÎ±ÏÎ¬ ÏÎ·Î½ Î±Î½Î¬Î³Î½ÏÏÎ· ÏÎ¿Ï ÏÎ¿Î¼ÎÎ± %u."
-
#. language code: myv
#: ../zypp/LanguageCode.cc:850
msgid "Erzya"
@@ -1289,7 +1259,7 @@
msgid "Failed to delete key."
msgstr "ÎÏÎ¿ÏÏÏÎ¯Î± ÎµÎºÎºÎ¯Î½Î·ÏÎ·Ï ÏÎ·Ï VM."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, fuzzy, c-format
msgid "Failed to import public key from file %s: %s"
msgstr "ÎÏÎÏÏÏÎµ"
@@ -1299,7 +1269,7 @@
msgid "Failed to mount %s on %s"
msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±Î½Î¿Î¯Î³Î¼Î±ÏÎ¿Ï %s - %s\n"

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, fuzzy, c-format
msgid "Failed to remove public key %s: %s"
msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î»Î®ÏÎ·Ï ÏÎ¿Ï Î´Î·Î¼Î¿ÏÎ¯Î¿Ï ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï."
@@ -1539,9 +1509,9 @@
msgid "Geez"
msgstr "Geez"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
#, fuzzy
-msgid "Generally ignore this requirement"
+msgid "Generally ignore of some dependecies"
msgstr "ÎÎ³Î½ÏÎ·ÏÎ· Î±ÏÏÎ®Ï ÏÎ·Ï Î±ÏÎ±Î¯ÏÎ·ÏÎ·Ï Î¼ÏÎ½Î¿ ÎµÎ´Ï"

#. :GRD:308:
@@ -1834,27 +1804,10 @@
msgstr "Igbo"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr "ÎÎ³Î½ÏÎ·ÏÎ· Î¿ÏÎ¹ ÏÎ¿ %s ÎµÎ¯Î½Î±Î¹ Î®Î´Î· ÎÏÎ¿Î¹Î¼Î¿ Î³Î¹Î±
ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
-#, c-format
-msgid "Ignore the obsolete %s in %s"
-msgstr "ÎÎ³Î½ÏÎ·ÏÎ· ÏÎ¿Ï ÏÎµÏÎ±Î»Î±Î¹ÏÎ¼ÎÎ½Î¿Ï %s ÏÏÎ¿ %s"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr "ÎÎ³Î½ÏÎ·ÏÎ· Î±ÏÏÎ®Ï ÏÎ·Ï ÏÏÎ³ÎºÏÎ¿ÏÏÎ·Ï ÏÎ¿Ï %s"
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
-msgstr "ÎÎ³Î½ÏÎ·ÏÎ· Î±ÏÏÎ®Ï ÏÎ·Ï Î±ÏÎ±Î¯ÏÎ·ÏÎ·Ï Î¼ÏÎ½Î¿ ÎµÎ´Ï"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
+#, fuzzy, c-format
+msgid "Ignore some dependencies of %s"
+msgstr "Î±Î´ÏÎ½Î±Î¼Î¯Î± ÎµÏÎ¯Î»ÏÏÎ·Ï ÎµÎ¾Î±ÏÏÎ®ÏÎµÏÎ½"

#. language code: ijo
#: ../zypp/LanguageCode.cc:630
@@ -1901,23 +1854,7 @@
msgid "Ingush"
msgstr "Ingush"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, 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:90
-#, fuzzy, c-format
-msgid "Install %s although it would change the vendor"
-msgstr "ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· %s ÏÎ±ÏÏÎ»Î¿ ÏÎ¿Ï Î¸Î± Î±Î»Î»Î¬Î¾ÎµÎ¹
ÏÎ·Î½ Î±ÏÏÎ¹ÏÎµÎºÏÎ¿Î½Î¹ÎºÎ®"
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr "ÎÎ³ÎºÎ±ÏÎÏÏÎ·ÏÎµ ÏÎ± ÏÎ±Î¼ÎÎ½Î± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±"
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr "Î ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î±ÎºÏÏÏÎ¸Î·ÎºÎµ ÏÏÏÏ
Î´Î¹Î±ÏÎ¬ÏÎ¸Î·ÎºÎµ."

@@ -1991,7 +1928,12 @@
msgid "Invalid port component '%s'"
msgstr "ÎÎ±Î½Î¸Î±ÏÎ¼ÎÎ½Î¿ ÏÏÏÏÎ±ÏÎ¹ÎºÏ Î¸ÏÏÎ±Ï '%s'"

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr ""
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
msgid "Invalid user name or password."
msgstr "ÎÎ±Î½Î¸Î±ÏÎ¼ÎÎ½Î¿ ÏÎ½Î¿Î¼Î± ÏÏÎ®ÏÏÎ· Î®
ÏÏÎ½Î¸Î·Î¼Î±ÏÎ¹ÎºÏ."

@@ -2040,11 +1982,6 @@
msgid "Israel"
msgstr "ÎÏÏÎ±Î®Î»"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±Î½Î¿Î¯Î³Î¼Î±ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï %1."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2170,10 +2107,6 @@
msgid "Kazakhstan"
msgstr "ÎÎ±Î¶Î±ÎºÏÏÎ¬Î½"

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr "ÎÏÎ¬ÏÎ± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±"
-
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
msgid "Kenya"
@@ -2891,7 +2824,7 @@
msgid "No Code"
msgstr "ÎÏÎ¹ ÎÏÎ´Î¹ÎºÎ±Ï"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
#, fuzzy
msgid "No url in repository."
msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï '%s'."
@@ -3116,14 +3049,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr "ÎÎ¹Î±Î´ÏÎ¿Î¼Î®."

-#: ../zypp/url/UrlBase.cc:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr "Î Î±Î½Î¬Î»ÏÏÎ· Î Î±ÏÎ±Î¼ÎÏÏÎ¿Ï ÎÎ¹Î±Î´ÏÎ¿Î¼Î®Ï Î´ÎµÎ½
ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÏÎ±Î¹ Î±ÏÏ Î±ÏÏÏ ÏÎ¿ URL"
-
-#: ../zypp/url/UrlBase.cc:727
-msgid "Path parameter parsing not supported for this URL"
-msgstr "Î Î±Î½Î¬Î»ÏÏÎ· ÏÎ±ÏÎ±Î¼ÎÏÏÎ¿Ï Î´Î¹Î±Î´ÏÎ¿Î¼Î®Ï Î´ÎµÎ½
ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÏÎ±Î¹ Î±ÏÏ Î±ÏÏÏ ÏÎ¿ URL"
-
#: ../zypp/media/MediaException.cc:200
#, fuzzy, c-format
msgid "Permission to access '%s' denied."
@@ -3224,8 +3149,8 @@
msgstr "Î Î±Î½Î¬Î»ÏÏÎ· Î³ÏÎ±Î¼Î¼Î®Ï Î±Î½Î±Î¶Î®ÏÎ·ÏÎ·Ï Î´ÎµÎ½
ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÏÎ±Î¹ Î±ÏÏ Î±ÏÏÏ ÏÎ¿ URL"

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
#, fuzzy
msgid "RPM failed: "
msgstr "Î±ÏÎÏÏÏÎµ"
@@ -3254,16 +3179,11 @@
msgid "Relative path not allowed if authority exists"
msgstr "Î£ÏÎµÏÎ¹ÎºÎ® Î´Î¹Î±Î´ÏÎ¿Î¼Î® Î´ÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ ÎµÎ±Î½
ÏÏÎ¬ÏÏÎµÎ¹ Î±ÏÏÎ®"

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ· ÏÎ·Î³Î®Ï ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï '%s'."

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr ""
@@ -3563,6 +3483,11 @@
msgid "Solomon Islands"
msgstr "ÎÎ®ÏÎ¿Î¹ Î£Î¿Î»Î¿Î¼ÏÎ½ÏÎ¿Ï"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, fuzzy, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr "Î¤Î¿ %s ÏÏÎ³ÎºÏÎ¿ÏÎµÏÎ±Î¹ Î¼Îµ %s"
+
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
msgid "Somali"
@@ -3798,7 +3723,7 @@
msgid "Thailand"
msgstr "Î¤Î±ÏÎ»Î¬Î½Î´Î·"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4038,10 +3963,6 @@
msgid "Unknown language: "
msgstr "ÎÎ³Î½ÏÏÏÎ· Î³Î»ÏÏÏÎ±: "

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr "ÎÎµÎºÎ»ÎµÎ¯Î´ÏÎ¼Î± Î±ÏÏÏÎ½ ÏÏÎ½ ÎµÏÎ¹Î»ÏÏÎ¹Î¼ÏÎ½"
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4307,90 +4228,74 @@
msgid "applydeltarpm failed."
msgstr "applydeltarpm Î±ÏÎÏÏÏÎµ."

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:875
#, fuzzy, c-format
msgid "cannot install both %s and %s"
msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·Ï %s"

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:859
#, fuzzy
msgid "conflicting requests"
msgstr "ÎÎ¯ÏÎ·ÏÎ· ÏÏÎ½Î´ÎµÏÎ·Ï ÏÎµ: "

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr "Î´Î·Î¼Î¹Î¿ÏÏÎ³Î¯Î± Î±Î½ÏÎ¹Î³ÏÎ¬ÏÎ¿Ï Î±ÏÏÎ±Î»ÎµÎ¯Î±Ï %s"

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
-#, c-format
-msgid "delete %s"
-msgstr "Î´Î¹Î±Î³ÏÎ±ÏÎ® %s"
-
-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:923
#, fuzzy
msgid "deleted providers: "
msgstr "ÎÎ±Î½ÎÎ½Î±Ï Î´ÎµÎ½ ÏÎ±ÏÎÏÎµÎ¹ ÏÎ¿ %s"

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, fuzzy, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr "ÎÎ± Î¼Î·Î½ Î³Î¯Î½ÎµÎ¹ ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î® Î´Î¹Î±Î³ÏÎ±ÏÎ®
ÏÎ¿Ï Î±ÏÎ¿ÏÎ¬ ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±"

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, fuzzy, c-format
msgid "do not ask to install a solvable providing %s"
msgstr "ÎÎµÎ½ ÏÏÎ¬ÏÏÎ¿ÏÎ½ ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·Î¼ÎÎ½Î¿Î¹ ÏÎ¬ÏÎ¿ÏÎ¿Î¹
ÏÎ¿Ï %s"

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "Î½Î± Î¼Î·Î½ ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ±Î¸ÎµÎ¯ ÏÎ¿ %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr "Î½Î± Î¼Î·Î½ ÎµÎ³ÎºÎ±ÏÎ±ÏÏÎ±Î¸ÎµÎ¯ ÏÎ¿ %s"

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, fuzzy, c-format
msgid "do not install most recent version of %s"
msgstr "ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·"

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:989
#, fuzzy, c-format
msgid "do not keep %s installed"
msgstr "Î¼Î· ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·Î¼ÎÎ½Î¿"

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, fuzzy, c-format
msgid "downgrade of %s to %s"
msgstr "ÎÎµÏÎ±ÏÎ¿ÏÏÏÎ¼ÎÎ½Î¿ %s Î±ÏÏ %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, c-format
-msgid "install %s"
-msgstr "ÎµÎ³ÎºÎ±ÏÎÏÏÎ·ÏÎµ ÏÎ¿ %s"
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, fuzzy, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4401,10 +4306,8 @@
"ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·\n"
"\n"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr "ÎºÏÎ¬ÏÎ± ÏÎ¿ %s"
@@ -4417,34 +4320,34 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection: ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î¿ÏÎ¹ÏÎ¼Î¿Ï
ÏÏÎ½Î´ÎµÏÎ·Ï dbus"

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:870
#, fuzzy, c-format
msgid "nothing provides %s needed by %s"
msgstr "Î¤Î¿ %s ÏÏÎµÎ¹Î¬Î¶ÎµÏÎ±Î¹ Î±ÏÏ %s"

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:862
#, fuzzy, c-format
msgid "nothing provides requested %s"
msgstr "ÎÎ±Î½ÎÎ½Î±Ï Î´ÎµÎ½ ÏÎ±ÏÎÏÎµÎ¹ ÏÎ¿ %s"

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:856
#, fuzzy, c-format
msgid "problem with installed package %s"
msgstr "ÎµÎ½ÏÎ¿Î»Î® Î³Î¹Î± Î±ÏÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÎ±ÎºÎÏÏÎ½"

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, 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:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -4453,18 +4356,18 @@
"To rpm Î´Î·Î¼Î¹Î¿ÏÏÎ³Î®Î¸Î·ÎºÎµ %s ÏÏ %s.\n"
"ÎÎ´Ï ÎµÎ¯Î½Î±Î¹ Î¿Î¹ ÏÏÏÏÎµÏ 25 ÏÎµÎ¹ÏÎÏ ÏÎ·Ï
Î´Î¹Î±ÏÎ¿ÏÎ¬Ï:\n"

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr "Î±ÏÎ¿ÏÎÎ»ÎµÏÎ¼Î± rpm:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, 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:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4473,17 +4376,73 @@
"Î¤Î¿ rpm Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎµ %s ÏÏ %s.\n"
"ÎÎ´Ï ÎµÎ¯Î½Î±Î¹ Î¿Î¹ ÏÏÏÏÎµÏ 25 Î³ÏÎ±Î¼Î¼ÎÏ ÏÎ·Ï
Î´Î¹Î±ÏÎ¿ÏÎ¬Ï:\n"

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:935
#, fuzzy
msgid "uninstallable providers: "
msgstr "ÎÎµÎ½ ÏÏÎ¬ÏÏÎ¿ÏÎ½ ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·Î¼ÎÎ½Î¿Î¹ ÏÎ¬ÏÎ¿ÏÎ¿Î¹
ÏÎ¿Ï %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr "Î¾ÎµÎºÎ»ÎµÎ¯Î´ÏÎ¼Î± %s"
+#, fuzzy
+#~ msgid "%s provides this dependency, but would change the architecture of
the installed item"
+#~ msgstr "Î¤Î¿ %s ÏÎ±ÏÎÏÎµÎ¹ Î±ÏÏÎ® ÏÎ·Î½ ÎµÎ¾Î¬ÏÏÎ·ÏÎ· Î±Î»Î»Î¬
Î¸Î± Î±Î»Î»Î¬Î¾ÎµÎ¹ ÏÎ·Î½ Î±ÏÏÎ¹ÏÎµÎºÏÎ¿Î½Î¹ÎºÎ® ÏÎ¿Ï
ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·Î¼ÎÎ½Î¿Ï Î±Î½ÏÎ¹ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï"
+
+#, fuzzy
+#~ msgid "%s provides this dependency, but would change the vendor of the
installed item"
+#~ msgstr "Î¤Î¿ %s ÏÎ±ÏÎÏÎµÎ¹ Î±ÏÏÎ® ÏÎ·Î½ ÎµÎ¾Î¬ÏÏÎ·ÏÎ· Î±Î»Î»Î¬
Î¸Î± Î±Î»Î»Î¬Î¾ÎµÎ¹ ÏÎ·Î½ Î±ÏÏÎ¹ÏÎµÎºÏÎ¿Î½Î¹ÎºÎ® ÏÎ¿Ï
ÎµÎ³ÎºÎ±ÏÎµÏÏÎ·Î¼ÎÎ½Î¿Ï Î±Î½ÏÎ¹ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï"
+
+#, fuzzy
+#~ msgid "Do not install or delete the resolvables concerned"
+#~ msgstr "ÎÎ± Î¼Î·Î½ Î³Î¯Î½ÎµÎ¹ ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· Î® Î´Î¹Î±Î³ÏÎ±ÏÎ®
ÏÎ¿Ï Î±ÏÎ¿ÏÎ¬ ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±"
+
+#~ msgid "Ignore that %s is already set to install"
+#~ msgstr "ÎÎ³Î½ÏÎ·ÏÎ· Î¿ÏÎ¹ ÏÎ¿ %s ÎµÎ¯Î½Î±Î¹ Î®Î´Î· ÎÏÎ¿Î¹Î¼Î¿ Î³Î¹Î±
ÎµÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ·"
+
+#~ msgid "Ignore the obsolete %s in %s"
+#~ msgstr "ÎÎ³Î½ÏÎ·ÏÎ· ÏÎ¿Ï ÏÎµÏÎ±Î»Î±Î¹ÏÎ¼ÎÎ½Î¿Ï %s ÏÏÎ¿ %s"
+
+#~ msgid "Ignore this conflict of %s"
+#~ msgstr "ÎÎ³Î½ÏÎ·ÏÎ· Î±ÏÏÎ®Ï ÏÎ·Ï ÏÏÎ³ÎºÏÎ¿ÏÏÎ·Ï ÏÎ¿Ï %s"
+
+#~ msgid "Ignore this requirement just here"
+#~ msgstr "ÎÎ³Î½ÏÎ·ÏÎ· Î±ÏÏÎ®Ï ÏÎ·Ï Î±ÏÎ±Î¯ÏÎ·ÏÎ·Ï Î¼ÏÎ½Î¿ ÎµÎ´Ï"
+
+#~ msgid "Install %s although it would change the architecture"
+#~ msgstr "ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· %s ÏÎ±ÏÏÎ»Î¿ ÏÎ¿Ï Î¸Î± Î±Î»Î»Î¬Î¾ÎµÎ¹
ÏÎ·Î½ Î±ÏÏÎ¹ÏÎµÎºÏÎ¿Î½Î¹ÎºÎ®"
+
+#, fuzzy
+#~ msgid "Install %s although it would change the vendor"
+#~ msgstr "ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· %s ÏÎ±ÏÏÎ»Î¿ ÏÎ¿Ï Î¸Î± Î±Î»Î»Î¬Î¾ÎµÎ¹
ÏÎ·Î½ Î±ÏÏÎ¹ÏÎµÎºÏÎ¿Î½Î¹ÎºÎ®"
+
+#~ msgid "Install missing resolvables"
+#~ msgstr "ÎÎ³ÎºÎ±ÏÎÏÏÎ·ÏÎµ ÏÎ± ÏÎ±Î¼ÎÎ½Î± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±"
+
+#~ msgid "Keep resolvables"
+#~ msgstr "ÎÏÎ¬ÏÎ± ÎµÏÎ¹Î»ÏÏÎ¹Î¼Î±"
+
+#~ msgid "Unlock these resolvables"
+#~ msgstr "ÎÎµÎºÎ»ÎµÎ¯Î´ÏÎ¼Î± Î±ÏÏÏÎ½ ÏÏÎ½ ÎµÏÎ¹Î»ÏÏÎ¹Î¼ÏÎ½"
+
+#~ msgid "delete %s"
+#~ msgstr "Î´Î¹Î±Î³ÏÎ±ÏÎ® %s"
+
+#~ msgid "install %s"
+#~ msgstr "ÎµÎ³ÎºÎ±ÏÎÏÏÎ·ÏÎµ ÏÎ¿ %s"
+
+#~ msgid "unlock %s"
+#~ msgstr "Î¾ÎµÎºÎ»ÎµÎ¯Î´ÏÎ¼Î± %s"
+
+#~ msgid "unlock all resolvables"
+#~ msgstr "ÎÎµÎºÎ»ÎµÎ¯Î´ÏÎ¼Î± ÏÎ»ÏÎ½ ÏÏÎ½ ÎµÏÎ¹Î»ÏÏÎ¹Î¼ÏÎ½"
+
+#, fuzzy
+#~ msgid "Can't open solv-file: "
+#~ msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î±Î½Î¿Î¯Î³Î¼Î±ÏÎ¿Ï Î±ÏÏÎµÎ¯Î¿Ï %1."
+
+#, fuzzy
+#~ msgid "Error reading solv-file: "
+#~ msgstr "Î£ÏÎ¬Î»Î¼Î± ÎºÎ±ÏÎ¬ ÏÎ·Î½ Î±Î½Î¬Î³Î½ÏÏÎ· ÏÎ¿Ï ÏÎ¿Î¼ÎÎ± %u."
+
+#~ msgid "Path Parameter parsing not supported for this URL"
+#~ msgstr "Î Î±Î½Î¬Î»ÏÏÎ· Î Î±ÏÎ±Î¼ÎÏÏÎ¿Ï ÎÎ¹Î±Î´ÏÎ¿Î¼Î®Ï Î´ÎµÎ½
ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÏÎ±Î¹ Î±ÏÏ Î±ÏÏÏ ÏÎ¿ URL"

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr "ÎÎµÎºÎ»ÎµÎ¯Î´ÏÎ¼Î± ÏÎ»ÏÎ½ ÏÏÎ½ ÎµÏÎ¹Î»ÏÏÎ¹Î¼ÏÎ½"
+#~ msgid "Path parameter parsing not supported for this URL"
+#~ msgstr "Î Î±Î½Î¬Î»ÏÏÎ· ÏÎ±ÏÎ±Î¼ÎÏÏÎ¿Ï Î´Î¹Î±Î´ÏÎ¿Î¼Î®Ï Î´ÎµÎ½
ÏÏÎ¿ÏÏÎ·ÏÎ¯Î¶ÎµÏÎ±Î¹ Î±ÏÏ Î±ÏÏÏ ÏÎ¿ URL"

Modified: trunk/libzypp/po/en_GB.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/en_GB.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/en_GB.po (original)
+++ trunk/libzypp/po/en_GB.po Mon Apr 28 15:25:19 2008
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
"PO-Revision-Date: 2007-08-19 16:20+0100\n"
"Last-Translator: Benjamin Weber <b.weber@xxxxxxxxxxxxx>\n"
"Language-Team: <en@xxxxxx>\n"
@@ -20,7 +20,7 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: KBabel 1.11.4\n"

-#: ../zypp/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:933
#, fuzzy
msgid ""
"\n"
@@ -32,61 +32,49 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:880
#, fuzzy, c-format
msgid "%s conflicts with %s provided by %s"
msgstr "%s conflicts with %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "%s install failed"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "%s installed ok"

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:866
#, fuzzy, c-format
msgid "%s is not installable"
msgstr "not installed"

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, fuzzy, c-format
msgid "%s obsoletes %s provided by %s"
msgstr "%s obsoletes %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, 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:93
-#, 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"
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "%s remove failed"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "%s remove ok"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -111,12 +99,12 @@
msgid "Adangme"
msgstr "Adangme"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
msgstr "Adding repository '%s'"

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "Additional rpm output:"

@@ -329,7 +317,7 @@
msgid "Austronesian (Other)"
msgstr "Austronesian (Other)"

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr "Authentication required for '%s'"
@@ -593,7 +581,7 @@
msgid "Buginese"
msgstr "Buginese"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr "Building repository '%s' cache"
@@ -643,7 +631,7 @@
msgid "Cameroon"
msgstr "Cameroon"

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:147
#, fuzzy
msgid "Can not create sat-pool."
msgstr "Cannot create the file."
@@ -652,10 +640,6 @@
msgid "Can't acquire the mutex lock"
msgstr "Can't acquire the mutex lock"

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
@@ -685,6 +669,11 @@
msgid "Can't initialize recursive mutex"
msgstr "Can't initialise recursive mutex"

+#: ../zypp/base/InterProcessMutex.cc:79
+#, fuzzy, c-format
+msgid "Can't open lock file: %s"
+msgstr "Cannot open file %1."
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -695,12 +684,7 @@
msgid "Can't open pty (%s)."
msgstr "Couldn't open file: %s."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "Cannot open file %1."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, fuzzy, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr "Can't provide file %s from repository %s"
@@ -709,10 +693,6 @@
msgid "Can't release the mutex lock"
msgstr "Can't release the mutex lock"

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr "Can't set recursive mutex attribute"
@@ -809,7 +789,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr "Changed configuration files for %s:"
@@ -1075,10 +1055,6 @@
msgid "Djibouti"
msgstr "Djibouti"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-msgid "Do not install or delete the resolvables concerned"
-msgstr "Do not install or delete the resolvables concerned"
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1124,7 +1100,7 @@
msgstr "Duala"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1237,11 +1213,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""

-#: ../zypp/Repository.cc:141
-#, fuzzy
-msgid "Error reading solv-file: "
-msgstr "Error reading repositories:"
-
#. language code: myv
#: ../zypp/LanguageCode.cc:850
msgid "Erzya"
@@ -1282,7 +1253,7 @@
msgid "Failed to delete key."
msgstr "Failed to start the VM."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1292,7 +1263,7 @@
msgid "Failed to mount %s on %s"
msgstr "Unable to open %s - %s\n"

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, fuzzy, c-format
msgid "Failed to remove public key %s: %s"
msgstr "Unable to get the public key."
@@ -1532,8 +1503,9 @@
msgid "Geez"
msgstr "Geez"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
-msgid "Generally ignore this requirement"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
+#, fuzzy
+msgid "Generally ignore of some dependecies"
msgstr "Generally ignore this requirement"

#. :GRD:308:
@@ -1824,27 +1796,10 @@
msgstr "Igbo"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr "Ignore that %s is already set to install"
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
-#, 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:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr "Ignore this conflict of %s"
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
-msgstr "Ignore this requirement just here"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
+#, fuzzy, c-format
+msgid "Ignore some dependencies of %s"
+msgstr "could not resolve dependencies"

#. language code: ijo
#: ../zypp/LanguageCode.cc:630
@@ -1891,23 +1846,7 @@
msgid "Ingush"
msgstr "Ingush"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, 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:90
-#, fuzzy, c-format
-msgid "Install %s although it would change the vendor"
-msgstr "Install %s although it would change the architecture"
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr "Install missing resolvables"
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr "Installation has been aborted as directed."

@@ -1981,7 +1920,12 @@
msgid "Invalid port component '%s'"
msgstr "Invalid port component '%s'"

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr ""
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
msgid "Invalid user name or password."
msgstr "Invalid user name or password."

@@ -2030,11 +1974,6 @@
msgid "Israel"
msgstr "Israel"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "Cannot open file %1."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2160,10 +2099,6 @@
msgid "Kazakhstan"
msgstr "Kazakhstan"

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr "Keep resolvables"
-
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
msgid "Kenya"
@@ -2879,7 +2814,7 @@
msgid "No Code"
msgstr "No Code"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
msgid "No url in repository."
msgstr "No url in repository."

@@ -3103,14 +3038,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr ""

-#: ../zypp/url/UrlBase.cc:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr "Path Parameter parsing not supported for this URL"
-
-#: ../zypp/url/UrlBase.cc:727
-msgid "Path parameter parsing not supported for this URL"
-msgstr "Path parameter parsing not supported for this URL"
-
#: ../zypp/media/MediaException.cc:200
#, fuzzy, c-format
msgid "Permission to access '%s' denied."
@@ -3211,8 +3138,8 @@
msgstr "Query string parsing not supported for this URL"

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
#, fuzzy
msgid "RPM failed: "
msgstr "failed"
@@ -3241,16 +3168,11 @@
msgid "Relative path not allowed if authority exists"
msgstr "Relative path not allowed if authority exists"

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, c-format
msgid "Removing repository '%s'"
msgstr "Removing repository '%s'"

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr "Required file is missing: "
@@ -3550,6 +3472,11 @@
msgid "Solomon Islands"
msgstr "Solomon Islands"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, fuzzy, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr "%s conflicts with %s"
+
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
msgid "Somali"
@@ -3785,7 +3712,7 @@
msgid "Thailand"
msgstr "Thailand"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4025,10 +3952,6 @@
msgid "Unknown language: "
msgstr "Unknown language: "

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr "Unlock these resolvables"
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4291,90 +4214,74 @@
msgid "applydeltarpm failed."
msgstr "applydeltarpm failed."

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:875
#, fuzzy, c-format
msgid "cannot install both %s and %s"
msgstr "Cannot install %s"

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:859
#, fuzzy
msgid "conflicting requests"
msgstr "Connection request to: "

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr "created backup %s"

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "Installation of %s failed:"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
-#, c-format
-msgid "delete %s"
-msgstr "delete %s"
-
-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:923
#, fuzzy
msgid "deleted providers: "
msgstr "None provides %s"

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, fuzzy, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr "Do not install or delete the resolvables concerned"

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, fuzzy, c-format
msgid "do not ask to install a solvable providing %s"
msgstr "There are no installable providers of %s"

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "do not install %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr "do not install %s"

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:989
#, fuzzy, c-format
msgid "do not keep %s installed"
msgstr "not installed"

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, fuzzy, c-format
msgid "downgrade of %s to %s"
msgstr "Updating %s to %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, c-format
-msgid "install %s"
-msgstr "install %s"
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4383,10 +4290,8 @@
" %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr "keep %s"
@@ -4399,34 +4304,34 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection: Can't set dbus connection"

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:870
#, fuzzy, c-format
msgid "nothing provides %s needed by %s"
msgstr "%s is needed by %s"

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:862
#, fuzzy, c-format
msgid "nothing provides requested %s"
msgstr "None provides %s"

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:856
#, fuzzy, c-format
msgid "problem with installed package %s"
msgstr "Problem installing source package %s-%s:"

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, 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:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
@@ -4435,18 +4340,18 @@
"rpm created %s as %s.\n"
"Here are the first 25 lines of difference:\n"

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr "rpm output:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, 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:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
@@ -4455,20 +4360,74 @@
"rpm saved %s as %s.\n"
"Here are the first 25 lines of difference:\n"

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:935
#, fuzzy
msgid "uninstallable providers: "
msgstr "There are no installable providers of %s"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr "unlock %s"
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Do not install or delete the resolvables concerned"
+#~ msgstr "Do not install or delete the resolvables concerned"
+
+#~ msgid "Ignore that %s is already set to install"
+#~ msgstr "Ignore that %s is already set to install"
+
+#~ msgid "Ignore the obsolete %s in %s"
+#~ msgstr "Ignore the obsolete %s in %s"
+
+#~ msgid "Ignore this conflict of %s"
+#~ msgstr "Ignore this conflict of %s"
+
+#~ msgid "Ignore this requirement just here"
+#~ msgstr "Ignore this requirement just here"
+
+#~ msgid "Install %s although it would change the architecture"
+#~ msgstr "Install %s although it would change the architecture"
+
+#, fuzzy
+#~ msgid "Install %s although it would change the vendor"
+#~ msgstr "Install %s although it would change the architecture"
+
+#~ msgid "Install missing resolvables"
+#~ msgstr "Install missing resolvables"
+
+#~ msgid "Keep resolvables"
+#~ msgstr "Keep resolvables"
+
+#~ msgid "Unlock these resolvables"
+#~ msgstr "Unlock these resolvables"
+
+#~ msgid "delete %s"
+#~ msgstr "delete %s"
+
+#~ msgid "install %s"
+#~ msgstr "install %s"
+
+#~ msgid "unlock %s"
+#~ msgstr "unlock %s"
+
+#~ msgid "unlock all resolvables"
+#~ msgstr "unlock all resolvables"
+
+#, fuzzy
+#~ msgid "Can't open solv-file: "
+#~ msgstr "Cannot open file %1."
+
+#, fuzzy
+#~ msgid "Error reading solv-file: "
+#~ msgstr "Error reading repositories:"
+
+#~ msgid "Path Parameter parsing not supported for this URL"
+#~ msgstr "Path Parameter parsing not supported for this URL"

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr "unlock all resolvables"
+#~ msgid "Path parameter parsing not supported for this URL"
+#~ msgstr "Path parameter parsing not supported for this URL"

#~ msgid "Reading '%s' repository cache"
#~ msgstr "Reading '%s' repository cache"

Modified: trunk/libzypp/po/en_US.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/en_US.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/en_US.po (original)
+++ trunk/libzypp/po/en_US.po Mon Apr 28 15:25:19 2008
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
"PO-Revision-Date: 2007-08-22 14:13+0200\n"
"Last-Translator: proofreader <i18n@xxxxxxx>\n"
"Language-Team: English <i18n@xxxxxxx>\n"
@@ -15,7 +15,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"

-#: ../zypp/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:933
msgid ""
"\n"
"uninstallable providers: "
@@ -26,61 +26,49 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:880
#, c-format
msgid "%s conflicts with %s provided by %s"
msgstr ""

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr ""

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:866
#, c-format
msgid "%s is not installable"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, c-format
msgid "%s obsoletes %s provided by %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, 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:93
-#, c-format
-msgid "%s provides this dependency, but would change the vendor of the
installed item"
-msgstr ""
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr ""

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -105,12 +93,12 @@
msgid "Adangme"
msgstr ""

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
msgstr ""

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr ""

@@ -323,7 +311,7 @@
msgid "Austronesian (Other)"
msgstr ""

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr ""
@@ -587,7 +575,7 @@
msgid "Buginese"
msgstr ""

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
@@ -637,7 +625,7 @@
msgid "Cameroon"
msgstr ""

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:147
msgid "Can not create sat-pool."
msgstr ""

@@ -645,10 +633,6 @@
msgid "Can't acquire the mutex lock"
msgstr ""

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
@@ -678,6 +662,11 @@
msgid "Can't initialize recursive mutex"
msgstr ""

+#: ../zypp/base/InterProcessMutex.cc:79
+#, fuzzy, c-format
+msgid "Can't open lock file: %s"
+msgstr "Couldn't open file: %s."
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -688,12 +677,7 @@
msgid "Can't open pty (%s)."
msgstr "Couldn't open file: %s."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "Couldn't open file: %s."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, fuzzy, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr "Reading log entries from %s."
@@ -702,10 +686,6 @@
msgid "Can't release the mutex lock"
msgstr ""

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr ""
@@ -801,7 +781,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr ""
@@ -1066,10 +1046,6 @@
msgid "Djibouti"
msgstr ""

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-msgid "Do not install or delete the resolvables concerned"
-msgstr ""
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1115,7 +1091,7 @@
msgstr ""

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1227,10 +1203,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""

-#: ../zypp/Repository.cc:141
-msgid "Error reading solv-file: "
-msgstr ""
-
#. language code: myv
#: ../zypp/LanguageCode.cc:850
msgid "Erzya"
@@ -1271,7 +1243,7 @@
msgid "Failed to delete key."
msgstr "Failed to parse: %s."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1281,7 +1253,7 @@
msgid "Failed to mount %s on %s"
msgstr "Failed to parse: %s."

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, c-format
msgid "Failed to remove public key %s: %s"
msgstr ""
@@ -1505,8 +1477,8 @@
msgid "Geez"
msgstr ""

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
-msgid "Generally ignore this requirement"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
+msgid "Generally ignore of some dependecies"
msgstr ""

#. :GRD:308:
@@ -1797,26 +1769,9 @@
msgstr ""

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
#, c-format
-msgid "Ignore the obsolete %s in %s"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr ""
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
+msgid "Ignore some dependencies of %s"
msgstr ""

#. language code: ijo
@@ -1864,23 +1819,7 @@
msgid "Ingush"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, c-format
-msgid "Install %s although it would change the architecture"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#, c-format
-msgid "Install %s although it would change the vendor"
-msgstr ""
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr ""
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr ""

@@ -1955,7 +1894,12 @@
msgid "Invalid port component '%s'"
msgstr "Invalid component URI: "

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr ""
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
#, fuzzy
msgid "Invalid user name or password."
msgstr "Invalid password"
@@ -2005,11 +1949,6 @@
msgid "Israel"
msgstr ""

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "Couldn't open file: %s."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2135,10 +2074,6 @@
msgid "Kazakhstan"
msgstr ""

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr ""
-
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
msgid "Kenya"
@@ -2854,7 +2789,7 @@
msgid "No Code"
msgstr ""

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
msgid "No url in repository."
msgstr ""

@@ -3077,14 +3012,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr ""

-#: ../zypp/url/UrlBase.cc:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr ""
-
-#: ../zypp/url/UrlBase.cc:727
-msgid "Path parameter parsing not supported for this URL"
-msgstr ""
-
#: ../zypp/media/MediaException.cc:200
#, fuzzy, c-format
msgid "Permission to access '%s' denied."
@@ -3185,8 +3112,8 @@
msgstr ""

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
#, fuzzy
msgid "RPM failed: "
msgstr "Download failed: "
@@ -3215,16 +3142,11 @@
msgid "Relative path not allowed if authority exists"
msgstr ""

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, c-format
msgid "Removing repository '%s'"
msgstr ""

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr ""
@@ -3524,6 +3446,11 @@
msgid "Solomon Islands"
msgstr ""

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr ""
+
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
msgid "Somali"
@@ -3759,7 +3686,7 @@
msgid "Thailand"
msgstr ""

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4004,10 +3931,6 @@
msgid "Unknown language: "
msgstr ""

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr ""
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4267,88 +4190,72 @@
msgid "applydeltarpm failed."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:875
#, c-format
msgid "cannot install both %s and %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:859
msgid "conflicting requests"
msgstr ""

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "Reading log entries from %s."

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
-#, c-format
-msgid "delete %s"
-msgstr ""
-
-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:923
msgid "deleted providers: "
msgstr ""

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, c-format
msgid "do not ask to install a solvable providing %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, c-format
msgid "do not forbid installation of %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:989
#, c-format
msgid "do not keep %s installed"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, c-format
msgid "downgrade of %s to %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, c-format
-msgid "install %s"
-msgstr ""
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4357,10 +4264,8 @@
" %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr ""
@@ -4373,71 +4278,65 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:870
#, c-format
msgid "nothing provides %s needed by %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:862
#, c-format
msgid "nothing provides requested %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:856
#, c-format
msgid "problem with installed package %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:935
msgid "uninstallable providers: "
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr ""
-
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr ""
+#, fuzzy
+#~ msgid "Can't open solv-file: "
+#~ msgstr "Couldn't open file: %s."

#, fuzzy
#~ msgid "Software management is already running."

Modified: trunk/libzypp/po/es.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/es.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/es.po (original)
+++ trunk/libzypp/po/es.po Mon Apr 28 15:25:19 2008
@@ -1,4 +1,4 @@
-# translation of zypp.es.po to
+# translation of zypp.po to
# IbÃ¡n josÃ© GarcÃa Castillo <Iban.Garcia@xxxxxxxxxxxxxx>, 2000.
# Javier Moreno <javier.moreno@xxxxxxxxxxxxxx>, 2000.
# Jordi Jaen Pallares <jordi@xxxxxxx>, 1999, 2000, 2001.
@@ -6,38 +6,40 @@
# CamaleÃ³n, 2007.
# CÃ©sar SÃ¡nchez Alonso <csalinux@xxxxxxxxx>, 2007.
# Miguel Angel Alvarez <maacruz@xxxxxxxxx>, 2008.
+# CamaleÃ³n <noelamac@xxxxxxxxx>, 2008.
+# translation of zypp.es.po to
# Spanish message file for YaST2 (@memory@).
# Copyright (C) 2005 SUSE Linux Products GmbH.
# Copyright (C) 2002, 2003 SuSE Linux AG.
# Copyright (C) 1999, 2000, 2001 SuSE GmbH.
msgid ""
msgstr ""
-"Project-Id-Version: zypp.es\n"
+"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
-"PO-Revision-Date: 2008-04-10 22:24+0200\n"
-"Last-Translator: Miguel Angel Alvarez <maacruz@xxxxxxxxx>\n"
-"Language-Team: <opensuse-translation-es@xxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2008-04-18 19:04+0200\n"
+"PO-Revision-Date: 2008-04-22 12:52+0200\n"
+"Last-Translator: CamaleÃ³n <noelamac@xxxxxxxxx>\n"
+"Language-Team: Spanish <opensuse-translation-es@xxxxxxxxxxxx>\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/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:915
msgid ""
"\n"
"uninstallable providers: "
msgstr ""
"\n"
-"No hay proveedores instalables: "
+"proveedores no instalables: "

#: ../zypp/media/MediaException.cc:214
#, c-format
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr " Hay un problema con el certificado SSL, compruebe que la autoridad de
certificaciÃ³n (CA) es correcta para '%s'."

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:867
#, c-format
msgid "%s conflicts with %s provided by %s"
msgstr "%s estÃ¡ en conflicto con %s proporcionado por %s"
@@ -46,24 +48,24 @@
# clients/online_update_start.ycp:188
#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "Error al instalar %s"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "InstalaciÃ³n correcta de %s"

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:853
#, c-format
msgid "%s is not installable"
msgstr "%s no es instalable"

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:872
#, c-format
msgid "%s obsoletes %s provided by %s"
msgstr "%s deja obsoleto a %s proporcionado por %s"
@@ -85,18 +87,18 @@
# clients/inst_prepdisk.ycp:507 clients/inst_prepdisk.ycp:526
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "Error al eliminar %s"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "EliminaciÃ³n de %s correcta"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:903
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr "%s requiere %s, pero este requisito no puede cumplirse"
@@ -121,12 +123,12 @@
msgid "Adangme"
msgstr "Adangme"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
msgstr "AÃ±adiendo el repositorio '%s'"

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "Salida de rpm adicional:"

@@ -339,7 +341,7 @@
msgid "Austronesian (Other)"
msgstr "Austranesio (otros)"

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr "Se requiere autenticaciÃ³n para '%s'"
@@ -603,7 +605,7 @@
msgid "Buginese"
msgstr "Bugi"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr "Construyendo el cachÃ© del repositorio '%s'"
@@ -653,17 +655,13 @@
msgid "Cameroon"
msgstr "CamerÃºn"

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:144
msgid "Can not create sat-pool."
msgstr "No es posible crear el 'sat-pool'."

#: ../zypp/thread/Mutex.cc:77
msgid "Can't acquire the mutex lock"
-msgstr "No es posible adquirir el bloqueo de mutex"
-
-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr "No se pueden aÃ±adir elementos a norepo."
+msgstr "No se puede adquirir el bloqueo de mutex"

#: ../zypp/ExternalProgram.cc:245
#, c-format
@@ -695,6 +693,11 @@
msgid "Can't initialize recursive mutex"
msgstr "No es posible iniciar mutex recursivo"

+#: ../zypp/base/InterProcessMutex.cc:79
+#, c-format
+msgid "Can't open lock file: %s"
+msgstr "No se puede abrir el archivo de bloqueo: %s"
+
#: ../zypp/ExternalProgram.cc:174
#, c-format
msgid "Can't open pipe (%s)."
@@ -706,11 +709,7 @@
msgid "Can't open pty (%s)."
msgstr "No es posible abrir el pty (%s)."

-#: ../zypp/Repository.cc:136
-msgid "Can't open solv-file: "
-msgstr "No es posible abrir el archivo solv: "
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr "No es posible proporcionar el archivo '%s' desde el repositorio '%s'"
@@ -719,10 +718,6 @@
msgid "Can't release the mutex lock"
msgstr "No es posible liberar el bloqueo de mutex"

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr "No se puede definir RepoInfo para norepo."
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr "No es posible establecer el atributo de mutex recursivo"
@@ -823,10 +818,10 @@
# modules/Mail.ycp:563
#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
-msgstr "Modificados archivos de configuraciÃ³n para %s:"
+msgstr "Modificados los archivos de configuraciÃ³n para %s:"

#. language code: che ce
#: ../zypp/LanguageCode.cc:396
@@ -1119,7 +1114,7 @@
"Error code: %s\n"
"Error message: %s\n"
msgstr ""
-"Error de descarga (curl) para '%s':\n"
+"Error en la descarga (curl) de '%s':\n"
"CÃ³digo de error: %s\n"
"Mensaje de error: %s\n"

@@ -1127,7 +1122,7 @@
#: ../zypp/media/MediaException.cc:84
#, c-format
msgid "Download (curl) initialization failed for '%s'"
-msgstr "La inicializaciÃ³n de la descarga (curl) ha fallado por '%s'"
+msgstr "La inicializaciÃ³n de la descarga (curl) ha fallado para '%s'"

#. language code: dra
#: ../zypp/LanguageCode.cc:470
@@ -1140,7 +1135,7 @@
msgstr "Duala"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr "Tipo dudoso '%s' para el byte %u suma de comprobaciÃ³n '%s'"
@@ -1207,19 +1202,19 @@

#: ../zypp/media/MediaException.cc:135
msgid "Empty destination in URI"
-msgstr "Destino vacio en URI"
+msgstr "Destino vacÃo en URI"

#: ../zypp/media/MediaException.cc:130
msgid "Empty filesystem in URI"
-msgstr "Sistema de archivos vacio en URI"
+msgstr "Sistema de archivos vacÃo en URI"

#: ../zypp/media/MediaException.cc:125
msgid "Empty host name in URI"
-msgstr "Nombre de host vacio en URI"
+msgstr "Nombre de host vacÃo en URI"

#: ../zypp/url/UrlUtils.cc:111
msgid "Encoded string contains a NUL byte"
-msgstr "La cadena cifrada incluye un byte nulo"
+msgstr "La cadena codificada incluye un byte NULO"

#. language code: eng en
#: ../zypp/LanguageCode.cc:494
@@ -1252,10 +1247,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr "Se ha producido un error al establecer las opciones de descarga (curl)
para '%s':"

-#: ../zypp/Repository.cc:141
-msgid "Error reading solv-file: "
-msgstr "Se ha producido un error al leer el archivo solv: "
-
#. language code: myv
#: ../zypp/LanguageCode.cc:850
msgid "Erzya"
@@ -1295,17 +1286,17 @@
msgid "Failed to delete key."
msgstr "Error al borrar clave."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
-msgstr "Error al importar clave pÃºblica desde el fichero %s: %s"
+msgstr "Error al importar la clave pÃºblica desde el archivo %s: %s"

#: ../zypp/media/MediaException.cc:31
#, c-format
msgid "Failed to mount %s on %s"
msgstr "Error al montar %s en %s"

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, c-format
msgid "Failed to remove public key %s: %s"
msgstr "Error al eliminar la clave pÃºblica %s: %s"
@@ -1362,7 +1353,7 @@
"Use the file anyway?"
msgstr ""
"El archivo %s no tiene una suma de comprobaciÃ³n.\n"
-"Â¿Desea utilizar el archivo de todos modos?"
+"Â¿Desea utilizarlo de todos modos?"

#: ../devel/devel.mvidner/installation_sources.cc:85
#, c-format
@@ -1373,7 +1364,7 @@
msgstr ""
"El archivo %s no ha superado la comprobaciÃ³n de integridad con la siguiente
clave:\n"
"%s|%s|%s\n"
-" Â¿Desea utilizar el archivo de todos modos?"
+"Â¿Desea utilizarlo de todos modos?"

#: ../devel/devel.mvidner/installation_sources.cc:117
#, c-format
@@ -1383,8 +1374,8 @@
"Use the file anyway?"
msgstr ""
"El archivo %s tiene una suma de comprobaciÃ³n incorrecta.\n"
-"Se esperaba %s, se ha encontrado %s\n"
-"Â¿Desea utilizar el archivo de todos modos?"
+"Se esperaba %s, pero se ha encontrado %s\n"
+"Â¿Desea utilizarlo de todos modos?"

#: ../devel/devel.mvidner/installation_sources.cc:108
#, c-format
@@ -1393,7 +1384,7 @@
"Use the file anyway?"
msgstr ""
"El archivo %s tiene una suma de comprobaciÃ³n desconocida %s.\n"
-"Â¿Desea utilizar el archivo de todos modos?"
+"Â¿Desea utilizarlo de todos modos?"

#: ../devel/devel.mvidner/installation_sources.cc:56
#, c-format
@@ -1413,12 +1404,12 @@
msgstr ""
"El archivo %s estÃ¡ firmado con una clave desconocida:\n"
"%s|%s|%s\n"
-" Â¿Desea utilizar el archivo de todos modos?"
+"Â¿Desea utilizarlo de todos modos?"

#: ../zypp/media/MediaException.cc:60
#, c-format
msgid "File '%s' not found on medium '%s'"
-msgstr "No se encuentra el archivo %s en el medio '%s'"
+msgstr "No se encuentra el archivo '%s' en el medio '%s'"

#. language code: fil
#: ../zypp/LanguageCode.cc:514
@@ -1706,7 +1697,7 @@
#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55
#: ../zypp/target/hal/HalException.h:64
msgid "Hal Exception"
-msgstr "ExcepciÃ³n de Hal"
+msgstr "ExcepciÃ³n de hal"

#: ../zypp/target/hal/HalContext.cc:94
msgid "HalContext not connected"
@@ -1910,7 +1901,7 @@
#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
#, c-format
msgid "Install %s although it would change the architecture"
-msgstr "Instalar %s aunque cambie la arquitectura"
+msgstr "Instalar %s aunque cambiarÃa la arquitectura"

#. TranslatorExplanation %s = name of package, patch, selection ...
#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
@@ -1922,7 +1913,7 @@
msgid "Install missing resolvables"
msgstr "Instalar los elementos que faltan"

-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:759
msgid "Installation has been aborted as directed."
msgstr "La instalaciÃ³n se ha cancelado siguiendo las indicaciones."

@@ -1949,54 +1940,59 @@
#: ../zypp/url/UrlBase.cc:180
#, c-format
msgid "Invalid %s component"
-msgstr "Componente %s incorrecto"
+msgstr "Componente %s no vÃ¡lido"

#: ../zypp/url/UrlBase.cc:173
#, c-format
msgid "Invalid %s component '%s'"
-msgstr "Componente %s incorrecto '%s'"
+msgstr "Componente %s no vÃ¡lido '%s'"

#: ../zypp/Url.cc:152
#, c-format
msgid "Invalid LDAP URL query parameter '%s'"
-msgstr "ParÃ¡metro de consulta URL LDAP '%s' incorrecto"
+msgstr "ParÃ¡metro de consulta URL LDAP '%s' no vÃ¡lido"

#: ../zypp/Url.cc:113
msgid "Invalid LDAP URL query string"
-msgstr "Cadena de consulta URL LDAP incorrecta"
+msgstr "Cadena de consulta URL LDAP no vÃ¡lida"

#: ../zypp/url/UrlBase.cc:826
#, c-format
msgid "Invalid Url scheme '%s'"
-msgstr "Esquema de URL incorrecto '%s'"
+msgstr "Esquema '%s' de URL no vÃ¡lido"

#: ../zypp/Url.cc:309
msgid "Invalid empty Url object reference"
-msgstr "Referencia de objeto URL vacÃa incorrecta"
+msgstr "Referencia de objeto de URL vacÃo no vÃ¡lido"

#: ../zypp/url/UrlBase.cc:1047
#, c-format
msgid "Invalid host component '%s'"
-msgstr "Componente host incorrecto '%s'"
+msgstr "Componente de host no vÃ¡lido '%s'"

#: ../zypp/url/UrlUtils.cc:283
msgid "Invalid parameter array join separator character"
-msgstr "CarÃ¡cter separador de uniÃ³n de conjunto de parÃ¡metros incorrecto"
+msgstr "ParÃ¡metro de carÃ¡cter de separaciÃ³n para la uniÃ³n de matrices no
vÃ¡lido"

#: ../zypp/url/UrlUtils.cc:173
msgid "Invalid parameter array split separator character"
-msgstr "CarÃ¡cter separador de divisiÃ³n de conjunto de parÃ¡metros incorrecto"
+msgstr "ParÃ¡metro de carÃ¡cter de separaciÃ³n para la divisiÃ³n de matrices
no vÃ¡lido"

#: ../zypp/url/UrlUtils.cc:213
msgid "Invalid parameter map split separator character"
-msgstr "CarÃ¡cter separador de divisiÃ³n de asignaciÃ³n de parÃ¡metros
incorrecto"
+msgstr "ParÃ¡metro de carÃ¡cter de separaciÃ³n para la divisiÃ³n de mapas no
vÃ¡lido"

#: ../zypp/url/UrlBase.cc:1079
#, c-format
msgid "Invalid port component '%s'"
-msgstr "Componente de puerto incorrecto '%s'"
+msgstr "Componente de puerto no vÃ¡lido '%s'"

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr "ExpresiÃ³n regular '%s' no vÃ¡lida: regcomp ha devuelto %d"
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
msgid "Invalid user name or password."
msgstr "Nombre de usuario o contraseÃ±a no vÃ¡lidos."

@@ -2045,11 +2041,6 @@
msgid "Israel"
msgstr "Israel"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "Se ha %d, no es posible abrir el archivo de bloqueo %s"
-
# include/partitioning/auto_part_ui.ycp:200
include/partitioning/auto_part_ui.ycp:249
# include/partitioning/auto_part_ui.ycp:200
include/partitioning/auto_part_ui.ycp:249
# include/partitioning/auto_part_ui.ycp:200
include/partitioning/auto_part_ui.ycp:249
@@ -2534,7 +2525,7 @@

#: ../zypp/media/MediaException.cc:115
msgid "Malformed URI"
-msgstr "URI incorrecta"
+msgstr "Formato de URI incorrecto"

#. :MKD:807:
#: ../zypp/CountryCode.cc:363
@@ -2658,7 +2649,7 @@
#: ../zypp/media/MediaException.cc:53
#, c-format
msgid "Medium not opened when trying to perform action '%s'."
-msgstr "El medio no se ha abierto al intentar realizar la acciÃ³n '%s'."
+msgstr "El medio no se ha abierto cuando se intentaba realizar la acciÃ³n
'%s'."

#. language code: men
#: ../zypp/LanguageCode.cc:808
@@ -2693,7 +2684,7 @@
#. language code: mis
#: ../zypp/LanguageCode.cc:816
msgid "Miscellaneous Languages"
-msgstr "Lenguas varias"
+msgstr "Varios idiomas"

#. language code: moh
#: ../zypp/LanguageCode.cc:830
@@ -2897,9 +2888,9 @@
msgid "No Code"
msgstr "Sin cÃ³digo"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
msgid "No url in repository."
-msgstr "No hay ninguna url en el repositorio."
+msgstr "No hay ninguna direcciÃ³n url en el repositorio."

#. language code: nog
#: ../zypp/LanguageCode.cc:884
@@ -2919,7 +2910,7 @@
#. language code: nai
#: ../zypp/LanguageCode.cc:854
msgid "North American Indian"
-msgstr "Lenguas amerindias de NorteamÃ©rica"
+msgstr "Lenguas amerindias"

#. :KNA:659:
#: ../zypp/CountryCode.cc:341
@@ -3120,14 +3111,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr "La ruta '%s' en el medio '%s' no es un archivo."

-#: ../zypp/url/UrlBase.cc:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr "El anÃ¡lisis de parÃ¡metros de ruta no es compatible con esta
direcciÃ³n URL"
-
-#: ../zypp/url/UrlBase.cc:727
-msgid "Path parameter parsing not supported for this URL"
-msgstr "El anÃ¡lisis de parÃ¡metros de ruta no es compatible con esta
direcciÃ³n URL"
-
#: ../zypp/media/MediaException.cc:200
#, c-format
msgid "Permission to access '%s' denied."
@@ -3228,8 +3211,8 @@
msgstr "El anÃ¡lisis de cadenas de consulta no es compatible con esta
direcciÃ³n URL"

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
msgid "RPM failed: "
msgstr "RPM fallido: "

@@ -3255,18 +3238,13 @@

#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131
msgid "Relative path not allowed if authority exists"
-msgstr "No se permiten ruta relativas si existe una autoridad"
+msgstr "No se permiten rutas relativas si existe una autoridad"

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, c-format
msgid "Removing repository '%s'"
msgstr "Eliminado el repositorio '%s'"

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr "El alias RepoInfo (%s) no cuadra con el nombre de repositorio (%s)"
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr "Falta el archivo requerido: "
@@ -3801,9 +3779,9 @@
msgid "Thailand"
msgstr "Tailandia"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
-msgstr "Esta acciÃ³n estÃ¡ siendo realizada por otro programa en ejecuciÃ³n."
+msgstr "Esta acciÃ³n estÃ¡ siendo ejecutada por otro programa."

#. language code: tib bod bo
#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114
@@ -3823,7 +3801,7 @@
#: ../zypp/media/MediaException.cc:207
#, c-format
msgid "Timeout exceed when access '%s'."
-msgstr "Tiempo de espera excedido mientras se accede '%s'."
+msgstr "Se ha sobrepasado el tiempo de espera al acceder a '%s'."

#. language code: tem
#: ../zypp/LanguageCode.cc:1100
@@ -3994,19 +3972,19 @@

#: ../zypp/Url.cc:296
msgid "Unable to clone Url object"
-msgstr "No es posible clonar el objeto URL"
+msgstr "No se puede clonar el objeto URL"

#: ../zypp/target/hal/HalContext.cc:206
msgid "Unable to create dbus connection"
-msgstr "No es posible crear la conexiÃ³n dbus"
+msgstr "No se puede crear la conexiÃ³n dbus"

#: ../zypp/target/hal/HalContext.cc:249
msgid "Unable to initalize HAL context -- hald not running?"
-msgstr "No es posible iniciar el contexto HAL -- Â¿Es posible que hald no se
estÃ© ejecutando?"
+msgstr "No se puede iniciar el contexto HAL -- Â¿Es posible que hald no se
estÃ© ejecutando?"

#: ../zypp/Url.cc:322 ../zypp/Url.cc:336
msgid "Unable to parse Url components"
-msgstr "No es posible analizar los componentes de URL"
+msgstr "No se pueden analizar los componentes de URL"

#. language code: und
#: ../zypp/LanguageCode.cc:1168
@@ -4053,7 +4031,7 @@
#: ../zypp/media/MediaException.cc:140
#, c-format
msgid "Unsupported URI scheme in '%s'."
-msgstr "Esquema de URL incorrecto '%s'."
+msgstr "Esquema de URL no soportado en '%s'."

#: ../devel/devel.mvidner/installation_sources.cc:75
#, c-format
@@ -4099,7 +4077,7 @@

#: ../zypp/url/UrlBase.cc:820
msgid "Url scheme is a required component"
-msgstr "El esquema de url es un componente obligatorio"
+msgstr "El esquema de URL es un componente obligatorio"

#: ../zypp/url/UrlBase.cc:1010
msgid "Url scheme requires a host component"
@@ -4301,38 +4279,38 @@

#: ../zypp/repo/PackageProvider.cc:233
msgid "applydeltarpm check failed."
-msgstr "ComprobaciÃ³n de applydeltarpm incorrecta."
+msgstr "Ha fallado la comprobaciÃ³n de applydeltarpm."

#: ../zypp/repo/PackageProvider.cc:247
msgid "applydeltarpm failed."
msgstr "Error de applydeltarpm."

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1109
#, c-format
msgid "architecture change of %s to %s"
-msgstr "la arquitectura cambia de %s a %s"
+msgstr "cambio en la arquitectura de %s a %s"

# include/partitioning/auto_part_ui.ycp:200
include/partitioning/auto_part_ui.ycp:249
# include/partitioning/auto_part_ui.ycp:200
include/partitioning/auto_part_ui.ycp:249
# include/partitioning/auto_part_ui.ycp:200
include/partitioning/auto_part_ui.ycp:249
-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:862
#, c-format
msgid "cannot install both %s and %s"
-msgstr "No es posible instalar %s y %s"
+msgstr "no se puede instalar ambos %s y %s"

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:846
msgid "conflicting requests"
msgstr "peticiones conflictivas"

# include/nis_server/io.ycp:582
# include/backup/ui.ycp:1286
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr "creada copia de seguridad %s"

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid "deinstallation of %s"
msgstr "desinstalaciÃ³n de %s"
@@ -4344,24 +4322,24 @@
msgid "delete %s"
msgstr "suprimir %s"

-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:905
msgid "deleted providers: "
msgstr "proveedores eliminados: "

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1057
#, c-format
msgid "do not ask to delete all solvables providing %s"
-msgstr "No preguntar si se eliminan los elementos proporcionando %s"
+msgstr "no preguntar si se eliminan todos los elementos que proporcionan %s"

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1042
#, c-format
msgid "do not ask to install a solvable providing %s"
-msgstr "no preguntar si se instala algÃºn elemento proporcionando %s"
+msgstr "no preguntar si se instala algÃºn elemento que proporciona %s"

# include/partitioning/auto_part_ui.ycp:200
include/partitioning/auto_part_ui.ycp:249
# include/partitioning/auto_part_ui.ycp:200
include/partitioning/auto_part_ui.ycp:249
# include/partitioning/auto_part_ui.ycp:200
include/partitioning/auto_part_ui.ycp:249
-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:995
#, c-format
msgid "do not forbid installation of %s"
msgstr "no prohibir la instalaciÃ³n de %s"
@@ -4370,24 +4348,25 @@
# 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/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:974
+#: ../zypp/solver/detail/SATResolver.cc:1013
#, c-format
msgid "do not install %s"
msgstr "no instalar %s"

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1069
#, c-format
msgid "do not install most recent version of %s"
msgstr "no instalar la versiÃ³n mas reciente de %s"

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:969
#, c-format
msgid "do not keep %s installed"
msgstr "no mantener instalado %s"

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1102
#, c-format
msgid "downgrade of %s to %s"
msgstr "desactualizaciÃ³n de %s a %s"
@@ -4399,7 +4378,7 @@
msgid "install %s"
msgstr "instalar %s"

-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1116
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4413,9 +4392,10 @@
" %s"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:990
+#: ../zypp/solver/detail/SATResolver.cc:1027
#, c-format
msgid "keep %s"
msgstr "mantener %s"
@@ -4428,63 +4408,63 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr "libhal_set_dbus_connection: no es posible establecer la conexiÃ³n dbus"

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:857
#, c-format
msgid "nothing provides %s needed by %s"
-msgstr "no hay nada que proporcione %s necesitado por %s"
+msgstr "no hay nada que proporcione %s y que lo necesita %s"

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:849
#, c-format
msgid "nothing provides requested %s"
-msgstr "no hay nada que proporcione %s requerido"
+msgstr "no hay nada que proporcione el solicitado %s"

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:843
#, c-format
msgid "problem with installed package %s"
msgstr "se ha producido un problema con el paquete instalado %s"

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1124
#, c-format
msgid "replacement of %s with %s"
msgstr "reemplazo de %s con %s"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr "rpm ha creado %s como %s, pero no es posible determinar la diferencia"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""
-"rpm creado %s como %s.\n"
+"rpm ha creado %s como %s.\n"
"A continuaciÃ³n se presentan las primeras 25 lÃneas de diferencia:\n"

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
-msgstr "Salida de rpm:"
+msgstr "salida de rpm:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr "rpm ha guardado %s como %s, pero no es posible determinar la
diferencia"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""
-"rpm guardado %s como %s.\n"
+"rpm ha guardado %s como %s.\n"
"A continuaciÃ³n se presentan las primeras 25 lÃneas de diferencia:\n"

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:917
msgid "uninstallable providers: "
msgstr "proveedores no instalables: "

@@ -4496,5 +4476,5 @@

#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
msgid "unlock all resolvables"
-msgstr "desbloquear todas los elementos"
+msgstr "desbloquear todos los elementos"

Modified: trunk/libzypp/po/et.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/et.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/et.po (original)
+++ trunk/libzypp/po/et.po Mon Apr 28 15:25:19 2008
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: zypp.et\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-31 15:30+0200\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
"PO-Revision-Date: 2007-05-04 13:39+0300\n"
"Last-Translator: Ain Vagula <avagula@xxxxxxxxx>\n"
"Language-Team: Estonian <linux-ee@xxxxxxxxxxxxxx>\n"
@@ -18,7 +18,7 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.11.4\n"

-#: ../zypp/sat/SATResolver.cc:757
+#: ../zypp/solver/detail/SATResolver.cc:933
msgid ""
"\n"
"uninstallable providers: "
@@ -29,61 +29,49 @@
msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:709
+#: ../zypp/solver/detail/SATResolver.cc:880
#, c-format
msgid "%s conflicts with %s provided by %s"
msgstr ""

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2056
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
msgid "%s install failed"
msgstr "Paketi %s paigaldamine nurjus"

#. %s = filename of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2065
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
msgid "%s installed ok"
msgstr "Paketi %s paigaldamine Ãµnnestus"

-#: ../zypp/sat/SATResolver.cc:695
+#: ../zypp/solver/detail/SATResolver.cc:866
#, fuzzy, c-format
msgid "%s is not installable"
msgstr "paigaldamata"

-#: ../zypp/sat/SATResolver.cc:714
+#: ../zypp/solver/detail/SATResolver.cc:885
#, c-format
msgid "%s obsoletes %s provided by %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:80
-#, 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:93
-#, c-format
-msgid "%s provides this dependency, but would change the vendor of the
installed item"
-msgstr ""
-
#. %s = name of rpm package
#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2176
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
msgid "%s remove failed"
msgstr "Paketi %s eemaldamine nurjus"

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2184
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
msgid "%s remove ok"
msgstr "Paketi %s eemaldamine Ãµnnestus"

-#: ../zypp/sat/SATResolver.cc:745
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
msgid "%s requires %s, but this requirement cannot be provided"
msgstr ""
@@ -108,12 +96,12 @@
msgid "Adangme"
msgstr "Adangme"

-#: ../zypp/RepoManager.cc:1005
+#: ../zypp/RepoManager.cc:1007
#, c-format
msgid "Adding repository '%s'"
msgstr ""

-#: ../zypp/target/rpm/RpmDb.cc:2068 ../zypp/target/rpm/RpmDb.cc:2187
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
msgid "Additional rpm output:"
msgstr "TÃ¤iendav rpm-i vÃ¤ljund:"

@@ -326,7 +314,7 @@
msgid "Austronesian (Other)"
msgstr ""

-#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820
+#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829
#, c-format
msgid "Authentication required for '%s'"
msgstr ""
@@ -591,7 +579,7 @@
msgid "Buginese"
msgstr "Bugi"

-#: ../zypp/RepoManager.cc:718
+#: ../zypp/RepoManager.cc:719
#, c-format
msgid "Building repository '%s' cache"
msgstr ""
@@ -641,7 +629,7 @@
msgid "Cameroon"
msgstr "Kamerun"

-#: ../zypp/sat/detail/PoolImpl.cc:100
+#: ../zypp/sat/detail/PoolImpl.cc:147
#, fuzzy
msgid "Can not create sat-pool."
msgstr "Faili ei sa luua."
@@ -650,10 +638,6 @@
msgid "Can't acquire the mutex lock"
msgstr ""

-#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147
-msgid "Can't add solvables to norepo."
-msgstr ""
-
#: ../zypp/ExternalProgram.cc:245
#, c-format
msgid "Can't chdir to '/' inside chroot (%s)."
@@ -683,6 +667,11 @@
msgid "Can't initialize recursive mutex"
msgstr ""

+#: ../zypp/base/InterProcessMutex.cc:79
+#, fuzzy, c-format
+msgid "Can't open lock file: %s"
+msgstr "Ei saa avada faili %1."
+
#: ../zypp/ExternalProgram.cc:174
#, fuzzy, c-format
msgid "Can't open pipe (%s)."
@@ -693,12 +682,7 @@
msgid "Can't open pty (%s)."
msgstr "Ei saanud avada faili: %s."

-#: ../zypp/Repository.cc:136
-#, fuzzy
-msgid "Can't open solv-file: "
-msgstr "Ei saa avada faili %1."
-
-#: ../zypp/repo/RepoProvideFile.cc:207
+#: ../zypp/repo/RepoProvideFile.cc:216
#, c-format
msgid "Can't provide file '%s' from repository '%s'"
msgstr ""
@@ -707,10 +691,6 @@
msgid "Can't release the mutex lock"
msgstr ""

-#: ../zypp/Repository.cc:101
-msgid "Can't set RepoInfo for norepo."
-msgstr ""
-
#: ../zypp/thread/Mutex.cc:40
msgid "Can't set recursive mutex attribute"
msgstr ""
@@ -807,7 +787,7 @@

#. Translator: %s = name of an rpm package. A list of diffs follows
#. this message.
-#: ../zypp/target/rpm/RpmDb.cc:1879
+#: ../zypp/target/rpm/RpmDb.cc:1877
#, c-format
msgid "Changed configuration files for %s:"
msgstr ""
@@ -1073,10 +1053,6 @@
msgid "Djibouti"
msgstr "Djibouti"

-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81
-msgid "Do not install or delete the resolvables concerned"
-msgstr ""
-
#. language code: doi
#: ../zypp/LanguageCode.cc:468
msgid "Dogri"
@@ -1122,7 +1098,7 @@
msgstr "Duala"

#. dubious: Throw on malformed known types, otherwise log a warning.
-#: ../zypp/CheckSum.cc:96
+#: ../zypp/CheckSum.cc:97
#, c-format
msgid "Dubious type '%s' for %u byte checksum '%s'"
msgstr ""
@@ -1235,11 +1211,6 @@
msgid "Error occurred while setting download (curl) options for '%s':"
msgstr ""

-#: ../zypp/Repository.cc:141
-#, fuzzy
-msgid "Error reading solv-file: "
-msgstr "Viga hoidlate lugemisel:"
-
#. language code: myv
#: ../zypp/LanguageCode.cc:850
msgid "Erzya"
@@ -1280,7 +1251,7 @@
msgid "Failed to delete key."
msgstr "Parsimine nurjus: %s."

-#: ../zypp/target/rpm/RpmDb.cc:1047
+#: ../zypp/target/rpm/RpmDb.cc:1045
#, c-format
msgid "Failed to import public key from file %s: %s"
msgstr ""
@@ -1290,7 +1261,7 @@
msgid "Failed to mount %s on %s"
msgstr "%s - %s ei saa avada\n"

-#: ../zypp/target/rpm/RpmDb.cc:1124
+#: ../zypp/target/rpm/RpmDb.cc:1122
#, fuzzy, c-format
msgid "Failed to remove public key %s: %s"
msgstr "Ei suuda hankida avalikku vÃµtit."
@@ -1515,8 +1486,8 @@
msgid "Geez"
msgstr "Etioopia"

-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65
-msgid "Generally ignore this requirement"
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61
+msgid "Generally ignore of some dependecies"
msgstr ""

#. :GRD:308:
@@ -1808,26 +1779,9 @@
msgstr "Ibo"

#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145
-#, c-format
-msgid "Ignore that %s is already set to install"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132
+#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52
#, c-format
-msgid "Ignore the obsolete %s in %s"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117
-#, c-format
-msgid "Ignore this conflict of %s"
-msgstr ""
-
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56
-msgid "Ignore this requirement just here"
+msgid "Ignore some dependencies of %s"
msgstr ""

#. language code: ijo
@@ -1875,23 +1829,7 @@
msgid "Ingush"
msgstr "InguÅ¡i"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:77
-#, c-format
-msgid "Install %s although it would change the architecture"
-msgstr ""
-
-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:90
-#, c-format
-msgid "Install %s although it would change the vendor"
-msgstr ""
-
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66
-msgid "Install missing resolvables"
-msgstr ""
-
-#: ../zypp/target/TargetImpl.cc:678
+#: ../zypp/target/TargetImpl.cc:762
msgid "Installation has been aborted as directed."
msgstr ""

@@ -1966,7 +1904,12 @@
msgid "Invalid port component '%s'"
msgstr "Vigane komponendi URI: "

-#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817
+#: ../zypp/PoolQuery.cc:419
+#, fuzzy, c-format
+msgid "Invalid regular expression '%s': regcomp returned %d"
+msgstr " pole korrektne regulaaravaldis: \""
+
+#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826
msgid "Invalid user name or password."
msgstr "Vigane kasutajanimi vÃµi parool."

@@ -2015,11 +1958,6 @@
msgid "Israel"
msgstr "Iisrael"

-#: ../zypp/base/InterProcessMutex.cc:68
-#, fuzzy, c-format
-msgid "It %d, Can't open lock file: %s"
-msgstr "Ei saa avada faili %1."
-
#. language code: ita it
#: ../zypp/LanguageCode.cc:654
msgid "Italian"
@@ -2145,10 +2083,6 @@
msgid "Kazakhstan"
msgstr "Kasahstan"

-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65
-msgid "Keep resolvables"
-msgstr ""
-
#. :JPN:392:
#: ../zypp/CountryCode.cc:335
msgid "Kenya"
@@ -2864,7 +2798,7 @@
msgid "No Code"
msgstr "Kood puudub"

-#: ../zypp/repo/RepoProvideFile.cc:213
+#: ../zypp/repo/RepoProvideFile.cc:222
#, fuzzy
msgid "No url in repository."
msgstr "Probleem hoidla andmete parsimisel."
@@ -3090,14 +3024,6 @@
msgid "Path '%s' on medium '%s' is not a file."
msgstr ""

-#: ../zypp/url/UrlBase.cc:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr ""
-
-#: ../zypp/url/UrlBase.cc:727
-msgid "Path parameter parsing not supported for this URL"
-msgstr ""
-
#: ../zypp/media/MediaException.cc:200
#, fuzzy, c-format
msgid "Permission to access '%s' denied."
@@ -3198,8 +3124,8 @@
msgstr ""

#. TranslatorExplanation after semicolon is error message
-#: ../zypp/target/rpm/RpmDb.cc:890 ../zypp/target/rpm/RpmDb.cc:2059
-#: ../zypp/target/rpm/RpmDb.cc:2179
+#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057
+#: ../zypp/target/rpm/RpmDb.cc:2177
#, fuzzy
msgid "RPM failed: "
msgstr "ebaÃµnnestus"
@@ -3228,16 +3154,11 @@
msgid "Relative path not allowed if authority exists"
msgstr ""

-#: ../zypp/RepoManager.cc:1112
+#: ../zypp/RepoManager.cc:1114
#, fuzzy, c-format
msgid "Removing repository '%s'"
msgstr "Hoidla '%s' lisamine."

-#: ../zypp/Repository.cc:104
-#, c-format
-msgid "RepoInfo alias (%s) does not match repository name (%s)"
-msgstr ""
-
#: ../zypp/parser/susetags/RepoParser.cc:232
msgid "Required file is missing: "
msgstr ""
@@ -3538,6 +3459,11 @@
msgid "Solomon Islands"
msgstr "Saalomoni saared"

+#: ../zypp/solver/detail/SATResolver.cc:889
+#, c-format
+msgid "Solvable %s conflicts with %s provided by itself"
+msgstr ""
+
#. language code: som so
#: ../zypp/LanguageCode.cc:1060
msgid "Somali"
@@ -3773,7 +3699,7 @@
msgid "Thailand"
msgstr "Tai"

-#: ../zypp/base/InterProcessMutex.cc:130
+#: ../zypp/base/InterProcessMutex.cc:139
msgid "This action is being run by another program already."
msgstr ""

@@ -4016,10 +3942,6 @@
msgid "Unknown language: "
msgstr "Tundmatu keel: "

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91
-msgid "Unlock these resolvables"
-msgstr ""
-
#: ../zypp/media/MediaUserAuth.cc:97
#, c-format
msgid "Unsupported HTTP authentication method '%s'"
@@ -4280,89 +4202,73 @@
msgid "applydeltarpm failed."
msgstr ""

-#: ../zypp/sat/SATResolver.cc:951
+#: ../zypp/solver/detail/SATResolver.cc:1129
#, c-format
msgid "architecture change of %s to %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:704
+#: ../zypp/solver/detail/SATResolver.cc:875
#, c-format
msgid "cannot install both %s and %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:688
+#: ../zypp/solver/detail/SATResolver.cc:859
#, fuzzy
msgid "conflicting requests"
msgstr "Ãhendumise katse serveriga: "

#. timestamp
-#: ../zypp/target/rpm/RpmDb.cc:2329
+#: ../zypp/target/rpm/RpmDb.cc:2327
#, c-format
msgid "created backup %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:978
+#: ../zypp/solver/detail/SATResolver.cc:1156
#, fuzzy, c-format
msgid "deinstallation of %s"
msgstr "Paigaldamine"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66
-#, c-format
-msgid "delete %s"
-msgstr ""
-
-#: ../zypp/sat/SATResolver.cc:747
+#: ../zypp/solver/detail/SATResolver.cc:923
msgid "deleted providers: "
msgstr ""

-#: ../zypp/sat/SATResolver.cc:899
+#: ../zypp/solver/detail/SATResolver.cc:1077
#, c-format
msgid "do not ask to delete all solvables providing %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:884
+#: ../zypp/solver/detail/SATResolver.cc:1062
#, c-format
msgid "do not ask to install a solvable providing %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:837
+#: ../zypp/solver/detail/SATResolver.cc:1015
#, fuzzy, c-format
msgid "do not forbid installation of %s"
msgstr "KÃ¤ivita paigaldus vÃµi sÃ¼steem"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:816 ../zypp/sat/SATResolver.cc:855
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69
-#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71
+#: ../zypp/solver/detail/SATResolver.cc:994
+#: ../zypp/solver/detail/SATResolver.cc:1033
#, c-format
msgid "do not install %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:911
+#: ../zypp/solver/detail/SATResolver.cc:1089
#, c-format
msgid "do not install most recent version of %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:811
+#: ../zypp/solver/detail/SATResolver.cc:989
#, fuzzy, c-format
msgid "do not keep %s installed"
msgstr "paigaldamata"

-#: ../zypp/sat/SATResolver.cc:944
+#: ../zypp/solver/detail/SATResolver.cc:1122
#, c-format
msgid "downgrade of %s to %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:54
-#: ../zypp/solver/detail/ProblemSolutionInstall.cc:56
-#, c-format
-msgid "install %s"
-msgstr ""
-
-#: ../zypp/sat/SATResolver.cc:958
+#: ../zypp/solver/detail/SATResolver.cc:1136
#, c-format
msgid ""
"install %s (with vendor change)\n"
@@ -4371,10 +4277,8 @@
" %s"
msgstr ""

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/sat/SATResolver.cc:832 ../zypp/sat/SATResolver.cc:869
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53
-#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55
+#: ../zypp/solver/detail/SATResolver.cc:1010
+#: ../zypp/solver/detail/SATResolver.cc:1047
#, c-format
msgid "keep %s"
msgstr ""
@@ -4387,72 +4291,70 @@
msgid "libhal_set_dbus_connection: Can't set dbus connection"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:699
+#: ../zypp/solver/detail/SATResolver.cc:870
#, c-format
msgid "nothing provides %s needed by %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:691
+#: ../zypp/solver/detail/SATResolver.cc:862
#, c-format
msgid "nothing provides requested %s"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:685
+#: ../zypp/solver/detail/SATResolver.cc:856
#, fuzzy, c-format
msgid "problem with installed package %s"
msgstr "Paigaldatud pakettide lugemine"

-#: ../zypp/sat/SATResolver.cc:966
+#: ../zypp/solver/detail/SATResolver.cc:1144
#, c-format
msgid "replacement of %s with %s"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2048
+#: ../zypp/target/rpm/RpmDb.cc:2046
#, c-format
msgid "rpm created %s as %s, but it was impossible to determine the difference"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2050
+#: ../zypp/target/rpm/RpmDb.cc:2048
#, c-format
msgid ""
"rpm created %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""

-#: ../zypp/target/rpm/RpmDb.cc:2057 ../zypp/target/rpm/RpmDb.cc:2177
+#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175
msgid "rpm output:"
msgstr "rpm-i vÃ¤ljund:"

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2043
+#: ../zypp/target/rpm/RpmDb.cc:2041
#, c-format
msgid "rpm saved %s as %s, but it was impossible to determine the difference"
msgstr ""

#. %s = filenames
-#: ../zypp/target/rpm/RpmDb.cc:2045
+#: ../zypp/target/rpm/RpmDb.cc:2043
#, c-format
msgid ""
"rpm saved %s as %s.\n"
"Here are the first 25 lines of difference:\n"
msgstr ""

-#: ../zypp/sat/SATResolver.cc:759
+#: ../zypp/solver/detail/SATResolver.cc:935
#, fuzzy
msgid "uninstallable providers: "
msgstr "Saadaolevad profiilid"

-#. TranslatorExplanation %s = name of package, patch, selection ...
-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82
-#, c-format
-msgid "unlock %s"
-msgstr ""
+#, fuzzy
+#~ msgid "Can't open solv-file: "
+#~ msgstr "Ei saa avada faili %1."

-#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69
-msgid "unlock all resolvables"
-msgstr ""
+#, fuzzy
+#~ msgid "Error reading solv-file: "
+#~ msgstr "Viga hoidlate lugemisel:"

#~ msgid "Software management is already running."
#~ msgstr "Tarkvarahaldur tÃ¶Ã¶tab juba."

Modified: trunk/libzypp/po/fi.po
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/fi.po?rev=9860&r1=9859&r2=9860&view=diff
==============================================================================
--- trunk/libzypp/po/fi.po (original)
+++ trunk/libzypp/po/fi.po Mon Apr 28 15:25:19 2008
@@ -1,4 +1,3 @@
-# translation of zypp.po to Suomi
# translation of zypp.po to
# translation of zypp.fi.po to
# Copyright (C) 2005 SUSE Linux Products GmbH.
@@ -10,229 +9,81 @@
# Jyri Palokangas <jmp@xxxxxxxx>, 2006, 2007.
# Jyri Palokangas <jmp@xxxxxxxxxxx>, 2007.
# Sami Vento <sami.vento@xxxxxxxxxxx>, 2007.
+# Jyri Palokangas <jyri.palokangas@xxxxxxxxxxxx>, 2008.
+# Mikko Piippo <mikko.piippo@xxxxxxxxxxx>, 2008.
msgid ""
msgstr ""
"Project-Id-Version: zypp\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-03 13:53+0200\n"
-"PO-Revision-Date: 2007-09-19 21:41+0300\n"
-"Last-Translator: Jyri Palokangas <jmp@xxxxxxxxxxx>\n"
-"Language-Team: Suomi <fi@xxxxxx>\n"
+"POT-Creation-Date: 2008-04-21 18:58+0200\n"
+"PO-Revision-Date: 2008-04-27 14:51+0300\n"
+"Last-Translator: Sami Vento <sami.vento@xxxxxxxxxxx>\n"
+"Language-Team: <fi@xxxxxx>\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:154
-#, c-format
-msgid "Url scheme does not allow a %s"
-msgstr "Ei sallittu URL-mallissa: %s"
-
-#: ../zypp/url/UrlBase.cc:173
-#, c-format
-msgid "Invalid %s component '%s'"
-msgstr "Virheellinen %s-komponentti '%s'"
-
-#: ../zypp/url/UrlBase.cc:180
-#, c-format
-msgid "Invalid %s component"
-msgstr "Virheellinen %s-komponentti"
-
-#: ../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: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:820
-msgid "Url scheme is a required component"
-msgstr "Url-malli on pakollinen"
-
-#: ../zypp/url/UrlBase.cc:826
-#, c-format
-msgid "Invalid Url scheme '%s'"
-msgstr "Virheellinen URL-muoto '%s'"
-
-#: ../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:981
-msgid "Url scheme does not allow a password"
-msgstr "URL-malli ei salli salasanaa"
-
-#: ../zypp/url/UrlBase.cc:1010
-msgid "Url scheme requires a host component"
-msgstr "Url-malli edellyttÃ¤Ã¤ konenimen"
-
-#: ../zypp/url/UrlBase.cc:1020
-msgid "Url scheme does not allow a host component"
-msgstr "URL-malli ei salli konenimeÃ¤"
-
-#: ../zypp/url/UrlBase.cc:1047
-#, c-format
-msgid "Invalid host component '%s'"
-msgstr "Virheellinen konenimen komponentti '%s'"
-
-#: ../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:1079
-#, c-format
-msgid "Invalid port component '%s'"
-msgstr "Virheellinen komponentti porttimÃ¤Ã¤rityksessÃ¤ '%s'"
-
-#: ../zypp/url/UrlBase.cc:1096
-msgid "Url scheme requires path name"
-msgstr "URL-malli edellyttÃ¤Ã¤ polun nimen mÃ¤Ã¤rittÃ¤misen"
-
-#: ../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:1184
-msgid "Path Parameter parsing not supported for this URL"
-msgstr "TÃ¤mÃ¤ URL-osoite ei tue polun jÃ¤sentÃ¤mistÃ¤"
-
-#: ../zypp/url/UrlUtils.cc:111
-msgid "Encoded string contains a NUL byte"
-msgstr "Koodattu merkkijono sisÃ¤ltÃ¤Ã¤ NUL-tavun"
-
-#: ../zypp/url/UrlUtils.cc:173
-msgid "Invalid parameter array split separator character"
-msgstr "Virheellinen parametritaulukon jaon erotinmerkki"
-
-#: ../zypp/url/UrlUtils.cc:213
-msgid "Invalid parameter map split separator character"
-msgstr "Virheellinen parametrikartan jaon erotinmerkki"
-
-#: ../zypp/url/UrlUtils.cc:283
-msgid "Invalid parameter array join separator character"
-msgstr "Virheellinen parametritaulukon liitoksen erotinmerkki"
-
-#. TranslatorExplanation followed by the list of error messages that lead to
this exception
-#: ../zypp/base/Exception.cc:89
-msgid "History:"
-msgstr "Historia:"
-
-#: ../zypp/repo/PackageProvider.cc:237
-msgid "applydeltarpm check failed."
-msgstr "rpm-muunnospaketin tarkistus epÃ¤onnistui."
-
-#: ../zypp/repo/PackageProvider.cc:251
-msgid "applydeltarpm failed."
-msgstr "rpm-muunnos epÃ¤onnistui"
-
-#. TranslatorExplanation %s = package being checked for integrity
-#: ../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:206
-msgid "No url in repository."
-msgstr "Ei verkko-osoitetta asennuslÃ¤hteessÃ¤."
-
-#. iteration over urls
-#: ../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:73
-#, c-format
-msgid "Reading '%s' repository cache"
-msgstr "Luetaan '%s' -asennuslÃ¤hteen vÃ¤limuistia"
+#: ../zypp/solver/detail/SATResolver.cc:933
+msgid ""
+"\n"
+"uninstallable providers: "
+msgstr ""
+"\n"
+"Postettavissaolevat: "

-#: ../zypp/repo/cached/RepoImpl.cc:194
+#: ../zypp/media/MediaException.cc:214
#, c-format
-msgid "Reading patch and delta rpms from '%s' repository cache"
-msgstr "Luetaan paikkaus- ja muutosrpm -tiedostoja '%s' -asennuslÃ¤hteen
vÃ¤limuistista."
+msgid " SSL certificate problem, verify that the CA cert is OK for '%s'."
+msgstr " SSL-ongelma: Tarkista ettÃ¤ CA-varmenne kuuluu '%s'."

-#: ../zypp/media/MediaUserAuth.cc:97
+#: ../zypp/solver/detail/SATResolver.cc:880
#, c-format
-msgid "Unsupported HTTP authentication method '%s'"
-msgstr "HTTP tunnistautumistapa '%s' ei ole tuettu"
-
-#: ../zypp/media/MediaCurl.cc:715 ../zypp/media/MediaCurl.cc:784
-msgid "Invalid user name or password."
-msgstr "KÃ¤yttÃ¤jÃ¤tunnus tai salasana on virheellinen."
+msgid "%s conflicts with %s provided by %s"
+msgstr "%s on ristiriidassa %s (%s) kanssa"

-#: ../zypp/media/MediaCurl.cc:718 ../zypp/media/MediaCurl.cc:787
+#. %s = filename of rpm package
+#. timestamp
+#: ../zypp/target/rpm/RpmDb.cc:2054
#, c-format
-msgid "Authentication required for '%s'"
-msgstr "'%s' vaatii tunnistautumisen"
+msgid "%s install failed"
+msgstr "%s asennus epÃ¤onnistui"

-#: ../zypp/RepoManager.cc:115
+#. %s = filename of rpm package
+#. timestamp
+#: ../zypp/target/rpm/RpmDb.cc:2063
#, c-format
-msgid "Cleaning repository '%s' cache"
-msgstr "Puhdistetaan '%s' -asennuslÃ¤hteen vÃ¤limuisti"
-
-#. 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"
+msgid "%s installed ok"
+msgstr "%s asennettu"

-#: ../zypp/RepoManager.cc:677
+#: ../zypp/solver/detail/SATResolver.cc:866
#, c-format
-msgid "Building repository '%s' cache"
-msgstr "Rakennetaan '%s' -asennuslÃ¤hteen vÃ¤limuistia"
+msgid "%s is not installable"
+msgstr "%s ei ole asennettavissa"

-#. progress.sendTo( progressrcv );
-#: ../zypp/RepoManager.cc:822
+#: ../zypp/solver/detail/SATResolver.cc:885
#, c-format
-msgid "Reading repository '%s' cache"
-msgstr "Luetaan '%s' -asennuslÃ¤hteen vÃ¤limuistia"
+msgid "%s obsoletes %s provided by %s"
+msgstr "%s vanhentaa %s (%s)"

-#: ../zypp/RepoManager.cc:912
+#. %s = name of rpm package
+#. timestamp
+#: ../zypp/target/rpm/RpmDb.cc:2174
#, c-format
-msgid "Adding repository '%s'"
-msgstr "LisÃ¤tÃ¤Ã¤n asennuslÃ¤hdettÃ¤ '%s'"
+msgid "%s remove failed"
+msgstr "%s poistaminen epÃ¤onnistui"

-#: ../zypp/RepoManager.cc:1017
+#. timestamp
+#: ../zypp/target/rpm/RpmDb.cc:2182
#, c-format
-msgid "Removing repository '%s'"
-msgstr "Poistetaan asennuslÃ¤hdettÃ¤ '%s'"
-
-#: ../zypp/Url.cc:112
-msgid "Invalid LDAP URL query string"
-msgstr "Virheellinen LDAP URL -kysely"
+msgid "%s remove ok"
+msgstr "%s poistaminen onnistui"

-#: ../zypp/Url.cc:151
+#: ../zypp/solver/detail/SATResolver.cc:921
#, c-format
-msgid "Invalid LDAP URL query parameter '%s'"
-msgstr "Virheellinen parametri LDAP URL -kyselyssÃ¤: '%s'"
-
-#: ../zypp/Url.cc:295
-msgid "Unable to clone Url object"
-msgstr "URL-objektin kahdentaminen ei onnistunut"
-
-#: ../zypp/Url.cc:308
-msgid "Invalid empty Url object reference"
-msgstr "Virheellinen viite tyhjÃ¤Ã¤n URL-objektiin"
-
-#: ../zypp/Url.cc:321 ../zypp/Url.cc:335
-msgid "Unable to parse Url components"
-msgstr "URL-komponentteja ei voi jÃ¤sentÃ¤Ã¤"
-
-#: ../zypp/LanguageCode.cc:145
-msgid "Unknown language: "
-msgstr "Tuntematon kieli: "
-
-#. Defined LanguageCode constants
-#. Defined CountryCode constants
-#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215
-msgid "No Code"
-msgstr "Ei koodia"
-
-#. language code: aar aa
-#: ../zypp/LanguageCode.cc:238
-msgid "Afar"
-msgstr "afar"
+msgid "%s requires %s, but this requirement cannot be provided"
+msgstr "%s tarvitsee %s, mutta sen asentaminen ei onnistu"

#. language code: abk ab
#: ../zypp/LanguageCode.cc:240
@@ -254,15 +105,29 @@
msgid "Adangme"
msgstr "adangme"

+#: ../zypp/RepoManager.cc:1007
+#, c-format
+msgid "Adding repository '%s'"
+msgstr "LisÃ¤tÃ¤Ã¤n asennuslÃ¤hdettÃ¤ '%s'"
+
+#: ../zypp/target/rpm/RpmDb.cc:2066 ../zypp/target/rpm/RpmDb.cc:2185
+msgid "Additional rpm output:"
+msgstr "rpm-lisÃ¤tuloste:"
+
#. language code: ady
#: ../zypp/LanguageCode.cc:248
msgid "Adyghe"
msgstr "adyge"

-#. language code: afa
-#: ../zypp/LanguageCode.cc:250
-msgid "Afro-Asiatic (Other)"
-msgstr "muut afroaasialaiset kielet"
+#. language code: aar aa
+#: ../zypp/LanguageCode.cc:238
+msgid "Afar"
+msgstr "afar"
+
+#. :ARE:784:
+#: ../zypp/CountryCode.cc:226
+msgid "Afghanistan"
+msgstr "Afganistan"

#. language code: afh
#: ../zypp/LanguageCode.cc:252
@@ -274,6 +139,11 @@
msgid "Afrikaans"
msgstr "afrikaans"

+#. language code: afa
+#: ../zypp/LanguageCode.cc:250
+msgid "Afro-Asiatic (Other)"
+msgstr "muut afroaasialaiset kielet"
+
#. language code: ain
#: ../zypp/LanguageCode.cc:256
msgid "Ainu"
@@ -289,6 +159,17 @@
msgid "Akkadian"
msgstr "akkadi"

+# FO
+#. :ABW:533:
+#: ../zypp/CountryCode.cc:239
+msgid "Aland Islands"
+msgstr "Ahvenanmaa"
+
+#. :AIA:660:
+#: ../zypp/CountryCode.cc:229
+msgid "Albania"
+msgstr "Albania"
+
#. language code: alb sqi sq
#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264
msgid "Albanian"
@@ -299,26 +180,56 @@
msgid "Aleut"
msgstr "aleutti"

+#. :DOM:214:
+#: ../zypp/CountryCode.cc:284
+msgid "Algeria"
+msgstr "Algeria"
+
#. language code: alg
#: ../zypp/LanguageCode.cc:268
msgid "Algonquian Languages"
msgstr "algonkin-kielet"

-# ZA
-#. language code: alt
-#: ../zypp/LanguageCode.cc:270
-msgid "Southern Altai"
-msgstr "altai, etelÃ¤-"
+#. language code: tut
+#: ../zypp/LanguageCode.cc:1150
+msgid "Altaic (Other)"
+msgstr "muut altailaiset kielet"
+
+# AS
+#. :ARG:032:
+#: ../zypp/CountryCode.cc:235
+msgid "American Samoa"
+msgstr "Amerikan Samoa"

#. language code: amh am
#: ../zypp/LanguageCode.cc:272
msgid "Amharic"
msgstr "amhara"

-#. language code: ang
-#: ../zypp/LanguageCode.cc:274
-msgid "English, Old (ca.450-1100)"
-msgstr "muinaisenglanti"
+#: ../zypp/CountryCode.cc:224
+msgid "Andorra"
+msgstr "Andorra"
+
+#. :ANT:530:
+#: ../zypp/CountryCode.cc:232
+msgid "Angola"
+msgstr "Angola"
+
+#. :ATG:028:
+#: ../zypp/CountryCode.cc:228
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#. :AGO:024:
+#: ../zypp/CountryCode.cc:233
+msgid "Antarctica"
+msgstr "Antarktis"
+
+# AG
+#. :AFG:004:
+#: ../zypp/CountryCode.cc:227
+msgid "Antigua and Barbuda"
+msgstr "Antigua ja Barbuda"

#. language code: apa
#: ../zypp/LanguageCode.cc:276
@@ -330,42 +241,59 @@
msgid "Arabic"
msgstr "arabia"

-#. language code: arc
-#: ../zypp/LanguageCode.cc:280
-msgid "Aramaic"
-msgstr "aramea"
-
#. language code: arg an
#: ../zypp/LanguageCode.cc:282
msgid "Aragonese"
msgstr "aragonia"

-# AM
-#. language code: arm hye hy
-#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286
-msgid "Armenian"
-msgstr "armenia"
-
-#. language code: arn
-#: ../zypp/LanguageCode.cc:288
-msgid "Araucanian"
-msgstr "araukaani"
+#. language code: arc
+#: ../zypp/LanguageCode.cc:280
+msgid "Aramaic"
+msgstr "aramea"

#. language code: arp
#: ../zypp/LanguageCode.cc:290
msgid "Arapaho"
msgstr "arapaho"

-#. language code: art
-#: ../zypp/LanguageCode.cc:292
-msgid "Artificial (Other)"
-msgstr "muut keinotekoiset kielet"
+#. language code: arn
+#: ../zypp/LanguageCode.cc:288
+msgid "Araucanian"
+msgstr "araukaani"

#. language code: arw
#: ../zypp/LanguageCode.cc:294
msgid "Arawak"
msgstr "arawak"

+#. :ATA:010:
+#: ../zypp/CountryCode.cc:234
+msgid "Argentina"
+msgstr "Argentiina"
+
+# AM
+#. :ALB:008:
+#: ../zypp/CountryCode.cc:230
+msgid "Armenia"
+msgstr "Armenia"
+
+# AM
+#. language code: arm hye hy
+#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286
+msgid "Armenian"
+msgstr "armenia"
+
+#. language code: art
+#: ../zypp/LanguageCode.cc:292
+msgid "Artificial (Other)"

Mailinglist Archive: zypp-commit (606 mails)

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