[zypp-commit] r9860 - /trunk/libzypp/po/

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 \n" "Language-Team: Novell Language \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 \n" "Language-Team: Novell Language \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 \n" "Language-Team: Bulgarian \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\n" "Language-Team: AgreeYa Solutions \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 \n" "Language-Team: Bosnian \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 \n" "Language-Team: czech \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 \n" "Language-Team: Welsh \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 , 2001. # Martin Schlander , 2007. # Ib Larsen , 2007. +# Jan Madsen , 2008. +# Martin Schlander , 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 \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 \n" "Language-Team: \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 \n" -"Language-Team: \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 \n" +"Language-Team: German \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 \n" "Language-Team: Hellenic \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 \n" "Language-Team: \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 \n" "Language-Team: English \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 , 2000. # Javier Moreno , 2000. # Jordi Jaen Pallares , 1999, 2000, 2001. @@ -6,38 +6,40 @@ # Camaleón, 2007. # César Sánchez Alonso , 2007. # Miguel Angel Alvarez , 2008. +# Camaleón , 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 \n" -"Language-Team: \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 \n" +"Language-Team: Spanish \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 \n" "Language-Team: Estonian \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 , 2006, 2007. # Jyri Palokangas , 2007. # Sami Vento , 2007. +# Jyri Palokangas , 2008. +# Mikko Piippo , 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 \n" -"Language-Team: Suomi \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 \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.11.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)" +msgstr "muut keinotekoiset kielet" + +# CU +#. :AUS:036: +#: ../zypp/CountryCode.cc:238 +msgid "Aruba" +msgstr "Aruba" + #. language code: asm as #: ../zypp/LanguageCode.cc:296 msgid "Assamese" @@ -381,11 +309,31 @@ msgid "Athapascan Languages" msgstr "athabasca-kielet" +#. :AUT:040: +#: ../zypp/CountryCode.cc:237 +msgid "Australia" +msgstr "Australia" + #. language code: aus #: ../zypp/LanguageCode.cc:302 msgid "Australian Languages" msgstr "australialaiset kielet" +#. :ASM:016: +#: ../zypp/CountryCode.cc:236 +msgid "Austria" +msgstr "Itävalta" + +#. language code: map +#: ../zypp/LanguageCode.cc:794 +msgid "Austronesian (Other)" +msgstr "muut austronesialaiset kielet" + +#: ../zypp/media/MediaCurl.cc:761 ../zypp/media/MediaCurl.cc:829 +#, c-format +msgid "Authentication required for '%s'" +msgstr "'%s' vaatii tunnistautumisen" + #. language code: ava av #: ../zypp/LanguageCode.cc:304 msgid "Avaric" @@ -408,25 +356,47 @@ msgid "Aymara" msgstr "aymara" +# AZ +#. :ALA:248: +#: ../zypp/CountryCode.cc:240 +msgid "Azerbaijan" +msgstr "Azerbaidžan" + #. language code: aze az #: ../zypp/LanguageCode.cc:312 msgid "Azerbaijani" msgstr "azeri" -#. language code: bad -#: ../zypp/LanguageCode.cc:314 -msgid "Banda" -msgstr "banda" +#: ../zypp/media/MediaException.cc:47 +#, c-format +msgid "Bad file name: %s" +msgstr "Virheellinen tiedoston nimi: %s" -#. language code: bai -#: ../zypp/LanguageCode.cc:316 -msgid "Bamileke Languages" -msgstr "bamileke-kielet" +#: ../zypp/media/MediaException.cc:77 +msgid "Bad media attach point" +msgstr "Virheellinen liitospiste" -#. language code: bak ba -#: ../zypp/LanguageCode.cc:318 -msgid "Bashkir" -msgstr "baškiiri" +# BS +#. :BRA:076: +#: ../zypp/CountryCode.cc:254 +msgid "Bahamas" +msgstr "Bahama" + +# BH +#. :BGR:100: +#: ../zypp/CountryCode.cc:247 +msgid "Bahrain" +msgstr "Bahrain" + +#. language code: ban +#: ../zypp/LanguageCode.cc:324 +msgid "Balinese" +msgstr "bali" + +#. language code: bat +#: ../zypp/LanguageCode.cc:332 +msgid "Baltic (Other)" +msgstr "muut balttilaiset kielet" #. language code: bal #: ../zypp/LanguageCode.cc:320 @@ -438,36 +408,81 @@ msgid "Bambara" msgstr "bambara" -#. language code: ban -#: ../zypp/LanguageCode.cc:324 -msgid "Balinese" -msgstr "bali" +#. language code: bai +#: ../zypp/LanguageCode.cc:316 +msgid "Bamileke Languages" +msgstr "bamileke-kielet" -#. language code: baq eus eu -#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328 -msgid "Basque" -msgstr "baski" +#. language code: bad +#: ../zypp/LanguageCode.cc:314 +msgid "Banda" +msgstr "banda" + +# BD +#. :BRB:052: +#: ../zypp/CountryCode.cc:243 +msgid "Bangladesh" +msgstr "Bangladesh" + +#. language code: bnt +#: ../zypp/LanguageCode.cc:356 +msgid "Bantu (Other)" +msgstr "muut bantukielet" + +# BB +#. :BIH:070: +#: ../zypp/CountryCode.cc:242 +msgid "Barbados" +msgstr "Barbados" #. language code: bas #: ../zypp/LanguageCode.cc:330 msgid "Basa" msgstr "basa" -#. language code: bat -#: ../zypp/LanguageCode.cc:332 -msgid "Baltic (Other)" -msgstr "muut balttilaiset kielet" +#. language code: bak ba +#: ../zypp/LanguageCode.cc:318 +msgid "Bashkir" +msgstr "baškiiri" + +#. language code: baq eus eu +#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328 +msgid "Basque" +msgstr "baski" + +# ID +#. language code: btk +#: ../zypp/LanguageCode.cc:364 +msgid "Batak (Indonesia)" +msgstr "batak" #. language code: bej #: ../zypp/LanguageCode.cc:334 msgid "Beja" msgstr "beja" +# BY +#. :BWA:072: +#: ../zypp/CountryCode.cc:258 +msgid "Belarus" +msgstr "Valko-Venäjä" + #. language code: bel be #: ../zypp/LanguageCode.cc:336 msgid "Belarusian" msgstr "valkovenäjä" +#. :BGD:050: +#: ../zypp/CountryCode.cc:244 +msgid "Belgium" +msgstr "Belgia" + +# BZ +#. :BLR:112: +#: ../zypp/CountryCode.cc:259 +msgid "Belize" +msgstr "Belize" + #. language code: bem #: ../zypp/LanguageCode.cc:338 msgid "Bemba" @@ -479,17 +494,33 @@ msgid "Bengali" msgstr "bengali" +#. :BDI:108: +#: ../zypp/CountryCode.cc:249 +msgid "Benin" +msgstr "Benin" + #. language code: ber #: ../zypp/LanguageCode.cc:342 msgid "Berber (Other)" msgstr "muut berberikielet" +#. :BEN:204: +#: ../zypp/CountryCode.cc:250 +msgid "Bermuda" +msgstr "Bermuda" + #. language code: bho #: ../zypp/LanguageCode.cc:344 msgid "Bhojpuri" msgstr "bhojpuri" # BH +#. :BHS:044: +#: ../zypp/CountryCode.cc:255 +msgid "Bhutan" +msgstr "Bhutan" + +# BH #. language code: bih bh #: ../zypp/LanguageCode.cc:346 msgid "Bihari" @@ -511,72 +542,219 @@ msgid "Bislama" msgstr "bislama" -#. language code: bla -#: ../zypp/LanguageCode.cc:354 -msgid "Siksika" -msgstr "mustajalka" +#. language code: byn +#: ../zypp/LanguageCode.cc:376 +msgid "Blin" +msgstr "blin" -#. language code: bnt -#: ../zypp/LanguageCode.cc:356 -msgid "Bantu (Other)" -msgstr "muut bantukielet" +#. :BRN:096: +#: ../zypp/CountryCode.cc:252 +msgid "Bolivia" +msgstr "Bolivia" + +#. :AZE:031: +#: ../zypp/CountryCode.cc:241 +msgid "Bosnia and Herzegovina" +msgstr "Bosnia ja Hertsegovina" #. language code: bos bs #: ../zypp/LanguageCode.cc:358 msgid "Bosnian" msgstr "bosnia" +#. :BVT:074: +#: ../zypp/CountryCode.cc:257 +msgid "Botswana" +msgstr "Botswana" + +# FO +#. :BTN:064: +#: ../zypp/CountryCode.cc:256 +msgid "Bouvet Island" +msgstr "Bouvetinsaari" + # BR #. language code: bra #: ../zypp/LanguageCode.cc:360 msgid "Braj" msgstr "braj" +# BR +#. :BOL:068: +#: ../zypp/CountryCode.cc:253 +msgid "Brazil" +msgstr "Brasilia" + #. language code: bre br #: ../zypp/LanguageCode.cc:362 msgid "Breton" msgstr "bretoni" -# ID -#. language code: btk -#: ../zypp/LanguageCode.cc:364 -msgid "Batak (Indonesia)" -msgstr "batak" +#. :IND:356: +#: ../zypp/CountryCode.cc:327 +msgid "British Indian Ocean Territory" +msgstr "Brittiläinen Intian valtameren alue" -#. language code: bua -#: ../zypp/LanguageCode.cc:366 -msgid "Buriat" -msgstr "burjaatti" +# VI +#. :VEN:862: +#: ../zypp/CountryCode.cc:454 +msgid "British Virgin Islands" +msgstr "Brittiläiset Neitsytsaaret" + +#. :BMU:060: +#: ../zypp/CountryCode.cc:251 +msgid "Brunei Darussalam" +msgstr "Brunei" #. language code: bug #: ../zypp/LanguageCode.cc:368 msgid "Buginese" msgstr "bugi" +#: ../zypp/RepoManager.cc:719 +#, c-format +msgid "Building repository '%s' cache" +msgstr "Rakennetaan asennuslähteen '%s' välimuistia" + +#. :BFA:854: +#: ../zypp/CountryCode.cc:246 +msgid "Bulgaria" +msgstr "Bulgaria" + #. language code: bul bg #: ../zypp/LanguageCode.cc:370 msgid "Bulgarian" msgstr "bulgaria" +#. language code: bua +#: ../zypp/LanguageCode.cc:366 +msgid "Buriat" +msgstr "burjaatti" + +#. :BEL:056: +#: ../zypp/CountryCode.cc:245 +msgid "Burkina Faso" +msgstr "Burkina Faso" + #. language code: bur mya my #: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374 msgid "Burmese" msgstr "burma" -#. language code: byn -#: ../zypp/LanguageCode.cc:376 -msgid "Blin" -msgstr "blin" +#. :BHR:048: +#: ../zypp/CountryCode.cc:248 +msgid "Burundi" +msgstr "Burundi" #. language code: cad #: ../zypp/LanguageCode.cc:378 msgid "Caddo" msgstr "caddo" -#. language code: cai -#: ../zypp/LanguageCode.cc:380 -msgid "Central American Indian (Other)" -msgstr "muut Keski-Amerikan intiaanikielet" +# KH +#. :KGZ:417: +#: ../zypp/CountryCode.cc:337 +msgid "Cambodia" +msgstr "Kambodža" + +#. :CHL:152: +#: ../zypp/CountryCode.cc:269 +msgid "Cameroon" +msgstr "Kamerun" + +#: ../zypp/sat/detail/PoolImpl.cc:147 +msgid "Can not create sat-pool." +msgstr "Sat-varaston luonti ei onnistu." + +#: ../zypp/thread/Mutex.cc:77 +msgid "Can't acquire the mutex lock" +msgstr "Mutex-lukitus ei onnistu" + +#: ../zypp/ExternalProgram.cc:245 +#, c-format +msgid "Can't chdir to '/' inside chroot (%s)." +msgstr "Siirtyminen juurihakemistoon ei onnistu hakemistorajoiteisessa(chroot) ympäristössä (%s)." + +#: ../zypp/ExternalProgram.cc:238 +#, c-format +msgid "Can't chroot to '%s' (%s)." +msgstr "Hakemistorajoitus(chroot) ei onnistu hakemistoon '%s' (%s)." + +#. don't want to get here +#: ../zypp/ExternalProgram.cc:259 +#, c-format +msgid "Can't exec '%s' (%s)." +msgstr "'%s' (%s) suorittaminen ei onnistu." + +#: ../zypp/ExternalProgram.cc:267 +#, c-format +msgid "Can't fork (%s)." +msgstr "Haarauttaminen(fork) ei onnistu (%s)." + +#: ../zypp/thread/Mutex.cc:33 +msgid "Can't initialize mutex attributes" +msgstr "Mutex-määritteiden alustaminen ei onnistu" + +#: ../zypp/thread/Mutex.cc:47 +msgid "Can't initialize recursive mutex" +msgstr "Rekursiivisten mutex-määritteiden alustaminen ei onnistu" + +#: ../zypp/base/InterProcessMutex.cc:79 +#, c-format +msgid "Can't open lock file: %s" +msgstr "Lukkotiedoston avaaminen ei onnistu: %s" + +#: ../zypp/ExternalProgram.cc:174 +#, c-format +msgid "Can't open pipe (%s)." +msgstr "Putken (%s) avaaminen ei onnistu." + +#: ../zypp/ExternalProgram.cc:163 +#, c-format +msgid "Can't open pty (%s)." +msgstr "pty:n (%s) avaaminen ei onnistu." + +#: ../zypp/repo/RepoProvideFile.cc:216 +#, c-format +msgid "Can't provide file '%s' from repository '%s'" +msgstr "Tiedoston '%s' haku asennuslähteestä '%s' ei onnistu" + +#: ../zypp/thread/Mutex.cc:87 +msgid "Can't release the mutex lock" +msgstr "Mutex-lukituksen vapauttaminen ei onnistu" + +#: ../zypp/thread/Mutex.cc:40 +msgid "Can't set recursive mutex attribute" +msgstr "Rekursiivisten mutex-määritteiden asetus ei onnistu" + +#. :BLZ:084: +#: ../zypp/CountryCode.cc:260 +msgid "Canada" +msgstr "Kanada" + +#: ../zypp/KeyRing.cc:276 +#, c-format +msgid "Cannot create public key %s from %s keyring to file %s" +msgstr "Julkisen avaimen %s luonti avainrenkaasta %s tiedostoon %s ei onnistu" + +#: ../zypp/media/MediaException.cc:182 +msgid "Cannot eject any media" +msgstr "Tietovälineiden irroittaminen ei onnistu" + +#: ../zypp/media/MediaException.cc:184 +#, c-format +msgid "Cannot eject media '%s'" +msgstr "Tietovälineen '%s' irroittaminen ei onnistu" + +#: ../zypp/media/MediaException.cc:67 +#, c-format +msgid "Cannot write file '%s'." +msgstr "Tiedostoon '%s' kirjoittaminen ei onnnistu." + +#. :CUB:192: +#: ../zypp/CountryCode.cc:275 +msgid "Cape Verde" +msgstr "Kap Verde" #. language code: car #: ../zypp/LanguageCode.cc:382 @@ -593,6 +771,12 @@ msgid "Caucasian (Other)" msgstr "muut kaukasialaiset kielet" +# FO +#. :KWT:414: +#: ../zypp/CountryCode.cc:344 +msgid "Cayman Islands" +msgstr "Caymansaaret" + #. language code: ceb #: ../zypp/LanguageCode.cc:388 msgid "Cebuano" @@ -603,82 +787,169 @@ msgid "Celtic (Other)" msgstr "muut kelttiläiset kielet" +# CF +#. :COD:180: +#: ../zypp/CountryCode.cc:263 +msgid "Central African Republic" +msgstr "Keski-Afrikan tasavalta" + +#. language code: cai +#: ../zypp/LanguageCode.cc:380 +msgid "Central American Indian (Other)" +msgstr "muut Keski-Amerikan intiaanikielet" + +# TD +#. :TCA:796: +#: ../zypp/CountryCode.cc:430 +msgid "Chad" +msgstr "Tšad" + +#. language code: chg +#: ../zypp/LanguageCode.cc:398 +msgid "Chagatai" +msgstr "tšagatai" + +#. language code: cmc +#: ../zypp/LanguageCode.cc:422 +msgid "Chamic Languages" +msgstr "cham-kielet" + #. language code: cha ch #: ../zypp/LanguageCode.cc:392 msgid "Chamorro" msgstr "chamorro" +#. Translator: %s = name of an rpm package. A list of diffs follows +#. this message. +#: ../zypp/target/rpm/RpmDb.cc:1877 +#, c-format +msgid "Changed configuration files for %s:" +msgstr "Muunnettiin paketin %s asetustiedostoja:" + +#. language code: che ce +#: ../zypp/LanguageCode.cc:396 +msgid "Chechen" +msgstr "tšetšeeni" + +#. language code: chr +#: ../zypp/LanguageCode.cc:414 +msgid "Cherokee" +msgstr "cherokee" + +#. language code: chy +#: ../zypp/LanguageCode.cc:420 +msgid "Cheyenne" +msgstr "cheyenne" + # CN #. language code: chb #: ../zypp/LanguageCode.cc:394 msgid "Chibcha" msgstr "chibcha" -#. language code: che ce -#: ../zypp/LanguageCode.cc:396 -msgid "Chechen" -msgstr "tšetšeeni" +#. language code: nya ny +#: ../zypp/LanguageCode.cc:896 +msgid "Chichewa" +msgstr "nyanja" -#. language code: chg -#: ../zypp/LanguageCode.cc:398 -msgid "Chagatai" -msgstr "tšagatai" +# CL +#. :COK:184: +#: ../zypp/CountryCode.cc:268 +msgid "Chile" +msgstr "Chile" + +# CN +#. :CMR:120: +#: ../zypp/CountryCode.cc:270 +msgid "China" +msgstr "Kiina" #. language code: chi zho zh #: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402 msgid "Chinese" msgstr "kiina" -#. language code: chk -#: ../zypp/LanguageCode.cc:404 -msgid "Chuukese" -msgstr "chuuk" - -# ML -#. language code: chm -#: ../zypp/LanguageCode.cc:406 -msgid "Mari" -msgstr "mari" - #. language code: chn #: ../zypp/LanguageCode.cc:408 msgid "Chinook Jargon" msgstr "chinook-jargon" -#. language code: cho -#: ../zypp/LanguageCode.cc:410 -msgid "Choctaw" -msgstr "choctaw" - #. language code: chp #: ../zypp/LanguageCode.cc:412 msgid "Chipewyan" msgstr "chipewyan" -#. language code: chr -#: ../zypp/LanguageCode.cc:414 -msgid "Cherokee" -msgstr "cherokee" +#. language code: cho +#: ../zypp/LanguageCode.cc:410 +msgid "Choctaw" +msgstr "choctaw" + +#. :CPV:132: +#: ../zypp/CountryCode.cc:276 +msgid "Christmas Island" +msgstr "Joulusaari" #. language code: chu cu #: ../zypp/LanguageCode.cc:416 msgid "Church Slavic" msgstr "kirkkoslaavi" +#. language code: chk +#: ../zypp/LanguageCode.cc:404 +msgid "Chuukese" +msgstr "chuuk" + #. language code: chv cv #: ../zypp/LanguageCode.cc:418 msgid "Chuvash" msgstr "tšuvassi" -#. language code: chy -#: ../zypp/LanguageCode.cc:420 -msgid "Cheyenne" -msgstr "cheyenne" +#. language code: nwc +#: ../zypp/LanguageCode.cc:894 +msgid "Classical Newari" +msgstr "klassinen newari" -#. language code: cmc -#: ../zypp/LanguageCode.cc:422 -msgid "Chamic Languages" -msgstr "cham-kielet" +#. :CAN:124: +#: ../zypp/CountryCode.cc:261 +msgid "Cocos (Keeling) Islands" +msgstr "Kookossaaret" + +# CO +#. :CHN:156: +#: ../zypp/CountryCode.cc:271 +msgid "Colombia" +msgstr "Kolumbia" + +#: ../zypp/ExternalProgram.cc:346 +#, c-format +msgid "Command exited with status %d." +msgstr "Komento päättyi tilaan %d." + +#: ../zypp/ExternalProgram.cc:371 +msgid "Command exited with unknown error." +msgstr "Komento päättyi tuntemattomaan virheeseen." + +#: ../zypp/ExternalProgram.cc:366 +#, c-format +msgid "Command was killed by signal %d (%s)." +msgstr "Komento lopetettiin signaalilla %d (%s)" + +#. :KIR:296: +#: ../zypp/CountryCode.cc:339 +msgid "Comoros" +msgstr "Komorit" + +#. :CCK:166: +#. :CAF:140: +#: ../zypp/CountryCode.cc:262 ../zypp/CountryCode.cc:264 +msgid "Congo" +msgstr "Kongo" + +# FO +#. :CIV:384: +#: ../zypp/CountryCode.cc:267 +msgid "Cook Islands" +msgstr "Cookinsaaret" #. language code: cop #: ../zypp/LanguageCode.cc:424 @@ -695,6 +966,31 @@ msgid "Corsican" msgstr "korsika" +#. :COL:170: +#: ../zypp/CountryCode.cc:272 +msgid "Costa Rica" +msgstr "Costa Rica" + +#. :CHE:756: +#: ../zypp/CountryCode.cc:266 +msgid "Cote D'Ivoire" +msgstr "Norsunluurannikko" + +#. language code: cre cr +#: ../zypp/LanguageCode.cc:436 +msgid "Cree" +msgstr "cree" + +#. language code: mus +#: ../zypp/LanguageCode.cc:842 +msgid "Creek" +msgstr "creek" + +#. language code: crp +#: ../zypp/LanguageCode.cc:440 +msgid "Creoles and Pidgins (Other)" +msgstr "muut kreolit ja pidginit" + #. language code: cpe #: ../zypp/LanguageCode.cc:430 msgid "Creoles and Pidgins, English-Based (Other)" @@ -710,36 +1006,49 @@ msgid "Creoles and Pidgins, Portuguese-Based (Other)" msgstr "muut portugaliin perustuvat kreolit ja pidginit" -#. language code: cre cr -#: ../zypp/LanguageCode.cc:436 -msgid "Cree" -msgstr "cree" - #. language code: crh #: ../zypp/LanguageCode.cc:438 msgid "Crimean Tatar" msgstr "krimintataari" -#. language code: crp -#: ../zypp/LanguageCode.cc:440 -msgid "Creoles and Pidgins (Other)" -msgstr "muut kreolit ja pidginit" +# HR +#. :HND:340: +#: ../zypp/CountryCode.cc:320 +msgid "Croatia" +msgstr "Kroatia" -#. language code: csb -#: ../zypp/LanguageCode.cc:442 -msgid "Kashubian" -msgstr "kašubi" +#. language code: scr hrv hr +#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010 +msgid "Croatian" +msgstr "kroatia" + +# CU +#. :SCG:891: +#: ../zypp/CountryCode.cc:274 +msgid "Cuba" +msgstr "Kuuba" #. language code: cus #: ../zypp/LanguageCode.cc:444 msgid "Cushitic (Other)" msgstr "muut kuušilaiset kielet" +#. :CXR:162: +#: ../zypp/CountryCode.cc:277 +msgid "Cyprus" +msgstr "Kypros" + #. language code: cze ces cs #: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448 msgid "Czech" msgstr "tšekki" +# CZ +#. :CYP:196: +#: ../zypp/CountryCode.cc:278 +msgid "Czech Republic" +msgstr "Tšekki" + #. language code: dak #: ../zypp/LanguageCode.cc:450 msgid "Dakota" @@ -765,15 +1074,10 @@ msgid "Delaware" msgstr "delaware" -#. language code: den -#: ../zypp/LanguageCode.cc:460 -msgid "Slave (Athapascan)" -msgstr "slave" - -#. language code: dgr -#: ../zypp/LanguageCode.cc:462 -msgid "Dogrib" -msgstr "dogrib" +#. :DJI:262: +#: ../zypp/CountryCode.cc:281 +msgid "Denmark" +msgstr "Tanska" #. language code: din #: ../zypp/LanguageCode.cc:464 @@ -785,36 +1089,77 @@ msgid "Divehi" msgstr "divehi" +#. :DEU:276: +#: ../zypp/CountryCode.cc:280 +msgid "Djibouti" +msgstr "Djibouti" + #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" msgstr "dogri" +#. language code: dgr +#: ../zypp/LanguageCode.cc:462 +msgid "Dogrib" +msgstr "dogrib" + +# DM +#. :DNK:208: +#: ../zypp/CountryCode.cc:282 +msgid "Dominica" +msgstr "Dominica" + +# DO +#. :DMA:212: +#: ../zypp/CountryCode.cc:283 +msgid "Dominican Republic" +msgstr "Dominikaaninen tasavalta" + +#: ../zypp/media/MediaException.cc:152 +#, c-format +msgid "" +"Download (curl) error for '%s':\n" +"Error code: %s\n" +"Error message: %s\n" +msgstr "" +"Latausvirhe (curl) %s:\n" +"Virhekoodi: %s\n" +"viesti: %s\n" + +#. TranslatorExplanation: curl is the name of a library, don't translate +#. param1 = url +#: ../zypp/media/MediaException.cc:84 +#, c-format +msgid "Download (curl) initialization failed for '%s'" +msgstr "Lataajan (curl) alustus osoitteelle '%s' epäonnistui" + #. language code: dra #: ../zypp/LanguageCode.cc:470 msgid "Dravidian (Other)" msgstr "muut dravidakielet" -#. language code: dsb -#: ../zypp/LanguageCode.cc:472 -msgid "Lower Sorbian" -msgstr "alasorbi" - #. language code: dua #: ../zypp/LanguageCode.cc:474 msgid "Duala" msgstr "duala" -#. language code: dum -#: ../zypp/LanguageCode.cc:476 -msgid "Dutch, Middle (ca.1050-1350)" -msgstr "keskihollanti" +#. dubious: Throw on malformed known types, otherwise log a warning. +#: ../zypp/CheckSum.cc:97 +#, c-format +msgid "Dubious type '%s' for %u byte checksum '%s'" +msgstr "Virheellinen tyyppi '%s' tavulle %u, tarkistussumma: '%s'" #. language code: dut nld nl #: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480 msgid "Dutch" msgstr "hollanti" +#. language code: dum +#: ../zypp/LanguageCode.cc:476 +msgid "Dutch, Middle (ca.1050-1350)" +msgstr "keskihollanti" + #. language code: dyu #: ../zypp/LanguageCode.cc:482 msgid "Dyula" @@ -825,11 +1170,27 @@ msgid "Dzongkha" msgstr "dzongkha" +#. :TON:776: +#: ../zypp/CountryCode.cc:439 +msgid "East Timor" +msgstr "Itä-Timor" + +# EC +#. :DZA:012: +#: ../zypp/CountryCode.cc:285 +msgid "Ecuador" +msgstr "Ecuador" + #. language code: efi #: ../zypp/LanguageCode.cc:486 msgid "Efik" msgstr "efik" +#. :EST:233: +#: ../zypp/CountryCode.cc:287 +msgid "Egypt" +msgstr "Egypti" + #. language code: egy #: ../zypp/LanguageCode.cc:488 msgid "Egyptian (Ancient)" @@ -840,11 +1201,33 @@ msgid "Ekajuk" msgstr "ekajuk" +# SV +#. :STP:678: +#: ../zypp/CountryCode.cc:426 +msgid "El Salvador" +msgstr "El Salvador" + #. language code: elx #: ../zypp/LanguageCode.cc:492 msgid "Elamite" msgstr "elami" +#: ../zypp/media/MediaException.cc:135 +msgid "Empty destination in URI" +msgstr "Tyhjä kohde" + +#: ../zypp/media/MediaException.cc:130 +msgid "Empty filesystem in URI" +msgstr "Tyhjä tiedostojärjestelmä" + +#: ../zypp/media/MediaException.cc:125 +msgid "Empty host name in URI" +msgstr "Tyhjä konenimi" + +#: ../zypp/url/UrlUtils.cc:111 +msgid "Encoded string contains a NUL byte" +msgstr "Koodattu merkkijono sisältää NUL-tavun" + #. language code: eng en #: ../zypp/LanguageCode.cc:494 msgid "English" @@ -855,16 +1238,56 @@ msgid "English, Middle (1100-1500)" msgstr "keskienglanti" +#. language code: ang +#: ../zypp/LanguageCode.cc:274 +msgid "English, Old (ca.450-1100)" +msgstr "muinaisenglanti" + +#. :GLP:312: +#: ../zypp/CountryCode.cc:310 +msgid "Equatorial Guinea" +msgstr "Päiväntasaajan Guinea" + +#. :ESH:732: +#: ../zypp/CountryCode.cc:289 +msgid "Eritrea" +msgstr "Eritrea" + +#. TranslatorExplanation: curl is the name of a library, don't translate +#. param1 = url +#: ../zypp/media/MediaException.cc:161 +#, c-format +msgid "Error occurred while setting download (curl) options for '%s':" +msgstr "Virhe asetettaessa lataimen (curl) asetuksia osoitteelle '%s':" + +# SY +#. language code: myv +#: ../zypp/LanguageCode.cc:850 +msgid "Erzya" +msgstr "ersä" + #. language code: epo eo #: ../zypp/LanguageCode.cc:498 msgid "Esperanto" msgstr "esperanto" +# EE +#. :ECU:218: +#: ../zypp/CountryCode.cc:286 +msgid "Estonia" +msgstr "Viro" + #. language code: est et #: ../zypp/LanguageCode.cc:500 msgid "Estonian" msgstr "viro" +# ET +#. :ESP:724: +#: ../zypp/CountryCode.cc:291 +msgid "Ethiopia" +msgstr "Etiopia" + #. language code: ewe ee #: ../zypp/LanguageCode.cc:502 msgid "Ewe" @@ -875,31 +1298,146 @@ msgid "Ewondo" msgstr "ewondo" +#: ../zypp/KeyRing.cc:558 +msgid "Failed to delete key." +msgstr "Avaimen poisto epäonnistui." + +#: ../zypp/target/rpm/RpmDb.cc:1045 +#, c-format +msgid "Failed to import public key from file %s: %s" +msgstr "Avaimen tuonti tiedostosta %s epäonnistui: %s" + +#: ../zypp/media/MediaException.cc:31 +#, c-format +msgid "Failed to mount %s on %s" +msgstr "%s liittäminen liitospisteeseen %s epäonnistui" + +#: ../zypp/target/rpm/RpmDb.cc:1122 +#, c-format +msgid "Failed to remove public key %s: %s" +msgstr "Julkisen avaimen %s poisto epäonnistui: %s" + +#: ../zypp/media/MediaException.cc:41 +#, c-format +msgid "Failed to unmount %s" +msgstr "%s irroittaminen ei onnistu" + +#. :FJI:242: +#: ../zypp/CountryCode.cc:294 +msgid "Falkland Islands (Malvinas)" +msgstr "Falklandinsaaret" + #. language code: fan #: ../zypp/LanguageCode.cc:506 msgid "Fang" msgstr "fang" +#. language code: fat +#: ../zypp/LanguageCode.cc:510 +msgid "Fanti" +msgstr "fanti" + +# FO +#. :FSM:583: +#: ../zypp/CountryCode.cc:296 +msgid "Faroe Islands" +msgstr "Färsaaret" + #. language code: fao fo #: ../zypp/LanguageCode.cc:508 msgid "Faroese" msgstr "fääri" -#. language code: fat -#: ../zypp/LanguageCode.cc:510 -msgid "Fanti" -msgstr "fanti" +#. :FLK:238: +#: ../zypp/CountryCode.cc:295 +msgid "Federated States of Micronesia" +msgstr "Mikronesia" + +#. :FIN:246: +#: ../zypp/CountryCode.cc:293 +msgid "Fiji" +msgstr "Fidži" #. language code: fij fj #: ../zypp/LanguageCode.cc:512 msgid "Fijian" msgstr "fidži" +#: ../devel/devel.mvidner/installation_sources.cc:99 +#, c-format +msgid "" +"File %s does not have a checksum.\n" +"Use the file anyway?" +msgstr "" +"Tiedostolla %s ei ole tarkistussummaa.\n" +"Käytetäänkö tiedostoa silti?" + +#: ../devel/devel.mvidner/installation_sources.cc:85 +#, c-format +msgid "" +"File %s failed integrity check with the folowing key:\n" +"%s|%s|%s\n" +"Use the file anyway?" +msgstr "" +"Tiedoston %s yhtenäisyystarkistus epäonnistui seuraavalla avaimella:\n" +"%s|%s|%s\n" +"Käytetäänkö tiedostoa silti?" + +#: ../devel/devel.mvidner/installation_sources.cc:117 +#, c-format +msgid "" +"File %s has an invalid checksum.\n" +"Expected %s, found %s\n" +"Use the file anyway?" +msgstr "" +"Tiedoston %s tarkistussumma on virheellinen.\n" +"Odotettiin tarkistussummaa %s, laskettiin %s.\n" +"Käytetäänkö tiedostoa silti?" + +#: ../devel/devel.mvidner/installation_sources.cc:108 +#, c-format +msgid "" +"File %s has an unknown checksum %s.\n" +"Use the file anyway?" +msgstr "" +"Tiedostolla %s on tunnistamaton tarkistussumma %s.\n" +"Käytetäänkö tiedostoa silti?" + +#: ../devel/devel.mvidner/installation_sources.cc:56 +#, c-format +msgid "" +"File %s is not signed.\n" +"Use it anyway?" +msgstr "" +"Tiedostoa %s ei ole allekirjoitettu.\n" +"Käytetäänkö tiedostoa silti?" + +#: ../devel/devel.mvidner/installation_sources.cc:65 +#, c-format +msgid "" +"File %s is signed with an unknown key:\n" +"%s|%s|%s\n" +"Use the file anyway?" +msgstr "" +"Tiedosto %s on allekirjoitettu tuntemattomalla avaimella:\n" +"%s|%s|%s\n" +"Käytetäänkö tiedostoa silti?" + +#: ../zypp/media/MediaException.cc:60 +#, c-format +msgid "File '%s' not found on medium '%s'" +msgstr "Tiedostoa '%s' ei löydy tietovälineeltä '%s'" + #. language code: fil #: ../zypp/LanguageCode.cc:514 msgid "Filipino" msgstr "filippiini" +#. :ETH:231: +#: ../zypp/CountryCode.cc:292 +msgid "Finland" +msgstr "Suomi" + #. language code: fin fi #: ../zypp/LanguageCode.cc:516 msgid "Finnish" @@ -910,16 +1448,40 @@ msgid "Finno-Ugrian (Other)" msgstr "muut suomalais-ugrilaiset kielet" +#: ../zypp/solver/detail/ProblemSolutionCombi.cc:73 +msgid "Following actions will be done:" +msgstr "Tehdään seuraavat toiminnot:" + #. language code: fon #: ../zypp/LanguageCode.cc:520 msgid "Fon" msgstr "fon" -#. language code: fre fra fr -#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524 +#. :FRO:234: +#: ../zypp/CountryCode.cc:297 +msgid "France" +msgstr "Ranska" + +#. language code: fre fra fr +#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524 msgid "French" msgstr "ranska" +#. :GEO:268: +#: ../zypp/CountryCode.cc:303 +msgid "French Guiana" +msgstr "Ranskan Guayana" + +#. :PER:604: +#: ../zypp/CountryCode.cc:393 +msgid "French Polynesia" +msgstr "Ranskan Polynesia" + +#. :TCD:148: +#: ../zypp/CountryCode.cc:431 +msgid "French Southern Territories" +msgstr "Ranskan eteläiset alueet" + #. language code: frm #: ../zypp/LanguageCode.cc:526 msgid "French, Middle (ca.1400-1600)" @@ -936,23 +1498,52 @@ msgid "Frisian" msgstr "friisi" -#. language code: ful ff -#: ../zypp/LanguageCode.cc:532 -msgid "Fulah" -msgstr "fulani" - # FR #. language code: fur #: ../zypp/LanguageCode.cc:534 msgid "Friulian" msgstr "friuli" +#. language code: ful ff +#: ../zypp/LanguageCode.cc:532 +msgid "Fulah" +msgstr "fulani" + #. language code: gaa #: ../zypp/LanguageCode.cc:536 msgid "Ga" msgstr "gã" # GH +#. :FXX:249: +#: ../zypp/CountryCode.cc:299 +msgid "Gabon" +msgstr "Gabon" + +# ML +#. language code: gla gd +#: ../zypp/LanguageCode.cc:556 +msgid "Gaelic" +msgstr "gaeli" + +#. language code: glg gl +#: ../zypp/LanguageCode.cc:560 +msgid "Galician" +msgstr "galicia" + +# GM +#. :GRL:304: +#: ../zypp/CountryCode.cc:307 +msgid "Gambia" +msgstr "Gambia" + +# GH +#. language code: lug lg +#: ../zypp/LanguageCode.cc:762 +msgid "Ganda" +msgstr "ganda" + +# GH #. language code: gay #: ../zypp/LanguageCode.cc:538 msgid "Gayo" @@ -963,10 +1554,20 @@ msgid "Gbaya" msgstr "gbaya" -#. language code: gem -#: ../zypp/LanguageCode.cc:542 -msgid "Germanic (Other)" -msgstr "muut germaaniset kielet" +#. language code: gez +#: ../zypp/LanguageCode.cc:552 +msgid "Geez" +msgstr "ge'ez" + +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" +msgstr "Jätä joitain vaatimuksia huomiotta" + +# GE +#. :GRD:308: +#: ../zypp/CountryCode.cc:302 +msgid "Georgia" +msgstr "Georgia" # GE #. language code: geo kat ka @@ -979,37 +1580,6 @@ msgid "German" msgstr "saksa" -#. language code: gez -#: ../zypp/LanguageCode.cc:552 -msgid "Geez" -msgstr "ge'ez" - -#. language code: gil -#: ../zypp/LanguageCode.cc:554 -msgid "Gilbertese" -msgstr "kiribati" - -# ML -#. language code: gla gd -#: ../zypp/LanguageCode.cc:556 -msgid "Gaelic" -msgstr "gaeli" - -#. language code: gle ga -#: ../zypp/LanguageCode.cc:558 -msgid "Irish" -msgstr "iiri" - -#. language code: glg gl -#: ../zypp/LanguageCode.cc:560 -msgid "Galician" -msgstr "galicia" - -#. language code: glv gv -#: ../zypp/LanguageCode.cc:562 -msgid "Manx" -msgstr "manx" - #. language code: gmh #: ../zypp/LanguageCode.cc:564 msgid "German, Middle High (ca.1050-1500)" @@ -1020,6 +1590,32 @@ msgid "German, Old High (ca.750-1050)" msgstr "muinaisyläsaksa" +#. language code: gem +#: ../zypp/LanguageCode.cc:542 +msgid "Germanic (Other)" +msgstr "muut germaaniset kielet" + +#. :CZE:203: +#: ../zypp/CountryCode.cc:279 +msgid "Germany" +msgstr "Saksa" + +# GH +#. :GUF:254: +#: ../zypp/CountryCode.cc:304 +msgid "Ghana" +msgstr "Ghana" + +#. :GHA:288: +#: ../zypp/CountryCode.cc:305 +msgid "Gibraltar" +msgstr "Gibraltar" + +#. language code: gil +#: ../zypp/LanguageCode.cc:554 +msgid "Gilbertese" +msgstr "kiribati" + #. language code: gon #: ../zypp/LanguageCode.cc:568 msgid "Gondi" @@ -1040,6 +1636,11 @@ msgid "Grebo" msgstr "grebo" +#. :GNQ:226: +#: ../zypp/CountryCode.cc:311 +msgid "Greece" +msgstr "Kreikka" + #. language code: grc #: ../zypp/LanguageCode.cc:576 msgid "Greek, Ancient (to 1453)" @@ -1050,16 +1651,62 @@ msgid "Greek, Modern (1453-)" msgstr "kreikka" +# GL +#. :GIB:292: +#: ../zypp/CountryCode.cc:306 +msgid "Greenland" +msgstr "Grönlanti" + +# GD +#. :GBR:826: +#: ../zypp/CountryCode.cc:301 +msgid "Grenada" +msgstr "Grenada" + +#. :GIN:324: +#: ../zypp/CountryCode.cc:309 +msgid "Guadeloupe" +msgstr "Guadeloupe" + +# GU +#. :GTM:320: +#: ../zypp/CountryCode.cc:314 +msgid "Guam" +msgstr "Guam" + #. language code: grn gn #: ../zypp/LanguageCode.cc:582 msgid "Guarani" msgstr "guarani" +# GT +#. :SGS:239: +#: ../zypp/CountryCode.cc:313 +msgid "Guatemala" +msgstr "Guatemala" + +# GU +#. :GMB:270: +#: ../zypp/CountryCode.cc:308 +msgid "Guinea" +msgstr "Guinea" + +#. :GUM:316: +#: ../zypp/CountryCode.cc:315 +msgid "Guinea-Bissau" +msgstr "Guinea-Bissau" + #. language code: guj gu #: ../zypp/LanguageCode.cc:584 msgid "Gujarati" msgstr "gujarati" +# GH +#. :GNB:624: +#: ../zypp/CountryCode.cc:316 +msgid "Guyana" +msgstr "Guyana" + #. language code: gwi #: ../zypp/LanguageCode.cc:586 msgid "Gwich'in" @@ -1070,11 +1717,33 @@ msgid "Haida" msgstr "haida" +#. :HRV:191: +#: ../zypp/CountryCode.cc:321 +msgid "Haiti" +msgstr "Haiti" + #. language code: hat ht #: ../zypp/LanguageCode.cc:590 msgid "Haitian" msgstr "haiti" +#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55 +#: ../zypp/target/hal/HalException.h:64 +msgid "Hal Exception" +msgstr "Hal-poikkeus" + +#: ../zypp/target/hal/HalContext.cc:94 +msgid "HalContext not connected" +msgstr "Hal-yhteyden muodostus ei onnistunut" + +#: ../zypp/target/hal/HalContext.cc:104 +msgid "HalDrive not initialized" +msgstr "Hal-asemaa ei ole alustettu" + +#: ../zypp/target/hal/HalContext.cc:114 +msgid "HalVolume not initialized" +msgstr "Hal-taltioa ei alustettu" + #. language code: hau ha #: ../zypp/LanguageCode.cc:592 msgid "Hausa" @@ -1085,6 +1754,11 @@ msgid "Hawaiian" msgstr "havaiji" +#. :HKG:344: +#: ../zypp/CountryCode.cc:318 +msgid "Heard Island and McDonald Islands" +msgstr "Heard ja McDonaldinsaaret" + #. language code: heb he #: ../zypp/LanguageCode.cc:596 msgid "Hebrew" @@ -1111,6 +1785,16 @@ msgid "Hindi" msgstr "hindi" +#. language code: hmo ho +#: ../zypp/LanguageCode.cc:610 +msgid "Hiri Motu" +msgstr "hiri-motu" + +#. TranslatorExplanation followed by the list of error messages that lead to this exception +#: ../zypp/base/Exception.cc:89 +msgid "History:" +msgstr "Historia:" + #. language code: hit #: ../zypp/LanguageCode.cc:606 msgid "Hittite" @@ -1121,21 +1805,33 @@ msgid "Hmong" msgstr "hmong" -#. language code: hmo ho -#: ../zypp/LanguageCode.cc:610 -msgid "Hiri Motu" -msgstr "hiri-motu" +#. :UZB:860: +#: ../zypp/CountryCode.cc:451 +msgid "Holy See (Vatican City State)" +msgstr "Vatikaani" -#. language code: hsb -#: ../zypp/LanguageCode.cc:612 -msgid "Upper Sorbian" -msgstr "yläsorbi" +# HN +#. :HMD:334: +#: ../zypp/CountryCode.cc:319 +msgid "Honduras" +msgstr "Honduras" + +#. :GUY:328: +#: ../zypp/CountryCode.cc:317 +msgid "Hong Kong" +msgstr "Hong Kong" #. language code: hun hu #: ../zypp/LanguageCode.cc:614 msgid "Hungarian" msgstr "unkari" +# HU +#. :HTI:332: +#: ../zypp/CountryCode.cc:322 +msgid "Hungary" +msgstr "Unkari" + #. language code: hup #: ../zypp/LanguageCode.cc:616 msgid "Hupa" @@ -1147,10 +1843,11 @@ msgid "Iban" msgstr "iban" -#. language code: ibo ig -#: ../zypp/LanguageCode.cc:620 -msgid "Igbo" -msgstr "igbo" +# IS +#. :IRN:364: +#: ../zypp/CountryCode.cc:330 +msgid "Iceland" +msgstr "Islanti" #. language code: ice isl is #: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624 @@ -1162,107 +1859,250 @@ msgid "Ido" msgstr "ido" -# LT -#. language code: iii ii -#: ../zypp/LanguageCode.cc:628 -msgid "Sichuan Yi" -msgstr "sichuanin-yi" +#. language code: ibo ig +#: ../zypp/LanguageCode.cc:620 +msgid "Igbo" +msgstr "igbo" + +#. TranslatorExplanation %s = name of package, patch, selection ... +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 +#, c-format +msgid "Ignore some dependencies of %s" +msgstr "Jätä joitain %s riippuvuuksia huomiotta" #. language code: ijo #: ../zypp/LanguageCode.cc:630 msgid "Ijo" msgstr "ijo" -#. language code: iku iu -#: ../zypp/LanguageCode.cc:632 -msgid "Inuktitut" -msgstr "inuktitut" - -#. language code: ile ie -#: ../zypp/LanguageCode.cc:634 -msgid "Interlingue" -msgstr "interlingue" - #. language code: ilo #: ../zypp/LanguageCode.cc:636 msgid "Iloko" msgstr "iloko" -#. language code: ina ia -#: ../zypp/LanguageCode.cc:638 -msgid "Interlingua (International Auxiliary Language Association)" -msgstr "interlingua" +#. language code: smn +#: ../zypp/LanguageCode.cc:1046 +msgid "Inari Sami" +msgstr "saame, inarin-" + +# IN +#. :ISR:376: +#: ../zypp/CountryCode.cc:326 +msgid "India" +msgstr "Intia" #. language code: inc #: ../zypp/LanguageCode.cc:640 msgid "Indic (Other)" msgstr "muut indoarjalaiset kielet" -#. language code: ind id -#: ../zypp/LanguageCode.cc:642 -msgid "Indonesian" -msgstr "indonesia" - #. language code: ine #: ../zypp/LanguageCode.cc:644 msgid "Indo-European (Other)" msgstr "muut indoeurooppalaiset kielet" +# ID +#. :HUN:348: +#: ../zypp/CountryCode.cc:323 +msgid "Indonesia" +msgstr "Indonesia" + +#. language code: ind id +#: ../zypp/LanguageCode.cc:642 +msgid "Indonesian" +msgstr "indonesia" + #. language code: inh #: ../zypp/LanguageCode.cc:646 msgid "Ingush" msgstr "inguuši" +#: ../zypp/target/TargetImpl.cc:762 +msgid "Installation has been aborted as directed." +msgstr "Asennus keskeytettiin." + +#. language code: ina ia +#: ../zypp/LanguageCode.cc:638 +msgid "Interlingua (International Auxiliary Language Association)" +msgstr "interlingua" + +#. language code: ile ie +#: ../zypp/LanguageCode.cc:634 +msgid "Interlingue" +msgstr "interlingue" + +#. language code: iku iu +#: ../zypp/LanguageCode.cc:632 +msgid "Inuktitut" +msgstr "inuktitut" + # IN #. language code: ipk ik #: ../zypp/LanguageCode.cc:648 msgid "Inupiaq" msgstr "iñupiak" +#: ../zypp/url/UrlBase.cc:180 +#, c-format +msgid "Invalid %s component" +msgstr "Virheellinen %s-komponentti" + +#: ../zypp/url/UrlBase.cc:173 +#, c-format +msgid "Invalid %s component '%s'" +msgstr "Virheellinen %s-komponentti '%s'" + +#: ../zypp/Url.cc:152 +#, c-format +msgid "Invalid LDAP URL query parameter '%s'" +msgstr "Virheellinen parametri LDAP URL: '%s'" + +#: ../zypp/Url.cc:113 +msgid "Invalid LDAP URL query string" +msgstr "Virheellinen LDAP URL" + +#: ../zypp/url/UrlBase.cc:826 +#, c-format +msgid "Invalid Url scheme '%s'" +msgstr "Virheellinen URL: '%s'" + +#: ../zypp/Url.cc:309 +msgid "Invalid empty Url object reference" +msgstr "Virheellinen viittaus tyhjään URL-objektiin" + +#: ../zypp/url/UrlBase.cc:1047 +#, c-format +msgid "Invalid host component '%s'" +msgstr "Virheellinen konenimi: '%s'" + +#: ../zypp/url/UrlUtils.cc:283 +msgid "Invalid parameter array join separator character" +msgstr "Virheellinen parametritaulukon liitoksen eroitin" + +#: ../zypp/url/UrlUtils.cc:173 +msgid "Invalid parameter array split separator character" +msgstr "Virheellinen parametritaulukon jaon erotin" + +#: ../zypp/url/UrlUtils.cc:213 +msgid "Invalid parameter map split separator character" +msgstr "Virheellinen parametrikartan jaon erotin" + +#: ../zypp/url/UrlBase.cc:1079 +#, c-format +msgid "Invalid port component '%s'" +msgstr "Virheellinen porttimääritys: '%s'" + +#: ../zypp/PoolQuery.cc:419 +#, c-format +msgid "Invalid regular expression '%s': regcomp returned %d" +msgstr "Virhe säännöllisessä lausekkeessa '%s': regcomp palautti %d" + +#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826 +msgid "Invalid user name or password." +msgstr "Virheellinen käyttäjätunnus tai salasana." + +# IR +#. :IRQ:368: +#: ../zypp/CountryCode.cc:329 +msgid "Iran" +msgstr "Iran" + #. language code: ira #: ../zypp/LanguageCode.cc:650 msgid "Iranian (Other)" msgstr "muut iranilaiset kielet" +# IQ +#. :IOT:086: +#: ../zypp/CountryCode.cc:328 +msgid "Iraq" +msgstr "Irak" + +# IE +#. :IDN:360: +#: ../zypp/CountryCode.cc:324 +msgid "Ireland" +msgstr "Irlanti" + +#. language code: gle ga +#: ../zypp/LanguageCode.cc:558 +msgid "Irish" +msgstr "iiri" + +#. language code: mga +#: ../zypp/LanguageCode.cc:810 +msgid "Irish, Middle (900-1200)" +msgstr "keski-iiri" + +#. language code: sga +#: ../zypp/LanguageCode.cc:1016 +msgid "Irish, Old (to 900)" +msgstr "muinaisiiri" + #. language code: iro #: ../zypp/LanguageCode.cc:652 msgid "Iroquoian Languages" msgstr "irokeesikielet" +# IL +#. :IRL:372: +#: ../zypp/CountryCode.cc:325 +msgid "Israel" +msgstr "Israel" + #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" msgstr "italia" -#. language code: jav jv -#: ../zypp/LanguageCode.cc:656 -msgid "Javanese" -msgstr "jaava" +#. :ISL:352: +#: ../zypp/CountryCode.cc:331 +msgid "Italy" +msgstr "Italia" -#. language code: jbo -#: ../zypp/LanguageCode.cc:658 -msgid "Lojban" -msgstr "lojban" +# JM +#. :ITA:380: +#: ../zypp/CountryCode.cc:332 +msgid "Jamaica" +msgstr "Jamaika" + +# JP +#. :JOR:400: +#: ../zypp/CountryCode.cc:334 +msgid "Japan" +msgstr "Japani" #. language code: jpn ja #: ../zypp/LanguageCode.cc:660 msgid "Japanese" msgstr "japani" -#. language code: jpr -#: ../zypp/LanguageCode.cc:662 -msgid "Judeo-Persian" -msgstr "juutalaispersia" +#. language code: jav jv +#: ../zypp/LanguageCode.cc:656 +msgid "Javanese" +msgstr "jaava" + +# JO +#. :JAM:388: +#: ../zypp/CountryCode.cc:333 +msgid "Jordan" +msgstr "Jordania" #. language code: jrb #: ../zypp/LanguageCode.cc:664 msgid "Judeo-Arabic" msgstr "juutalaisarabia" -#. language code: kaa -#: ../zypp/LanguageCode.cc:666 -msgid "Kara-Kalpak" -msgstr "karakalpakki" +#. language code: jpr +#: ../zypp/LanguageCode.cc:662 +msgid "Judeo-Persian" +msgstr "juutalaispersia" + +# MR +#. language code: kbd +#: ../zypp/LanguageCode.cc:688 +msgid "Kabardian" +msgstr "kabardi" #. language code: kab #: ../zypp/LanguageCode.cc:668 @@ -1279,6 +2119,11 @@ msgid "Kalaallisut" msgstr "kalaallisut" +#. language code: xal +#: ../zypp/LanguageCode.cc:1202 +msgid "Kalmyk" +msgstr "kalmukki" + #. language code: kam #: ../zypp/LanguageCode.cc:674 msgid "Kamba" @@ -1290,6 +2135,21 @@ msgid "Kannada" msgstr "kannada" +#. language code: kau kr +#: ../zypp/LanguageCode.cc:682 +msgid "Kanuri" +msgstr "kanuri" + +#. language code: kaa +#: ../zypp/LanguageCode.cc:666 +msgid "Kara-Kalpak" +msgstr "karakalpakki" + +#. language code: krc +#: ../zypp/LanguageCode.cc:718 +msgid "Karachay-Balkar" +msgstr "karatšai-balkaari" + #. language code: kar #: ../zypp/LanguageCode.cc:678 msgid "Karen" @@ -1300,10 +2160,10 @@ msgid "Kashmiri" msgstr "kashmiri" -#. language code: kau kr -#: ../zypp/LanguageCode.cc:682 -msgid "Kanuri" -msgstr "kanuri" +#. language code: csb +#: ../zypp/LanguageCode.cc:442 +msgid "Kashubian" +msgstr "kašubi" #. language code: kaw #: ../zypp/LanguageCode.cc:684 @@ -1316,27 +2176,32 @@ msgid "Kazakh" msgstr "kazakki" -# MR -#. language code: kbd -#: ../zypp/LanguageCode.cc:688 -msgid "Kabardian" -msgstr "kabardi" +# KZ +#. :CYM:136: +#: ../zypp/CountryCode.cc:345 +msgid "Kazakhstan" +msgstr "Kazakstan" + +#. :JPN:392: +#: ../zypp/CountryCode.cc:335 +msgid "Kenya" +msgstr "Kenia" #. language code: kha #: ../zypp/LanguageCode.cc:690 msgid "Khasi" msgstr "khasi" -#. language code: khi -#: ../zypp/LanguageCode.cc:692 -msgid "Khoisan (Other)" -msgstr "muut khoisan-kielet" - #. language code: khm km #: ../zypp/LanguageCode.cc:694 msgid "Khmer" msgstr "khmer" +#. language code: khi +#: ../zypp/LanguageCode.cc:692 +msgid "Khoisan (Other)" +msgstr "muut khoisan-kielet" + #. language code: kho #: ../zypp/LanguageCode.cc:696 msgid "Khotanese" @@ -1347,6 +2212,11 @@ msgid "Kikuyu" msgstr "kikuju" +#. language code: kmb +#: ../zypp/LanguageCode.cc:704 +msgid "Kimbundu" +msgstr "kimbundu" + #. language code: kin rw #: ../zypp/LanguageCode.cc:700 msgid "Kinyarwanda" @@ -1357,15 +2227,15 @@ msgid "Kirghiz" msgstr "kirgiisi" -#. language code: kmb -#: ../zypp/LanguageCode.cc:704 -msgid "Kimbundu" -msgstr "kimbundu" +#. :KHM:116: +#: ../zypp/CountryCode.cc:338 +msgid "Kiribati" +msgstr "Kiribati" -#. language code: kok -#: ../zypp/LanguageCode.cc:706 -msgid "Konkani" -msgstr "konkani" +#. language code: tlh +#: ../zypp/LanguageCode.cc:1124 +msgid "Klingon" +msgstr "klingon" #. language code: kom kv #: ../zypp/LanguageCode.cc:708 @@ -1377,6 +2247,11 @@ msgid "Kongo" msgstr "kongo" +#. language code: kok +#: ../zypp/LanguageCode.cc:706 +msgid "Konkani" +msgstr "konkani" + #. language code: kor ko #: ../zypp/LanguageCode.cc:712 msgid "Korean" @@ -1392,21 +2267,11 @@ msgid "Kpelle" msgstr "kpelle" -#. language code: krc -#: ../zypp/LanguageCode.cc:718 -msgid "Karachay-Balkar" -msgstr "karatšai-balkaari" - #. language code: kro #: ../zypp/LanguageCode.cc:720 msgid "Kru" msgstr "kru-kielet" -#. language code: kru -#: ../zypp/LanguageCode.cc:722 -msgid "Kurukh" -msgstr "kurukh" - # PA #. language code: kua kj #: ../zypp/LanguageCode.cc:724 @@ -1423,11 +2288,27 @@ msgid "Kurdish" msgstr "kurdi" +#. language code: kru +#: ../zypp/LanguageCode.cc:722 +msgid "Kurukh" +msgstr "kurukh" + #. language code: kut #: ../zypp/LanguageCode.cc:730 msgid "Kutenai" msgstr "kutenai" +#. :KOR:410: +#: ../zypp/CountryCode.cc:343 +msgid "Kuwait" +msgstr "Kuwait" + +# KZ +#. :KEN:404: +#: ../zypp/CountryCode.cc:336 +msgid "Kyrgyzstan" +msgstr "Kirgisia" + #. language code: lad #: ../zypp/LanguageCode.cc:732 msgid "Ladino" @@ -1448,21 +2329,59 @@ msgid "Lao" msgstr "lao" +#. :KAZ:398: +#: ../zypp/CountryCode.cc:346 +msgid "Lao People's Democratic Republic" +msgstr "Laos" + #. language code: lat la #: ../zypp/LanguageCode.cc:740 msgid "Latin" msgstr "latina" +# LV +#. :LUX:442: +#: ../zypp/CountryCode.cc:355 +msgid "Latvia" +msgstr "Latvia" + #. language code: lav lv #: ../zypp/LanguageCode.cc:742 msgid "Latvian" msgstr "latvia" +#. :LAO:418: +#: ../zypp/CountryCode.cc:347 +msgid "Lebanon" +msgstr "Libanon" + +#. :LBR:430: +#: ../zypp/CountryCode.cc:352 +msgid "Lesotho" +msgstr "Lesotho" + #. language code: lez #: ../zypp/LanguageCode.cc:744 msgid "Lezghian" msgstr "lezgi" +# LR +#. :LKA:144: +#: ../zypp/CountryCode.cc:351 +msgid "Liberia" +msgstr "Liberia" + +# LR +#. :LVA:428: +#: ../zypp/CountryCode.cc:356 +msgid "Libya" +msgstr "Libya" + +#. :LCA:662: +#: ../zypp/CountryCode.cc:349 +msgid "Liechtenstein" +msgstr "Liechtenstein" + #. language code: lim li #: ../zypp/LanguageCode.cc:746 msgid "Limburgan" @@ -1473,48 +2392,58 @@ msgid "Lingala" msgstr "lingala" +# LT +#. :LSO:426: +#: ../zypp/CountryCode.cc:353 +msgid "Lithuania" +msgstr "Liettua" + #. language code: lit lt #: ../zypp/LanguageCode.cc:750 msgid "Lithuanian" msgstr "liettua" -#. language code: lol -#: ../zypp/LanguageCode.cc:752 -msgid "Mongo" -msgstr "mongo" +#. language code: jbo +#: ../zypp/LanguageCode.cc:658 +msgid "Lojban" +msgstr "lojban" + +#. language code: nds +#: ../zypp/LanguageCode.cc:868 +msgid "Low German" +msgstr "alasaksa" + +#. language code: dsb +#: ../zypp/LanguageCode.cc:472 +msgid "Lower Sorbian" +msgstr "alasorbi" #. language code: loz #: ../zypp/LanguageCode.cc:754 msgid "Lozi" msgstr "lozi" -# LU -#. language code: ltz lb -#: ../zypp/LanguageCode.cc:756 -msgid "Luxembourgish" -msgstr "luxemburg" - -#. language code: lua -#: ../zypp/LanguageCode.cc:758 -msgid "Luba-Lulua" -msgstr "luba (Lulua)" - #. language code: lub lu #: ../zypp/LanguageCode.cc:760 msgid "Luba-Katanga" msgstr "luba (Katanga)" -# GH -#. language code: lug lg -#: ../zypp/LanguageCode.cc:762 -msgid "Ganda" -msgstr "ganda" +#. language code: lua +#: ../zypp/LanguageCode.cc:758 +msgid "Luba-Lulua" +msgstr "luba (Lulua)" #. language code: lui #: ../zypp/LanguageCode.cc:764 msgid "Luiseno" msgstr "luiseño" +# ES +#. language code: smj +#: ../zypp/LanguageCode.cc:1044 +msgid "Lule Sami" +msgstr "saame, luulajan-" + #. language code: lun #: ../zypp/LanguageCode.cc:766 msgid "Lunda" @@ -1530,11 +2459,40 @@ msgid "Lushai" msgstr "lushai" +# LU +#. :LTU:440: +#: ../zypp/CountryCode.cc:354 +msgid "Luxembourg" +msgstr "Luxemburg" + +# LU +#. language code: ltz lb +#: ../zypp/LanguageCode.cc:756 +msgid "Luxembourgish" +msgstr "luxemburg" + +# MO +#. :MNG:496: +#: ../zypp/CountryCode.cc:366 +msgid "Macao" +msgstr "Macao, Kiinan e.h.a." + +# MK +#. :MHL:584: +#: ../zypp/CountryCode.cc:362 +msgid "Macedonia" +msgstr "Makedonia" + #. language code: mac mkd mk #: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774 msgid "Macedonian" msgstr "makedonia" +#. :MDA:498: +#: ../zypp/CountryCode.cc:360 +msgid "Madagascar" +msgstr "Madagaskar" + #. language code: mad #: ../zypp/LanguageCode.cc:776 msgid "Madurese" @@ -1546,11 +2504,6 @@ msgid "Magahi" msgstr "magahi" -#. language code: mah mh -#: ../zypp/LanguageCode.cc:780 -msgid "Marshallese" -msgstr "marshall" - #. language code: mai #: ../zypp/LanguageCode.cc:782 msgid "Maithili" @@ -1562,65 +2515,197 @@ msgstr "makassar" # MY +#. language code: mlg mg +#: ../zypp/LanguageCode.cc:820 +msgid "Malagasy" +msgstr "malagassi" + +# MW +#. :MDV:462: +#: ../zypp/CountryCode.cc:374 +msgid "Malawi" +msgstr "Malawi" + +# MT +#. language code: may msa ms +#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802 +msgid "Malay" +msgstr "malaiji" + +# MY #. language code: mal ml #: ../zypp/LanguageCode.cc:786 msgid "Malayalam" msgstr "malayalam" +# MY +#. :MEX:484: +#: ../zypp/CountryCode.cc:376 +msgid "Malaysia" +msgstr "Malesia" + +# MV +#. :MUS:480: +#: ../zypp/CountryCode.cc:373 +msgid "Maldives" +msgstr "Malediivit" + +#: ../zypp/media/MediaException.cc:115 +msgid "Malformed URI" +msgstr "Virheellisesti muotoiltu URL" + +# ML +#. :MKD:807: +#: ../zypp/CountryCode.cc:363 +msgid "Mali" +msgstr "Mali" + +# MT +#. :MSR:500: +#: ../zypp/CountryCode.cc:371 +msgid "Malta" +msgstr "Malta" + +# MV +#. language code: mlt mt +#: ../zypp/LanguageCode.cc:822 +msgid "Maltese" +msgstr "malta" + +#. language code: mnc +#: ../zypp/LanguageCode.cc:824 +msgid "Manchu" +msgstr "mantšu" + +# MM +#. language code: mdr +#: ../zypp/LanguageCode.cc:806 +msgid "Mandar" +msgstr "mandar" + #. language code: man #: ../zypp/LanguageCode.cc:788 msgid "Mandingo" msgstr "mandingo" # ML +#. language code: mni +#: ../zypp/LanguageCode.cc:826 +msgid "Manipuri" +msgstr "manipuri" + +#. language code: mno +#: ../zypp/LanguageCode.cc:828 +msgid "Manobo Languages" +msgstr "manobo-kielet" + +#. language code: glv gv +#: ../zypp/LanguageCode.cc:562 +msgid "Manx" +msgstr "manx" + +# ML #. language code: mao mri mi #: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792 msgid "Maori" msgstr "maori" -#. language code: map -#: ../zypp/LanguageCode.cc:794 -msgid "Austronesian (Other)" -msgstr "muut austronesialaiset kielet" - # MU #. language code: mar mr #: ../zypp/LanguageCode.cc:796 msgid "Marathi" msgstr "marathi" -# MW -#. language code: mas -#: ../zypp/LanguageCode.cc:798 -msgid "Masai" -msgstr "maasai" - -# MT -#. language code: may msa ms -#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802 -msgid "Malay" -msgstr "malaiji" +# ML +#. language code: chm +#: ../zypp/LanguageCode.cc:406 +msgid "Mari" +msgstr "mari" -#. language code: mdf -#: ../zypp/LanguageCode.cc:804 -msgid "Moksha" -msgstr "mokša" +# FO +#. :MDG:450: +#: ../zypp/CountryCode.cc:361 +msgid "Marshall Islands" +msgstr "Marshallinsaaret" -# MM -#. language code: mdr -#: ../zypp/LanguageCode.cc:806 -msgid "Mandar" -msgstr "mandar" +#. language code: mah mh +#: ../zypp/LanguageCode.cc:780 +msgid "Marshallese" +msgstr "marshall" + +#. :MNP:580: +#: ../zypp/CountryCode.cc:368 +msgid "Martinique" +msgstr "Martinique" + +# MU +#. language code: mwr +#: ../zypp/LanguageCode.cc:846 +msgid "Marwari" +msgstr "marwari" + +# MW +#. language code: mas +#: ../zypp/LanguageCode.cc:798 +msgid "Masai" +msgstr "maasai" + +# MR +#. :MTQ:474: +#: ../zypp/CountryCode.cc:369 +msgid "Mauritania" +msgstr "Mauritania" + +# MU +#. :MLT:470: +#: ../zypp/CountryCode.cc:372 +msgid "Mauritius" +msgstr "Mauritius" + +#. language code: myn +#: ../zypp/LanguageCode.cc:848 +msgid "Mayan Languages" +msgstr "maya-kielet" + +#. :YEM:887: +#: ../zypp/CountryCode.cc:461 +msgid "Mayotte" +msgstr "Mayotte" + +#: ../zypp/media/MediaException.cc:169 +#, c-format +msgid "Media source '%s' does not contain the desired medium" +msgstr "'%s' ei sisällä haluttua tietolähdettä" + +#: ../zypp/media/MediaException.cc:175 +#, c-format +msgid "Medium '%s' is in use by another instance" +msgstr "Tietolähde '%s' on varattu" + +#: ../zypp/media/MediaException.cc:72 +msgid "Medium not attached" +msgstr "Tietolähdettä ei ole liitetty" + +#: ../zypp/media/MediaException.cc:53 +#, c-format +msgid "Medium not opened when trying to perform action '%s'." +msgstr "Tietolähdettä ei avattu suoritettaessa '%s'." #. language code: men #: ../zypp/LanguageCode.cc:808 msgid "Mende" msgstr "mende" -#. language code: mga -#: ../zypp/LanguageCode.cc:810 -msgid "Irish, Middle (900-1200)" -msgstr "keski-iiri" +#. :FRA:250: +#: ../zypp/CountryCode.cc:298 +msgid "Metropolitan France" +msgstr "Metropolitan France" + +# MX +#. :MWI:454: +#: ../zypp/CountryCode.cc:375 +msgid "Mexico" +msgstr "Meksiko" #. language code: mic #: ../zypp/LanguageCode.cc:812 @@ -1632,64 +2717,82 @@ msgid "Minangkabau" msgstr "minangkabau" +# MV +#. language code: mwl +#: ../zypp/LanguageCode.cc:844 +msgid "Mirandese" +msgstr "mirandi" + #. language code: mis #: ../zypp/LanguageCode.cc:816 msgid "Miscellaneous Languages" msgstr "luokittelemattomat kielet" -#. language code: mkh -#: ../zypp/LanguageCode.cc:818 -msgid "Mon-Khmer (Other)" -msgstr "muut mon-khmer-kielet" - -# MY -#. language code: mlg mg -#: ../zypp/LanguageCode.cc:820 -msgid "Malagasy" -msgstr "malagassi" - -# MV -#. language code: mlt mt -#: ../zypp/LanguageCode.cc:822 -msgid "Maltese" -msgstr "malta" - -#. language code: mnc -#: ../zypp/LanguageCode.cc:824 -msgid "Manchu" -msgstr "mantšu" - -# ML -#. language code: mni -#: ../zypp/LanguageCode.cc:826 -msgid "Manipuri" -msgstr "manipuri" - -#. language code: mno -#: ../zypp/LanguageCode.cc:828 -msgid "Manobo Languages" -msgstr "manobo-kielet" - #. language code: moh #: ../zypp/LanguageCode.cc:830 msgid "Mohawk" msgstr "mohawk" +#. language code: mdf +#: ../zypp/LanguageCode.cc:804 +msgid "Moksha" +msgstr "mokša" + #. language code: mol mo #: ../zypp/LanguageCode.cc:832 msgid "Moldavian" msgstr "moldavia" +#. :MCO:492: +#: ../zypp/CountryCode.cc:359 +msgid "Moldova" +msgstr "Moldova" + +#. language code: mkh +#: ../zypp/LanguageCode.cc:818 +msgid "Mon-Khmer (Other)" +msgstr "muut mon-khmer-kielet" + +#. :MAR:504: +#: ../zypp/CountryCode.cc:358 +msgid "Monaco" +msgstr "Monaco" + +#. language code: lol +#: ../zypp/LanguageCode.cc:752 +msgid "Mongo" +msgstr "mongo" + +#. :MMR:104: +#: ../zypp/CountryCode.cc:365 +msgid "Mongolia" +msgstr "Mongolia" + #. language code: mon mn #: ../zypp/LanguageCode.cc:834 msgid "Mongolian" msgstr "mongoli" +#. :MRT:478: +#: ../zypp/CountryCode.cc:370 +msgid "Montserrat" +msgstr "Montserrat" + +#. :LBY:434: +#: ../zypp/CountryCode.cc:357 +msgid "Morocco" +msgstr "Marokko" + #. language code: mos #: ../zypp/LanguageCode.cc:836 msgid "Mossi" msgstr "mossi" +#. :MYS:458: +#: ../zypp/CountryCode.cc:377 +msgid "Mozambique" +msgstr "Mosambik" + #. language code: mul #: ../zypp/LanguageCode.cc:838 msgid "Multiple Languages" @@ -1700,54 +2803,26 @@ msgid "Munda languages" msgstr "mundakielet" -#. language code: mus -#: ../zypp/LanguageCode.cc:842 -msgid "Creek" -msgstr "creek" - -# MV -#. language code: mwl -#: ../zypp/LanguageCode.cc:844 -msgid "Mirandese" -msgstr "mirandi" - -# MU -#. language code: mwr -#: ../zypp/LanguageCode.cc:846 -msgid "Marwari" -msgstr "marwari" - -#. language code: myn -#: ../zypp/LanguageCode.cc:848 -msgid "Mayan Languages" -msgstr "maya-kielet" - -# SY -#. language code: myv -#: ../zypp/LanguageCode.cc:850 -msgid "Erzya" -msgstr "ersä" +# MM +#. :MLI:466: +#: ../zypp/CountryCode.cc:364 +msgid "Myanmar" +msgstr "Myanmar" #. language code: nah #: ../zypp/LanguageCode.cc:852 msgid "Nahuatl" msgstr "nahuatl" -# ZA -#. language code: nai -#: ../zypp/LanguageCode.cc:854 -msgid "North American Indian" -msgstr "Pohjois-Amerikan intiaanikielet" - -# ML -#. language code: nap -#: ../zypp/LanguageCode.cc:856 -msgid "Neapolitan" -msgstr "napoli" +# GM +#. :MOZ:508: +#: ../zypp/CountryCode.cc:378 +msgid "Namibia" +msgstr "Namibia" #. language code: nau na #. :NPL:524: -#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:380 +#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:387 msgid "Nauru" msgstr "nauru" @@ -1756,97 +2831,191 @@ msgid "Navajo" msgstr "navajo" -#. language code: nbl nr -#: ../zypp/LanguageCode.cc:862 -msgid "Ndebele, South" -msgstr "ndebele, etelä-" - #. language code: nde nd #: ../zypp/LanguageCode.cc:864 msgid "Ndebele, North" msgstr "ndebele, pohjois-" +#. language code: nbl nr +#: ../zypp/LanguageCode.cc:862 +msgid "Ndebele, South" +msgstr "ndebele, etelä-" + #. language code: ndo ng #: ../zypp/LanguageCode.cc:866 msgid "Ndonga" msgstr "ndonga" -#. language code: nds -#: ../zypp/LanguageCode.cc:868 -msgid "Low German" -msgstr "alasaksa" - # ML -#. language code: nep ne -#: ../zypp/LanguageCode.cc:870 -msgid "Nepali" -msgstr "nepali" +#. language code: nap +#: ../zypp/LanguageCode.cc:856 +msgid "Neapolitan" +msgstr "napoli" + +#. :NOR:578: +#: ../zypp/CountryCode.cc:386 +msgid "Nepal" +msgstr "Nepal" #. language code: new #: ../zypp/LanguageCode.cc:872 msgid "Nepal Bhasa" msgstr "newari" -#. language code: nia -#: ../zypp/LanguageCode.cc:874 -msgid "Nias" -msgstr "nias" +# ML +#. language code: nep ne +#: ../zypp/LanguageCode.cc:870 +msgid "Nepali" +msgstr "nepali" -#. language code: nic +# NL +#. :NIC:558: +#: ../zypp/CountryCode.cc:384 +msgid "Netherlands" +msgstr "Alankomaat" + +# AN +#. :ARM:051: +#: ../zypp/CountryCode.cc:231 +msgid "Netherlands Antilles" +msgstr "Alankomaiden Antillit" + +# NC +#. :NAM:516: +#: ../zypp/CountryCode.cc:379 +msgid "New Caledonia" +msgstr "Uusi-Kaledonia" + +# NZ +#. :NIU:570: +#: ../zypp/CountryCode.cc:389 +msgid "New Zealand" +msgstr "Uusi-Seelanti" + +#. language code: nia +#: ../zypp/LanguageCode.cc:874 +msgid "Nias" +msgstr "nias" + +# NI +#. :NGA:566: +#: ../zypp/CountryCode.cc:383 +msgid "Nicaragua" +msgstr "Nicaragua" + +# NG +#. :NCL:540: +#: ../zypp/CountryCode.cc:380 +msgid "Niger" +msgstr "Niger" + +#. language code: nic #: ../zypp/LanguageCode.cc:876 msgid "Niger-Kordofanian (Other)" msgstr "muut nigeriläis-kongolaiset kielet" +# NG +#. :NFK:574: +#: ../zypp/CountryCode.cc:382 +msgid "Nigeria" +msgstr "Nigeria" + +#. language code: ssa +#: ../zypp/LanguageCode.cc:1072 +msgid "Nilo-Saharan (Other)" +msgstr "muut niililäis-saharalaiset kielet" + +#. :NRU:520: +#: ../zypp/CountryCode.cc:388 +msgid "Niue" +msgstr "Niue" + #. language code: niu #: ../zypp/LanguageCode.cc:878 msgid "Niuean" msgstr "niue" -#. language code: nno nn -#: ../zypp/LanguageCode.cc:880 -msgid "Norwegian Nynorsk" -msgstr "norja (nynorsk)" +#. Defined LanguageCode constants +#. Defined CountryCode constants +#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215 +msgid "No Code" +msgstr "Ei koodia" -#. language code: nob nb -#: ../zypp/LanguageCode.cc:882 -msgid "Norwegian Bokmal" -msgstr "norja (bokmål)" +#: ../zypp/repo/RepoProvideFile.cc:222 +msgid "No url in repository." +msgstr "Asennuslähteen URL puuttuu" #. language code: nog #: ../zypp/LanguageCode.cc:884 msgid "Nogai" msgstr "nogai" +# FO +#. :NER:562: +#: ../zypp/CountryCode.cc:381 +msgid "Norfolk Island" +msgstr "Norfolkinsaari" + #. language code: non #: ../zypp/LanguageCode.cc:886 msgid "Norse, Old" msgstr "muinaisnorja" -#. language code: nor no -#: ../zypp/LanguageCode.cc:888 -msgid "Norwegian" -msgstr "norja" +# ZA +#. language code: nai +#: ../zypp/LanguageCode.cc:854 +msgid "North American Indian" +msgstr "Pohjois-Amerikan intiaanikielet" + +#. :KNA:659: +#: ../zypp/CountryCode.cc:341 +msgid "North Korea" +msgstr "Pohjois-Korea" + +#. :MAC:446: +#: ../zypp/CountryCode.cc:367 +msgid "Northern Mariana Islands" +msgstr "Pohjois-Mariaanit" + +#. language code: sme se +#: ../zypp/LanguageCode.cc:1040 +msgid "Northern Sami" +msgstr "saame, pohjois-" #. language code: nso #: ../zypp/LanguageCode.cc:890 msgid "Northern Sotho" msgstr "sotho, pohjois-" +#. :NLD:528: +#: ../zypp/CountryCode.cc:385 +msgid "Norway" +msgstr "Norja" + +#. language code: nor no +#: ../zypp/LanguageCode.cc:888 +msgid "Norwegian" +msgstr "norja" + +#. language code: nob nb +#: ../zypp/LanguageCode.cc:882 +msgid "Norwegian Bokmal" +msgstr "norja (bokmål)" + +#. language code: nno nn +#: ../zypp/LanguageCode.cc:880 +msgid "Norwegian Nynorsk" +msgstr "norja (nynorsk)" + +#: ../zypp/target/hal/HalContext.cc:828 +msgid "Not a CDROM drive" +msgstr "Kohde ei ole CD-asema" + #. language code: nub #: ../zypp/LanguageCode.cc:892 msgid "Nubian Languages" msgstr "nubialaiset kielet" -#. language code: nwc -#: ../zypp/LanguageCode.cc:894 -msgid "Classical Newari" -msgstr "klassinen newari" - -#. language code: nya ny -#: ../zypp/LanguageCode.cc:896 -msgid "Chichewa" -msgstr "nyanja" - #. language code: nym #: ../zypp/LanguageCode.cc:898 msgid "Nyamwezi" @@ -1877,6 +3046,15 @@ msgid "Ojibwa" msgstr "ojibwa" +#. :NZL:554: +#: ../zypp/CountryCode.cc:390 +msgid "Oman" +msgstr "Oman" + +#: ../zypp/media/MediaException.cc:145 +msgid "Operation not supported by medium" +msgstr "Tietoväline ei tue toimintoa" + # SY #. language code: ori or #: ../zypp/LanguageCode.cc:910 @@ -1898,25 +3076,16 @@ msgid "Ossetian" msgstr "osseetti" -#. language code: ota -#: ../zypp/LanguageCode.cc:918 -msgid "Turkish, Ottoman (1500-1928)" -msgstr "osmani" - #. language code: oto #: ../zypp/LanguageCode.cc:920 msgid "Otomian Languages" msgstr "otomi-kielet" -#. language code: paa -#: ../zypp/LanguageCode.cc:922 -msgid "Papuan (Other)" -msgstr "muut papualaiset kielet" - -#. language code: pag -#: ../zypp/LanguageCode.cc:924 -msgid "Pangasinan" -msgstr "pangasinan" +#. TranslatorExplanation %s = package being checked for integrity +#: ../zypp/repo/PackageProvider.cc:314 +#, c-format +msgid "Package %s fails integrity check. Do you want to retry?" +msgstr "Paketin %s yhtenäisyystarkistus epäonnistui. Yritetäänkö uudelleen?" # ML #. language code: pal @@ -1924,6 +3093,34 @@ msgid "Pahlavi" msgstr "pahlavi" +#. :PHL:608: +#: ../zypp/CountryCode.cc:396 +msgid "Pakistan" +msgstr "Pakistan" + +# PW +#. :PRT:620: +#: ../zypp/CountryCode.cc:403 +msgid "Palau" +msgstr "Palau" + +# PW +#. language code: pau +#: ../zypp/LanguageCode.cc:934 +msgid "Palauan" +msgstr "palau" + +#. :PRI:630: +#: ../zypp/CountryCode.cc:401 +msgid "Palestinian Territory" +msgstr "Palestiina" + +# ML +#. language code: pli pi +#: ../zypp/LanguageCode.cc:946 +msgid "Pali" +msgstr "paali" + # PY #. language code: pam #: ../zypp/LanguageCode.cc:928 @@ -1931,6 +3128,17 @@ msgstr "pampanga" # PA +#. :OMN:512: +#: ../zypp/CountryCode.cc:391 +msgid "Panama" +msgstr "Panama" + +#. language code: pag +#: ../zypp/LanguageCode.cc:924 +msgid "Pangasinan" +msgstr "pangasinan" + +# PA #. language code: pan pa #: ../zypp/LanguageCode.cc:930 msgid "Panjabi" @@ -1941,49 +3149,96 @@ msgid "Papiamento" msgstr "papiamentu" -# PW -#. language code: pau -#: ../zypp/LanguageCode.cc:934 -msgid "Palauan" -msgstr "palau" +#. :PYF:258: +#: ../zypp/CountryCode.cc:394 +msgid "Papua New Guinea" +msgstr "Papua-Uusi-Guinea" -#. language code: peo -#: ../zypp/LanguageCode.cc:936 -msgid "Persian, Old (ca.600-400 B.C.)" -msgstr "muinaispersia" +#. language code: paa +#: ../zypp/LanguageCode.cc:922 +msgid "Papuan (Other)" +msgstr "muut papualaiset kielet" + +# PY +#. :PLW:585: +#: ../zypp/CountryCode.cc:404 +msgid "Paraguay" +msgstr "Paraguay" + +#: ../zypp/media/MediaException.cc:106 +#, c-format +msgid "Path '%s' on medium '%s' is not a directory." +msgstr "'%s' tietovälineellä '%s' ei ole hakemisto." + +#: ../zypp/media/MediaException.cc:98 +#, c-format +msgid "Path '%s' on medium '%s' is not a file." +msgstr "'%s' tietovälineellä '%s' ei ole tiedosto." + +#: ../zypp/media/MediaException.cc:200 +#, c-format +msgid "Permission to access '%s' denied." +msgstr "Pääsy evätty kohteeseen '%s'." #. language code: per fas fa #: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 msgid "Persian" msgstr "farsi" +#. language code: peo +#: ../zypp/LanguageCode.cc:936 +msgid "Persian, Old (ca.600-400 B.C.)" +msgstr "muinaispersia" + +# PE +#. :PAN:591: +#: ../zypp/CountryCode.cc:392 +msgid "Peru" +msgstr "Peru" + #. language code: phi #: ../zypp/LanguageCode.cc:942 msgid "Philippine (Other)" msgstr "muut filippiiniläiset kielet" +#. :PNG:598: +#: ../zypp/CountryCode.cc:395 +msgid "Philippines" +msgstr "Filippiinit" + #. language code: phn #: ../zypp/LanguageCode.cc:944 msgid "Phoenician" msgstr "foinikia" -# ML -#. language code: pli pi -#: ../zypp/LanguageCode.cc:946 -msgid "Pali" -msgstr "paali" - -#. language code: pol pl -#: ../zypp/LanguageCode.cc:948 -msgid "Polish" -msgstr "puola" +#. :SPM:666: +#: ../zypp/CountryCode.cc:399 +msgid "Pitcairn" +msgstr "Pitcairn" #. language code: pon #: ../zypp/LanguageCode.cc:950 msgid "Pohnpeian" msgstr "pohnpei" -#. language code: por pt +# PL +#. :PAK:586: +#: ../zypp/CountryCode.cc:397 +msgid "Poland" +msgstr "Puola" + +#. language code: pol pl +#: ../zypp/LanguageCode.cc:948 +msgid "Polish" +msgstr "puola" + +# PT +#. :PSE:275: +#: ../zypp/CountryCode.cc:402 +msgid "Portugal" +msgstr "Portugali" + +#. language code: por pt #: ../zypp/LanguageCode.cc:952 msgid "Portuguese" msgstr "portugali" @@ -1998,16 +3253,42 @@ msgid "Provencal, Old (to 1500)" msgstr "muinaisprovensaali" +#. :PCN:612: +#: ../zypp/CountryCode.cc:400 +msgid "Puerto Rico" +msgstr "Puerto Rico" + #. language code: pus ps #: ../zypp/LanguageCode.cc:958 msgid "Pushto" msgstr "pašto" +# QA +#. :PRY:600: +#: ../zypp/CountryCode.cc:405 +msgid "Qatar" +msgstr "Qatar" + #. language code: que qu #: ../zypp/LanguageCode.cc:960 msgid "Quechua" msgstr "quechua" +#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229 +msgid "Query string parsing not supported for this URL" +msgstr "Tämän URL:n jäsentäminen kyselyksi ei ole tuettu" + +#. TranslatorExplanation after semicolon is error message +#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057 +#: ../zypp/target/rpm/RpmDb.cc:2177 +msgid "RPM failed: " +msgstr "RPM-virhe: " + +#. language code: roh rm +#: ../zypp/LanguageCode.cc:970 +msgid "Raeto-Romance" +msgstr "retoromaani" + # KZ #. language code: raj #: ../zypp/LanguageCode.cc:962 @@ -2025,27 +3306,48 @@ msgid "Rarotongan" msgstr "rarotonga" +#: ../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/RepoManager.cc:1114 +#, c-format +msgid "Removing repository '%s'" +msgstr "Poistetaan asennuslähdettä '%s'" + +#: ../zypp/parser/susetags/RepoParser.cc:232 +msgid "Required file is missing: " +msgstr "Tarvittava tiedosto puuttuu: " + +#. :QAT:634: +#: ../zypp/CountryCode.cc:406 +msgid "Reunion" +msgstr "Réunion" + #. language code: roa #: ../zypp/LanguageCode.cc:968 msgid "Romance (Other)" msgstr "muut romaaniset kielet" -#. language code: roh rm -#: ../zypp/LanguageCode.cc:970 -msgid "Raeto-Romance" -msgstr "retoromaani" - # RO -#. language code: rom -#: ../zypp/LanguageCode.cc:972 -msgid "Romany" -msgstr "romani" +#. :REU:638: +#: ../zypp/CountryCode.cc:407 +msgid "Romania" +msgstr "Romania" #. language code: rum ron ro #: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976 msgid "Romanian" msgstr "romania" +# RO +#. language code: rom +#: ../zypp/LanguageCode.cc:972 +msgid "Romany" +msgstr "romani" + # IN #. language code: run rn #: ../zypp/LanguageCode.cc:978 @@ -2057,27 +3359,44 @@ msgid "Russian" msgstr "venäjä" -# SD -#. language code: sad -#: ../zypp/LanguageCode.cc:982 -msgid "Sandawe" -msgstr "sandawe" +#. :ROU:642: +#: ../zypp/CountryCode.cc:408 +msgid "Russian Federation" +msgstr "Venäjä" -# SD -#. language code: sag sg -#: ../zypp/LanguageCode.cc:984 -msgid "Sango" -msgstr "sango" +# RW +#. :RUS:643: +#: ../zypp/CountryCode.cc:409 +msgid "Rwanda" +msgstr "Ruanda" -#. language code: sah -#: ../zypp/LanguageCode.cc:986 -msgid "Yakut" -msgstr "jakuutti" +#. :SGP:702: +#: ../zypp/CountryCode.cc:416 +msgid "Saint Helena" +msgstr "Saint Helena" -#. language code: sai -#: ../zypp/LanguageCode.cc:988 -msgid "South American Indian (Other)" -msgstr "muut Etelä-Amerikan intiaanikielet" +# KN +#. :COM:174: +#: ../zypp/CountryCode.cc:340 +msgid "Saint Kitts and Nevis" +msgstr "Saint Kitts ja Nevis" + +# LC +#. :LBN:422: +#: ../zypp/CountryCode.cc:348 +msgid "Saint Lucia" +msgstr "Saint Lucia" + +#. :POL:616: +#: ../zypp/CountryCode.cc:398 +msgid "Saint Pierre and Miquelon" +msgstr "Saint-Pierre ja Miquelon" + +# VC +#. :VAT:336: +#: ../zypp/CountryCode.cc:452 +msgid "Saint Vincent and the Grenadines" +msgstr "Saint Vincent ja Grenadiinit" #. language code: sal #: ../zypp/LanguageCode.cc:990 @@ -2089,41 +3408,74 @@ msgid "Samaritan Aramaic" msgstr "samarianaramea" +#. language code: smi +#: ../zypp/LanguageCode.cc:1042 +msgid "Sami Languages (Other)" +msgstr "muut saamelaiskielet" + +#. :WLF:876: +#: ../zypp/CountryCode.cc:459 +msgid "Samoa" +msgstr "Samoa" + +#. language code: smo sm +#: ../zypp/LanguageCode.cc:1048 +msgid "Samoan" +msgstr "samoa" + +#. :SLE:694: +#: ../zypp/CountryCode.cc:421 +msgid "San Marino" +msgstr "San Marino" + +# SD +#. language code: sad +#: ../zypp/LanguageCode.cc:982 +msgid "Sandawe" +msgstr "sandawe" + +# SD +#. language code: sag sg +#: ../zypp/LanguageCode.cc:984 +msgid "Sango" +msgstr "sango" + #. language code: san sa #: ../zypp/LanguageCode.cc:994 msgid "Sanskrit" msgstr "sanskrit" -#. language code: sas -#: ../zypp/LanguageCode.cc:996 -msgid "Sasak" -msgstr "sasak" - #. language code: sat #: ../zypp/LanguageCode.cc:998 msgid "Santali" msgstr "santali" -#. language code: scc srp sr -#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002 -msgid "Serbian" -msgstr "serbia" +#. :SUR:740: +#: ../zypp/CountryCode.cc:425 +msgid "Sao Tome and Principe" +msgstr "São Tomé ja Príncipe" -#. language code: scn -#: ../zypp/LanguageCode.cc:1004 -msgid "Sicilian" -msgstr "sisilia" +# MR +#. language code: srd sc +#: ../zypp/LanguageCode.cc:1068 +msgid "Sardinian" +msgstr "sardi" + +#. language code: sas +#: ../zypp/LanguageCode.cc:996 +msgid "Sasak" +msgstr "sasak" + +#. :RWA:646: +#: ../zypp/CountryCode.cc:410 +msgid "Saudi Arabia" +msgstr "Saudi-Arabia" #. language code: sco #: ../zypp/LanguageCode.cc:1006 msgid "Scots" msgstr "skotti" -#. language code: scr hrv hr -#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010 -msgid "Croatian" -msgstr "kroatia" - #. language code: sel #: ../zypp/LanguageCode.cc:1012 msgid "Selkup" @@ -2134,41 +3486,113 @@ msgid "Semitic (Other)" msgstr "muut seemiläiset kielet" -#. language code: sga -#: ../zypp/LanguageCode.cc:1016 -msgid "Irish, Old (to 900)" -msgstr "muinaisiiri" +#. :SMR:674: +#: ../zypp/CountryCode.cc:422 +msgid "Senegal" +msgstr "Senegal" -#. language code: sgn -#: ../zypp/LanguageCode.cc:1018 -msgid "Sign Languages" -msgstr "viittomakielet" +#. :CRI:188: +#: ../zypp/CountryCode.cc:273 +msgid "Serbia and Montenegro" +msgstr "Serbia ja Montenegro" + +#. language code: scc srp sr +#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002 +msgid "Serbian" +msgstr "serbia" + +#. language code: srr +#: ../zypp/LanguageCode.cc:1070 +msgid "Serer" +msgstr "serer" + +#. :SLB:090: +#: ../zypp/CountryCode.cc:412 +msgid "Seychelles" +msgstr "Seychellit" #. language code: shn #: ../zypp/LanguageCode.cc:1020 msgid "Shan" msgstr "shan" +# SI +#. language code: sna sn +#: ../zypp/LanguageCode.cc:1052 +msgid "Shona" +msgstr "shona" + +# LT +#. language code: iii ii +#: ../zypp/LanguageCode.cc:628 +msgid "Sichuan Yi" +msgstr "sichuanin-yi" + +#. language code: scn +#: ../zypp/LanguageCode.cc:1004 +msgid "Sicilian" +msgstr "sisilia" + #. language code: sid #: ../zypp/LanguageCode.cc:1022 msgid "Sidamo" msgstr "sidamo" -#. language code: sin si -#: ../zypp/LanguageCode.cc:1024 -msgid "Sinhala" -msgstr "sinhali" - -#. language code: sio -#: ../zypp/LanguageCode.cc:1026 -msgid "Siouan Languages" -msgstr "sioux-kielet" +#. :SVK:703: +#: ../zypp/CountryCode.cc:420 +msgid "Sierra Leone" +msgstr "Sierra Leone" + +#. language code: sgn +#: ../zypp/LanguageCode.cc:1018 +msgid "Sign Languages" +msgstr "viittomakielet" + +#: ../zypp/KeyRing.cc:568 +#, c-format +msgid "Signature file %s not found" +msgstr "Allekirjoitustiedostoa %s ei löydetty" + +#. language code: bla +#: ../zypp/LanguageCode.cc:354 +msgid "Siksika" +msgstr "mustajalka" + +#. language code: snd sd +#: ../zypp/LanguageCode.cc:1054 +msgid "Sindhi" +msgstr "sindhi" + +#. :SWE:752: +#: ../zypp/CountryCode.cc:415 +msgid "Singapore" +msgstr "Singapore" + +#. language code: sin si +#: ../zypp/LanguageCode.cc:1024 +msgid "Sinhala" +msgstr "sinhali" #. language code: sit #: ../zypp/LanguageCode.cc:1028 msgid "Sino-Tibetan (Other)" msgstr "muut sinotiibetiläiset kielet" +#. language code: sio +#: ../zypp/LanguageCode.cc:1026 +msgid "Siouan Languages" +msgstr "sioux-kielet" + +#. language code: sms +#: ../zypp/LanguageCode.cc:1050 +msgid "Skolt Sami" +msgstr "saame, koltan-" + +#. language code: den +#: ../zypp/LanguageCode.cc:460 +msgid "Slave (Athapascan)" +msgstr "slave" + #. language code: sla #: ../zypp/LanguageCode.cc:1030 msgid "Slavic (Other)" @@ -2179,131 +3603,156 @@ msgid "Slovak" msgstr "slovakki" +# SK +#. :SJM:744: +#: ../zypp/CountryCode.cc:419 +msgid "Slovakia" +msgstr "Slovakia" + +# SI +#. :SHN:654: +#: ../zypp/CountryCode.cc:417 +msgid "Slovenia" +msgstr "Slovenia" + #. language code: slv sl #: ../zypp/LanguageCode.cc:1036 msgid "Slovenian" msgstr "sloveeni" -#. language code: sma -#: ../zypp/LanguageCode.cc:1038 -msgid "Southern Sami" -msgstr "saame, etelä-" - -#. language code: sme se -#: ../zypp/LanguageCode.cc:1040 -msgid "Northern Sami" -msgstr "saame, pohjois-" - -#. language code: smi -#: ../zypp/LanguageCode.cc:1042 -msgid "Sami Languages (Other)" -msgstr "muut saamelaiskielet" - -# ES -#. language code: smj -#: ../zypp/LanguageCode.cc:1044 -msgid "Lule Sami" -msgstr "saame, luulajan-" - -#. language code: smn -#: ../zypp/LanguageCode.cc:1046 -msgid "Inari Sami" -msgstr "saame, inarin-" - -#. language code: smo sm -#: ../zypp/LanguageCode.cc:1048 -msgid "Samoan" -msgstr "samoa" - -#. language code: sms -#: ../zypp/LanguageCode.cc:1050 -msgid "Skolt Sami" -msgstr "saame, koltan-" - -# SI -#. language code: sna sn -#: ../zypp/LanguageCode.cc:1052 -msgid "Shona" -msgstr "shona" - -#. language code: snd sd -#: ../zypp/LanguageCode.cc:1054 -msgid "Sindhi" -msgstr "sindhi" - -#. language code: snk -#: ../zypp/LanguageCode.cc:1056 -msgid "Soninke" -msgstr "soninke" - #. language code: sog #: ../zypp/LanguageCode.cc:1058 msgid "Sogdian" msgstr "sogdi" +# FO +#. :SAU:682: +#: ../zypp/CountryCode.cc:411 +msgid "Solomon Islands" +msgstr "Salomonsaaret" + +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%s on ristiriidassa itsensä kanssa (%s)" + # SO #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" msgstr "somali" +# SO +#. :SEN:686: +#: ../zypp/CountryCode.cc:423 +msgid "Somalia" +msgstr "Somalia" + #. language code: son #: ../zypp/LanguageCode.cc:1062 msgid "Songhai" msgstr "songhai" +#. language code: snk +#: ../zypp/LanguageCode.cc:1056 +msgid "Soninke" +msgstr "soninke" + +#. language code: wen +#: ../zypp/LanguageCode.cc:1196 +msgid "Sorbian Languages" +msgstr "sorbin kielet" + #. language code: sot st #: ../zypp/LanguageCode.cc:1064 msgid "Sotho, Southern" msgstr "sotho, etelä-" +# ZA +#. :MYT:175: +#: ../zypp/CountryCode.cc:462 +msgid "South Africa" +msgstr "Etelä-Afrikka" + +#. language code: sai +#: ../zypp/LanguageCode.cc:988 +msgid "South American Indian (Other)" +msgstr "muut Etelä-Amerikan intiaanikielet" + +#. :GRC:300: +#: ../zypp/CountryCode.cc:312 +msgid "South Georgia and the South Sandwich Islands" +msgstr "Etelä-Georgia ja Eteläiset Sandwichsaaret" + +# ZA +#. :PRK:408: +#: ../zypp/CountryCode.cc:342 +msgid "South Korea" +msgstr "Etelä-Korea" + +# ZA +#. language code: alt +#: ../zypp/LanguageCode.cc:270 +msgid "Southern Altai" +msgstr "altai, etelä-" + +#. language code: sma +#: ../zypp/LanguageCode.cc:1038 +msgid "Southern Sami" +msgstr "saame, etelä-" + +#. :ERI:232: +#: ../zypp/CountryCode.cc:290 +msgid "Spain" +msgstr "Espanja" + #. language code: spa es #: ../zypp/LanguageCode.cc:1066 msgid "Spanish" msgstr "espanja" -# MR -#. language code: srd sc -#: ../zypp/LanguageCode.cc:1068 -msgid "Sardinian" -msgstr "sardi" - -#. language code: srr -#: ../zypp/LanguageCode.cc:1070 -msgid "Serer" -msgstr "serer" - -#. language code: ssa -#: ../zypp/LanguageCode.cc:1072 -msgid "Nilo-Saharan (Other)" -msgstr "muut niililäis-saharalaiset kielet" +#. :LIE:438: +#: ../zypp/CountryCode.cc:350 +msgid "Sri Lanka" +msgstr "Sri Lanka" -# ES -#. language code: ssw ss -#: ../zypp/LanguageCode.cc:1074 -msgid "Swati" -msgstr "swazi" +# SD +#. :SYC:690: +#: ../zypp/CountryCode.cc:413 +msgid "Sudan" +msgstr "Sudan" #. language code: suk #: ../zypp/LanguageCode.cc:1076 msgid "Sukuma" msgstr "sukuma" +#. language code: sux +#: ../zypp/LanguageCode.cc:1082 +msgid "Sumerian" +msgstr "sumeri" + # SD #. language code: sun su #: ../zypp/LanguageCode.cc:1078 msgid "Sundanese" msgstr "sunda" +# SY +#. :SOM:706: +#: ../zypp/CountryCode.cc:424 +msgid "Suriname" +msgstr "Suriname" + #. language code: sus #: ../zypp/LanguageCode.cc:1080 msgid "Susu" msgstr "susu" -#. language code: sux -#: ../zypp/LanguageCode.cc:1082 -msgid "Sumerian" -msgstr "sumeri" +#. :SVN:705: +#: ../zypp/CountryCode.cc:418 +msgid "Svalbard and Jan Mayen" +msgstr "Huippuvuoret ja Jan Mayen" # SZ #. language code: swa sw @@ -2311,17 +3760,65 @@ msgid "Swahili" msgstr "swahili" +# ES +#. language code: ssw ss +#: ../zypp/LanguageCode.cc:1074 +msgid "Swati" +msgstr "swazi" + +# SZ +#. :SYR:760: +#: ../zypp/CountryCode.cc:428 +msgid "Swaziland" +msgstr "Swazimaa" + +#. :SDN:736: +#: ../zypp/CountryCode.cc:414 +msgid "Sweden" +msgstr "Ruotsi" + #. language code: swe sv #: ../zypp/LanguageCode.cc:1086 msgid "Swedish" msgstr "ruotsi" +# CH +#. :COG:178: +#: ../zypp/CountryCode.cc:265 +msgid "Switzerland" +msgstr "Sveitsi" + +# SY +#. :SLV:222: +#: ../zypp/CountryCode.cc:427 +msgid "Syria" +msgstr "Syyria" + # SY #. language code: syr #: ../zypp/LanguageCode.cc:1088 msgid "Syriac" msgstr "syyria" +#: ../zypp/media/MediaException.cc:91 +#, c-format +msgid "System exception '%s' on medium '%s'." +msgstr "Järjestelmäpoikkeus '%s' tietovälineellä '%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 "" +"Prosessi %d on lukinnut järjestelmänhallinnan. Sulje ohjelma ennen " +"uudelleenyritystä." + +#. language code: tgl tl +#: ../zypp/LanguageCode.cc:1108 +msgid "Tagalog" +msgstr "tagalog" + #. language code: tah ty #: ../zypp/LanguageCode.cc:1090 msgid "Tahitian" @@ -2332,11 +3829,39 @@ msgid "Tai (Other)" msgstr "muut thaikielet" -#. language code: tam ta -#: ../zypp/LanguageCode.cc:1094 +# TW +#. :TUV:798: +#: ../zypp/CountryCode.cc:443 +msgid "Taiwan" +msgstr "Taiwan" + +# TJ +#. language code: tgk tg +#: ../zypp/LanguageCode.cc:1106 +msgid "Tajik" +msgstr "tadžikki" + +# TJ +#. :THA:764: +#: ../zypp/CountryCode.cc:434 +msgid "Tajikistan" +msgstr "Tadžikistan" + +#. language code: tmh +#: ../zypp/LanguageCode.cc:1128 +msgid "Tamashek" +msgstr "tamashek" + +#. language code: tam ta +#: ../zypp/LanguageCode.cc:1094 msgid "Tamil" msgstr "tamil" +#. :TWN:158: +#: ../zypp/CountryCode.cc:444 +msgid "Tanzania" +msgstr "Tansania" + # QA #. language code: tat tt #: ../zypp/LanguageCode.cc:1096 @@ -2349,11 +3874,6 @@ msgid "Telugu" msgstr "telugu" -#. language code: tem -#: ../zypp/LanguageCode.cc:1100 -msgid "Timne" -msgstr "temne" - #. language code: ter #: ../zypp/LanguageCode.cc:1102 msgid "Tereno" @@ -2364,22 +3884,21 @@ msgid "Tetum" msgstr "tetum" -# TJ -#. language code: tgk tg -#: ../zypp/LanguageCode.cc:1106 -msgid "Tajik" -msgstr "tadžikki" - -#. language code: tgl tl -#: ../zypp/LanguageCode.cc:1108 -msgid "Tagalog" -msgstr "tagalog" - #. language code: tha th #: ../zypp/LanguageCode.cc:1110 msgid "Thai" msgstr "thai" +# TH +#. :TGO:768: +#: ../zypp/CountryCode.cc:433 +msgid "Thailand" +msgstr "Thaimaa" + +#: ../zypp/base/InterProcessMutex.cc:139 +msgid "This action is being run by another program already." +msgstr "Jokin toinen ohjelma suorittaa tätä toimintoa." + # TW #. language code: tib bod bo #: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114 @@ -2397,31 +3916,46 @@ msgid "Tigrinya" msgstr "tigrinya" +#: ../zypp/media/MediaException.cc:207 +#, c-format +msgid "Timeout exceed when access '%s'." +msgstr "Aikakatkaisu avattaessa '%s'." + +#. language code: tem +#: ../zypp/LanguageCode.cc:1100 +msgid "Timne" +msgstr "temne" + #. language code: tiv #: ../zypp/LanguageCode.cc:1120 msgid "Tiv" msgstr "tiv" -#. language code: tkl -#. :TJK:762: -#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:428 -msgid "Tokelau" -msgstr "tokelau" - -#. language code: tlh -#: ../zypp/LanguageCode.cc:1124 -msgid "Klingon" -msgstr "klingon" - #. language code: tli #: ../zypp/LanguageCode.cc:1126 msgid "Tlingit" msgstr "tlingit" -#. language code: tmh -#: ../zypp/LanguageCode.cc:1128 -msgid "Tamashek" -msgstr "tamashek" +#. :ATF:260: +#: ../zypp/CountryCode.cc:432 +msgid "Togo" +msgstr "Togo" + +#. language code: tpi +#: ../zypp/LanguageCode.cc:1134 +msgid "Tok Pisin" +msgstr "tok-pisin" + +#. language code: tkl +#. :TJK:762: +#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:435 +msgid "Tokelau" +msgstr "tokelau" + +#. :TUN:788: +#: ../zypp/CountryCode.cc:438 +msgid "Tonga" +msgstr "Tonga" #. language code: tog #: ../zypp/LanguageCode.cc:1130 @@ -2434,10 +3968,16 @@ msgid "Tonga (Tonga Islands)" msgstr "tonga (Tonga)" -#. language code: tpi -#: ../zypp/LanguageCode.cc:1134 -msgid "Tok Pisin" -msgstr "tok-pisin" +#: ../zypp/KeyRing.cc:507 +#, c-format +msgid "Tried to import not existant key %s into keyring %s" +msgstr "Yritettiin lisätä avain %s avainrenkaaseen %s, mutta tiedostoa ei löydetty" + +# TT +#. :TUR:792: +#: ../zypp/CountryCode.cc:441 +msgid "Trinidad and Tobago" +msgstr "Trinidad ja Tobago" # FR #. language code: tsi @@ -2445,66 +3985,95 @@ msgid "Tsimshian" msgstr "tsimshian" -# TW -#. language code: tsn tn -#: ../zypp/LanguageCode.cc:1138 -msgid "Tswana" -msgstr "tswana" - # EE #. language code: tso ts #: ../zypp/LanguageCode.cc:1140 msgid "Tsonga" msgstr "tsonga" -# TR -#. language code: tuk tk -#: ../zypp/LanguageCode.cc:1142 -msgid "Turkmen" -msgstr "turkmeeni" +# TW +#. language code: tsn tn +#: ../zypp/LanguageCode.cc:1138 +msgid "Tswana" +msgstr "tswana" #. language code: tum #: ../zypp/LanguageCode.cc:1144 msgid "Tumbuka" msgstr "tumbuka" +# TN +#. :TKM:795: +#: ../zypp/CountryCode.cc:437 +msgid "Tunisia" +msgstr "Tunisia" + #. language code: tup #: ../zypp/LanguageCode.cc:1146 msgid "Tupi Languages" msgstr "tupi-kielet" +# TR +#. :TLS:626: +#: ../zypp/CountryCode.cc:440 +msgid "Turkey" +msgstr "Turkki" + #. language code: tur tr #: ../zypp/LanguageCode.cc:1148 msgid "Turkish" msgstr "turkki" -#. language code: tut -#: ../zypp/LanguageCode.cc:1150 -msgid "Altaic (Other)" -msgstr "muut altailaiset kielet" +#. language code: ota +#: ../zypp/LanguageCode.cc:918 +msgid "Turkish, Ottoman (1500-1928)" +msgstr "osmani" + +# TR +#. language code: tuk tk +#: ../zypp/LanguageCode.cc:1142 +msgid "Turkmen" +msgstr "turkmeeni" + +# TJ +#. :TKL:772: +#: ../zypp/CountryCode.cc:436 +msgid "Turkmenistan" +msgstr "Turkmenistan" + +#. :SWZ:748: +#: ../zypp/CountryCode.cc:429 +msgid "Turks and Caicos Islands" +msgstr "Turks- ja Caicossaaret" #. language code: tvl #. :TTO:780: -#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:435 +#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:442 msgid "Tuvalu" msgstr "tuvalu" -#. language code: twi tw -#: ../zypp/LanguageCode.cc:1154 -msgid "Twi" -msgstr "twi" - # TN #. language code: tyv #: ../zypp/LanguageCode.cc:1156 msgid "Tuvinian" msgstr "tuva" +#. language code: twi tw +#: ../zypp/LanguageCode.cc:1154 +msgid "Twi" +msgstr "twi" + #. language code: udm #: ../zypp/LanguageCode.cc:1158 msgid "Udmurt" msgstr "udmurtti" +# UG +#. :UKR:804: +#: ../zypp/CountryCode.cc:446 +msgid "Uganda" +msgstr "Uganda" + #. language code: uga #: ../zypp/LanguageCode.cc:1160 msgid "Ugaritic" @@ -2516,6 +4085,12 @@ msgstr "uiguuri" # UA +#. :TZA:834: +#: ../zypp/CountryCode.cc:445 +msgid "Ukraine" +msgstr "Ukraina" + +# UA #. language code: ukr uk #: ../zypp/LanguageCode.cc:1164 msgid "Ukrainian" @@ -2526,59 +4101,213 @@ msgid "Umbundu" msgstr "umbundu" +#: ../zypp/Url.cc:296 +msgid "Unable to clone Url object" +msgstr "URL-objektin kahdentaminen ei onnistunut" + +#: ../zypp/target/hal/HalContext.cc:206 +msgid "Unable to create dbus connection" +msgstr "dbus-yhteyden luonti epäonnistui" + +#: ../zypp/target/hal/HalContext.cc:249 +msgid "Unable to initalize HAL context -- hald not running?" +msgstr "HAL-yhteyden alustus ei onnistu. Varmista, että 'hald' on käynnissä." + +#: ../zypp/Url.cc:322 ../zypp/Url.cc:336 +msgid "Unable to parse Url components" +msgstr "URL:n jäsentäminen ei onnistu." + #. language code: und #: ../zypp/LanguageCode.cc:1168 msgid "Undetermined" msgstr "määrittämätön" -#. language code: urd ur -#: ../zypp/LanguageCode.cc:1170 -msgid "Urdu" -msgstr "urdu" - -#. language code: uzb uz -#: ../zypp/LanguageCode.cc:1172 -msgid "Uzbek" -msgstr "uzbekki" +#. :AND:020: +#: ../zypp/CountryCode.cc:225 +msgid "United Arab Emirates" +msgstr "Arabiemiirikunnat" -#. language code: vai -#: ../zypp/LanguageCode.cc:1174 -msgid "Vai" -msgstr "vai" +#. :GAB:266: +#: ../zypp/CountryCode.cc:300 +msgid "United Kingdom" +msgstr "Iso-Britannia" -#. language code: ven ve -#: ../zypp/LanguageCode.cc:1176 -msgid "Venda" -msgstr "venda" +# US +#. :UMI:581: +#: ../zypp/CountryCode.cc:448 +msgid "United States" +msgstr "Yhdysvallat" -#. language code: vie vi -#: ../zypp/LanguageCode.cc:1178 -msgid "Vietnamese" -msgstr "vietnam" +# UM +#. :UGA:800: +#: ../zypp/CountryCode.cc:447 +msgid "United States Minor Outlying Islands" +msgstr "Yhdysvaltain pienet erillissaaret" -#. language code: vol vo -#: ../zypp/LanguageCode.cc:1180 -msgid "Volapuk" -msgstr "volapük" +#: ../zypp/CountryCode.cc:135 +msgid "Unknown country: " +msgstr "Tuntematon maa: " -#. language code: vot -#: ../zypp/LanguageCode.cc:1182 -msgid "Votic" -msgstr "vatja" +#: ../zypp/LanguageCode.cc:145 +msgid "Unknown language: " +msgstr "Tuntematon kieli: " -#. language code: wak -#: ../zypp/LanguageCode.cc:1184 -msgid "Wakashan Languages" -msgstr "wakash-kielet" +#: ../zypp/media/MediaUserAuth.cc:97 +#, c-format +msgid "Unsupported HTTP authentication method '%s'" +msgstr "HTTP-tunnistautumistapa '%s' ei ole tuettu" -#. language code: wal -#: ../zypp/LanguageCode.cc:1186 -msgid "Walamo" -msgstr "walamo" +#: ../zypp/media/MediaException.cc:140 +#, c-format +msgid "Unsupported URI scheme in '%s'." +msgstr "Virheellinen URL: '%s'." -#. language code: war -#: ../zypp/LanguageCode.cc:1188 -msgid "Waray" +#: ../devel/devel.mvidner/installation_sources.cc:75 +#, c-format +msgid "" +"Untrusted key found:\n" +"%s|%s|%s\n" +"Trust key?" +msgstr "" +"Löydettiin ei-luotettu avain:\n" +"%s|%s|%s\n" +"Luotetaanko avaimeen?" + +#. language code: hsb +#: ../zypp/LanguageCode.cc:612 +msgid "Upper Sorbian" +msgstr "yläsorbi" + +#. language code: urd ur +#: ../zypp/LanguageCode.cc:1170 +msgid "Urdu" +msgstr "urdu" + +#: ../zypp/url/UrlBase.cc:154 +#, c-format +msgid "Url scheme does not allow a %s" +msgstr "Ei sallittu URL: %s" + +#: ../zypp/url/UrlBase.cc:1020 +msgid "Url scheme does not allow a host component" +msgstr "URL ei salli konenimeä" + +#: ../zypp/url/UrlBase.cc:981 +msgid "Url scheme does not allow a password" +msgstr "URL ei salli salasanaa" + +#: ../zypp/url/UrlBase.cc:1068 +msgid "Url scheme does not allow a port" +msgstr "URL ei salli portin määritystä" + +#: ../zypp/url/UrlBase.cc:947 +msgid "Url scheme does not allow a username" +msgstr "URL ei salli käyttäjänimeä" + +#: ../zypp/url/UrlBase.cc:820 +msgid "Url scheme is a required component" +msgstr "Url on pakollinen" + +#: ../zypp/url/UrlBase.cc:1010 +msgid "Url scheme requires a host component" +msgstr "Url edellyttää konenimen" + +#: ../zypp/url/UrlBase.cc:1096 +msgid "Url scheme requires path name" +msgstr "URL edellyttää polun määrittämistä" + +# UY +#. :USA:840: +#: ../zypp/CountryCode.cc:449 +msgid "Uruguay" +msgstr "Uruguay" + +#. language code: uzb uz +#: ../zypp/LanguageCode.cc:1172 +msgid "Uzbek" +msgstr "uzbekki" + +#. :URY:858: +#: ../zypp/CountryCode.cc:450 +msgid "Uzbekistan" +msgstr "Uzbekistan" + +#. language code: vai +#: ../zypp/LanguageCode.cc:1174 +msgid "Vai" +msgstr "vai" + +#. we will throw this later if no URL checks out fine +#: ../zypp/RepoManager.cc:526 +msgid "Valid metadata not found at specified URL(s)" +msgstr "Annetuista verkko-osoitteista ei löytynyt kelpaavia metatietoja" + +#. :VNM:704: +#: ../zypp/CountryCode.cc:457 +msgid "Vanuatu" +msgstr "Vanuatu" + +#. language code: ven ve +#: ../zypp/LanguageCode.cc:1176 +msgid "Venda" +msgstr "venda" + +# VE +#. :VCT:670: +#: ../zypp/CountryCode.cc:453 +msgid "Venezuela" +msgstr "Venezuela" + +# VN +#. :VIR:850: +#: ../zypp/CountryCode.cc:456 +msgid "Vietnam" +msgstr "Vietnam" + +#. language code: vie vi +#: ../zypp/LanguageCode.cc:1178 +msgid "Vietnamese" +msgstr "vietnam" + +# VI +#. :VGB:092: +#: ../zypp/CountryCode.cc:455 +msgid "Virgin Islands, U.S." +msgstr "Yhdysvaltain Neitsytsaaret" + +#. language code: vol vo +#: ../zypp/LanguageCode.cc:1180 +msgid "Volapuk" +msgstr "volapük" + +#. language code: vot +#: ../zypp/LanguageCode.cc:1182 +msgid "Votic" +msgstr "vatja" + +#. language code: wak +#: ../zypp/LanguageCode.cc:1184 +msgid "Wakashan Languages" +msgstr "wakash-kielet" + +#. language code: wal +#: ../zypp/LanguageCode.cc:1186 +msgid "Walamo" +msgstr "walamo" + +#. :VUT:548: +#: ../zypp/CountryCode.cc:458 +msgid "Wallis and Futuna" +msgstr "Wallis ja Futuna" + +#. language code: wln wa +#: ../zypp/LanguageCode.cc:1198 +msgid "Walloon" +msgstr "valloni" + +#. language code: war +#: ../zypp/LanguageCode.cc:1188 +msgid "Waray" msgstr "waray" #. language code: was @@ -2591,31 +4320,26 @@ msgid "Welsh" msgstr "kymri" -#. language code: wen -#: ../zypp/LanguageCode.cc:1196 -msgid "Sorbian Languages" -msgstr "sorbin kielet" - -#. language code: wln wa -#: ../zypp/LanguageCode.cc:1198 -msgid "Walloon" -msgstr "valloni" +#. :EGY:818: +#: ../zypp/CountryCode.cc:288 +msgid "Western Sahara" +msgstr "Länsi-Sahara" #. language code: wol wo #: ../zypp/LanguageCode.cc:1200 msgid "Wolof" msgstr "wolof" -#. language code: xal -#: ../zypp/LanguageCode.cc:1202 -msgid "Kalmyk" -msgstr "kalmukki" - #. language code: xho xh #: ../zypp/LanguageCode.cc:1204 msgid "Xhosa" msgstr "xhosa" +#. language code: sah +#: ../zypp/LanguageCode.cc:986 +msgid "Yakut" +msgstr "jakuutti" + #. language code: yao #: ../zypp/LanguageCode.cc:1206 msgid "Yao" @@ -2626,6 +4350,11 @@ msgid "Yapese" msgstr "yap" +#. :WSM:882: +#: ../zypp/CountryCode.cc:460 +msgid "Yemen" +msgstr "Jemen" + #. language code: yid yi #: ../zypp/LanguageCode.cc:1210 msgid "Yiddish" @@ -2642,6 +4371,17 @@ msgid "Yupik Languages" msgstr "jupikkikielet" +# ZM +#. :ZAF:710: +#: ../zypp/CountryCode.cc:463 +msgid "Zambia" +msgstr "Sambia" + +#. language code: znd +#: ../zypp/LanguageCode.cc:1222 +msgid "Zande" +msgstr "zande" + #. language code: zap #: ../zypp/LanguageCode.cc:1216 msgid "Zapotec" @@ -2658,10 +4398,10 @@ msgid "Zhuang" msgstr "zhuang" -#. language code: znd -#: ../zypp/LanguageCode.cc:1222 -msgid "Zande" -msgstr "zande" +#. :ZMB:894: +#: ../zypp/CountryCode.cc:464 +msgid "Zimbabwe" +msgstr "Zimbabwe" #. language code: zul zu #: ../zypp/LanguageCode.cc:1224 @@ -2673,218 +4413,294 @@ msgid "Zuni" msgstr "zuni" -#: ../zypp/ZYppFactory.cc:279 ../zypp/ZYppFactory.cc:334 -msgid "Software management is already running." -msgstr "Ohjelmistonhallinta on jo käynnissä." +#: ../zypp/repo/PackageProvider.cc:233 +msgid "applydeltarpm check failed." +msgstr "applydeltarpm-tarkistus epäonnistui." -#: ../zypp/parser/susetags/RepoParser.cc:232 -msgid "Required file is missing: " -msgstr "Tarvittava tiedosto puuttuu: " +#: ../zypp/repo/PackageProvider.cc:247 +msgid "applydeltarpm failed." +msgstr "applydeltarpm epäonnistui." -#: ../zypp/target/hal/HalContext.cc:96 -msgid "HalContext not connected" -msgstr "Hal-konteksti ei yhdistetty" +#: ../zypp/solver/detail/SATResolver.cc:1129 +#, c-format +msgid "architecture change of %s to %s" +msgstr "arkkitehtuurin vaihto %s -> %s" -#: ../zypp/target/hal/HalContext.cc:106 -msgid "HalDrive not initialized" -msgstr "Hal-asema ei ole alustettu" +#: ../zypp/solver/detail/SATResolver.cc:875 +#, c-format +msgid "cannot install both %s and %s" +msgstr "Ei voida asentaa molempia %s ja %s" -#: ../zypp/target/hal/HalContext.cc:116 -msgid "HalVolume not initialized" -msgstr "Hal-taltio ei alustettu" +#: ../zypp/solver/detail/SATResolver.cc:859 +msgid "conflicting requests" +msgstr "ristiriitaiset kyselyt" -#: ../zypp/target/hal/HalContext.cc:208 -msgid "Unable to create dbus connection" -msgstr "dbus-yhteyttä ei voitu luoda" +#. timestamp +#: ../zypp/target/rpm/RpmDb.cc:2327 +#, c-format +msgid "created backup %s" +msgstr "luotiin varmuuskopio %s" -#: ../zypp/target/hal/HalContext.cc:224 -msgid "libhal_ctx_new: Can't create libhal context" -msgstr "libhal_ctx_new: libhal-kontekstia ei voitu luoda" +#: ../zypp/solver/detail/SATResolver.cc:1156 +#, c-format +msgid "deinstallation of %s" +msgstr "%s poisto epäonnistui" -#: ../zypp/target/hal/HalContext.cc:239 -msgid "libhal_set_dbus_connection: Can't set dbus connection" -msgstr "libhal_set_dbus_connection: dbus-yhteyttä ei voitu asettaa" +#: ../zypp/solver/detail/SATResolver.cc:923 +msgid "deleted providers: " +msgstr "poistetut tarjoajat: " -#: ../zypp/target/hal/HalContext.cc:254 -msgid "Unable to initalize HAL context -- hald not running?" -msgstr "HAL-kontekstia ei voi alustaa. Varmista, että 'hald' on käynnissä." +#: ../zypp/solver/detail/SATResolver.cc:1077 +#, c-format +msgid "do not ask to delete all solvables providing %s" +msgstr "älä kysy poistettaessa paketteja, jotka tuo %s" -#: ../zypp/target/hal/HalContext.cc:843 -msgid "Not a CDROM drive" -msgstr "Kohde ei ole CD-asema" +#: ../zypp/solver/detail/SATResolver.cc:1062 +#, c-format +msgid "do not ask to install a solvable providing %s" +msgstr "älä kysy asennettaessa paketteja, jotka tuo %s" -#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55 -#: ../zypp/target/hal/HalException.h:64 -msgid "Hal Exception" -msgstr "Hal-poikkeus" +#: ../zypp/solver/detail/SATResolver.cc:1015 +#, c-format +msgid "do not forbid installation of %s" +msgstr "Älä estä %s asentamista" -#. Translator: %s = name of an rpm package. A list of diffs follows -#. this message. -#: ../zypp/target/rpm/RpmDb.cc:1779 +#: ../zypp/solver/detail/SATResolver.cc:994 +#: ../zypp/solver/detail/SATResolver.cc:1033 #, c-format -msgid "Changed configuration files for %s:" -msgstr "Muunnettiin määritystiedostoja paketille %s:" +msgid "do not install %s" +msgstr "älä asenna %s" -#. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1943 +#: ../zypp/solver/detail/SATResolver.cc:1089 #, c-format -msgid "rpm saved %s as %s, but it was impossible to determine the difference" -msgstr "rpm tallensi tiedoston %s tiedostona %s, mutta erojen selvittäminen ei onnistunut" +msgid "do not install most recent version of %s" +msgstr "älä asenna uusinta %s" -#. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1945 +#: ../zypp/solver/detail/SATResolver.cc:989 +#, c-format +msgid "do not keep %s installed" +msgstr "älä pidä %s asennettuna" + +#: ../zypp/solver/detail/SATResolver.cc:1122 +#, c-format +msgid "downgrade of %s to %s" +msgstr "päivitetään vanhempaan %s -> %s" + +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" -"rpm saved %s as %s.\n" -"Here are the first 25 lines of difference:\n" +"install %s (with vendor change)\n" +" %s\n" +"-->\n" +" %s" msgstr "" -"rpm tallensi tiedoston %s tiedostona %s.\n" -"Tässä ensimmäiset 25 muuttunutta riviä:\n" +"asenna %s (vaihtaa tarjoajaa)\n" +" %s\n" +"-->\n" +" %s" + +#: ../zypp/solver/detail/SATResolver.cc:1010 +#: ../zypp/solver/detail/SATResolver.cc:1047 +#, c-format +msgid "keep %s" +msgstr "pidä %s" + +#: ../zypp/target/hal/HalContext.cc:219 +msgid "libhal_ctx_new: Can't create libhal context" +msgstr "libhal_ctx_new: libhal-yhteyttä ei voitu luoda" + +#: ../zypp/target/hal/HalContext.cc:234 +msgid "libhal_set_dbus_connection: Can't set dbus connection" +msgstr "libhal_set_dbus_connection: dbus-yhteyden asettaminen ei onnistu" + +#: ../zypp/solver/detail/SATResolver.cc:870 +#, c-format +msgid "nothing provides %s needed by %s" +msgstr "mikään ei tarjoa %s, jota %s tarvitsee" + +#: ../zypp/solver/detail/SATResolver.cc:862 +#, c-format +msgid "nothing provides requested %s" +msgstr "Mikään ei tarjoa pyydettyä %s" + +#: ../zypp/solver/detail/SATResolver.cc:856 +#, c-format +msgid "problem with installed package %s" +msgstr "virhe asennettaessa pakettia %s" + +#: ../zypp/solver/detail/SATResolver.cc:1144 +#, c-format +msgid "replacement of %s with %s" +msgstr "Korvataan %s -> %s" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1948 +#: ../zypp/target/rpm/RpmDb.cc:2046 #, c-format msgid "rpm created %s as %s, but it was impossible to determine the difference" -msgstr "rpm loi tiedoston %s tiedostona %s, mutta erojen selvittäminen ei onnistunut" +msgstr "rpm loi tiedoston %s nimellä %s. Erojen selvittäminen ei onnistunut." #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:1950 +#: ../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 loi tiedoston %s tiedostona %s.\n" +"rpm loi tiedoston %s nimellä %s.\n" "Tässä on ensimmäiset 25 vaihtunutta riviä:\n" -#. %s = filename of rpm package -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1956 -#, c-format -msgid "%s install failed" -msgstr "%s asennus epäonnistui" - -#: ../zypp/target/rpm/RpmDb.cc:1957 ../zypp/target/rpm/RpmDb.cc:2075 +#: ../zypp/target/rpm/RpmDb.cc:2055 ../zypp/target/rpm/RpmDb.cc:2175 msgid "rpm output:" msgstr "rpm-tuloste:" -#. %s = filename of rpm package -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:1963 +#. %s = filenames +#: ../zypp/target/rpm/RpmDb.cc:2041 #, c-format -msgid "%s installed ok" -msgstr "%s asennettu" - -#: ../zypp/target/rpm/RpmDb.cc:1966 ../zypp/target/rpm/RpmDb.cc:2083 -msgid "Additional rpm output:" -msgstr "rpm-lisätuloste:" +msgid "rpm saved %s as %s, but it was impossible to determine the difference" +msgstr "rpm tallensi tiedoston %s niemellä %s. Erojen selvittäminen ei onnistunut." -#. %s = name of rpm package -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2074 +#. %s = filenames +#: ../zypp/target/rpm/RpmDb.cc:2043 #, c-format -msgid "%s remove failed" -msgstr "%s poistaminen epäonnistui" +msgid "" +"rpm saved %s as %s.\n" +"Here are the first 25 lines of difference:\n" +msgstr "" +"rpm tallensi tiedoston %s nimellä %s.\n" +"Tässä ensimmäiset 25 muuttunutta riviä:\n" -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2080 -#, c-format -msgid "%s remove ok" -msgstr "%s poistaminen onnistui" +#: ../zypp/solver/detail/SATResolver.cc:935 +msgid "uninstallable providers: " +msgstr "poistetut tarjoajat: " -#. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2225 -#, c-format -msgid "created backup %s" -msgstr "luotiin varmuuskopio %s" +msgid "" +"%s provides this dependency, but would change the architecture of the " +"installed item" +msgstr "%s tarjoaa tämän riippuvuuden, mutta vaihtaa asennetun kohteen arkkitehtuuria" -#: ../zypp/target/TargetImpl.cc:731 -msgid "Installation has been aborted as directed." -msgstr "Asennus on keskeytetty ohjeiden mukaan." +msgid "" +"%s provides this dependency, but would change the vendor of the installed " +"item" +msgstr "%s tarjoaa tämän riippuvuuden, mutta vaihtaa asennetun kohteen tarjoajaa" + +msgid "Do not install or delete the resolvables concerned" +msgstr "Älä asenna tai poista tätä koskevia osia" + +msgid "Ignore that %s is already set to install" +msgstr "Jätä huomiotta, että %s on jo asetettu asennettavaksi" + +msgid "Ignore the obsolete %s in %s" +msgstr "Jätä %s vanheneminen tilanteessa %s" + +msgid "Ignore this conflict of %s" +msgstr "Jätä %s ristiriitaa huomiotta" + +msgid "Ignore this requirement just here" +msgstr "Jätä tämä vaatimus huomiotta vain tässä" + +msgid "Install %s although it would change the architecture" +msgstr "Asenna %s vaikka se muuttaisi arkkitehtuuria" + +msgid "Install %s although it would change the vendor" +msgstr "Asenna %s vaikka se muuttaisi toimittajaa" + +msgid "Install missing resolvables" +msgstr "Asenna puuttuvat" + +msgid "Keep resolvables" +msgstr "Pidä" + +msgid "Unlock these resolvables" +msgstr "Poistetaan seuraavat lukitukset" + +msgid "delete %s" +msgstr "poista %s" + +msgid "install %s" +msgstr "asenna %s" + +msgid "unlock %s" +msgstr "Poista %s lukitus" + +msgid "unlock all resolvables" +msgstr "Poista kaikki lukitukset" + +msgid "Can't open solv-file: " +msgstr "Ratkaisintiedoston avaaminen ei onnistu: " + +msgid "Error reading solv-file: " +msgstr "Virhe luettaessa ratkaisintiedostoa: " + +msgid "Path Parameter parsing not supported for this URL" +msgstr "URL ei tue polun jäsentämistä" + +msgid "Path parameter parsing not supported for this URL" +msgstr "URL:n jäsentäminen parametreiksi ei ole tuettu" + +msgid "Reading '%s' repository cache" +msgstr "Luetaan asennuslähteen '%s' välimuistia" + +msgid "Reading patch and delta rpms from '%s' repository cache" +msgstr "" +"Luetaan paikkaus- ja muutosrpm-tiedostoja '%s' -asennuslähteen " +"välimuistista." + +msgid "Cleaning repository '%s' cache" +msgstr "Puhdistetaan '%s'-asennuslähteen välimuisti" + +msgid "Reading repository '%s' cache" +msgstr "Luetaan '%s' -asennuslähteen välimuistia" + +msgid "Software management is already running." +msgstr "Ohjelmistonhallinta on jo käynnissä." -#. Translator: all.%s = name of package,patch,.... -#: ../zypp/solver/detail/ResolverInfoObsoletes.cc:55 -#, c-format msgid "%s is replaced by %s" -msgstr "%s korvataan osalla %s" +msgstr "%s korvattiin %s" -#. TranslatorExplanation: 1.%s name of package, 2.%s list of names -#. TranslatorExplanation: 1.%s is replaced by others -#: ../zypp/solver/detail/ResolverInfoObsoletes.cc:69 -#, c-format msgid "%s replaced by %s" -msgstr "%s korvataan osalla %s" +msgstr "%s korvataan %s" -#. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:263 -#, c-format msgid "%s will be deleted by the user.\n" msgstr "%s poistetaan käyttäjän mukana.\n" -#. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:268 -#, c-format msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" msgstr "%s poistetaan toisen ohjelman mukana. (ApplLow/ApplHigh)\n" -#. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:274 -#, c-format msgid "%s will be installed by the user.\n" msgstr "%s asennetaan käyttäjän mukana.\n" -#. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:279 -#, c-format msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" msgstr "%s asennetaan toisen ohjelman mukana. (ApplLow/ApplHigh)\n" -#. This can be generated by a timout only -#: ../zypp/solver/detail/Resolver_problems.cc:356 -#, c-format msgid "No valid solution found within %d seconds" msgstr "Kelpaavaa ratkaisua ei löydetty %d sekunnin aikana" -#: ../zypp/solver/detail/Resolver_problems.cc:357 msgid "The solver has reached a defined timout" msgstr "Ratkaisin saavutti määritetyn aikakatkaisu ajan." -#. a second run with ALL possibilities has not been tried -#. possible other solutions skipped -#. give the user an additional solution for trying all branches -#: ../zypp/solver/detail/Resolver_problems.cc:383 msgid "No valid solution found with just resolvables of best architecture." -msgstr "Parhaiten soveltuvasta arkkitehtuurin paketeista ei löytynyt sopivia ratkaisuja pakettiriivuuksien tyydyttämiseksi." +msgstr "" +"Parhaiten soveltuvasta arkkitehtuurin paketeista ei löytynyt sopivia " +"ratkaisuja pakettiriivuuksien tyydyttämiseksi." -#: ../zypp/solver/detail/Resolver_problems.cc:384 -msgid "With this run only resolvables with the best architecture have been regarded.\n" +msgid "" +"With this run only resolvables with the best architecture have been " +"regarded.\n" msgstr "Tällä ajolla harkitaan ainoastaan parhaiten soveltuvan arkkitehtuuria.\n" -#: ../zypp/solver/detail/Resolver_problems.cc:385 -msgid "Regarding all possible resolvables takes time, but can come to a valid result." -msgstr "Sopiva ratkaisu voidaan löytää käymällä läpi kaikki mahdolliset vaihtoehdot, mikä kuitenkin vie aikaa." +msgid "" +"Regarding all possible resolvables takes time, but can come to a valid " +"result." +msgstr "" +"Sopiva ratkaisu voidaan löytää käymällä läpi kaikki mahdolliset vaihtoehdot, " +"mikä kuitenkin vie aikaa." -#: ../zypp/solver/detail/Resolver_problems.cc:411 msgid "Invalid information" msgstr "Virheelliset tiedot" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:418 -#, c-format msgid "%s is needed by other resolvables" msgstr "Muut osat tarvitsevat %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:421 -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:90 -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:140 -#, c-format -msgid "%s is needed by %s" -msgstr "%2$s tarvisee osaa %1$s" - -#: ../zypp/solver/detail/Resolver_problems.cc:422 -#, c-format msgid "" "%s is needed by:\n" "%s" @@ -2892,25 +4708,9 @@ "seuraavat osat tarvitsevat '%s':\n" "%s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:429 -#, c-format msgid "%s conflicts with other resolvables" msgstr "%s on ristiriidassa muiden osien kanssa" -#. TranslatorExplanation %s = name of package, patch, selection ... -#. Translator: all.%s = name of package, patch,... -#. TranslatorExplanation: 1.%s name of package, 2.%s list of names -#. TranslatorExplanation: 1.%s is conflicting with multiple others -#: ../zypp/solver/detail/Resolver_problems.cc:432 -#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:55 -#: ../zypp/solver/detail/ResolverInfoConflictsWith.cc:70 -#, c-format -msgid "%s conflicts with %s" -msgstr "%s on ristiriidassa osan %s kanssa" - -#: ../zypp/solver/detail/Resolver_problems.cc:434 -#, c-format msgid "" "%s conflicts with:\n" "%s" @@ -2918,25 +4718,12 @@ "%s on ristiriidassa:\n" "%s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:463 -#, c-format msgid "%s obsoletes other resolvables" msgstr "%s vanhentaa muut osat" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:466 -#, c-format -msgid "%s obsoletes %s" -msgstr "%s vanhentaa %s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:468 -#, c-format msgid "%s obsoletes:%s" msgstr "%s vanhentaa:%s" -#: ../zypp/solver/detail/Resolver_problems.cc:469 msgid "" "\n" "These resolvables will be deleted from the system." @@ -2944,47 +4731,18 @@ "\n" "Nämä osat poistetaan järjestelmästä." -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:477 -#, c-format msgid "%s depends on other resolvables" msgstr "%s on riippuvainen muista osista" -#. TranslatorExplanation %s = name of package, patch, selection ... -#. TranslatorExplanation: 1.%s name of package, 2.%s list of names -#. TranslatorExplanation: 1.%s is dependent on list of names -#: ../zypp/solver/detail/Resolver_problems.cc:481 -#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:69 -#, c-format msgid "%s depends on %s" msgstr "%s on riippuvainen osasta %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:484 -#, c-format msgid "%s depends on:%s" msgstr "%s riippuu osasta:%s" -#. TranslatorExplanation: currently it is unused. -#: ../zypp/solver/detail/Resolver_problems.cc:490 msgid "Child of" msgstr "Lapsi" -#. TranslatorExplanation %s = dependency -#. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:496 -#: ../zypp/solver/detail/Resolver_problems.cc:580 -#, c-format -msgid "Cannot install %s" -msgstr "Ei voida asentaa %s" - -#. TranslatorExplanation %s = capability -#: ../zypp/solver/detail/Resolver_problems.cc:498 -#, c-format -msgid "None provides %s" -msgstr "Mikään ei tarjoa %s" - -#: ../zypp/solver/detail/Resolver_problems.cc:499 msgid "" "\n" "There is no resource available which supports this requirement." @@ -2992,2026 +4750,238 @@ "\n" "Ei ole saatavilla osaa, joka täyttäisi tämän riippuvuuden." -#: ../zypp/solver/detail/Resolver_problems.cc:507 -msgid "Due to the problems described above/below, this resolution will not solve all dependencies" -msgstr "Yllä tai alla kuvattujen ongelmien takia tämä ehdotus ei ratkaise kaikkia riippuvuuksia" +msgid "" +"Due to the problems described above/below, this resolution will not solve " +"all dependencies" +msgstr "" +"Yllä tai alla kuvattujen ongelmien takia tämä ehdotus ei ratkaise kaikkia " +"riippuvuuksia" -#: ../zypp/solver/detail/Resolver_problems.cc:518 -#: ../zypp/solver/detail/Resolver_problems.cc:900 -#, c-format msgid "Cannot install %s, because it is conflicting with %s" msgstr "Ei voida asentaa osaa %s, koska se on ristiriidassa osan %s kanssa" -#. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:536 -#, c-format msgid "%s is not installed and has been marked as uninstallable" msgstr "%s ei asennettu ja se on merkitty poistettavaksi" -#. TranslatorExplanation %s = name of package,patch,... -#: ../zypp/solver/detail/Resolver_problems.cc:548 -#, c-format msgid "Cannot install %s due to dependency problems" msgstr "Ei voida asentaa %s riippuvuusongelmien vuoksi" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:590 -#: ../zypp/solver/detail/Resolver_problems.cc:600 -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:64 -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:66 -#, c-format -msgid "delete %s" -msgstr "poista %s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:593 -#: ../zypp/solver/detail/Resolver_problems.cc:603 -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:69 -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:71 -#, c-format -msgid "do not install %s" -msgstr "älä asenna %s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:616 -#, c-format msgid "%s has unfulfilled requirements" msgstr "Osalla %s on täyttämättömiä vaatimuksia" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:655 -#, c-format msgid "%s has missing dependencies" msgstr "osalla %s on puuttuvia riippuvuuksia" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:703 -#, c-format msgid "%s cannot be installed due to missing dependencies" msgstr "Osaa %s ei voida asentaa puuttuvien riippuvuuksien takia" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:760 -#, c-format msgid "%s fulfills dependencies of %s but will be uninstalled" msgstr "Osa %s täyttää osan %s riippuvuudet, mutta se poistetaan" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:770 -#, c-format msgid "%s fulfills dependencies of %s but will be kept on your system" msgstr "Osa %s täyttää osan %s riippuvuudet ja se säilytetään järjestelmässä" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:780 -#, c-format msgid "No need to install %s" msgstr "Ei tarvetta asentaa %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:788 -#, c-format msgid "Cannot install %s to fulfill the dependencies of %s" msgstr "Ei voida asentaa %s täyttämään osan %s riippuvuudet" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:803 -#, c-format msgid "Cannot install %s to fulfil the dependencies of %s" msgstr "Ei voida asentaa %s täyttämään osan %s riippuvuudet" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:841 -#: ../zypp/solver/detail/Resolver_problems.cc:849 -#, c-format msgid "%s will not be uninstalled, because it is still required" msgstr "%s ei poisteta, koska sitä tarvitaan edelleen" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:872 -#, c-format msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." msgstr "osa %s vanhentaa %s. Mutta %s ei voida poistaa koska se on lukittu." -#: ../zypp/solver/detail/Resolver_problems.cc:904 -#, c-format msgid "Cannot install %s, because it is conflicting" msgstr "osaa %s ei voida asentaa, koska se on ristiriidassa" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/Resolver_problems.cc:926 -#, c-format msgid "%s is uninstallable due to conflicts with %s" msgstr "%s on poistettavissa, koska se on ristiriidassa osan %s kanssa" -#. TranslatorExplanation %s = name requirement ... -#: ../zypp/solver/detail/Resolver_problems.cc:940 -#, c-format msgid "Requirememt %s cannot be fulfilled." msgstr "Tarvetta %s ei voida täyttää." -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:55 -msgid "Ignore this requirement just here" -msgstr "Jätä tämä vaatimus huomiotta vain tässä" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:64 -msgid "Generally ignore this requirement" -msgstr "Jätä tämä vaatimus huomiotta" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:76 -#, c-format -msgid "Install %s although it would change the architecture" -msgstr "Asenna %s vaikka se muuttaisi arkkitehtuuria" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:79 -#, c-format -msgid "%s provides this dependency, but would change the architecture of the installed item" -msgstr "%s tarjoaa tämän riippuvuuden, mutta vaihtaa asennetun kohteen arkkitehtuurin" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:89 -#, c-format -msgid "Install %s although it would change the vendor" -msgstr "Asenna %s vaikka se muuttaisi valmistajan" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:92 -#, c-format -msgid "%s provides this dependency, but would change the vendor of the installed item" -msgstr "%s tarjoaa tämän riippuvuuden, mutta vaihtaa asennetun kohteen valmistajan" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:104 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:116 -#, c-format -msgid "Ignore this conflict of %s" -msgstr "Jätä osan %s ristiriitaa huomiotta" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:131 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "Jätä osan %s vanhentuminen %s huomiotta" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:144 -#, c-format -msgid "Ignore that %s is already set to install" -msgstr "Jätä huomiotta, että %s on jo asetettu asennettavaksi" - -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "Älä asenna tai poista tätä koskevia osia" - -#. Translator: 1.%s = dependency; 2.%s and 3.%s = name of package,patch,... -#: ../zypp/solver/detail/QueueItemRequire.cc:791 -#, c-format msgid "for requiring %s for %s when upgrading %s" msgstr "tarvitaan %s osaa %s varten, kun päivitetään %s" -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency -#: ../zypp/solver/detail/ResolverInfoMissingReq.cc:64 -#, c-format msgid "%s is lacking the requirement %s" msgstr "%s puuttuu vaatimus %s" -#: ../zypp/solver/detail/ResolverInfoMisc.cc:56 msgid ", Action: " msgstr ", Toimenpide: " -#: ../zypp/solver/detail/ResolverInfoMisc.cc:58 msgid ", Trigger: " msgstr ", Laukaisin: " -#. Translator: Notation for (RPM) package -#: ../zypp/solver/detail/ResolverInfoMisc.cc:90 msgid "package" msgstr "paketti" -#. Translator: Notation for SuSE package selection (set of packages) -#: ../zypp/solver/detail/ResolverInfoMisc.cc:94 msgid "selection" msgstr "esivalinta" -#. Translator: Notation for SuSE installation pattern (set of packages, describing use of system) -#: ../zypp/solver/detail/ResolverInfoMisc.cc:98 msgid "pattern" msgstr "ohjelmistoryhmä" -#. Translator: Notation for product -#: ../zypp/solver/detail/ResolverInfoMisc.cc:102 msgid "product" msgstr "tuote" -#. Translator: Notation for patch -#: ../zypp/solver/detail/ResolverInfoMisc.cc:106 msgid "patch" msgstr "korjaus" -#. Translator: Notation for script (part of a patch) -#: ../zypp/solver/detail/ResolverInfoMisc.cc:110 msgid "script" msgstr "komentojono" -#. Translator: Notation for message (part of a patch) -#: ../zypp/solver/detail/ResolverInfoMisc.cc:114 msgid "message" msgstr "sanoma" -#. Translator: Notation for atom (part of a patch) -#: ../zypp/solver/detail/ResolverInfoMisc.cc:118 msgid "atom" msgstr "atomi" -#. Translator: Notation for computer system -#: ../zypp/solver/detail/ResolverInfoMisc.cc:122 msgid "system" msgstr "järjestelmä" -#. Translator: Generic term for an item with dependencies, please leave untranslated for now -#: ../zypp/solver/detail/ResolverInfoMisc.cc:126 msgid "Resolvable" msgstr "osa" -#. TranslatorExplanation: Additional information to dependency solver result, no solution could be found -#: ../zypp/solver/detail/ResolverInfoMisc.cc:144 msgid "Marking this resolution attempt as invalid." msgstr "Tämä ratkaisuehdotus merkattiin virheelliseksi." -#. Translator: %s = name of packages,patch,... -#. TranslatorExplanation: Additional information to dependency solver result. -#: ../zypp/solver/detail/ResolverInfoMisc.cc:151 -#, c-format msgid "Marking resolvable %s as uninstallable" msgstr "Merkitään osa %s poistettavaksi" -#. Translator: %s = name of packages,patch,... -#. TranslatorExplanation: Additional information to dependency solver result. -#: ../zypp/solver/detail/ResolverInfoMisc.cc:159 -#, c-format -msgid "%s is scheduled to be installed, but this is impossible due to dependency problems." -msgstr "%s on asetettu asennettavaksi, mutta se ei ole mahdollista riippuvuusongelmien vuoksi." - -#. Translator: %s = name of package,patch,... -#. TranslatorExplanation: Additional information to dependency solver result. -#: ../zypp/solver/detail/ResolverInfoMisc.cc:167 -#, c-format +msgid "" +"%s is scheduled to be installed, but this is impossible due to dependency " +"problems." +msgstr "" +"%s on asetettu asennettavaksi, mutta se ei ole mahdollista " +"riippuvuusongelmien vuoksi." + msgid "Can't install %s since it is already marked as needed to be uninstalled" msgstr "Ei voida asentaa osaa %s, koska se on jo merkitty poistettavaksi" -#. Translator: %s = name of patch -#. TranslatorExplanation: A patch which is not needed (does not apply) cant be installed -#. TranslatorExplanation: Patches contain updates (bug fixes) to packages. Such fixes -#. TranslatorExplanation: do only apply if the package to-be-fixed is actually installed. -#. TranslatorExplanation: Here a patch was selected for installation but the to-be-fixed -#. TranslatorExplanation: package is not installed. -#: ../zypp/solver/detail/ResolverInfoMisc.cc:179 -#, c-format msgid "Can't install %s, because it does not apply to this system." msgstr "Ei voida asentaa osaa %s, koska se ei toimi tässä järjestelmässä." -#. affected() = item 1 which has to be installed -#. _capability = -#. other() = item 2 which has to be installed -#. other_capability() = -#. Translator: %s = name of package,patch,... -#: ../zypp/solver/detail/ResolverInfoMisc.cc:190 -#, c-format msgid "Can't install %s, because %s is already marked as needed to for installation" msgstr "Ei voida asentaa osaa %s, koska %s on jo merkitty asennettavaksi" -#. Translator: %s = name of patch,product -#: ../zypp/solver/detail/ResolverInfoMisc.cc:198 -#, c-format msgid "This would invalidate %s." msgstr "Tämä muuttaisi osan %s virheelliseksi." -#. Translator: %s = name of patch, pattern, ... -#. TranslatorExplanation: Establishing is the process of computing which patches are needed -#. TranslatorExplanation: This is just a progress indicator -#. TranslatorExplanation: It is also used for other types of resolvables in order to verify -#. TranslatorExplanation: the completeness of their dependencies -#: ../zypp/solver/detail/ResolverInfoMisc.cc:214 -#, c-format msgid "Establishing %s" msgstr "Valmistellaan %s" -#. affected() = resolvable to be installed -#. _capability = -#. other() = -#. other_capability() = -#. Translator: %s = name of package,patch,... -#. TranslatorExample: Installing foo -#. TranslatorExplanation: Just a progress indicator that something is scheduled for installation -#. Translator: %s = packagename -#: ../zypp/solver/detail/ResolverInfoMisc.cc:235 -#, c-format msgid "Installing %s" msgstr "Asennetaan %s" -#. affected() = updated resolvable -#. _capability = -#. other() = currently installed, being updated resolvable -#. other_capability() = -#. Translator: 1.%s and 2.%s = name of package -#. TranslatorExample: Updating foo-1.1 to foo-1.2 -#. TranslatorExplanation: Just a progress indicator that something is scheduled for upgrade -#: ../zypp/solver/detail/ResolverInfoMisc.cc:252 -#, c-format -msgid "Updating %s to %s" -msgstr "Päivitetään %s -> %s" - -#. affected() = -#. _capability = -#. other() = -#. other_capability() = -#. Translator: %s = name of package,patch,... -#. TranslatorExample: Skipping foo: already installed -#. TranslatorExplanation: An installation request for foo is skipped since foo is already installed -#: ../zypp/solver/detail/ResolverInfoMisc.cc:270 -#, c-format msgid "Skipping %s: already installed" msgstr "Ohitetaan %s: jo asennettu" -#. affected() = is set -#. _capability = is set -#. other() = -#. other_capability() = -#. Translator: 1.%s = dependency -#. TranslatorExample: There are no alternative installed providers of foo -#. TranslatorExplanation: A resolvable is to be uninstalled. It provides 'foo' which is needed by others -#. TranslatorExplanation: We just found out that 'foo' is not provided by anything else (an alternative) -#. TranslatorExplanation: removal of this resolvable would therefore break dependency -#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be uninstalled -#: ../zypp/solver/detail/ResolverInfoMisc.cc:292 -#, c-format msgid "There are no alternative providers of %s installed" msgstr "Osalle %s ei ole muita vaihtoehtoja" -#. Translator: 1.%s = name of package,patch.... -#. TranslatorExample: for bar -#. TranslatorExplanation: extension to previous message if we know what the resolvable is -#: ../zypp/solver/detail/ResolverInfoMisc.cc:298 -#: ../zypp/solver/detail/ResolverInfoMisc.cc:323 -#, c-format msgid "for %s" msgstr "%s:lle" -#. affected() = -#. _capability = -#. other() = -#. other_capability() = -#. Translator: 1.%s = dependency -#. TranslatorExample: There are no installable providers of foo -#. TranslatorExplanation: A resolvable is to be installed which requires foo -#. TranslatorExplanation: But there is nothing available to fulfill this requirement -#. TranslatorExplanation: This is an error message explaining that the resolvable cannot be installed -#: ../zypp/solver/detail/ResolverInfoMisc.cc:317 -#, c-format -msgid "There are no installable providers of %s" -msgstr "Mikään osa ei tarjoa osaa %s" - -#. Translator: 1.%s = name of package,patch,..., 2.%s = name of package,patch,... -#. TranslatorExample: Upgrade to foo to avoid removing bar is not possible -#. TranslatorExplanation: bar requires something from foo -#: ../zypp/solver/detail/ResolverInfoMisc.cc:341 -#, c-format msgid "Upgrading to %s to avoid removing %s is not possible." msgstr "osan %s päivittäminen poistamatta osaa %s ei ole mahdollista." -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; -#: ../zypp/solver/detail/ResolverInfoMisc.cc:359 -#, c-format msgid "%s provides %s, but is scheduled to be uninstalled." msgstr "Osa %s tarjoaa %s, mutta se on merkitty poistettavaksi." -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s type (package, patch, ...) -#: ../zypp/solver/detail/ResolverInfoMisc.cc:377 -#, c-format msgid "%s provides %s, but another version of that %s is already installed." msgstr "Osa %s tarjoaa %s, mutta toinen versio %s on jo asennettu." -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; -#: ../zypp/solver/detail/ResolverInfoMisc.cc:396 -#, c-format -msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details." -msgstr "Osa %s tarjoaa %s, mutta se on merkitty poistettavaksi. Yritä asentaa se yksinään saadaksesi lisätietoja." +msgid "" +"%s provides %s, but it is uninstallable. Try installing it on its own for " +"more details." +msgstr "" +"Osa %s tarjoaa %s, mutta se on merkitty poistettavaksi. Yritä asentaa se " +"yksinään saadaksesi lisätietoja." -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; -#: ../zypp/solver/detail/ResolverInfoMisc.cc:414 -#, c-format msgid "%s provides %s, but it is locked." msgstr "Osa %s tarjoaa %s, mutta se on lukittu." -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; -#: ../zypp/solver/detail/ResolverInfoMisc.cc:432 -#, c-format msgid "%s provides %s, but is scheduled to be kept." msgstr "Osa %s tarjoaa %s, mutta se on merkitty pidettäväksi." -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; -#: ../zypp/solver/detail/ResolverInfoMisc.cc:451 -#, c-format msgid "%s provides %s, but has another architecture." msgstr "Osa %s tarjoaa %s, mutta se on eri arkkitehtuuria." -#. Translator: 1.%s = name of package,patch,...; 2.%s = dependency; 3.%s = vendor ID -#: ../zypp/solver/detail/ResolverInfoMisc.cc:469 -#, c-format msgid "%s provides %s, but has another vendor (%s)." msgstr "Osa %s tarjoaa %s, mutta sillä on eri valmistaja (%s)." -#. Translator: 1.%s = dependency. 2.%s name of package, patch, ... -#: ../zypp/solver/detail/ResolverInfoMisc.cc:487 -#, c-format msgid "Can't satisfy requirement %s for %s" msgstr "Ei voida tyydyttää vaatimusta %s osalle %s" -#. affected() = to-be-installed resolvable which was scheduled to be uninstalled -#. _capability = -#. other() = -#. other_capability() = -#. Translator: %s = name of package,patch,... -#. TranslatorExample: foo is required by other to-be-installed resolvable, so it won't be unlinked. -#. TranslatorExplanation: Cant uninstall foo since it is required by an to-be-installed resolvable -#: ../zypp/solver/detail/ResolverInfoMisc.cc:508 -#, c-format -msgid "%s is required by another resolvable selected for installation, so it won't be unlinked." +msgid "" +"%s is required by another resolvable selected for installation, so it won't " +"be unlinked." msgstr "Jokin asennettavaksi merkitty paketti vaatii osan %s, joten sitä ei poisteta." -#. affected() = provider of cap -#. _capability = -#. other() = -#. other_capability() = -#. Translator: %s = name of package,patch,... -#. TranslatorExample: foo is required by other installed resolvable, so it won't be unlinked. -#. TranslatorExplanation: Cant uninstall foo since it is required by an installed resolvable -#: ../zypp/solver/detail/ResolverInfoMisc.cc:525 -#, c-format msgid "%s is required by another installed resolvable, so it won't be unlinked." msgstr "Muu asennettu osa vaatii %s, joten sitä ei poisteta." -#. affected() = to-be-uninstalled resolvable which is locked -#. _capability = -#. other() = -#. other_capability() = -#. Translator: %s = name of package,patch,... -#. TranslatorExample: foo is locked and cannot be uninstalled. -#. TranslatorExplanation: foo is to-be-uninstalled but it is locked -#: ../zypp/solver/detail/ResolverInfoMisc.cc:542 -#, c-format msgid "%s is locked and cannot be uninstalled." msgstr "%s on lukittu ja sitä ei voida poistaa." -#. affected() = provider of capability -#. _capability = provided by provider -#. other() = conflict issuer -#. other_capability() = conflict capability -#. Translator: 1.%s and 2.%s = Dependency; 4.%s = name of package,patch,... -#. TranslatorExample: A conflict over foo (bar) requires the removal of to-be-installed xyz -#: ../zypp/solver/detail/ResolverInfoMisc.cc:561 -#, c-format -msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation" +msgid "" +"A conflict over %s (%s) requires the removal of %s which is scheduled for " +"installation" msgstr "Ristiriita osasta %s (%s) vaatii asennettavaksi määritellyn %s poistamista" -#. affected() = provider of capability -#. _capability = provided by provider -#. other() = conflict issuer -#. other_capability() = conflict capability from issuer -#. Translator: 1.%s = name of package,patch,...; 3.%s and 4.%s = Dependency; -#. TranslatorExample: Marking xyz as uninstallable due to conflicts over foo (bar) -#: ../zypp/solver/detail/ResolverInfoMisc.cc:579 -#, c-format msgid "Marking %s as uninstallable due to conflicts over %s" msgstr "Merkitään %s poistettavaksi %s olevan ristiriidan vuoksi" -#. Translator: %s = name of package,patch -#. TranslatorExample: from abc -#: ../zypp/solver/detail/ResolverInfoMisc.cc:587 -#, c-format msgid "from %s" msgstr "%s:sta" -#: ../zypp/solver/detail/ResolverInfo.cc:195 msgid " Error!" msgstr " Virhe!" -#: ../zypp/solver/detail/ResolverInfo.cc:196 msgid " Important!" msgstr " Tärkeä!" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:53 -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:55 -#, c-format -msgid "keep %s" -msgstr "pidä %s" - -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Pidä osat" - -#. 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 "asenna %s" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Asenna puuttuvat osat" - -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:53 msgid "Make a solver run with ALL possibilities." msgstr "Etsitään KAIKKI mahdolliset vaihtoehdot." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:54 msgid "Regarding all resolvables with a compatible architecture." msgstr "Harkitaan kaikkia osia, jotka ovat yhteensopivaa arkkitehtuuria." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:57 msgid "Make a solver run with best architecture only." msgstr "Ratkaisin hakee vain sopivimmasta arkkitehtuurista." -#: ../zypp/solver/detail/ProblemSolutionAllBranches.cc:58 msgid "Regarding resolvables with best architecture only." msgstr "Harkitaan osia vain sopivimmasta arkkitehtuurista." -#. Translator: all.%s = name of package,patch,.... -#: ../zypp/solver/detail/ResolverInfoDependsOn.cc:55 -#, c-format msgid "%s depended on %s" msgstr "%s riippuuu osasta %s" -#. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:60 -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:110 -#, c-format msgid "%s is recommended by %s" msgstr "%2$s suosittelee osaa %1$s" -#. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:66 -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:116 -#, c-format msgid "%s is suggested by %s" msgstr "%2$s ehdottaa osaa %1$s" -#. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:72 -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:122 -#, c-format msgid "%s will be evaluated for installation (freshened) by %s" msgstr "%s on määritelty asennettavaksi (päivitettäväksi) %s takia" -#. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:78 -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:128 -#, c-format msgid "%s is enhanced by %s" msgstr "%s on paranneltu osalla %s" -#. Translator: all.%s = name of package,patch,... -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:84 -#: ../zypp/solver/detail/ResolverInfoNeededBy.cc:134 -#, c-format msgid "%s is supplemented by %s" msgstr "%2$s on täydennetty osalla %1$s" -#. Translator all.%s = name of packages,patches,.... -#. TranslatorExplanation: 1.%s name of package, 2.%s list of names -#. TranslatorExplanation: 1.%s is part of 'bundles', the bundles are listed in 2.%s -#: ../zypp/solver/detail/ResolverInfoChildOf.cc:56 -#: ../zypp/solver/detail/ResolverInfoChildOf.cc:71 -#, c-format msgid "%s part of %s" msgstr "%s kuuluu osaan %s" -#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:50 msgid "Double timeout" msgstr "Kaksinkertainen aikakatkaisu" -#: ../zypp/solver/detail/ProblemSolutionDoubleTimeout.cc:51 msgid "Start the next solver run with doubled timeout." msgstr "Käynnistä seuraava ratkaisin kaksikertaisella aikakatkaisu ajalla." -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:70 -msgid "unlock all resolvables" -msgstr "Poista kaikki lukitukset" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:83 -#, c-format -msgid "unlock %s" -msgstr "Poista %s lukitus" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:92 -msgid "Unlock these resolvables" -msgstr "Poistetaan näiden osien lukitus" - -#: ../zypp/thread/Mutex.cc:33 -msgid "Can't initialize mutex attributes" -msgstr "Mutex-määritetteitä ei voitu alustaa" - -#: ../zypp/thread/Mutex.cc:40 -msgid "Can't set recursive mutex attribute" -msgstr "Rekursiivisten mutex-määritteiden asetus ei onnistu" - -#: ../zypp/thread/Mutex.cc:47 -msgid "Can't initialize recursive mutex" -msgstr "Rekursiivisten mutex-määritteiden alustus ei onnistu" - -#: ../zypp/thread/Mutex.cc:77 -msgid "Can't acquire the mutex lock" -msgstr "Mutex-lukitusta ei voi hankkia" - -#: ../zypp/thread/Mutex.cc:87 -msgid "Can't release the mutex lock" -msgstr "Mutex-lukitusta ei voitu vapauttaa" - -#: ../zypp/CountryCode.cc:135 -msgid "Unknown country: " -msgstr "Tuntematon maa: " - -#: ../zypp/CountryCode.cc:217 -msgid "Andorra" -msgstr "Andorra" - -#. :AND:020: -#: ../zypp/CountryCode.cc:218 -msgid "United Arab Emirates" -msgstr "Arabiemiirikunnat" - -#. :ARE:784: -#: ../zypp/CountryCode.cc:219 -msgid "Afghanistan" -msgstr "Afganistan" - -# AG -#. :AFG:004: -#: ../zypp/CountryCode.cc:220 -msgid "Antigua and Barbuda" -msgstr "Antigua ja Barbuda" - -#. :ATG:028: -#: ../zypp/CountryCode.cc:221 -msgid "Anguilla" -msgstr "Anguilla" - -#. :AIA:660: -#: ../zypp/CountryCode.cc:222 -msgid "Albania" -msgstr "Albania" - -# AM -#. :ALB:008: -#: ../zypp/CountryCode.cc:223 -msgid "Armenia" -msgstr "Armenia" - -# AN -#. :ARM:051: -#: ../zypp/CountryCode.cc:224 -msgid "Netherlands Antilles" -msgstr "Alankomaiden Antillit" - -#. :ANT:530: -#: ../zypp/CountryCode.cc:225 -msgid "Angola" -msgstr "Angola" - -#. :AGO:024: -#: ../zypp/CountryCode.cc:226 -msgid "Antarctica" -msgstr "Antarktis" - -#. :ATA:010: -#: ../zypp/CountryCode.cc:227 -msgid "Argentina" -msgstr "Argentiina" - -# AS -#. :ARG:032: -#: ../zypp/CountryCode.cc:228 -msgid "American Samoa" -msgstr "Amerikan Samoa" - -#. :ASM:016: -#: ../zypp/CountryCode.cc:229 -msgid "Austria" -msgstr "Itävalta" - -#. :AUT:040: -#: ../zypp/CountryCode.cc:230 -msgid "Australia" -msgstr "Australia" - -# CU -#. :AUS:036: -#: ../zypp/CountryCode.cc:231 -msgid "Aruba" -msgstr "Aruba" - -# FO -#. :ABW:533: -#: ../zypp/CountryCode.cc:232 -msgid "Aland Islands" -msgstr "Ahvenanmaa" - -# AZ -#. :ALA:248: -#: ../zypp/CountryCode.cc:233 -msgid "Azerbaijan" -msgstr "Azerbaidžan" - -#. :AZE:031: -#: ../zypp/CountryCode.cc:234 -msgid "Bosnia and Herzegovina" -msgstr "Bosnia ja Hertsegovina" - -# BB -#. :BIH:070: -#: ../zypp/CountryCode.cc:235 -msgid "Barbados" -msgstr "Barbados" - -# BD -#. :BRB:052: -#: ../zypp/CountryCode.cc:236 -msgid "Bangladesh" -msgstr "Bangladesh" - -#. :BGD:050: -#: ../zypp/CountryCode.cc:237 -msgid "Belgium" -msgstr "Belgia" - -#. :BEL:056: -#: ../zypp/CountryCode.cc:238 -msgid "Burkina Faso" -msgstr "Burkina Faso" - -#. :BFA:854: -#: ../zypp/CountryCode.cc:239 -msgid "Bulgaria" -msgstr "Bulgaria" - -# BH -#. :BGR:100: -#: ../zypp/CountryCode.cc:240 -msgid "Bahrain" -msgstr "Bahrain" - -#. :BHR:048: -#: ../zypp/CountryCode.cc:241 -msgid "Burundi" -msgstr "Burundi" - -#. :BDI:108: -#: ../zypp/CountryCode.cc:242 -msgid "Benin" -msgstr "Benin" - -#. :BEN:204: -#: ../zypp/CountryCode.cc:243 -msgid "Bermuda" -msgstr "Bermuda" - -#. :BMU:060: -#: ../zypp/CountryCode.cc:244 -msgid "Brunei Darussalam" -msgstr "Brunei" - -#. :BRN:096: -#: ../zypp/CountryCode.cc:245 -msgid "Bolivia" -msgstr "Bolivia" - -# BR -#. :BOL:068: -#: ../zypp/CountryCode.cc:246 -msgid "Brazil" -msgstr "Brasilia" - -# BS -#. :BRA:076: -#: ../zypp/CountryCode.cc:247 -msgid "Bahamas" -msgstr "Bahama" - -# BH -#. :BHS:044: -#: ../zypp/CountryCode.cc:248 -msgid "Bhutan" -msgstr "Bhutan" - -# FO -#. :BTN:064: -#: ../zypp/CountryCode.cc:249 -msgid "Bouvet Island" -msgstr "Bouvetinsaari" - -#. :BVT:074: -#: ../zypp/CountryCode.cc:250 -msgid "Botswana" -msgstr "Botswana" - -# BY -#. :BWA:072: -#: ../zypp/CountryCode.cc:251 -msgid "Belarus" -msgstr "Valko-Venäjä" - -# BZ -#. :BLR:112: -#: ../zypp/CountryCode.cc:252 -msgid "Belize" -msgstr "Belize" - -#. :BLZ:084: -#: ../zypp/CountryCode.cc:253 -msgid "Canada" -msgstr "Kanada" - -#. :CAN:124: -#: ../zypp/CountryCode.cc:254 -msgid "Cocos (Keeling) Islands" -msgstr "Kookossaaret" - -#. :CCK:166: -#. :CAF:140: -#: ../zypp/CountryCode.cc:255 ../zypp/CountryCode.cc:257 -msgid "Congo" -msgstr "Kongo" - -# CF -#. :COD:180: -#: ../zypp/CountryCode.cc:256 -msgid "Central African Republic" -msgstr "Keski-Afrikan tasavalta" - -# CH -#. :COG:178: -#: ../zypp/CountryCode.cc:258 -msgid "Switzerland" -msgstr "Sveitsi" - -#. :CHE:756: -#: ../zypp/CountryCode.cc:259 -msgid "Cote D'Ivoire" -msgstr "Norsunluurannikko" - -# FO -#. :CIV:384: -#: ../zypp/CountryCode.cc:260 -msgid "Cook Islands" -msgstr "Cookinsaaret" - -# CL -#. :COK:184: -#: ../zypp/CountryCode.cc:261 -msgid "Chile" -msgstr "Chile" - -#. :CHL:152: -#: ../zypp/CountryCode.cc:262 -msgid "Cameroon" -msgstr "Kamerun" - -# CN -#. :CMR:120: -#: ../zypp/CountryCode.cc:263 -msgid "China" -msgstr "Kiina" - -# CO -#. :CHN:156: -#: ../zypp/CountryCode.cc:264 -msgid "Colombia" -msgstr "Kolumbia" - -#. :COL:170: -#: ../zypp/CountryCode.cc:265 -msgid "Costa Rica" -msgstr "Costa Rica" - -#. :CRI:188: -#: ../zypp/CountryCode.cc:266 -msgid "Serbia and Montenegro" -msgstr "Serbia ja Montenegro" - -# CU -#. :SCG:891: -#: ../zypp/CountryCode.cc:267 -msgid "Cuba" -msgstr "Kuuba" - -#. :CUB:192: -#: ../zypp/CountryCode.cc:268 -msgid "Cape Verde" -msgstr "Kap Verde" - -#. :CPV:132: -#: ../zypp/CountryCode.cc:269 -msgid "Christmas Island" -msgstr "Joulusaari" - -#. :CXR:162: -#: ../zypp/CountryCode.cc:270 -msgid "Cyprus" -msgstr "Kypros" - -# CZ -#. :CYP:196: -#: ../zypp/CountryCode.cc:271 -msgid "Czech Republic" -msgstr "Tšekki" - -#. :CZE:203: -#: ../zypp/CountryCode.cc:272 -msgid "Germany" -msgstr "Saksa" - -#. :DEU:276: -#: ../zypp/CountryCode.cc:273 -msgid "Djibouti" -msgstr "Djibouti" - -#. :DJI:262: -#: ../zypp/CountryCode.cc:274 -msgid "Denmark" -msgstr "Tanska" - -# DM -#. :DNK:208: -#: ../zypp/CountryCode.cc:275 -msgid "Dominica" -msgstr "Dominica" - -# DO -#. :DMA:212: -#: ../zypp/CountryCode.cc:276 -msgid "Dominican Republic" -msgstr "Dominikaaninen tasavalta" - -#. :DOM:214: -#: ../zypp/CountryCode.cc:277 -msgid "Algeria" -msgstr "Algeria" - -# EC -#. :DZA:012: -#: ../zypp/CountryCode.cc:278 -msgid "Ecuador" -msgstr "Ecuador" - -# EE -#. :ECU:218: -#: ../zypp/CountryCode.cc:279 -msgid "Estonia" -msgstr "Viro" - -#. :EST:233: -#: ../zypp/CountryCode.cc:280 -msgid "Egypt" -msgstr "Egypti" - -#. :EGY:818: -#: ../zypp/CountryCode.cc:281 -msgid "Western Sahara" -msgstr "Länsi-Sahara" - -#. :ESH:732: -#: ../zypp/CountryCode.cc:282 -msgid "Eritrea" -msgstr "Eritrea" - -#. :ERI:232: -#: ../zypp/CountryCode.cc:283 -msgid "Spain" -msgstr "Espanja" - -# ET -#. :ESP:724: -#: ../zypp/CountryCode.cc:284 -msgid "Ethiopia" -msgstr "Etiopia" - -#. :ETH:231: -#: ../zypp/CountryCode.cc:285 -msgid "Finland" -msgstr "Suomi" - -#. :FIN:246: -#: ../zypp/CountryCode.cc:286 -msgid "Fiji" -msgstr "Fidži" - -#. :FJI:242: -#: ../zypp/CountryCode.cc:287 -msgid "Falkland Islands (Malvinas)" -msgstr "Falklandinsaaret" - -#. :FLK:238: -#: ../zypp/CountryCode.cc:288 -msgid "Federated States of Micronesia" -msgstr "Mikronesia" - -# FO -#. :FSM:583: -#: ../zypp/CountryCode.cc:289 -msgid "Faroe Islands" -msgstr "Färsaaret" - -#. :FRO:234: -#: ../zypp/CountryCode.cc:290 -msgid "France" -msgstr "Ranska" - -#. :FRA:250: -#: ../zypp/CountryCode.cc:291 -msgid "Metropolitan France" -msgstr "Metropolitan France" - -# GH -#. :FXX:249: -#: ../zypp/CountryCode.cc:292 -msgid "Gabon" -msgstr "Gabon" - -#. :GAB:266: -#: ../zypp/CountryCode.cc:293 -msgid "United Kingdom" -msgstr "Iso-Britannia" - -# GD -#. :GBR:826: -#: ../zypp/CountryCode.cc:294 -msgid "Grenada" -msgstr "Grenada" - -# GE -#. :GRD:308: -#: ../zypp/CountryCode.cc:295 -msgid "Georgia" -msgstr "Georgia" - -#. :GEO:268: -#: ../zypp/CountryCode.cc:296 -msgid "French Guiana" -msgstr "Ranskan Guayana" - -# GH -#. :GUF:254: -#: ../zypp/CountryCode.cc:297 -msgid "Ghana" -msgstr "Ghana" - -#. :GHA:288: -#: ../zypp/CountryCode.cc:298 -msgid "Gibraltar" -msgstr "Gibraltar" - -# GL -#. :GIB:292: -#: ../zypp/CountryCode.cc:299 -msgid "Greenland" -msgstr "Grönlanti" - -# GM -#. :GRL:304: -#: ../zypp/CountryCode.cc:300 -msgid "Gambia" -msgstr "Gambia" - -# GU -#. :GMB:270: -#: ../zypp/CountryCode.cc:301 -msgid "Guinea" -msgstr "Guinea" - -#. :GIN:324: -#: ../zypp/CountryCode.cc:302 -msgid "Guadeloupe" -msgstr "Guadeloupe" - -#. :GLP:312: -#: ../zypp/CountryCode.cc:303 -msgid "Equatorial Guinea" -msgstr "Päiväntasaajan Guinea" - -#. :GNQ:226: -#: ../zypp/CountryCode.cc:304 -msgid "Greece" -msgstr "Kreikka" - -#. :GRC:300: -#: ../zypp/CountryCode.cc:305 -msgid "South Georgia and the South Sandwich Islands" -msgstr "Etelä-Georgia ja Eteläiset Sandwichsaaret" - -# GT -#. :SGS:239: -#: ../zypp/CountryCode.cc:306 -msgid "Guatemala" -msgstr "Guatemala" - -# GU -#. :GTM:320: -#: ../zypp/CountryCode.cc:307 -msgid "Guam" -msgstr "Guam" - -#. :GUM:316: -#: ../zypp/CountryCode.cc:308 -msgid "Guinea-Bissau" -msgstr "Guinea-Bissau" - -# GH -#. :GNB:624: -#: ../zypp/CountryCode.cc:309 -msgid "Guyana" -msgstr "Guyana" - -#. :GUY:328: -#: ../zypp/CountryCode.cc:310 -msgid "Hong Kong" -msgstr "Hong Kong" - -#. :HKG:344: -#: ../zypp/CountryCode.cc:311 -msgid "Heard Island and McDonald Islands" -msgstr "Heard ja McDonaldinsaaret" - -# HN -#. :HMD:334: -#: ../zypp/CountryCode.cc:312 -msgid "Honduras" -msgstr "Honduras" - -# HR -#. :HND:340: -#: ../zypp/CountryCode.cc:313 -msgid "Croatia" -msgstr "Kroatia" - -#. :HRV:191: -#: ../zypp/CountryCode.cc:314 -msgid "Haiti" -msgstr "Haiti" - -# HU -#. :HTI:332: -#: ../zypp/CountryCode.cc:315 -msgid "Hungary" -msgstr "Unkari" - -# ID -#. :HUN:348: -#: ../zypp/CountryCode.cc:316 -msgid "Indonesia" -msgstr "Indonesia" - -# IE -#. :IDN:360: -#: ../zypp/CountryCode.cc:317 -msgid "Ireland" -msgstr "Irlanti" - -# IL -#. :IRL:372: -#: ../zypp/CountryCode.cc:318 -msgid "Israel" -msgstr "Israel" - -# IN -#. :ISR:376: -#: ../zypp/CountryCode.cc:319 -msgid "India" -msgstr "Intia" - -#. :IND:356: -#: ../zypp/CountryCode.cc:320 -msgid "British Indian Ocean Territory" -msgstr "Brittiläinen Intian valtameren alue" - -# IQ -#. :IOT:086: -#: ../zypp/CountryCode.cc:321 -msgid "Iraq" -msgstr "Irak" - -# IR -#. :IRQ:368: -#: ../zypp/CountryCode.cc:322 -msgid "Iran" -msgstr "Iran" - -# IS -#. :IRN:364: -#: ../zypp/CountryCode.cc:323 -msgid "Iceland" -msgstr "Islanti" - -#. :ISL:352: -#: ../zypp/CountryCode.cc:324 -msgid "Italy" -msgstr "Italia" - -# JM -#. :ITA:380: -#: ../zypp/CountryCode.cc:325 -msgid "Jamaica" -msgstr "Jamaika" - -# JO -#. :JAM:388: -#: ../zypp/CountryCode.cc:326 -msgid "Jordan" -msgstr "Jordania" - -# JP -#. :JOR:400: -#: ../zypp/CountryCode.cc:327 -msgid "Japan" -msgstr "Japani" - -#. :JPN:392: -#: ../zypp/CountryCode.cc:328 -msgid "Kenya" -msgstr "Kenia" - -# KZ -#. :KEN:404: -#: ../zypp/CountryCode.cc:329 -msgid "Kyrgyzstan" -msgstr "Kirgisia" - -# KH -#. :KGZ:417: -#: ../zypp/CountryCode.cc:330 -msgid "Cambodia" -msgstr "Kambodža" - -#. :KHM:116: -#: ../zypp/CountryCode.cc:331 -msgid "Kiribati" -msgstr "Kiribati" - -#. :KIR:296: -#: ../zypp/CountryCode.cc:332 -msgid "Comoros" -msgstr "Komorit" - -# KN -#. :COM:174: -#: ../zypp/CountryCode.cc:333 -msgid "Saint Kitts and Nevis" -msgstr "Saint Kitts ja Nevis" - -#. :KNA:659: -#: ../zypp/CountryCode.cc:334 -msgid "North Korea" -msgstr "Pohjois-Korea" - -# ZA -#. :PRK:408: -#: ../zypp/CountryCode.cc:335 -msgid "South Korea" -msgstr "Etelä-Korea" - -#. :KOR:410: -#: ../zypp/CountryCode.cc:336 -msgid "Kuwait" -msgstr "Kuwait" - -# FO -#. :KWT:414: -#: ../zypp/CountryCode.cc:337 -msgid "Cayman Islands" -msgstr "Caymansaaret" - -# KZ -#. :CYM:136: -#: ../zypp/CountryCode.cc:338 -msgid "Kazakhstan" -msgstr "Kazakstan" - -#. :KAZ:398: -#: ../zypp/CountryCode.cc:339 -msgid "Lao People's Democratic Republic" -msgstr "Laos" - -#. :LAO:418: -#: ../zypp/CountryCode.cc:340 -msgid "Lebanon" -msgstr "Libanon" - -# LC -#. :LBN:422: -#: ../zypp/CountryCode.cc:341 -msgid "Saint Lucia" -msgstr "Saint Lucia" - -#. :LCA:662: -#: ../zypp/CountryCode.cc:342 -msgid "Liechtenstein" -msgstr "Liechtenstein" - -#. :LIE:438: -#: ../zypp/CountryCode.cc:343 -msgid "Sri Lanka" -msgstr "Sri Lanka" - -# LR -#. :LKA:144: -#: ../zypp/CountryCode.cc:344 -msgid "Liberia" -msgstr "Liberia" - -#. :LBR:430: -#: ../zypp/CountryCode.cc:345 -msgid "Lesotho" -msgstr "Lesotho" - -# LT -#. :LSO:426: -#: ../zypp/CountryCode.cc:346 -msgid "Lithuania" -msgstr "Liettua" - -# LU -#. :LTU:440: -#: ../zypp/CountryCode.cc:347 -msgid "Luxembourg" -msgstr "Luxemburg" - -# LV -#. :LUX:442: -#: ../zypp/CountryCode.cc:348 -msgid "Latvia" -msgstr "Latvia" - -# LR -#. :LVA:428: -#: ../zypp/CountryCode.cc:349 -msgid "Libya" -msgstr "Libya" - -#. :LBY:434: -#: ../zypp/CountryCode.cc:350 -msgid "Morocco" -msgstr "Marokko" - -#. :MAR:504: -#: ../zypp/CountryCode.cc:351 -msgid "Monaco" -msgstr "Monaco" - -#. :MCO:492: -#: ../zypp/CountryCode.cc:352 -msgid "Moldova" -msgstr "Moldova" - -#. :MDA:498: -#: ../zypp/CountryCode.cc:353 -msgid "Madagascar" -msgstr "Madagaskar" - -# FO -#. :MDG:450: -#: ../zypp/CountryCode.cc:354 -msgid "Marshall Islands" -msgstr "Marshallinsaaret" - -# MK -#. :MHL:584: -#: ../zypp/CountryCode.cc:355 -msgid "Macedonia" -msgstr "Makedonia" - -# ML -#. :MKD:807: -#: ../zypp/CountryCode.cc:356 -msgid "Mali" -msgstr "Mali" - -# MM -#. :MLI:466: -#: ../zypp/CountryCode.cc:357 -msgid "Myanmar" -msgstr "Myanmar" - -#. :MMR:104: -#: ../zypp/CountryCode.cc:358 -msgid "Mongolia" -msgstr "Mongolia" - -# MO -#. :MNG:496: -#: ../zypp/CountryCode.cc:359 -msgid "Macao" -msgstr "Macao, Kiinan e.h.a." - -#. :MAC:446: -#: ../zypp/CountryCode.cc:360 -msgid "Northern Mariana Islands" -msgstr "Pohjois-Mariaanit" - -#. :MNP:580: -#: ../zypp/CountryCode.cc:361 -msgid "Martinique" -msgstr "Martinique" - -# MR -#. :MTQ:474: -#: ../zypp/CountryCode.cc:362 -msgid "Mauritania" -msgstr "Mauritania" - -#. :MRT:478: -#: ../zypp/CountryCode.cc:363 -msgid "Montserrat" -msgstr "Montserrat" - -# MT -#. :MSR:500: -#: ../zypp/CountryCode.cc:364 -msgid "Malta" -msgstr "Malta" - -# MU -#. :MLT:470: -#: ../zypp/CountryCode.cc:365 -msgid "Mauritius" -msgstr "Mauritius" - -# MV -#. :MUS:480: -#: ../zypp/CountryCode.cc:366 -msgid "Maldives" -msgstr "Malediivit" - -# MW -#. :MDV:462: -#: ../zypp/CountryCode.cc:367 -msgid "Malawi" -msgstr "Malawi" - -# MX -#. :MWI:454: -#: ../zypp/CountryCode.cc:368 -msgid "Mexico" -msgstr "Meksiko" - -# MY -#. :MEX:484: -#: ../zypp/CountryCode.cc:369 -msgid "Malaysia" -msgstr "Malesia" - -#. :MYS:458: -#: ../zypp/CountryCode.cc:370 -msgid "Mozambique" -msgstr "Mosambik" - -# GM -#. :MOZ:508: -#: ../zypp/CountryCode.cc:371 -msgid "Namibia" -msgstr "Namibia" - -# NC -#. :NAM:516: -#: ../zypp/CountryCode.cc:372 -msgid "New Caledonia" -msgstr "Uusi-Kaledonia" - -# NG -#. :NCL:540: -#: ../zypp/CountryCode.cc:373 -msgid "Niger" -msgstr "Niger" - -# FO -#. :NER:562: -#: ../zypp/CountryCode.cc:374 -msgid "Norfolk Island" -msgstr "Norfolkinsaari" - -# NG -#. :NFK:574: -#: ../zypp/CountryCode.cc:375 -msgid "Nigeria" -msgstr "Nigeria" - -# NI -#. :NGA:566: -#: ../zypp/CountryCode.cc:376 -msgid "Nicaragua" -msgstr "Nicaragua" - -# NL -#. :NIC:558: -#: ../zypp/CountryCode.cc:377 -msgid "Netherlands" -msgstr "Alankomaat" - -#. :NLD:528: -#: ../zypp/CountryCode.cc:378 -msgid "Norway" -msgstr "Norja" - -#. :NOR:578: -#: ../zypp/CountryCode.cc:379 -msgid "Nepal" -msgstr "Nepal" - -#. :NRU:520: -#: ../zypp/CountryCode.cc:381 -msgid "Niue" -msgstr "Niue" - -# NZ -#. :NIU:570: -#: ../zypp/CountryCode.cc:382 -msgid "New Zealand" -msgstr "Uusi-Seelanti" - -#. :NZL:554: -#: ../zypp/CountryCode.cc:383 -msgid "Oman" -msgstr "Oman" - -# PA -#. :OMN:512: -#: ../zypp/CountryCode.cc:384 -msgid "Panama" -msgstr "Panama" - -# PE -#. :PAN:591: -#: ../zypp/CountryCode.cc:385 -msgid "Peru" -msgstr "Peru" - -#. :PER:604: -#: ../zypp/CountryCode.cc:386 -msgid "French Polynesia" -msgstr "Ranskan Polynesia" - -#. :PYF:258: -#: ../zypp/CountryCode.cc:387 -msgid "Papua New Guinea" -msgstr "Papua-Uusi-Guinea" - -#. :PNG:598: -#: ../zypp/CountryCode.cc:388 -msgid "Philippines" -msgstr "Filippiinit" - -#. :PHL:608: -#: ../zypp/CountryCode.cc:389 -msgid "Pakistan" -msgstr "Pakistan" - -# PL -#. :PAK:586: -#: ../zypp/CountryCode.cc:390 -msgid "Poland" -msgstr "Puola" - -#. :POL:616: -#: ../zypp/CountryCode.cc:391 -msgid "Saint Pierre and Miquelon" -msgstr "Saint-Pierre ja Miquelon" - -#. :SPM:666: -#: ../zypp/CountryCode.cc:392 -msgid "Pitcairn" -msgstr "Pitcairn" - -#. :PCN:612: -#: ../zypp/CountryCode.cc:393 -msgid "Puerto Rico" -msgstr "Puerto Rico" - -#. :PRI:630: -#: ../zypp/CountryCode.cc:394 -msgid "Palestinian Territory" -msgstr "Palestiina" - -# PT -#. :PSE:275: -#: ../zypp/CountryCode.cc:395 -msgid "Portugal" -msgstr "Portugali" - -# PW -#. :PRT:620: -#: ../zypp/CountryCode.cc:396 -msgid "Palau" -msgstr "Palau" - -# PY -#. :PLW:585: -#: ../zypp/CountryCode.cc:397 -msgid "Paraguay" -msgstr "Paraguay" - -# QA -#. :PRY:600: -#: ../zypp/CountryCode.cc:398 -msgid "Qatar" -msgstr "Qatar" - -#. :QAT:634: -#: ../zypp/CountryCode.cc:399 -msgid "Reunion" -msgstr "Réunion" - -# RO -#. :REU:638: -#: ../zypp/CountryCode.cc:400 -msgid "Romania" -msgstr "Romania" - -#. :ROU:642: -#: ../zypp/CountryCode.cc:401 -msgid "Russian Federation" -msgstr "Venäjä" - -# RW -#. :RUS:643: -#: ../zypp/CountryCode.cc:402 -msgid "Rwanda" -msgstr "Ruanda" - -#. :RWA:646: -#: ../zypp/CountryCode.cc:403 -msgid "Saudi Arabia" -msgstr "Saudi-Arabia" - -# FO -#. :SAU:682: -#: ../zypp/CountryCode.cc:404 -msgid "Solomon Islands" -msgstr "Salomonsaaret" - -#. :SLB:090: -#: ../zypp/CountryCode.cc:405 -msgid "Seychelles" -msgstr "Seychellit" - -# SD -#. :SYC:690: -#: ../zypp/CountryCode.cc:406 -msgid "Sudan" -msgstr "Sudan" - -#. :SDN:736: -#: ../zypp/CountryCode.cc:407 -msgid "Sweden" -msgstr "Ruotsi" - -#. :SWE:752: -#: ../zypp/CountryCode.cc:408 -msgid "Singapore" -msgstr "Singapore" - -#. :SGP:702: -#: ../zypp/CountryCode.cc:409 -msgid "Saint Helena" -msgstr "Saint Helena" - -# SI -#. :SHN:654: -#: ../zypp/CountryCode.cc:410 -msgid "Slovenia" -msgstr "Slovenia" - -#. :SVN:705: -#: ../zypp/CountryCode.cc:411 -msgid "Svalbard and Jan Mayen" -msgstr "Huippuvuoret ja Jan Mayen" - -# SK -#. :SJM:744: -#: ../zypp/CountryCode.cc:412 -msgid "Slovakia" -msgstr "Slovakia" - -#. :SVK:703: -#: ../zypp/CountryCode.cc:413 -msgid "Sierra Leone" -msgstr "Sierra Leone" - -#. :SLE:694: -#: ../zypp/CountryCode.cc:414 -msgid "San Marino" -msgstr "San Marino" - -#. :SMR:674: -#: ../zypp/CountryCode.cc:415 -msgid "Senegal" -msgstr "Senegal" - -# SO -#. :SEN:686: -#: ../zypp/CountryCode.cc:416 -msgid "Somalia" -msgstr "Somalia" - -# SY -#. :SOM:706: -#: ../zypp/CountryCode.cc:417 -msgid "Suriname" -msgstr "Suriname" - -#. :SUR:740: -#: ../zypp/CountryCode.cc:418 -msgid "Sao Tome and Principe" -msgstr "São Tomé ja Príncipe" - -# SV -#. :STP:678: -#: ../zypp/CountryCode.cc:419 -msgid "El Salvador" -msgstr "El Salvador" - -# SY -#. :SLV:222: -#: ../zypp/CountryCode.cc:420 -msgid "Syria" -msgstr "Syyria" - -# SZ -#. :SYR:760: -#: ../zypp/CountryCode.cc:421 -msgid "Swaziland" -msgstr "Swazimaa" - -#. :SWZ:748: -#: ../zypp/CountryCode.cc:422 -msgid "Turks and Caicos Islands" -msgstr "Turks- ja Caicossaaret" - -# TD -#. :TCA:796: -#: ../zypp/CountryCode.cc:423 -msgid "Chad" -msgstr "Tšad" - -#. :TCD:148: -#: ../zypp/CountryCode.cc:424 -msgid "French Southern Territories" -msgstr "Ranskan eteläiset alueet" - -#. :ATF:260: -#: ../zypp/CountryCode.cc:425 -msgid "Togo" -msgstr "Togo" - -# TH -#. :TGO:768: -#: ../zypp/CountryCode.cc:426 -msgid "Thailand" -msgstr "Thaimaa" - -# TJ -#. :THA:764: -#: ../zypp/CountryCode.cc:427 -msgid "Tajikistan" -msgstr "Tadžikistan" - -# TJ -#. :TKL:772: -#: ../zypp/CountryCode.cc:429 -msgid "Turkmenistan" -msgstr "Turkmenistan" - -# TN -#. :TKM:795: -#: ../zypp/CountryCode.cc:430 -msgid "Tunisia" -msgstr "Tunisia" - -#. :TUN:788: -#: ../zypp/CountryCode.cc:431 -msgid "Tonga" -msgstr "Tonga" - -#. :TON:776: -#: ../zypp/CountryCode.cc:432 -msgid "East Timor" -msgstr "Itä-Timor" - -# TR -#. :TLS:626: -#: ../zypp/CountryCode.cc:433 -msgid "Turkey" -msgstr "Turkki" - -# TT -#. :TUR:792: -#: ../zypp/CountryCode.cc:434 -msgid "Trinidad and Tobago" -msgstr "Trinidad ja Tobago" - -# TW -#. :TUV:798: -#: ../zypp/CountryCode.cc:436 -msgid "Taiwan" -msgstr "Taiwan" - -#. :TWN:158: -#: ../zypp/CountryCode.cc:437 -msgid "Tanzania" -msgstr "Tansania" - -# UA -#. :TZA:834: -#: ../zypp/CountryCode.cc:438 -msgid "Ukraine" -msgstr "Ukraina" - -# UG -#. :UKR:804: -#: ../zypp/CountryCode.cc:439 -msgid "Uganda" -msgstr "Uganda" - -# UM -#. :UGA:800: -#: ../zypp/CountryCode.cc:440 -msgid "United States Minor Outlying Islands" -msgstr "Yhdysvaltain pienet erillissaaret" - -# US -#. :UMI:581: -#: ../zypp/CountryCode.cc:441 -msgid "United States" -msgstr "Yhdysvallat" - -# UY -#. :USA:840: -#: ../zypp/CountryCode.cc:442 -msgid "Uruguay" -msgstr "Uruguay" - -#. :URY:858: -#: ../zypp/CountryCode.cc:443 -msgid "Uzbekistan" -msgstr "Uzbekistan" - -#. :UZB:860: -#: ../zypp/CountryCode.cc:444 -msgid "Holy See (Vatican City State)" -msgstr "Vatikaani" - -# VC -#. :VAT:336: -#: ../zypp/CountryCode.cc:445 -msgid "Saint Vincent and the Grenadines" -msgstr "Saint Vincent ja Grenadiinit" - -# VE -#. :VCT:670: -#: ../zypp/CountryCode.cc:446 -msgid "Venezuela" -msgstr "Venezuela" - -# VI -#. :VEN:862: -#: ../zypp/CountryCode.cc:447 -msgid "British Virgin Islands" -msgstr "Brittiläiset Neitsytsaaret" - -# VI -#. :VGB:092: -#: ../zypp/CountryCode.cc:448 -msgid "Virgin Islands, U.S." -msgstr "Yhdysvaltain Neitsytsaaret" - -# VN -#. :VIR:850: -#: ../zypp/CountryCode.cc:449 -msgid "Vietnam" -msgstr "Vietnam" - -#. :VNM:704: -#: ../zypp/CountryCode.cc:450 -msgid "Vanuatu" -msgstr "Vanuatu" - -#. :VUT:548: -#: ../zypp/CountryCode.cc:451 -msgid "Wallis and Futuna" -msgstr "Wallis ja Futuna" - -#. :WLF:876: -#: ../zypp/CountryCode.cc:452 -msgid "Samoa" -msgstr "Samoa" - -#. :WSM:882: -#: ../zypp/CountryCode.cc:453 -msgid "Yemen" -msgstr "Jemen" - -#. :YEM:887: -#: ../zypp/CountryCode.cc:454 -msgid "Mayotte" -msgstr "Mayotte" - -# ZA -#. :MYT:175: -#: ../zypp/CountryCode.cc:455 -msgid "South Africa" -msgstr "Etelä-Afrikka" - -# ZM -#. :ZAF:710: -#: ../zypp/CountryCode.cc:456 -msgid "Zambia" -msgstr "Sambia" - -#. :ZMB:894: -#: ../zypp/CountryCode.cc:457 -msgid "Zimbabwe" -msgstr "Zimbabwe" - -#: ../devel/devel.mvidner/installation_sources.cc:56 -#, c-format -msgid "" -"File %s is not signed.\n" -"Use it anyway?" -msgstr "" -"Tiedostoa %s ei ole allekirjoitettu.\n" -"Käytetäänkö silti?" - -#: ../devel/devel.mvidner/installation_sources.cc:65 -#, c-format -msgid "" -"File %s is signed with an unknown key:\n" -"%s|%s|%s\n" -"Use the file anyway?" -msgstr "" -"Tiedosto %s on allekirjoitettu tuntemattomalla avaimella:\n" -"%s|%s|%s\n" -" Käytetäänkö silti?" - -#: ../devel/devel.mvidner/installation_sources.cc:75 -#, c-format -msgid "" -"Untrusted key found:\n" -"%s|%s|%s\n" -"Trust key?" -msgstr "" -"Löydettiin ei-luotettu avain:\n" -"%s|%s|%s\n" -" Luotetaanko avaimeen?" - -#: ../devel/devel.mvidner/installation_sources.cc:85 -#, c-format -msgid "" -"File %s failed integrity check with the folowing key:\n" -"%s|%s|%s\n" -"Use the file anyway?" -msgstr "" -"Tiedoston %s yhtenäisyystarkistus epäonnistui seuraavalla avaimella:\n" -"%s|%s|%s\n" -" Käytetäänkö tiedostoa silti?" - -#: ../devel/devel.mvidner/installation_sources.cc:99 -#, c-format -msgid "" -"File %s does not have a checksum.\n" -"Use the file anyway?" -msgstr "" -"Tiedostolla %s ei ole tarkistussummaa.\n" -"Käytetäänkö tiedostoa silti?" - -#: ../devel/devel.mvidner/installation_sources.cc:108 -#, c-format -msgid "" -"File %s has an unknown checksum %s.\n" -"Use the file anyway?" -msgstr "" -"Tiedostolla %s on tuntematon tarkistussumma %s.\n" -"Käytetäänkö tiedostoa silti?" - -#: ../devel/devel.mvidner/installation_sources.cc:117 -#, c-format -msgid "" -"File %s has an invalid checksum.\n" -"Expected %s, found %s\n" -"Use the file anyway?" -msgstr "" -"Tiedoston %s tarkistussumma on virheellinen.\n" -"Odotettiin arvoa %s, saatiin %s\n" -"Käytetäänkö tiedostoa silti?" - Modified: trunk/libzypp/po/fr.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/fr.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/fr.po (original) +++ trunk/libzypp/po/fr.po Mon Apr 28 15:25:19 2008 @@ -1,46 +1,49 @@ +# translation of zypp.fr.po to # French message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002, 2003 SuSE Linux AG. # Copyright (C) 2000, 2001 SuSE GmbH. +# # Patricia Vaz , 2003. # Francoise Lermen , 2000, 2001, 2002. # Karine Nguyen , 2001. # Guillaume GARDET , 2008. -# +# Rémy Marquis , 2008. msgid "" msgstr "" -"Project-Id-Version: YaST (@memory@)\n" +"Project-Id-Version: zypp.fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-31 15:30+0200\n" -"PO-Revision-Date: 2008-02-17 16:56+0100\n" +"POT-Creation-Date: 2008-04-21 18:58+0200\n" +"PO-Revision-Date: 2008-04-22 18:47+0100\n" "Last-Translator: Guillaume GARDET \n" -"Language-Team: French Team \n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../zypp/sat/SATResolver.cc:757 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " -msgstr "Aucun fournisseur de %s définissable" +msgstr "" +"\n" +"fournisseurs pas installables: " #: ../zypp/media/MediaException.cc:214 #, c-format msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." -msgstr "" +msgstr " problème de certificat SSL, vérifiez que le certificat CA est OK pour '%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 en conflit avec %s" +msgstr "%s est en conflit avec %s fournit par %s" # TLABEL online_update_2002_01_04_0147__112 #. %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 "Échec de l'installation de %s" @@ -48,52 +51,40 @@ # TLABEL online_update_2002_01_04_0147__83 #. %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 installé." +msgstr "%s installé" # TLABEL partitioning_2002_01_04_0147__180 -#: ../zypp/sat/SATResolver.cc:695 -#, fuzzy, c-format -msgid "%s is not installable" -msgstr "non installé" - -#: ../zypp/sat/SATResolver.cc:714 -#, fuzzy, c-format -msgid "%s obsoletes %s provided by %s" -msgstr "%s rend obsolète %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 offre cette dépendance, mais changerait l'architecture de l'élément installé" +msgid "%s is not installable" +msgstr "%s n'est pas installable" -#. 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 offre cette dépendance, mais changerait le fabricant de l'élément installé" +msgid "%s obsoletes %s provided by %s" +msgstr "%s rend obsolète %s fourni par %s" # TLABEL partitioning_2002_01_04_0147__99 #. %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 "Échec du retrait de %s" +msgstr "Échec de la désinstallation de %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" -msgstr "Réussite du retrait de %s" +msgstr "Réussite de la désinstallation de %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 "" +msgstr "%s requiert %s, mais cette dépendance ne peut pas être fournie" #. language code: abk ab #: ../zypp/LanguageCode.cc:240 @@ -115,15 +106,16 @@ msgid "Adangme" msgstr "Adangme" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" -msgstr "Ajout du référentiel '%s'" +msgstr "Ajout du dépôt '%s'" # TLABEL firewall_2002_03_14_2340__51 -#: ../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 "Sortie rpm supplémentaire :" +msgstr "Sortie rpm supplémentaire:" #. language code: ady #: ../zypp/LanguageCode.cc:248 @@ -181,7 +173,8 @@ msgstr "Albanie" #. language code: alb sqi sq -#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264 +#: ../zypp/LanguageCode.cc:262 +#: ../zypp/LanguageCode.cc:264 msgid "Albanian" msgstr "Albanais" @@ -285,7 +278,8 @@ msgstr "Arménie" #. language code: arm hye hy -#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286 +#: ../zypp/LanguageCode.cc:284 +#: ../zypp/LanguageCode.cc:286 msgid "Armenian" msgstr "Arménien" @@ -334,7 +328,8 @@ msgid "Austronesian (Other)" msgstr "Malayo-polynésiennes (autres langues)" -#: ../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 "Authentification requise pour '%s'" @@ -372,11 +367,11 @@ #: ../zypp/media/MediaException.cc:47 #, c-format msgid "Bad file name: %s" -msgstr "" +msgstr "Mauvais nom de fichier: %s" #: ../zypp/media/MediaException.cc:77 msgid "Bad media attach point" -msgstr "" +msgstr "Mauvais point d'attache du media" #. :BRA:076: #: ../zypp/CountryCode.cc:254 @@ -444,7 +439,8 @@ msgstr "Bachkir" #. language code: baq eus eu -#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328 +#: ../zypp/LanguageCode.cc:326 +#: ../zypp/LanguageCode.cc:328 msgid "Basque" msgstr "Basque" @@ -598,7 +594,7 @@ msgid "Buginese" msgstr "Bugi" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "Construction du cache du dépôt '%s'" @@ -624,7 +620,8 @@ msgstr "Burkina Faso" #. language code: bur mya my -#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374 +#: ../zypp/LanguageCode.cc:372 +#: ../zypp/LanguageCode.cc:374 msgid "Burmese" msgstr "Birman" @@ -648,40 +645,35 @@ msgid "Cameroon" msgstr "Cameroun" -#: ../zypp/sat/detail/PoolImpl.cc:100 -#, fuzzy +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." -msgstr "Impossible de créer le fichier." +msgstr "Impossible de créer le pool-sat." #: ../zypp/thread/Mutex.cc:77 msgid "Can't acquire the mutex lock" msgstr "Impossible d'acquérir le verrouillage 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 "Impossible de chdir à '/' dans un chroot (%s)." #: ../zypp/ExternalProgram.cc:238 #, c-format msgid "Can't chroot to '%s' (%s)." -msgstr "" +msgstr "Impossible de chrooter dans '%s' (%s)." #. don't want to get here #: ../zypp/ExternalProgram.cc:259 #, c-format msgid "Can't exec '%s' (%s)." -msgstr "" +msgstr "Impossible d'exécuter '%s' (%s)." # TLABEL printconf_2002_03_14_2340__110 #: ../zypp/ExternalProgram.cc:267 -#, fuzzy, c-format +#, c-format msgid "Can't fork (%s)." -msgstr "%s introuvable." +msgstr "Impossible de forker (%s)." #: ../zypp/thread/Mutex.cc:33 msgid "Can't initialize mutex attributes" @@ -691,35 +683,31 @@ msgid "Can't initialize recursive mutex" msgstr "Impossible d'initialiser l'attribut mutex récursif" +#: ../zypp/base/InterProcessMutex.cc:79 +#, c-format +msgid "Can't open lock file: %s" +msgstr "Impossible d'ouvrir le fichier verrouillé: %s" + #: ../zypp/ExternalProgram.cc:174 -#, fuzzy, c-format +#, c-format msgid "Can't open pipe (%s)." -msgstr "Impossible d'ouvrir le fichier %1." +msgstr "Impossible d'ouvrir le pipe (%s)." # TLABEL backup_2002_03_14_2340__125 #: ../zypp/ExternalProgram.cc:163 -#, fuzzy, c-format +#, c-format msgid "Can't open pty (%s)." -msgstr "Impossible d'ouvrir le fichier : %s." - -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "Impossible d'ouvrir le fichier %1." +msgstr "Impossible d'ouvrir pty (%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 "Impossible de fournir %s à partir de %s" +msgstr "Impossible de fournir '%s' à partir du dépôt '%s'" #: ../zypp/thread/Mutex.cc:87 msgid "Can't release the mutex lock" msgstr "Impossible de libérer le verrouillage 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 "Impossible de définir l'attribut mutex récursif" @@ -732,23 +720,22 @@ #: ../zypp/KeyRing.cc:276 #, c-format msgid "Cannot create public key %s from %s keyring to file %s" -msgstr "" +msgstr "Impossible de créer la clé publiqe %s du porteclé %s dans le fichier %s" # TLABEL profile-manager_2002_08_07_0216__9 #: ../zypp/media/MediaException.cc:182 -#, fuzzy msgid "Cannot eject any media" -msgstr "Impossible de lire les profils." +msgstr "Impossible d'éjecter les media" #: ../zypp/media/MediaException.cc:184 -#, fuzzy, c-format +#, c-format msgid "Cannot eject media '%s'" -msgstr "Ouverture impossible de l'élément du bureau '%s'" +msgstr "Impossible d'éjecter le media '%s'" #: ../zypp/media/MediaException.cc:67 -#, fuzzy, c-format +#, c-format msgid "Cannot write file '%s'." -msgstr "Impossible d'écrire des données dans le fichier %1." +msgstr "Impossible d'écrire dans le fichier '%s'." #. :CUB:192: #: ../zypp/CountryCode.cc:275 @@ -818,7 +805,7 @@ # TLABEL sw_single_2002_01_04_0147__11 #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1879 +#: ../zypp/target/rpm/RpmDb.cc:1877 #, c-format msgid "Changed configuration files for %s:" msgstr "Fichiers de configuration modifiés pour %s :" @@ -859,7 +846,8 @@ msgstr "Chine" #. language code: chi zho zh -#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402 +#: ../zypp/LanguageCode.cc:400 +#: ../zypp/LanguageCode.cc:402 msgid "Chinese" msgstr "Chinois" @@ -916,17 +904,16 @@ #: ../zypp/ExternalProgram.cc:346 #, c-format msgid "Command exited with status %d." -msgstr "" +msgstr "La commande s'est terminée avec le status %d." #: ../zypp/ExternalProgram.cc:371 -#, fuzzy msgid "Command exited with unknown error." -msgstr "Commande exécutée à la connexion" +msgstr "La commande s'est terminée à cause d'une erreur inconnue." #: ../zypp/ExternalProgram.cc:366 #, c-format msgid "Command was killed by signal %d (%s)." -msgstr "" +msgstr "La command a été tuée par le signal %d (%s)." #. :KIR:296: #: ../zypp/CountryCode.cc:339 @@ -935,7 +922,8 @@ #. :CCK:166: #. :CAF:140: -#: ../zypp/CountryCode.cc:262 ../zypp/CountryCode.cc:264 +#: ../zypp/CountryCode.cc:262 +#: ../zypp/CountryCode.cc:264 msgid "Congo" msgstr "Congo" @@ -1010,7 +998,8 @@ msgstr "Croatie" #. language code: scr hrv hr -#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010 +#: ../zypp/LanguageCode.cc:1008 +#: ../zypp/LanguageCode.cc:1010 msgid "Croatian" msgstr "Croate" @@ -1030,7 +1019,8 @@ msgstr "Chypre" #. language code: cze ces cs -#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448 +#: ../zypp/LanguageCode.cc:446 +#: ../zypp/LanguageCode.cc:448 msgid "Czech" msgstr "Tchèque" @@ -1084,10 +1074,6 @@ msgid "Djibouti" msgstr "Djibouti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "Ne pas installer ou supprimer les élements concernés" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1115,12 +1101,15 @@ "Error code: %s\n" "Error message: %s\n" msgstr "" +"Erreur de téléchargement (curl) pour '%s':\n" +"Code erreur: %s\n" +"Message erreur: %s\n" #. TranslatorExplanation: curl is the name of a library, don't translate #: ../zypp/media/MediaException.cc:84 -#, fuzzy, c-format +#, c-format msgid "Download (curl) initialization failed for '%s'" -msgstr "Échec de l'initialisation de la cible : " +msgstr "Échec de l'initialisation du téléchagement (curl) pour '%s'" #. language code: dra #: ../zypp/LanguageCode.cc:470 @@ -1133,13 +1122,14 @@ msgstr "Douala" #. 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 "Type '%s' douteux pour %u byte de la somme de contrôle '%s'" #. language code: dut nld nl -#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480 +#: ../zypp/LanguageCode.cc:478 +#: ../zypp/LanguageCode.cc:480 msgid "Dutch" msgstr "Hollandais" @@ -1200,16 +1190,15 @@ #: ../zypp/media/MediaException.cc:135 msgid "Empty destination in URI" -msgstr "" +msgstr "Destination vide dans l'URI" #: ../zypp/media/MediaException.cc:130 msgid "Empty filesystem in URI" -msgstr "" +msgstr "Système de fichier vide dans l'URI" #: ../zypp/media/MediaException.cc:125 -#, fuzzy msgid "Empty host name in URI" -msgstr "Nom CA vide." +msgstr "Nom d'hôte vide dans l'URI" #: ../zypp/url/UrlUtils.cc:111 msgid "Encoded string contains a NUL byte" @@ -1244,12 +1233,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 "Erreur lors de la lecture des dépots :" +msgstr "Erreur survenue pendant la définition des options de téléchargement (curl) pour '%s':" #. language code: myv #: ../zypp/LanguageCode.cc:850 @@ -1288,31 +1272,30 @@ # TLABEL restore_2002_08_07_0216__88 #: ../zypp/KeyRing.cc:558 -#, fuzzy msgid "Failed to delete key." -msgstr "Impossible de démarrer la VM." +msgstr "Impossible de supprimer la clé." -#: ../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 "Impossible d'importer la clé publique du fichier %s: %s" # TLABEL restore_2002_08_07_0216__88 #: ../zypp/media/MediaException.cc:31 -#, fuzzy, c-format +#, c-format msgid "Failed to mount %s on %s" -msgstr "Échec lors de l'analyse : %s." +msgstr "Impossible de monter %s sur %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 "Impossible d'obtenir la clé publique." +msgstr "Impossible de supprimer la clé publique %s: %s" # TLABEL linuxrc_2002_03_29_0036__22 #: ../zypp/media/MediaException.cc:41 -#, fuzzy, c-format +#, c-format msgid "Failed to unmount %s" -msgstr "Échec du chargement du module \"%s\"." +msgstr "Impossible de démonter %s" #. :FJI:242: #: ../zypp/CountryCode.cc:294 @@ -1370,9 +1353,9 @@ "%s|%s|%s\n" "Use the file anyway?" msgstr "" -"Échec de la vérification de l'intégrité du fichier %s avec la clé suivante :\n" +"Échec de la vérification de l'intégrité du fichier %s avec la clé suivante:\n" "%s|%s|%s\n" -" Voulez-vous utiliser le fichier malgré tout ?" +"Voulez-vous utiliser le fichier malgré tout ?" #: ../devel/devel.mvidner/installation_sources.cc:117 #, c-format @@ -1383,7 +1366,7 @@ msgstr "" "Le fichier %s a une somme de contrôle non valide.\n" "%s attendu, %s trouvé\n" -" Voulez-vous utiliser ce fichier malgré tout ?" +"Voulez-vous utiliser ce fichier malgré tout ?" #: ../devel/devel.mvidner/installation_sources.cc:108 #, c-format @@ -1410,14 +1393,14 @@ "%s|%s|%s\n" "Use the file anyway?" msgstr "" -"Le fichier %s est signé avec une clé inconnue :\n" +"Le fichier %s est signé avec une clé inconnue:\n" "%s|%s|%s\n" " Voulez-vous l'utiliser malgré tout ?" #: ../zypp/media/MediaException.cc:60 -#, fuzzy, c-format +#, c-format msgid "File '%s' not found on medium '%s'" -msgstr "Fichier %1 introuvable dans le référentiel." +msgstr "Fichier '%s' introuvable dans sur le media '%s'" #. language code: fil #: ../zypp/LanguageCode.cc:514 @@ -1440,9 +1423,8 @@ msgstr "Finno-ougriennes (autres langues)" #: ../zypp/solver/detail/ProblemSolutionCombi.cc:73 -#, fuzzy msgid "Following actions will be done:" -msgstr "Les paquetages suivants seront mis à niveau :\n" +msgstr "Les actions suivantes seront exécutées:" #. language code: fon #: ../zypp/LanguageCode.cc:520 @@ -1455,7 +1437,8 @@ msgstr "France" #. language code: fre fra fr -#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524 +#: ../zypp/LanguageCode.cc:522 +#: ../zypp/LanguageCode.cc:524 msgid "French" msgstr "Français" @@ -1544,9 +1527,9 @@ msgid "Geez" msgstr "Guèze" -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65 -msgid "Generally ignore this requirement" -msgstr "Ignorer cette exigence à chaque fois" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" +msgstr "Ignorer généralement des exigences" #. :GRD:308: #: ../zypp/CountryCode.cc:302 @@ -1554,12 +1537,14 @@ msgstr "Géorgie" #. language code: geo kat ka -#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546 +#: ../zypp/LanguageCode.cc:544 +#: ../zypp/LanguageCode.cc:546 msgid "Georgian" msgstr "Géorgien" #. language code: ger deu de -#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550 +#: ../zypp/LanguageCode.cc:548 +#: ../zypp/LanguageCode.cc:550 msgid "German" msgstr "Allemand" @@ -1629,7 +1614,8 @@ msgstr "Grec ancien (jusqu'à 1453)" #. language code: gre ell el -#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580 +#: ../zypp/LanguageCode.cc:578 +#: ../zypp/LanguageCode.cc:580 msgid "Greek, Modern (1453-)" msgstr "Grec moderne (après 1453)" @@ -1703,7 +1689,8 @@ msgid "Haitian" msgstr "Haïtien" -#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55 +#: ../zypp/target/hal/HalException.h:46 +#: ../zypp/target/hal/HalException.h:55 #: ../zypp/target/hal/HalException.h:64 msgid "Hal Exception" msgstr "Exception Hal" @@ -1821,7 +1808,8 @@ msgstr "Islande" #. language code: ice isl is -#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624 +#: ../zypp/LanguageCode.cc:622 +#: ../zypp/LanguageCode.cc:624 msgid "Icelandic" msgstr "Islandais" @@ -1835,29 +1823,11 @@ msgid "Igbo" msgstr "Igbo" -# TLABEL scanner_2002_01_04_0147__15 #. 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 "Ignorer que %s est déjà prêt(e) à être installé" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "Ignorer le %s obsolète dans %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 "Ignorer ce conflit de %s" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Ignorer cette exigence cette fois uniquement" +msgid "Ignore some dependencies of %s" +msgstr "Ignorer des dépendances de %s" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1904,23 +1874,7 @@ msgid "Ingush" msgstr "Ingouche" -#. 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 "Installer %s bien que cela modifie l'architecture" - -#. 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 "Installer %s bien que cela modifie le fabricant" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Installer les correctifs manquants" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "L'installation a été abandonnée comme indiqué." @@ -1952,7 +1906,7 @@ #: ../zypp/url/UrlBase.cc:173 #, c-format msgid "Invalid %s component '%s'" -msgstr "Composant '%s' non valide %s " +msgstr "Composant '%s' non valide '%s'" #: ../zypp/Url.cc:152 #, c-format @@ -1970,7 +1924,7 @@ #: ../zypp/Url.cc:309 msgid "Invalid empty Url object reference" -msgstr "Référence de l'objet d'Url vide non valide" +msgstr "Référence d'objet d'Url vide non valide" #: ../zypp/url/UrlBase.cc:1047 #, c-format @@ -1979,7 +1933,7 @@ #: ../zypp/url/UrlUtils.cc:283 msgid "Invalid parameter array join separator character" -msgstr "Caractère séparateur d'union non valide pour l'ensemble de paramètres" +msgstr "Caractère séparateur de tableau d'union non valide pour l'ensemble de paramètres" #: ../zypp/url/UrlUtils.cc:173 msgid "Invalid parameter array split separator character" @@ -1994,7 +1948,13 @@ msgid "Invalid port component '%s'" msgstr "Composant de port non valide '%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 "Expression régulière '%s' invalide : regcomp a retourné %d" + +#: ../zypp/media/MediaCurl.cc:758 +#: ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "Mot de passe ou nom d'utilisateur invalide." @@ -2043,11 +2003,6 @@ msgid "Israel" msgstr "Israël" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Impossible d'ouvrir le fichier %1." - # TLABEL partitioning_2002_01_04_0147__180 #. language code: ita it #: ../zypp/LanguageCode.cc:654 @@ -2174,10 +2129,6 @@ msgid "Kazakhstan" msgstr "Kazakhstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Conserver les correctifs" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2469,7 +2420,8 @@ msgstr "Macédoine" #. language code: mac mkd mk -#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774 +#: ../zypp/LanguageCode.cc:772 +#: ../zypp/LanguageCode.cc:774 msgid "Macedonian" msgstr "Macédonien" @@ -2509,7 +2461,8 @@ msgstr "Malawi" #. language code: may msa ms -#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802 +#: ../zypp/LanguageCode.cc:800 +#: ../zypp/LanguageCode.cc:802 msgid "Malay" msgstr "Malais" @@ -2530,7 +2483,7 @@ #: ../zypp/media/MediaException.cc:115 msgid "Malformed URI" -msgstr "" +msgstr "URI malformé" #. :MKD:807: #: ../zypp/CountryCode.cc:363 @@ -2578,7 +2531,8 @@ msgstr "Manx" #. language code: mao mri mi -#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792 +#: ../zypp/LanguageCode.cc:790 +#: ../zypp/LanguageCode.cc:792 msgid "Maori" msgstr "Maori" @@ -2640,21 +2594,21 @@ #: ../zypp/media/MediaException.cc:169 #, c-format msgid "Media source '%s' does not contain the desired medium" -msgstr "" +msgstr "Le media source '%s' ne contient pas le contenu désiré" #: ../zypp/media/MediaException.cc:175 #, c-format msgid "Medium '%s' is in use by another instance" -msgstr "" +msgstr "Le medium '%s' est en utilisation par une autre instance" #: ../zypp/media/MediaException.cc:72 msgid "Medium not attached" -msgstr "" +msgstr "Le medium n'est pas attaché" #: ../zypp/media/MediaException.cc:53 #, c-format msgid "Medium not opened when trying to perform action '%s'." -msgstr "" +msgstr "Le medium ne s'est pas ouvert lors de l'action '%s'." #. language code: men #: ../zypp/LanguageCode.cc:808 @@ -2783,7 +2737,8 @@ #. language code: nau na #. :NPL:524: -#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:387 +#: ../zypp/LanguageCode.cc:858 +#: ../zypp/CountryCode.cc:387 msgid "Nauru" msgstr "Nauruan" @@ -2889,11 +2844,12 @@ #. Defined LanguageCode constants #. Defined CountryCode constants -#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215 +#: ../zypp/LanguageCode.cc:225 +#: ../zypp/CountryCode.cc:215 msgid "No Code" msgstr "Pas de code" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "Pas d'URL dans le référentiel." @@ -3002,9 +2958,8 @@ msgstr "Oman" #: ../zypp/media/MediaException.cc:145 -#, fuzzy msgid "Operation not supported by medium" -msgstr "Version de profil non prise en charge par le module AppArmor\n" +msgstr "Operation non supportée par le medium" #. language code: ori or #: ../zypp/LanguageCode.cc:910 @@ -3035,7 +2990,7 @@ #: ../zypp/repo/PackageProvider.cc:314 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" -msgstr "Échec de la vérification de l'intégrité du paquetage %s. Souhaitez-vous tenter de le télécharger de nouveau ?" +msgstr "Échec de la vérification de l'intégrité du paquet %s. Souhaitez-vous essayer à nouveau?" #. language code: pal #: ../zypp/LanguageCode.cc:926 @@ -3108,30 +3063,23 @@ msgstr "Paraguay" #: ../zypp/media/MediaException.cc:106 -#, fuzzy, c-format +#, c-format msgid "Path '%s' on medium '%s' is not a directory." -msgstr "%1 n'est pas un répertoire." +msgstr "Le chemin '%s' sur le medium '%s' n'est pas un répertoire." #: ../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 "Analyse du paramètre de chemin non prise en charge pour cette URL" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "Analyse du paramètre de chemin non prise en charge pour cette URL" +msgstr "Le chemin '%s' sur le medium '%s' n'est pas un fichier." #: ../zypp/media/MediaException.cc:200 -#, fuzzy, c-format +#, c-format msgid "Permission to access '%s' denied." -msgstr "Autorisations refusées" +msgstr "Autorisation d'accès à '%s' refusée." #. language code: per fas fa -#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 +#: ../zypp/LanguageCode.cc:938 +#: ../zypp/LanguageCode.cc:940 msgid "Persian" msgstr "Persan" @@ -3220,16 +3168,17 @@ msgid "Quechua" msgstr "Quechua" -#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229 +#: ../zypp/url/UrlBase.cc:782 +#: ../zypp/url/UrlBase.cc:1229 msgid "Query string parsing not supported for this URL" msgstr "Analyse de la chaîne de requête non prise en charge pour cette URL" #. 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 "échec" +msgstr "Echec RPM:" #. language code: roh rm #: ../zypp/LanguageCode.cc:970 @@ -3251,19 +3200,15 @@ msgid "Rarotongan" msgstr "Rarotonga" -#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131 +#: ../zypp/url/UrlBase.cc:1117 +#: ../zypp/url/UrlBase.cc:1131 msgid "Relative path not allowed if authority exists" msgstr "Chemin relatif non autorisé en présence d'une autorité" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, c-format msgid "Removing repository '%s'" -msgstr "Suppression du référentiel '%s'" - -#: ../zypp/Repository.cc:104 -#, c-format -msgid "RepoInfo alias (%s) does not match repository name (%s)" -msgstr "" +msgstr "Suppression du dépôt'%s'" #: ../zypp/parser/susetags/RepoParser.cc:232 msgid "Required file is missing: " @@ -3285,7 +3230,8 @@ msgstr "Roumanie" #. language code: rum ron ro -#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976 +#: ../zypp/LanguageCode.cc:974 +#: ../zypp/LanguageCode.cc:976 msgid "Romanian" msgstr "Roumain" @@ -3435,7 +3381,8 @@ msgstr "Serbie-Monténégro" #. language code: scc srp sr -#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002 +#: ../zypp/LanguageCode.cc:1000 +#: ../zypp/LanguageCode.cc:1002 msgid "Serbian" msgstr "Serbe" @@ -3486,9 +3433,9 @@ # TLABEL linuxrc_2002_03_29_0036__117 #: ../zypp/KeyRing.cc:568 -#, fuzzy, c-format +#, c-format msgid "Signature file %s not found" -msgstr "Paquet source '%s' introuvable." +msgstr "Fichier de signature %s introuvable" #. language code: bla #: ../zypp/LanguageCode.cc:354 @@ -3536,7 +3483,8 @@ msgstr "Slaves (autres langues)" #. language code: slo slk sk -#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034 +#: ../zypp/LanguageCode.cc:1032 +#: ../zypp/LanguageCode.cc:1034 msgid "Slovak" msgstr "Slovaque" @@ -3565,6 +3513,11 @@ msgid "Solomon Islands" msgstr "Îles Salomon" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "L'élément %s est en conflit avec %s fournit par lui même" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3718,12 +3671,12 @@ #: ../zypp/media/MediaException.cc:91 #, c-format msgid "System exception '%s' on medium '%s'." -msgstr "" +msgstr "Exception système '%s' sur le 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 "La gestion du système est verrouillée par l'application avec le pid %d. Veuillez fermer cette application avant de réessayer." #. language code: tgl tl #: ../zypp/LanguageCode.cc:1108 @@ -3800,12 +3753,13 @@ msgid "Thailand" msgstr "Thaïlande" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." -msgstr "" +msgstr "Cette action est actuellement déjà exécutée par un autre programme." #. language code: tib bod bo -#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114 +#: ../zypp/LanguageCode.cc:1112 +#: ../zypp/LanguageCode.cc:1114 msgid "Tibetan" msgstr "Tibétain" @@ -3822,7 +3776,7 @@ #: ../zypp/media/MediaException.cc:207 #, c-format msgid "Timeout exceed when access '%s'." -msgstr "" +msgstr "Timeout dépassé lors de l'accès à '%s'." #. language code: tem #: ../zypp/LanguageCode.cc:1100 @@ -3851,7 +3805,8 @@ #. language code: tkl #. :TJK:762: -#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:435 +#: ../zypp/LanguageCode.cc:1122 +#: ../zypp/CountryCode.cc:435 msgid "Tokelau" msgstr "Tokelau" @@ -3873,7 +3828,7 @@ #: ../zypp/KeyRing.cc:507 #, c-format msgid "Tried to import not existant key %s into keyring %s" -msgstr "" +msgstr "Essayé d'importer la clé non existante %s dans le porteclé %s" #. :TUR:792: #: ../zypp/CountryCode.cc:441 @@ -3942,7 +3897,8 @@ #. language code: tvl #. :TTO:780: -#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:442 +#: ../zypp/LanguageCode.cc:1152 +#: ../zypp/CountryCode.cc:442 msgid "Tuvalu" msgstr "Tuvalu" @@ -3998,13 +3954,14 @@ # TLABEL linuxrc_2002_03_29_0036__141 #: ../zypp/target/hal/HalContext.cc:206 msgid "Unable to create dbus connection" -msgstr "Impossible de créer la connexion dbus." +msgstr "Impossible de créer la connexion dbus" #: ../zypp/target/hal/HalContext.cc:249 msgid "Unable to initalize HAL context -- hald not running?" -msgstr "Impossible d'initialiser le contexte HAL -- hald fonctionne-t-il ?" +msgstr "Impossible d'initialiser le contexte HAL -- hald fonctionne-t-il?" -#: ../zypp/Url.cc:322 ../zypp/Url.cc:336 +#: ../zypp/Url.cc:322 +#: ../zypp/Url.cc:336 msgid "Unable to parse Url components" msgstr "Impossible d'analyser les composants de l'Url" @@ -4035,15 +3992,11 @@ #: ../zypp/CountryCode.cc:135 msgid "Unknown country: " -msgstr "Pays inconnu :" +msgstr "Pays inconnu: " #: ../zypp/LanguageCode.cc:145 msgid "Unknown language: " -msgstr "Langue inconnue :" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "Déverrouiller ces correctifs" +msgstr "Langue inconnue: " #: ../zypp/media/MediaUserAuth.cc:97 #, c-format @@ -4051,9 +4004,9 @@ msgstr "Méthode d'autentification HTTP '%s' non supportée" #: ../zypp/media/MediaException.cc:140 -#, fuzzy, c-format +#, c-format msgid "Unsupported URI scheme in '%s'." -msgstr "Schéma d'URL '%1' non valide." +msgstr "Schéma d'URL '%s' non supporté." #: ../devel/devel.mvidner/installation_sources.cc:75 #, c-format @@ -4062,9 +4015,9 @@ "%s|%s|%s\n" "Trust key?" msgstr "" -"La clé trouvée n'est pas approuvée :\n" +"Clé non approuvée trouvée:\n" "%s|%s|%s\n" -" Voulez-vous l'approuver ?" +"Voulez-vous l'approuver ?" #. language code: hsb #: ../zypp/LanguageCode.cc:612 @@ -4079,23 +4032,23 @@ #: ../zypp/url/UrlBase.cc:154 #, c-format msgid "Url scheme does not allow a %s" -msgstr "Le schéma de l'Url n'autorise pas de %s" +msgstr "Le modèle de l'Url n'autorise pas de %s" #: ../zypp/url/UrlBase.cc:1020 msgid "Url scheme does not allow a host component" -msgstr "Le schéma de l'Url n'autorise pas de composant d'hôte" +msgstr "Le modèle de l'Url n'autorise pas de composant d'hôte" #: ../zypp/url/UrlBase.cc:981 msgid "Url scheme does not allow a password" -msgstr "Le schéma de l'Url n'autorise pas de mot de passe" +msgstr "Le modèle de l'Url n'autorise pas de mot de passe" #: ../zypp/url/UrlBase.cc:1068 msgid "Url scheme does not allow a port" -msgstr "Le schéma de l'Url n'autorise pas de port" +msgstr "Le modèle de l'Url n'autorise pas de port" #: ../zypp/url/UrlBase.cc:947 msgid "Url scheme does not allow a username" -msgstr "Le schéma de l'Url n'autorise pas de nom d'utilisateur" +msgstr "Le modèle de l'Url n'autorise pas de nom d'utilisateur" #: ../zypp/url/UrlBase.cc:820 msgid "Url scheme is a required component" @@ -4103,11 +4056,11 @@ #: ../zypp/url/UrlBase.cc:1010 msgid "Url scheme requires a host component" -msgstr "Le schéma de l'Url nécessite un composant d'hôte" +msgstr "Le modèle de l'Url nécessite un composant d'hôte" #: ../zypp/url/UrlBase.cc:1096 msgid "Url scheme requires path name" -msgstr "Le schéma de l'Url requiert un nom de chemin" +msgstr "Le modèle de l'Url requiert un nom de chemin" #. :USA:840: #: ../zypp/CountryCode.cc:449 @@ -4132,7 +4085,7 @@ #. we will throw this later if no URL checks out fine #: ../zypp/RepoManager.cc:526 msgid "Valid metadata not found at specified URL(s)" -msgstr "Metadata valide non trouvée à l'URL spécifiée" +msgstr "Meta-donnée valide non trouvée à l'URL spécifiée" #. :VNM:704: #: ../zypp/CountryCode.cc:457 @@ -4205,7 +4158,8 @@ msgstr "Washo" #. language code: wel cym cy -#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194 +#: ../zypp/LanguageCode.cc:1192 +#: ../zypp/LanguageCode.cc:1194 msgid "Welsh" msgstr "Gallois" @@ -4307,98 +4261,78 @@ msgid "applydeltarpm failed." msgstr "applydeltarpm a échoué." -#: ../zypp/sat/SATResolver.cc:951 +#: ../zypp/solver/detail/SATResolver.cc:1129 #, c-format msgid "architecture change of %s to %s" -msgstr "" +msgstr "changement de l'architecture %s à %s" # TLABEL partitioning_2002_01_04_0147__180 -#: ../zypp/sat/SATResolver.cc:704 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:875 +#, c-format msgid "cannot install both %s and %s" -msgstr "Impossible d'installer %s" +msgstr "impossible d'installer simultanément %s et %s" # TLABEL kinternet_2002_02_20_2255__29 -#: ../zypp/sat/SATResolver.cc:688 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:859 msgid "conflicting requests" -msgstr "Demande de connexion à : " +msgstr "requêtes conflictuelles" # TLABEL backup_2002_03_14_2340__102 #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" -msgstr "- sauvegarde %s créée" +msgstr "sauvegarde %s créée" -#: ../zypp/sat/SATResolver.cc:978 -#, fuzzy, c-format -msgid "deinstallation of %s" -msgstr "Échec de l'installation de %s:" - -# TLABEL packages_2002_01_04_0147__198 -#. 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 "supprimer %s" +msgid "deinstallation of %s" +msgstr "désinstallation de %s" -#: ../zypp/sat/SATResolver.cc:747 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:923 msgid "deleted providers: " -msgstr "Aucun ne fournit %s" +msgstr "fournisseurs supprimés: " -#: ../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 "Ne pas installer ou supprimer les élements concernés" +msgstr "Ne pas demander de supprimer tous les élements fournissant %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 "Aucun fournisseur de %s définissable" +msgstr "Ne pas demander d'installer un élément fournissant %s" # TLABEL partitioning_2002_01_04_0147__180 -#: ../zypp/sat/SATResolver.cc:837 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:1015 +#, c-format msgid "do not forbid installation of %s" -msgstr "ne pas installer %s" +msgstr "ne pas interdire l'installation de %s" # TLABEL partitioning_2002_01_04_0147__180 -#. 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 "ne pas installer %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 "ne pas installer une version plus récente de %s" # TLABEL partitioning_2002_01_04_0147__180 -#: ../zypp/sat/SATResolver.cc:811 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:989 +#, c-format msgid "do not keep %s installed" -msgstr "non installé" - -#: ../zypp/sat/SATResolver.cc:944 -#, fuzzy, c-format -msgid "downgrade of %s to %s" -msgstr "Téléchargement de %s à partir de %s" +msgstr "ne pas laisser %s installé" -# TLABEL online_update_2002_01_04_0147__8 -#. 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 "installation d'une version moins récente de %s vers %s" -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4406,11 +4340,13 @@ "-->\n" " %s" msgstr "" +"installer %s (avec changement de fournisseur)\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 "conserver %s" @@ -4423,495 +4359,72 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection : impossible de définir la connexion 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 est requis par %s" +msgstr "rien ne fournit %s, qui est requis par %s" -#: ../zypp/sat/SATResolver.cc:691 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:862 +#, c-format msgid "nothing provides requested %s" -msgstr "Aucun ne fournit %s" +msgstr "rien ne fournit %s qui est requis" -#: ../zypp/sat/SATResolver.cc:685 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:856 +#, c-format msgid "problem with installed package %s" -msgstr "Problème lors de l'installation des paquets sources %s-%s :" +msgstr "problème avec le paquet installé %s" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" -msgstr "" +msgstr "remplacement de %s avec %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 a créé %s sous le nom de %s mais il a été impossible de déterminer la différence" +msgstr "rpm a créé %s sous le nom de %s, mais il a été impossible de déterminer la différence" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc: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 a créé %s sous le nom de %s.\n" -"Dans les 25 premières lignes, la différence se présente comme suit :\n" +"Voici les 25 premières lignes qui diffèrent:\n" # TLABEL firewall_2002_03_14_2340__2 -#: ../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 "Sortie rpm :" +msgstr "sortie 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 a enregistré %s sous le nom de %s mais il a été impossible de déterminer la différence" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc: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 a enregistré %s sous le nom de %s.\n" -"Dans les 25 premières lignes, la différence se présente comme suit :\n" +"Voici les 25 premières lignes qui diffèrent:\n" -#: ../zypp/sat/SATResolver.cc:759 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:935 msgid "uninstallable providers: " -msgstr "Aucun fournisseur de %s définissable" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "déverrouiller %s" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "déverrouiller tous les correctifs" - -#~ msgid "Reading '%s' repository cache" -#~ msgstr "Lecture de '%s' depuis le cache du dépôt" - -#~ msgid "Reading patch and delta rpms from '%s' repository cache" -#~ msgstr "Lecture du correctif et du delta du RPM depuis '%s' le dépôt" - -#~ msgid "Cleaning repository '%s' cache" -#~ msgstr "Nettoyage du cache du dépôt '%s'" - -#~ msgid "Reading repository '%s' cache" -#~ msgstr "Lecture du cache du dépôt '%s'" - -#~ msgid "Software management is already running." -#~ msgstr "La gestion des logiciels est déjà en cours d'exécution." - -#~ msgid "%s is replaced by %s" -#~ msgstr "%s est remplacé par %s" - -#~ msgid "%s replaced by %s" -#~ msgstr "%s remplacé par %s" - -#~ msgid "%s will be deleted by the user.\n" -#~ msgstr "%s sera supprimé par l'utilisateur.\n" - -#~ msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "%s sera supprimé par une autre apllication. (ApplLow/ApplHigh)\n" - -#~ msgid "%s will be installed by the user.\n" -#~ msgstr "%s sera installé par l'utilisateur.\n" - -#~ msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "%s sera installé par une autre application. (ApplLow/ApplHigh)\n" - -#~ msgid "No valid solution found within %d seconds" -#~ msgstr "Aucune solution valide trouvée dans les %d secondes" - -#~ msgid "The solver has reached a defined timout" -#~ msgstr "Le résolveur a atteint un temps limite défini (timeout)" - -#~ msgid "No valid solution found with just resolvables of best architecture." -#~ msgstr "Aucune solution valide trouvée avec seulement les solutions de la meillleur architecture." - -#~ msgid "With this run only resolvables with the best architecture have been regarded.\n" -#~ msgstr "Par ce processus, seuls les résolutions avec la meilleur architecture ont été considérées.\n" - -#~ msgid "Regarding all possible resolvables takes time, but can come to a valid result." -#~ msgstr "Considérer toutes les résolutions possibles prend du temps mais peut amener à un résultat valide." - -#~ msgid "Invalid information" -#~ msgstr "Informations incorrectes" - -#~ msgid "%s is needed by other resolvables" -#~ msgstr "%s est requis par d'autres correctifs" - -#~ msgid "" -#~ "%s is needed by:\n" -#~ "%s" -#~ msgstr "" -#~ "%s est requis par :\n" -#~ "%s" - -#~ msgid "%s conflicts with other resolvables" -#~ msgstr "%s est en conflit avec d'autres correctifs" - -#~ msgid "" -#~ "%s conflicts with:\n" -#~ "%s" -#~ msgstr "" -#~ "%s est en conflit avec :\n" -#~ "%s" - -#~ msgid "%s obsoletes other resolvables" -#~ msgstr "%s rend d'autres correctifs obsolètes" - -#~ msgid "%s obsoletes:%s" -#~ msgstr "%s rend obsolète :%s" - -#~ msgid "" -#~ "\n" -#~ "These resolvables will be deleted from the system." -#~ msgstr "" -#~ "\n" -#~ "Ces correctifs seront supprimés du système." - -#~ msgid "%s depends on other resolvables" -#~ msgstr "%s dépend d'autres correctifs" - -#~ msgid "%s depends on %s" -#~ msgstr "%s dépend de %s" - -#~ msgid "%s depends on:%s" -#~ msgstr "%s dépend de :%s" - -#~ msgid "Child of" -#~ msgstr "Enfant de" - -#~ msgid "" -#~ "\n" -#~ "There is no resource available which supports this requirement." -#~ msgstr "" -#~ "\n" -#~ "Aucune ressource disponible qui prenne en charge cette exigence." - -#~ msgid "Due to the problems described above/below, this resolution will not solve all dependencies" -#~ msgstr "Étant donné les problèmes décrits ci-dessus/dessous, cette solution ne résoudra pas toutes les dépendances" - -#~ msgid "Cannot install %s, because it is conflicting with %s" -#~ msgstr "Impossible d'installer %s car il est en conflit avec %s" - -# TLABEL autoinst_2002_08_07_0216__335 -#~ msgid "%s is not installed and has been marked as uninstallable" -#~ msgstr "%s n'est pas installé et est marqué comme non installable" - -#~ msgid "Cannot install %s due to dependency problems" -#~ msgstr "Impossible d'installer %s à cause de problèmes de dépendance" - -#~ msgid "%s has unfulfilled requirements" -#~ msgstr "%s ne respecte pas certaines exigences" - -#~ msgid "%s has missing dependencies" -#~ msgstr "%s comporte des dépendances manquantes" - -#~ msgid "%s cannot be installed due to missing dependencies" -#~ msgstr "Impossible d'installer %s à cause de dépendances manquantes" - -#~ msgid "%s fulfills dependencies of %s but will be uninstalled" -#~ msgstr "%s satisfait les dépendances de %s mais sera désinstallé" - -#~ msgid "%s fulfills dependencies of %s but will be kept on your system" -#~ msgstr "%s satisfait les dépendances de %s mais sera conservé sur votre système" - -# TLABEL online_update_2002_01_04_0147__92 -#~ msgid "No need to install %s" -#~ msgstr "Aucune nécessité d'installer %s" - -#~ msgid "Cannot install %s to fulfill the dependencies of %s" -#~ msgstr "Impossible d'installer %s pour satisfaire les dépendances de %s" - -#~ msgid "Cannot install %s to fulfil the dependencies of %s" -#~ msgstr "Impossible d'installer %s pour satisfaire les dépendances de %s" - -#~ msgid "%s will not be uninstalled, because it is still required" -#~ msgstr "%s ne sera pas désinstallé car il est toujours requis" - -#~ msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." -#~ msgstr "%s rend obsolète %s. Mais il est impossible de supprimer %s car il est verrouillé." - -#~ msgid "Cannot install %s, because it is conflicting" -#~ msgstr "Impossible d'installer %s à cause d'un conflit" - -#~ msgid "%s is uninstallable due to conflicts with %s" -#~ msgstr "%s ne peut pas être installé car il est en conflit avec %s" - -#~ msgid "Requirememt %s cannot be fulfilled." -#~ msgstr "Le besoin %s ne peut être comblé." - -#~ msgid "for requiring %s for %s when upgrading %s" -#~ msgstr "pour l'exigence %s destinée à %s lors de la mise à niveau de %s" - -#~ msgid "%s is lacking the requirement %s" -#~ msgstr "%s manque le besoin %s" - -# TLABEL rpm-groups_2002_03_14_2340__3 -#~ msgid ", Action: " -#~ msgstr ". Action :" - -#~ msgid ", Trigger: " -#~ msgstr ". Déclencheur :" - -#~ msgid "package" -#~ msgstr "package" - -#~ msgid "selection" -#~ msgstr "sélection" - -#~ msgid "pattern" -#~ msgstr "modèle" - -#~ msgid "product" -#~ msgstr "produit" - -#~ msgid "patch" -#~ msgstr "correctif" - -#~ msgid "script" -#~ msgstr "script" - -#~ msgid "message" -#~ msgstr "message" - -#~ msgid "atom" -#~ msgstr "atome" - -#~ msgid "system" -#~ msgstr "système" - -#~ msgid "Resolvable" -#~ msgstr "Correctif" - -#~ msgid "Marking this resolution attempt as invalid." -#~ msgstr "Marquage de cette tentative de résolution comme étant incorrecte." - -#~ msgid "Marking resolvable %s as uninstallable" -#~ msgstr "Marquage du correctif %s comme étant non installable" - -#~ msgid "%s is scheduled to be installed, but this is impossible due to dependency problems." -#~ msgstr "L'installation de %s est planifiée mais elle est impossible en raison de problèmes de dépendance." - -#~ msgid "Can't install %s since it is already marked as needed to be uninstalled" -#~ msgstr "Impossible d'installer %s car le fichier est marqué comme étant à désinstaller" - -#~ msgid "Can't install %s, because it does not apply to this system." -#~ msgstr "Impossible d'installer %s parce qu'il n'est pas necessaire pour ce système." - -#~ msgid "Can't install %s, because %s is already marked as needed to for installation" -#~ msgstr "Impossible d'installer %s car %s est déjà marqué comme étant à installer" - -#~ msgid "This would invalidate %s." -#~ msgstr "Cela invaliderait %s." - -# TLABEL partitioning_2002_01_04_0147__180 -#~ msgid "Establishing %s" -#~ msgstr "Mise en place de %s" - -# TLABEL partitioning_2002_01_04_0147__180 -#~ msgid "Installing %s" -#~ msgstr "Installation de %s..." - -#~ msgid "Updating %s to %s" -#~ msgstr "Mise à jour de %s vers %s" - -# TLABEL scanner_2002_01_04_0147__15 -#~ msgid "Skipping %s: already installed" -#~ msgstr "%s ignoré : déjà installé." - -#~ msgid "There are no alternative providers of %s installed" -#~ msgstr "Il n'y a aucun fournisseur alternatif de %s d'installé" - -#~ msgid "for %s" -#~ msgstr "pour %s" - -#, fuzzy -#~ msgid "Upgrading to %s to avoid removing %s is not possible." -#~ msgstr "La mise à niveau vers %s pour éviter de retirer %s n'est pas possible." - -#~ msgid "%s provides %s, but is scheduled to be uninstalled." -#~ msgstr "%s fournit %s mais un problème lié à la planification de la désinstallation se pose." - -#~ msgid "%s provides %s, but another version of that %s is already installed." -#~ msgstr "%s fournit %s, mais une autre version de %s est déjà installée." - -#~ msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details." -#~ msgstr "%s fournit %s mais un problème d'installation se pose. Pour identifier le problème, tentez de l'installer indépendamment." - -#~ msgid "%s provides %s, but it is locked." -#~ msgstr "%s fournit %s mais un problème de verrouillage se pose." - -#~ msgid "%s provides %s, but is scheduled to be kept." -#~ msgstr "%s fournit %s mais sa conservation est prévue." - -#~ msgid "%s provides %s, but has another architecture." -#~ msgstr "%s offre %s, mais a une autre architecture." - -#~ msgid "%s provides %s, but has another vendor (%s)." -#~ msgstr "%s fournit %s, mais a un autre créateur (%s)." - -#~ msgid "Can't satisfy requirement %s for %s" -#~ msgstr "Impossible de satisfaire l'exigence %s pour %s" - -#~ msgid "%s is required by another resolvable selected for installation, so it won't be unlinked." -#~ msgstr "%s est requis par un autre élement sélectionné pour l'installation donc il ne sera pas supprimé." - -#~ msgid "%s is required by another installed resolvable, so it won't be unlinked." -#~ msgstr "%s est requis par un autre élement installé donc il ne sera pas supprimé." - -# TLABEL autoinst_2002_08_07_0216__335 -#~ msgid "%s is locked and cannot be uninstalled." -#~ msgstr "%s est verrouillé et ne peut pas être désinstallé." - -#~ msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation" -#~ msgstr "Un conflit sur %s (%s) nécessite le retrait de %s qui est prévu à l'installation" - -#~ msgid "Marking %s as uninstallable due to conflicts over %s" -#~ msgstr "Marquage de %s comme non installable en raison de conflits sur %s" - -#~ msgid "from %s" -#~ msgstr "à partir de %s" - -# TLABEL wizard_2002_01_04_0147__40 -#~ msgid " Error!" -#~ msgstr "Erreur !" - -# TLABEL autoinst_2002_08_07_0216__135 -#~ msgid " Important!" -#~ msgstr "Important !" - -#~ msgid "Make a solver run with ALL possibilities." -#~ msgstr "Créer un solutionneur qui couvre toutes les possibilités." - -#~ msgid "Regarding all resolvables with a compatible architecture." -#~ msgstr "Regarde tous les élements avec une architecture compatible." - -#~ msgid "Make a solver run with best architecture only." -#~ msgstr "Lancer un résolveur avec la meilleure architecture uniquement." - -#~ msgid "Regarding resolvables with best architecture only." -#~ msgstr "Regarde les élements avec la meilleure architecture uniquement." - -#~ msgid "%s depended on %s" -#~ msgstr "%s basé sur %s" - -#~ msgid "%s is recommended by %s" -#~ msgstr "%s est recommandé par %s" - -#~ msgid "%s is suggested by %s" -#~ msgstr "%s est suggéré par %s" - -#~ msgid "%s will be evaluated for installation (freshened) by %s" -#~ msgstr "%s sera évalué pour l'installation (rafraichi) par %s" - -#~ msgid "%s is enhanced by %s" -#~ msgstr "%s est remplacé par %s" - -#~ msgid "%s is supplemented by %s" -#~ msgstr "%s est requis par %s" - -#~ msgid "%s part of %s" -#~ msgstr "%s - partie de %s" - -#~ msgid "Double timeout" -#~ msgstr "Double timeout" - -#~ msgid "Start the next solver run with doubled timeout." -#~ msgstr "Lancer le prochain résolveur de conflit avec un délai (timeout) doublé." - -#~ msgid "%s is freshened by %s" -#~ msgstr "%s est rafraichis par %s" - -#~ msgid "Unable to parse Url authority" -#~ msgstr "Impossible d'analyser l'autorité de l'Url" - -#~ msgid "Ignore this requirement generally" -#~ msgstr "Ignorer cette exigence en règle générale" - -#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked." -#~ msgstr "%s est requis par un autre correctif à installer, donc sa liaison ne sera pas supprimée." - -#~ msgid "Cannot create a file needed to perform update installation." -#~ msgstr "Impossible de créer un fichier nécessaire pour installer la mise à jour." - -#~ msgid "Unable to restore all sources." -#~ msgstr "Impossible de restaurer toutes les sources." - -#~ msgid "At least one source already registered, stored sources cannot be restored." -#~ msgstr "Au moins une source est déjà enregistrée ; les sources stockées ne peuvent pas être restaurées." - -#~ msgid "Cannot be install %s to fulfil the dependencies of %s" -#~ msgstr "Impossible d'installer %s pour satisfaire les dépendances de %s" - -#~ msgid "%s dependend on %s" -#~ msgstr "%s dépendant de %s" - -#~ msgid "Reading index files" -#~ msgstr "Lecture des fichiers d'index" - -#~ msgid "The signed repomd.xml file failed the signature check." -#~ msgstr "Le fichier repomd.xml signé a échoué au contrôle de signature." - -# TLABEL restore_2002_08_07_0216__60 -#~ msgid "Reading product from %s" -#~ msgstr "Lecture du produit depuis %s" - -# TLABEL restore_2002_08_07_0216__60 -#~ msgid "Reading filelist from %s" -#~ msgstr "Lecture de la liste de fichiers depuis %s" - -# TLABEL restore_2002_08_07_0216__60 -#~ msgid "Reading packages from %s" -#~ msgstr "Lecture des paquetages depuis %s" - -# TLABEL restore_2002_08_07_0216__60 -#~ msgid "Reading selection from %s" -#~ msgstr "Lecture de la sélection depuis %s" - -# TLABEL restore_2002_08_07_0216__60 -#~ msgid "Reading pattern from %s" -#~ msgstr "Lecture du modèle depuis %s" - -#~ msgid "Reading patches index %s" -#~ msgstr "Lecture de l'index des correctifs %s" - -# TLABEL autoinst_2002_08_07_0216__71 -#~ msgid "Reading patch %s" -#~ msgstr "Lecture du correctif %s" - -#~ msgid "The script file failed the checksum test." -#~ msgstr "Échec du fichier de script lors du test relatif à la somme de contrôle." - -#~ msgid "Reading packages file" -#~ msgstr "Lecture du fichier des paquetages" - -# progress indicator label -#~ msgid "Reading translation: %s" -#~ msgstr "Lecture de la traduction : %s" - -#, fuzzy -#~ msgid "Package %s fails integrity check. Do you want to retry, or abort installation?" -#~ msgstr "Échec de la vérification de l'intégrité du paquetage %s. Souhaitez-vous tenter de le télécharger de nouveau, ou voulez-vous annuler l'installation ?" - -#~ msgid " miss checksum." -#~ msgstr " a manqué la somme de contrôle." - -#~ msgid " fails checksum verification." -#~ msgstr " a échoué lors de la vérification des sommes de contrôle." +msgstr "fournisseurs non installables: " -#~ msgid "Downloading %s" -#~ msgstr "Téléchargement de %s" +#~ msgid "%s provides this dependency, but would change the architecture of the installed item" +#~ msgstr "%s offre cette dépendance, mais changerait l'architecture de l'élément installé" +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s offre cette dépendance, mais changerait le fabricant de l'élément installé" +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "Ne pas installer ou supprimer les élements concernés" -#~ msgid "%s needed by %s" -#~ msgstr "%s requis par %s" Modified: trunk/libzypp/po/gl.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/gl.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/gl.po (original) +++ trunk/libzypp/po/gl.po Mon Apr 28 15:25:19 2008 @@ -1,26 +1,28 @@ -# Galician message file for YaST2 (@memory@). +# Galician translation of zypp # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2000, 2001 SuSE GmbH. # Copyright (C) 2002 SuSE Linux AG. +# # Jesús Bravo Álvarez , 2000. +# Leandro Regueiro , 2008. # # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas -# colaborar connosco, podes atopar máis información en http://trasno.gpul.org +# colaborar connosco, podes atopar máis información en http://trasno.net # msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-03-31 15:30+0200\n" -"PO-Revision-Date: 2002-07-23 11:51+0200\n" -"Last-Translator: Jesús Bravo Álvarez \n" -"Language-Team: Galician \n" +"PO-Revision-Date: 2008-04-24 13:10+0100\n" +"Last-Translator: Leandro Regueiro <leandro DOT regueiro AT gmail DOT com>\n" +"Language-Team: Galician \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" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -31,61 +33,49 @@ msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr "" -#: ../zypp/sat/SATResolver.cc:709 -#, c-format +#: ../zypp/solver/detail/SATResolver.cc:880 +#, fuzzy, c-format msgid "%s conflicts with %s provided by %s" -msgstr "" +msgstr "Inglés (proporcionado por Drupal)" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2056 -#, c-format +#: ../zypp/target/rpm/RpmDb.cc:2054 +#, fuzzy, c-format msgid "%s install failed" -msgstr "" +msgstr "Cron executouse con fallas" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2065 -#, c-format +#: ../zypp/target/rpm/RpmDb.cc:2063 +#, fuzzy, c-format msgid "%s installed ok" -msgstr "" +msgstr "Non instalado" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, fuzzy, c-format msgid "%s is not installable" -msgstr "Instalando en:" +msgstr "Non se pode escribir no cartafol %directory" -#: ../zypp/sat/SATResolver.cc:714 -#, c-format +#: ../zypp/solver/detail/SATResolver.cc:885 +#, fuzzy, 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 "" +msgstr "Inglés (proporcionado por Drupal)" #. %s = name of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2176 -#, c-format +#: ../zypp/target/rpm/RpmDb.cc:2174 +#, fuzzy, c-format msgid "%s remove failed" -msgstr "" +msgstr "Eliminar elemento" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 -#, c-format +#: ../zypp/target/rpm/RpmDb.cc:2182 +#, fuzzy, c-format msgid "%s remove ok" -msgstr "" +msgstr "Eliminar elemento" -#: ../zypp/sat/SATResolver.cc:745 +#: ../zypp/solver/detail/SATResolver.cc:921 #, c-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" @@ -96,7 +86,7 @@ #: ../zypp/LanguageCode.cc:240 #, fuzzy msgid "Abkhazian" -msgstr "Turco" +msgstr "Abxasio" #. language code: ace #: ../zypp/LanguageCode.cc:242 @@ -114,12 +104,13 @@ 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 "" @@ -130,13 +121,14 @@ #. language code: aar aa #: ../zypp/LanguageCode.cc:238 +#, fuzzy msgid "Afar" -msgstr "" +msgstr "Afarense" #. :ARE:784: #: ../zypp/CountryCode.cc:226 msgid "Afghanistan" -msgstr "" +msgstr "Afganistán" #. language code: afh #: ../zypp/LanguageCode.cc:252 @@ -155,15 +147,14 @@ #. language code: ain #: ../zypp/LanguageCode.cc:256 -#, fuzzy msgid "Ainu" -msgstr "Linux:" +msgstr "Ainu" #. language code: aka ak #: ../zypp/LanguageCode.cc:258 #, fuzzy msgid "Akan" -msgstr "Afrikaans" +msgstr "Akan" #. language code: akk #: ../zypp/LanguageCode.cc:260 @@ -181,15 +172,14 @@ #. :AIA:660: #: ../zypp/CountryCode.cc:229 msgid "Albania" -msgstr "" +msgstr "Albania" # AZ -# fuzzy #. language code: alb sqi sq -#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264 -#, fuzzy +#: ../zypp/LanguageCode.cc:262 +#: ../zypp/LanguageCode.cc:264 msgid "Albanian" -msgstr "Turco" +msgstr "Albanés" #. language code: ale #: ../zypp/LanguageCode.cc:266 @@ -197,17 +187,16 @@ msgstr "" # DZ -# fuzzy #. :DOM:214: #: ../zypp/CountryCode.cc:284 msgid "Algeria" -msgstr "Bulgaria" +msgstr "Alxeria" #. language code: alg #: ../zypp/LanguageCode.cc:268 #, fuzzy msgid "Algonquian Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" #. language code: tut #: ../zypp/LanguageCode.cc:1150 @@ -215,27 +204,24 @@ msgstr "" # AS -# fuzzy #. :ARG:032: #: ../zypp/CountryCode.cc:235 msgid "American Samoa" -msgstr "América do Norte" +msgstr "Samoa Americana" #. language code: amh am #: ../zypp/LanguageCode.cc:272 -#, fuzzy msgid "Amharic" -msgstr "Automático" +msgstr "Amhárico" #: ../zypp/CountryCode.cc:224 -#, fuzzy msgid "Andorra" -msgstr "Vendedor" +msgstr "Andorra" #. :ANT:530: #: ../zypp/CountryCode.cc:232 msgid "Angola" -msgstr "" +msgstr "Angola" #. :ATG:028: #: ../zypp/CountryCode.cc:228 @@ -244,9 +230,8 @@ #. :AGO:024: #: ../zypp/CountryCode.cc:233 -#, fuzzy msgid "Antarctica" -msgstr "Automático" +msgstr "Antártida" # AG #. :AFG:004: @@ -256,9 +241,8 @@ #. language code: apa #: ../zypp/LanguageCode.cc:276 -#, fuzzy msgid "Apache Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Linguas Apache" #. language code: ara ar #: ../zypp/LanguageCode.cc:278 @@ -268,13 +252,12 @@ #. language code: arg an #: ../zypp/LanguageCode.cc:282 msgid "Aragonese" -msgstr "" +msgstr "Aragonés" #. language code: arc #: ../zypp/LanguageCode.cc:280 -#, fuzzy msgid "Aramaic" -msgstr "Árabe" +msgstr "Arameo" #. language code: arp #: ../zypp/LanguageCode.cc:290 @@ -305,15 +288,14 @@ #. :ALB:008: #: ../zypp/CountryCode.cc:230 msgid "Armenia" -msgstr "Arxentina" +msgstr "Armenia" # AM -# fuzzy #. language code: arm hye hy -#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286 -#, fuzzy +#: ../zypp/LanguageCode.cc:284 +#: ../zypp/LanguageCode.cc:286 msgid "Armenian" -msgstr "Arxentina" +msgstr "Armenio" #. language code: art #: ../zypp/LanguageCode.cc:292 @@ -321,31 +303,29 @@ msgstr "" # CU -# fuzzy #. :AUS:036: #: ../zypp/CountryCode.cc:238 -#, fuzzy msgid "Aruba" -msgstr "Colombia" +msgstr "Aruba" #. language code: asm as #: ../zypp/LanguageCode.cc:296 +#, fuzzy msgid "Assamese" -msgstr "" +msgstr "Asamés" # AT #. language code: ast #: ../zypp/LanguageCode.cc:298 -#, fuzzy msgid "Asturian" -msgstr "Austria" +msgstr "Asturiano" # AU #. language code: ath #: ../zypp/LanguageCode.cc:300 #, fuzzy msgid "Athapascan Languages" -msgstr "Australia" +msgstr "Tódalas linguas" # AU #. :AUT:040: @@ -356,9 +336,8 @@ # AU #. language code: aus #: ../zypp/LanguageCode.cc:302 -#, fuzzy msgid "Australian Languages" -msgstr "Australia" +msgstr "Linguas Australianas" # AT #. :ASM:016: @@ -371,10 +350,11 @@ msgid "Austronesian (Other)" msgstr "" -#: ../zypp/media/MediaCurl.cc:752 ../zypp/media/MediaCurl.cc:820 -#, c-format +#: ../zypp/media/MediaCurl.cc:761 +#: ../zypp/media/MediaCurl.cc:829 +#, fuzzy, c-format msgid "Authentication required for '%s'" -msgstr "" +msgstr "Revisións para %title" #. language code: ava av #: ../zypp/LanguageCode.cc:304 @@ -384,8 +364,9 @@ #. language code: ave ae #: ../zypp/LanguageCode.cc:306 +#, fuzzy msgid "Avestan" -msgstr "" +msgstr "Avestan" #. language code: awa #: ../zypp/LanguageCode.cc:308 @@ -396,47 +377,41 @@ # fuzzy #. language code: aym ay #: ../zypp/LanguageCode.cc:310 -#, fuzzy msgid "Aymara" -msgstr "Panamá" +msgstr "Aimará" # AZ -# fuzzy #. :ALA:248: #: ../zypp/CountryCode.cc:240 msgid "Azerbaijan" -msgstr "Turco" +msgstr "Acerbaixán" # AZ -# fuzzy #. language code: aze az #: ../zypp/LanguageCode.cc:312 -#, fuzzy msgid "Azerbaijani" -msgstr "Turco" +msgstr "Acerí" #: ../zypp/media/MediaException.cc:47 -#, c-format +#, fuzzy, c-format msgid "Bad file name: %s" -msgstr "" +msgstr "O nome da opción do menú." #: ../zypp/media/MediaException.cc:77 msgid "Bad media attach point" msgstr "" # BS -# fuzzy #. :BRA:076: #: ../zypp/CountryCode.cc:254 msgid "Bahamas" -msgstr "Panamá" +msgstr "Bahamas" # BH -# fuzzy #. :BGR:100: #: ../zypp/CountryCode.cc:247 msgid "Bahrain" -msgstr "Brasil" +msgstr "Bahrain" #. language code: ban #: ../zypp/LanguageCode.cc:324 @@ -460,12 +435,13 @@ #: ../zypp/LanguageCode.cc:322 #, fuzzy msgid "Bambara" -msgstr "Xamaica" +msgstr "Bambara" #. language code: bai #: ../zypp/LanguageCode.cc:316 +#, fuzzy msgid "Bamileke Languages" -msgstr "" +msgstr "Tódalas linguas" # CA #. language code: bad @@ -475,11 +451,10 @@ msgstr "Canadá" # BD -# fuzzy #. :BRB:052: #: ../zypp/CountryCode.cc:243 msgid "Bangladesh" -msgstr "Inglés" +msgstr "Bangladesh" #. language code: bnt #: ../zypp/LanguageCode.cc:356 @@ -500,11 +475,13 @@ #. language code: bak ba #: ../zypp/LanguageCode.cc:318 +#, fuzzy msgid "Bashkir" -msgstr "" +msgstr "Bashkirés" #. language code: baq eus eu -#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328 +#: ../zypp/LanguageCode.cc:326 +#: ../zypp/LanguageCode.cc:328 msgid "Basque" msgstr "Éuscaro" @@ -522,19 +499,16 @@ msgstr "" # BY -# fuzzy #. :BWA:072: #: ../zypp/CountryCode.cc:258 msgid "Belarus" -msgstr "Beos" +msgstr "Bielorrusia" # BY -# fuzzy #. language code: bel be #: ../zypp/LanguageCode.cc:336 -#, fuzzy msgid "Belarusian" -msgstr "Beos" +msgstr "Bielorruso" # BE #. :BGD:050: @@ -543,11 +517,10 @@ msgstr "Bélxica" # BZ -# fuzzy #. :BLR:112: #: ../zypp/CountryCode.cc:259 msgid "Belize" -msgstr "Bélxica" +msgstr "" #. language code: bem #: ../zypp/LanguageCode.cc:338 @@ -560,7 +533,7 @@ #: ../zypp/LanguageCode.cc:340 #, fuzzy msgid "Bengali" -msgstr "Bélxica" +msgstr "Bengalí" #. :BDI:108: #: ../zypp/CountryCode.cc:249 @@ -574,9 +547,8 @@ #. :BEN:204: #: ../zypp/CountryCode.cc:250 -#, fuzzy msgid "Bermuda" -msgstr "Alemán" +msgstr "Bermudas" #. language code: bho #: ../zypp/LanguageCode.cc:344 @@ -597,7 +569,7 @@ #: ../zypp/LanguageCode.cc:346 #, fuzzy msgid "Bihari" -msgstr "Brasil" +msgstr "Biharí" #. language code: bik #: ../zypp/LanguageCode.cc:348 @@ -612,8 +584,9 @@ #. language code: bis bi #: ../zypp/LanguageCode.cc:352 +#, fuzzy msgid "Bislama" -msgstr "" +msgstr "Bislama" #. language code: byn #: ../zypp/LanguageCode.cc:376 @@ -630,13 +603,12 @@ #. :AZE:031: #: ../zypp/CountryCode.cc:241 msgid "Bosnia and Herzegovina" -msgstr "" +msgstr "Bosnia e Hercegovina" #. language code: bos bs #: ../zypp/LanguageCode.cc:358 -#, fuzzy msgid "Bosnian" -msgstr "Romanés" +msgstr "Bosnio" #. :BVT:074: #: ../zypp/CountryCode.cc:257 @@ -675,12 +647,10 @@ msgstr "" # VI -# fuzzy #. :VEN:862: #: ../zypp/CountryCode.cc:454 -#, fuzzy msgid "British Virgin Islands" -msgstr "Finlandia" +msgstr "Illas Virxes Británicas" #. :BMU:060: #: ../zypp/CountryCode.cc:251 @@ -693,10 +663,10 @@ msgid "Buginese" msgstr "Chinés" -#: ../zypp/RepoManager.cc:718 -#, c-format +#: ../zypp/RepoManager.cc:719 +#, fuzzy, c-format msgid "Building repository '%s' cache" -msgstr "" +msgstr "Mínimo de permanencia en caché" # BG #. :BFA:854: @@ -722,14 +692,16 @@ msgstr "" #. language code: bur mya my -#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374 +#: ../zypp/LanguageCode.cc:372 +#: ../zypp/LanguageCode.cc:374 +#, fuzzy msgid "Burmese" -msgstr "" +msgstr "Birmano" #. :BHR:048: #: ../zypp/CountryCode.cc:248 msgid "Burundi" -msgstr "" +msgstr "Burundi" # TD # fuzzy @@ -740,18 +712,17 @@ msgstr "China" # KH -# fuzzy #. :KGZ:417: #: ../zypp/CountryCode.cc:337 msgid "Cambodia" -msgstr "Colombia" +msgstr "" #. :CHL:152: #: ../zypp/CountryCode.cc:269 msgid "Cameroon" -msgstr "" +msgstr "Camerún" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "" @@ -759,30 +730,26 @@ 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)." msgstr "" #: ../zypp/ExternalProgram.cc:238 -#, c-format +#, fuzzy, c-format msgid "Can't chroot to '%s' (%s)." -msgstr "" +msgstr "Responder ó comentario" #. don't want to get here #: ../zypp/ExternalProgram.cc:259 -#, c-format +#, fuzzy, c-format msgid "Can't exec '%s' (%s)." -msgstr "" +msgstr "non pode enviar comentarios" #: ../zypp/ExternalProgram.cc:267 -#, c-format +#, fuzzy, c-format msgid "Can't fork (%s)." -msgstr "" +msgstr "non pode enviar comentarios" #: ../zypp/thread/Mutex.cc:33 msgid "Can't initialize mutex attributes" @@ -792,22 +759,22 @@ 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)." -msgstr "Couldn't open file: %s." +msgstr "non pode enviar comentarios" #: ../zypp/ExternalProgram.cc:163 #, fuzzy, c-format msgid "Can't open pty (%s)." -msgstr "Couldn't open file: %s." +msgstr "non pode enviar comentarios" -#: ../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 "" @@ -816,10 +783,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 "" @@ -840,25 +803,24 @@ msgstr "" #: ../zypp/media/MediaException.cc:184 -#, fuzzy, c-format +#, c-format msgid "Cannot eject media '%s'" -msgstr "Instalando en:" +msgstr "Non se puido expulsar o soporte '%s'" #: ../zypp/media/MediaException.cc:67 -#, fuzzy, c-format +#, c-format msgid "Cannot write file '%s'." -msgstr "Instalando en:" +msgstr "Non se puido escribir o ficheiro '%s'." #. :CUB:192: #: ../zypp/CountryCode.cc:275 msgid "Cape Verde" -msgstr "" +msgstr "Cabo Verde" #. language code: car #: ../zypp/LanguageCode.cc:382 -#, fuzzy msgid "Carib" -msgstr "Maorí" +msgstr "Caribe" #. language code: cat ca #: ../zypp/LanguageCode.cc:384 @@ -871,12 +833,10 @@ msgstr "" # FO -# fuzzy #. :KWT:414: #: ../zypp/CountryCode.cc:344 -#, fuzzy msgid "Cayman Islands" -msgstr "Irlanda" +msgstr "Illas Caimán" #. language code: ceb #: ../zypp/LanguageCode.cc:388 @@ -902,11 +862,10 @@ msgstr "" # TD -# fuzzy #. :TCA:796: #: ../zypp/CountryCode.cc:430 msgid "Chad" -msgstr "China" +msgstr "Chad" #. language code: chg #: ../zypp/LanguageCode.cc:398 @@ -917,25 +876,24 @@ #: ../zypp/LanguageCode.cc:422 #, fuzzy msgid "Chamic Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" #. language code: cha ch #: ../zypp/LanguageCode.cc:392 msgid "Chamorro" -msgstr "" +msgstr "Chamorro" #. 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 "Vaise gardar agora a configuración do son." +msgstr "Xestiona opcións xerais de configuración para os administradores." #. language code: che ce #: ../zypp/LanguageCode.cc:396 -#, fuzzy msgid "Chechen" -msgstr "Checo" +msgstr "Checheno" #. language code: chr #: ../zypp/LanguageCode.cc:414 @@ -959,7 +917,7 @@ #: ../zypp/LanguageCode.cc:896 #, fuzzy msgid "Chichewa" -msgstr "Chile" +msgstr "Chichewa" # CL #. :COK:184: @@ -974,7 +932,8 @@ msgstr "China" #. language code: chi zho zh -#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402 +#: ../zypp/LanguageCode.cc:400 +#: ../zypp/LanguageCode.cc:402 msgid "Chinese" msgstr "Chinés" @@ -1011,8 +970,9 @@ #. language code: chv cv #: ../zypp/LanguageCode.cc:418 +#, fuzzy msgid "Chuvash" -msgstr "" +msgstr "Chuvash" #. language code: nwc #: ../zypp/LanguageCode.cc:894 @@ -1048,13 +1008,14 @@ #. :KIR:296: #: ../zypp/CountryCode.cc:339 msgid "Comoros" -msgstr "" +msgstr "Comores" #. :CCK:166: #. :CAF:140: -#: ../zypp/CountryCode.cc:262 ../zypp/CountryCode.cc:264 +#: ../zypp/CountryCode.cc:262 +#: ../zypp/CountryCode.cc:264 msgid "Congo" -msgstr "" +msgstr "Congo" # FO # fuzzy @@ -1067,37 +1028,35 @@ # HR #. language code: cop #: ../zypp/LanguageCode.cc:424 -#, fuzzy msgid "Coptic" -msgstr "Croacia" +msgstr "Copto" #. language code: cor kw #: ../zypp/LanguageCode.cc:426 #, fuzzy msgid "Cornish" -msgstr "Irlandés" +msgstr "Córnico" #. language code: cos co #: ../zypp/LanguageCode.cc:428 -#, fuzzy msgid "Corsican" -msgstr "Croata" +msgstr "Corso" #. :COL:170: #: ../zypp/CountryCode.cc:272 msgid "Costa Rica" -msgstr "" +msgstr "Costa Rica" #. :CHE:756: #: ../zypp/CountryCode.cc:266 msgid "Cote D'Ivoire" -msgstr "" +msgstr "Costa do Marfil" #. language code: cre cr #: ../zypp/LanguageCode.cc:436 #, fuzzy msgid "Cree" -msgstr "&Crear" +msgstr "Cree" #. language code: mus #: ../zypp/LanguageCode.cc:842 @@ -1137,16 +1096,16 @@ msgstr "Croacia" #. language code: scr hrv hr -#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010 +#: ../zypp/LanguageCode.cc:1008 +#: ../zypp/LanguageCode.cc:1010 msgid "Croatian" msgstr "Croata" # CU -# fuzzy #. :SCG:891: #: ../zypp/CountryCode.cc:274 msgid "Cuba" -msgstr "Colombia" +msgstr "Cuba" #. language code: cus #: ../zypp/LanguageCode.cc:444 @@ -1156,19 +1115,19 @@ #. :CXR:162: #: ../zypp/CountryCode.cc:277 msgid "Cyprus" -msgstr "" +msgstr "Chipre" #. language code: cze ces cs -#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448 +#: ../zypp/LanguageCode.cc:446 +#: ../zypp/LanguageCode.cc:448 msgid "Czech" msgstr "Checo" # CZ -# fuzzy #. :CYP:196: #: ../zypp/CountryCode.cc:278 msgid "Czech Republic" -msgstr "República Dominicana" +msgstr "República Checa" #. language code: dak #: ../zypp/LanguageCode.cc:450 @@ -1178,7 +1137,7 @@ #. language code: dan da #: ../zypp/LanguageCode.cc:452 msgid "Danish" -msgstr "Dinamarqués" +msgstr "Danés" #. language code: dar #: ../zypp/LanguageCode.cc:454 @@ -1219,12 +1178,7 @@ #. :DEU:276: #: ../zypp/CountryCode.cc:280 msgid "Djibouti" -msgstr "" - -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -#, fuzzy -msgid "Do not install or delete the resolvables concerned" -msgstr "Instalando o controlador..." +msgstr "Xibutí" #. language code: doi #: ../zypp/LanguageCode.cc:468 @@ -1238,11 +1192,10 @@ msgstr "" # DM -# fuzzy #. :DNK:208: #: ../zypp/CountryCode.cc:282 msgid "Dominica" -msgstr "Romanía" +msgstr "Dominica" # DO #. :DMA:212: @@ -1278,13 +1231,14 @@ msgstr "Paraguai" #. 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 "" #. language code: dut nld nl -#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480 +#: ../zypp/LanguageCode.cc:478 +#: ../zypp/LanguageCode.cc:480 msgid "Dutch" msgstr "Holandés" @@ -1306,7 +1260,7 @@ #. :TON:776: #: ../zypp/CountryCode.cc:439 msgid "East Timor" -msgstr "" +msgstr "Timor Leste" # EC # fuzzy @@ -1321,16 +1275,15 @@ msgstr "" # EG -# fuzzy #. :EST:233: #: ../zypp/CountryCode.cc:287 msgid "Egypt" -msgstr "Enerxía" +msgstr "Exipto" #. language code: egy #: ../zypp/LanguageCode.cc:488 msgid "Egyptian (Ancient)" -msgstr "" +msgstr "Exipto (Antigo)" #. language code: eka #: ../zypp/LanguageCode.cc:490 @@ -1366,9 +1319,8 @@ #. language code: eng en #: ../zypp/LanguageCode.cc:494 -#, fuzzy msgid "English" -msgstr "Inglés (Reino Unido)" +msgstr "Inglés" #. language code: enm #: ../zypp/LanguageCode.cc:496 @@ -1383,12 +1335,12 @@ #. :GLP:312: #: ../zypp/CountryCode.cc:310 msgid "Equatorial Guinea" -msgstr "" +msgstr "Guinea Ecuatorial" #. :ESH:732: #: ../zypp/CountryCode.cc:289 msgid "Eritrea" -msgstr "" +msgstr "Eritrea" #. TranslatorExplanation: curl is the name of a library, don't translate #: ../zypp/media/MediaException.cc:161 @@ -1396,10 +1348,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" @@ -1422,16 +1370,16 @@ msgstr "Estonio" # ET -# fuzzy #. :ESP:724: #: ../zypp/CountryCode.cc:291 msgid "Ethiopia" -msgstr "Estonia" +msgstr "" #. language code: ewe ee #: ../zypp/LanguageCode.cc:502 +#, fuzzy msgid "Ewe" -msgstr "" +msgstr "Ewe" #. language code: ewo #: ../zypp/LanguageCode.cc:504 @@ -1440,29 +1388,28 @@ msgstr "Fin " #: ../zypp/KeyRing.cc:558 -#, fuzzy msgid "Failed to delete key." -msgstr "Failed to parse: %s." +msgstr "Fallo ó eliminar a 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 "" #: ../zypp/media/MediaException.cc:31 -#, fuzzy, c-format +#, c-format msgid "Failed to mount %s on %s" -msgstr "Failed to parse: %s." +msgstr "Fallo ó 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 "" #: ../zypp/media/MediaException.cc:41 -#, fuzzy, c-format +#, c-format msgid "Failed to unmount %s" -msgstr "Failed to parse: %s." +msgstr "Fallo ó desmontar %s" #. :FJI:242: #: ../zypp/CountryCode.cc:294 @@ -1481,11 +1428,10 @@ msgstr "" # FO -# fuzzy #. :FSM:583: #: ../zypp/CountryCode.cc:296 msgid "Faroe Islands" -msgstr "Irlanda" +msgstr "Illas Feroe" #. language code: fao fo #: ../zypp/LanguageCode.cc:508 @@ -1500,9 +1446,8 @@ #. :FIN:246: #: ../zypp/CountryCode.cc:293 -#, fuzzy msgid "Fiji" -msgstr "Finalizar" +msgstr "Fixi" # FI #. language code: fij fj @@ -1564,7 +1509,7 @@ #. language code: fil #: ../zypp/LanguageCode.cc:514 msgid "Filipino" -msgstr "" +msgstr "Filipino" # FI #. :ETH:231: @@ -1598,20 +1543,20 @@ msgstr "Francia" #. language code: fre fra fr -#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524 +#: ../zypp/LanguageCode.cc:522 +#: ../zypp/LanguageCode.cc:524 msgid "French" msgstr "Francés" #. :GEO:268: #: ../zypp/CountryCode.cc:303 -#, fuzzy msgid "French Guiana" -msgstr "Francés" +msgstr "Güiana Francesa" #. :PER:604: #: ../zypp/CountryCode.cc:393 msgid "French Polynesia" -msgstr "" +msgstr "Polinesia Francesa" #. :TCD:148: #: ../zypp/CountryCode.cc:431 @@ -1631,9 +1576,8 @@ # FR #. language code: fry fy #: ../zypp/LanguageCode.cc:530 -#, fuzzy msgid "Frisian" -msgstr "Francia" +msgstr "Frisio" # FI #. language code: fur @@ -1646,7 +1590,7 @@ #: ../zypp/LanguageCode.cc:532 #, fuzzy msgid "Fulah" -msgstr "Flags" +msgstr "Fulah" # GU # fuzzy @@ -1657,33 +1601,27 @@ msgstr "Guatemala" # GH -# fuzzy #. :FXX:249: #: ../zypp/CountryCode.cc:299 -#, fuzzy msgid "Gabon" -msgstr "China" +msgstr "Gabón" # ML -# fuzzy #. language code: gla gd #: ../zypp/LanguageCode.cc:556 -#, fuzzy msgid "Gaelic" -msgstr "Kanu" +msgstr "Gaélico" #. language code: glg gl #: ../zypp/LanguageCode.cc:560 -#, fuzzy msgid "Galician" -msgstr "Italiano" +msgstr "Galego" # GM -# fuzzy #. :GRL:304: #: ../zypp/CountryCode.cc:307 msgid "Gambia" -msgstr "Xamaica" +msgstr "Gambia" # GH # fuzzy @@ -1712,27 +1650,26 @@ msgid "Geez" msgstr "Grego" -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65 -msgid "Generally ignore this requirement" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" msgstr "" # GE -# fuzzy #. :GRD:308: #: ../zypp/CountryCode.cc:302 msgid "Georgia" -msgstr "Serbia" +msgstr "Xeorxia" # GE -# fuzzy #. language code: geo kat ka -#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546 -#, fuzzy +#: ../zypp/LanguageCode.cc:544 +#: ../zypp/LanguageCode.cc:546 msgid "Georgian" -msgstr "Serbia" +msgstr "Xeorxiano" #. language code: ger deu de -#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550 +#: ../zypp/LanguageCode.cc:548 +#: ../zypp/LanguageCode.cc:550 msgid "German" msgstr "Alemán" @@ -1748,9 +1685,8 @@ #. language code: gem #: ../zypp/LanguageCode.cc:542 -#, fuzzy msgid "Germanic (Other)" -msgstr "Alemán (Suíza)" +msgstr "Xermánicas (Outras)" #. :CZE:203: #: ../zypp/CountryCode.cc:279 @@ -1758,16 +1694,15 @@ msgstr "Alemaña" # GH -# fuzzy #. :GUF:254: #: ../zypp/CountryCode.cc:304 msgid "Ghana" -msgstr "China" +msgstr "" #. :GHA:288: #: ../zypp/CountryCode.cc:305 msgid "Gibraltar" -msgstr "" +msgstr "Xibraltar" #. language code: gil #: ../zypp/LanguageCode.cc:554 @@ -1810,22 +1745,22 @@ msgstr "" #. language code: gre ell el -#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580 +#: ../zypp/LanguageCode.cc:578 +#: ../zypp/LanguageCode.cc:580 msgid "Greek, Modern (1453-)" msgstr "" # GL -# fuzzy #. :GIB:292: #: ../zypp/CountryCode.cc:306 msgid "Greenland" -msgstr "Granada" +msgstr "Grenlandia" # GD #. :GBR:826: #: ../zypp/CountryCode.cc:301 msgid "Grenada" -msgstr "Granada" +msgstr "" #. :GIN:324: #: ../zypp/CountryCode.cc:309 @@ -1833,17 +1768,15 @@ msgstr "" # GU -# fuzzy #. :GTM:320: #: ../zypp/CountryCode.cc:314 msgid "Guam" -msgstr "Guatemala" +msgstr "Guam" #. language code: grn gn #: ../zypp/LanguageCode.cc:582 -#, fuzzy msgid "Guarani" -msgstr "Paranoica" +msgstr "Guaraní" # GT #. :SGS:239: @@ -1852,35 +1785,33 @@ msgstr "Guatemala" # GU -# fuzzy #. :GMB:270: #: ../zypp/CountryCode.cc:308 -#, fuzzy msgid "Guinea" -msgstr "Guatemala" +msgstr "Guinea" #. :GUM:316: #: ../zypp/CountryCode.cc:315 msgid "Guinea-Bissau" -msgstr "" +msgstr "Guinea Bissau" #. language code: guj gu #: ../zypp/LanguageCode.cc:584 +#, fuzzy msgid "Gujarati" -msgstr "" +msgstr "Guxaratí" # GH -# fuzzy #. :GNB:624: #: ../zypp/CountryCode.cc:316 -#, fuzzy msgid "Guyana" -msgstr "China" +msgstr "Güiana" #. language code: gwi #: ../zypp/LanguageCode.cc:586 +#, fuzzy msgid "Gwich'in" -msgstr "" +msgstr "en categoría" #. language code: hai #: ../zypp/LanguageCode.cc:588 @@ -1890,9 +1821,8 @@ #. :HRV:191: #: ../zypp/CountryCode.cc:321 -#, fuzzy msgid "Haiti" -msgstr "Apagar" +msgstr "Haití" #. language code: hat ht #: ../zypp/LanguageCode.cc:590 @@ -1900,27 +1830,29 @@ msgid "Haitian" msgstr "Croata" -#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55 +#: ../zypp/target/hal/HalException.h:46 +#: ../zypp/target/hal/HalException.h:55 #: ../zypp/target/hal/HalException.h:64 msgid "Hal Exception" msgstr "" #: ../zypp/target/hal/HalContext.cc:94 msgid "HalContext not connected" -msgstr "" +msgstr "HalContext non conectado" #: ../zypp/target/hal/HalContext.cc:104 msgid "HalDrive not initialized" -msgstr "" +msgstr "HalDrive non inicializado" #: ../zypp/target/hal/HalContext.cc:114 msgid "HalVolume not initialized" -msgstr "" +msgstr "HalVolume non inicializado" #. language code: hau ha #: ../zypp/LanguageCode.cc:592 +#, fuzzy msgid "Hausa" -msgstr "" +msgstr "Hausa" #. language code: haw #: ../zypp/LanguageCode.cc:594 @@ -1941,7 +1873,7 @@ #: ../zypp/LanguageCode.cc:598 #, fuzzy msgid "Herero" -msgstr "Hebreo" +msgstr "Herero" #. language code: hil #: ../zypp/LanguageCode.cc:600 @@ -1954,27 +1886,27 @@ msgstr "" # IN -# fuzzy #. language code: hin hi #: ../zypp/LanguageCode.cc:604 -#, fuzzy msgid "Hindi" -msgstr "Iconas" +msgstr "Hindi" #. language code: hmo ho #: ../zypp/LanguageCode.cc:610 +#, fuzzy msgid "Hiri Motu" -msgstr "" +msgstr "Hiri Motu" #. TranslatorExplanation followed by the list of error messages that lead to this exception #: ../zypp/base/Exception.cc:89 +#, fuzzy msgid "History:" -msgstr "" +msgstr "Historial" #. language code: hit #: ../zypp/LanguageCode.cc:606 msgid "Hittite" -msgstr "" +msgstr "Hitita" #. language code: hmn #: ../zypp/LanguageCode.cc:608 @@ -2028,7 +1960,8 @@ msgstr "Islandia" #. language code: ice isl is -#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624 +#: ../zypp/LanguageCode.cc:622 +#: ../zypp/LanguageCode.cc:624 msgid "Icelandic" msgstr "Islandés" @@ -2042,30 +1975,13 @@ #: ../zypp/LanguageCode.cc:620 #, fuzzy msgid "Igbo" -msgstr "Ignorar" - -#. 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 "" +msgstr "Igbo" #. 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" -msgstr "" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 +#, fuzzy, c-format +msgid "Ignore some dependencies of %s" +msgstr "Depende de: !dependecies" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -2079,15 +1995,15 @@ #. language code: smn #: ../zypp/LanguageCode.cc:1046 +#, fuzzy msgid "Inari Sami" -msgstr "" +msgstr "Sami (norte)" # IN -# fuzzy #. :ISR:376: #: ../zypp/CountryCode.cc:326 msgid "India" -msgstr "Iconas" +msgstr "India" #. language code: inc #: ../zypp/LanguageCode.cc:640 @@ -2100,43 +2016,23 @@ msgstr "" # ID -# fuzzy #. :HUN:348: #: ../zypp/CountryCode.cc:323 msgid "Indonesia" -msgstr "Iconas" +msgstr "Indonesia" # ID -# fuzzy #. language code: ind id #: ../zypp/LanguageCode.cc:642 -#, fuzzy msgid "Indonesian" -msgstr "Iconas" +msgstr "Indonesio" #. language code: inh #: ../zypp/LanguageCode.cc:646 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 "Instalando o controlador..." - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "" @@ -2147,14 +2043,14 @@ #. language code: ile ie #: ../zypp/LanguageCode.cc:634 -#, fuzzy msgid "Interlingue" -msgstr "Continuar" +msgstr "Interlingua" #. language code: iku iu #: ../zypp/LanguageCode.cc:632 +#, fuzzy msgid "Inuktitut" -msgstr "" +msgstr "Inuktitut" # IN # fuzzy @@ -2165,14 +2061,14 @@ msgstr "Iconas" #: ../zypp/url/UrlBase.cc:180 -#, c-format +#, fuzzy, c-format msgid "Invalid %s component" -msgstr "" +msgstr "Artigo non válido." #: ../zypp/url/UrlBase.cc:173 -#, c-format +#, fuzzy, c-format msgid "Invalid %s component '%s'" -msgstr "" +msgstr "Artigo non válido." #: ../zypp/Url.cc:152 #, c-format @@ -2184,18 +2080,18 @@ msgstr "" #: ../zypp/url/UrlBase.cc:826 -#, c-format +#, fuzzy, c-format msgid "Invalid Url scheme '%s'" -msgstr "" +msgstr "Axustes de ruta URL" #: ../zypp/Url.cc:309 msgid "Invalid empty Url object reference" msgstr "" #: ../zypp/url/UrlBase.cc:1047 -#, c-format +#, fuzzy, c-format msgid "Invalid host component '%s'" -msgstr "" +msgstr "Código de lingua inválido" #: ../zypp/url/UrlUtils.cc:283 msgid "Invalid parameter array join separator character" @@ -2210,20 +2106,25 @@ msgstr "" #: ../zypp/url/UrlBase.cc:1079 -#, c-format +#, fuzzy, c-format msgid "Invalid port component '%s'" +msgstr "Código de lingua inválido" + +#: ../zypp/PoolQuery.cc:419 +#, c-format +msgid "Invalid regular expression '%s': regcomp returned %d" msgstr "" -#: ../zypp/media/MediaCurl.cc:749 ../zypp/media/MediaCurl.cc:817 +#: ../zypp/media/MediaCurl.cc:758 +#: ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "" # IR -# fuzzy #. :IRQ:368: #: ../zypp/CountryCode.cc:329 msgid "Iran" -msgstr "Israel" +msgstr "Irán" #. language code: ira #: ../zypp/LanguageCode.cc:650 @@ -2231,11 +2132,10 @@ msgstr "" # IQ -# fuzzy #. :IOT:086: #: ../zypp/CountryCode.cc:328 msgid "Iraq" -msgstr "Israel" +msgstr "Iraq" # IE #. :IDN:360: @@ -2260,9 +2160,8 @@ #. language code: iro #: ../zypp/LanguageCode.cc:652 -#, fuzzy msgid "Iroquoian Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Linguas Iroquesas" # IL #. :IRL:372: @@ -2270,11 +2169,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 msgid "Italian" @@ -2287,7 +2181,6 @@ msgstr "Italia" # JM -# fuzzy #. :ITA:380: #: ../zypp/CountryCode.cc:332 msgid "Jamaica" @@ -2308,20 +2201,18 @@ #: ../zypp/LanguageCode.cc:656 #, fuzzy msgid "Javanese" -msgstr "Xaponés" +msgstr "Xavanés" # JO -# fuzzy #. :JAM:388: #: ../zypp/CountryCode.cc:333 msgid "Jordan" -msgstr "Coreano" +msgstr "" #. language code: jrb #: ../zypp/LanguageCode.cc:664 -#, fuzzy msgid "Judeo-Arabic" -msgstr "Árabe" +msgstr "Xudeo-Árabe" #. language code: jpr #: ../zypp/LanguageCode.cc:662 @@ -2369,12 +2260,13 @@ #: ../zypp/LanguageCode.cc:676 #, fuzzy msgid "Kannada" -msgstr "Canadá" +msgstr "Kanada" #. language code: kau kr #: ../zypp/LanguageCode.cc:682 +#, fuzzy msgid "Kanuri" -msgstr "" +msgstr "Kanuri" #. language code: kaa #: ../zypp/LanguageCode.cc:666 @@ -2394,8 +2286,9 @@ #. language code: kas ks #: ../zypp/LanguageCode.cc:680 +#, fuzzy msgid "Kashmiri" -msgstr "" +msgstr "Cachemirés" #. language code: csb #: ../zypp/LanguageCode.cc:442 @@ -2416,19 +2309,13 @@ #: ../zypp/LanguageCode.cc:686 #, fuzzy msgid "Kazakh" -msgstr "Taiwán" +msgstr "Kazaxio" # KZ -# fuzzy #. :CYM:136: #: ../zypp/CountryCode.cc:345 msgid "Kazakhstan" -msgstr "Taiwán" - -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -#, fuzzy -msgid "Keep resolvables" -msgstr "Instalando o controlador..." +msgstr "" #. :JPN:392: #: ../zypp/CountryCode.cc:335 @@ -2443,9 +2330,8 @@ #. language code: khm km #: ../zypp/LanguageCode.cc:694 -#, fuzzy msgid "Khmer" -msgstr "outro" +msgstr "Khmer" #. language code: khi #: ../zypp/LanguageCode.cc:692 @@ -2460,8 +2346,9 @@ #. language code: kik ki #: ../zypp/LanguageCode.cc:698 +#, fuzzy msgid "Kikuyu" -msgstr "" +msgstr "Kikuyu" #. language code: kmb #: ../zypp/LanguageCode.cc:704 @@ -2470,13 +2357,15 @@ #. language code: kin rw #: ../zypp/LanguageCode.cc:700 +#, fuzzy msgid "Kinyarwanda" -msgstr "" +msgstr "Kiniarwanda" #. language code: kir ky #: ../zypp/LanguageCode.cc:702 +#, fuzzy msgid "Kirghiz" -msgstr "" +msgstr "Kirgués" #. :KHM:116: #: ../zypp/CountryCode.cc:338 @@ -2490,13 +2379,15 @@ #. language code: kom kv #: ../zypp/LanguageCode.cc:708 +#, fuzzy msgid "Komi" -msgstr "" +msgstr "Cómico" #. language code: kon kg #: ../zypp/LanguageCode.cc:710 +#, fuzzy msgid "Kongo" -msgstr "" +msgstr "Kongo" #. language code: kok #: ../zypp/LanguageCode.cc:706 @@ -2542,7 +2433,7 @@ #: ../zypp/LanguageCode.cc:728 #, fuzzy msgid "Kurdish" -msgstr "Turco" +msgstr "Curdo" #. language code: kru #: ../zypp/LanguageCode.cc:722 @@ -2557,9 +2448,8 @@ #. :KOR:410: #: ../zypp/CountryCode.cc:343 -#, fuzzy msgid "Kuwait" -msgstr "Saír" +msgstr "Kuwait" # KZ # fuzzy @@ -2572,7 +2462,7 @@ #. language code: lad #: ../zypp/LanguageCode.cc:732 msgid "Ladino" -msgstr "" +msgstr "Ladino" # UG # fuzzy @@ -2601,32 +2491,27 @@ msgstr "" # LV -# fuzzy #. language code: lat la #: ../zypp/LanguageCode.cc:740 -#, fuzzy msgid "Latin" -msgstr "Croacia" +msgstr "Latín" # LV -# fuzzy #. :LUX:442: #: ../zypp/CountryCode.cc:355 msgid "Latvia" -msgstr "Croacia" +msgstr "Letonia" # LV -# fuzzy #. language code: lav lv #: ../zypp/LanguageCode.cc:742 -#, fuzzy msgid "Latvian" -msgstr "Croacia" +msgstr "Letón" #. :LAO:418: #: ../zypp/CountryCode.cc:347 msgid "Lebanon" -msgstr "" +msgstr "Líbano" #. :LBR:430: #: ../zypp/CountryCode.cc:352 @@ -2640,24 +2525,21 @@ msgstr "Autenticación" # LR -# fuzzy #. :LKA:144: #: ../zypp/CountryCode.cc:351 msgid "Liberia" -msgstr "Serbia" +msgstr "Liberia" # LR -# fuzzy #. :LVA:428: #: ../zypp/CountryCode.cc:356 -#, fuzzy msgid "Libya" -msgstr "Serbia" +msgstr "Libia" #. :LCA:662: #: ../zypp/CountryCode.cc:349 msgid "Liechtenstein" -msgstr "" +msgstr "Liechtenstein" # LU # fuzzy @@ -2669,8 +2551,9 @@ #. language code: lin ln #: ../zypp/LanguageCode.cc:748 +#, fuzzy msgid "Lingala" -msgstr "" +msgstr "Lingala" # LT # fuzzy @@ -2691,9 +2574,8 @@ #. language code: nds #: ../zypp/LanguageCode.cc:868 -#, fuzzy msgid "Low German" -msgstr "Alemán" +msgstr "Baixo Alemán" #. language code: dsb #: ../zypp/LanguageCode.cc:472 @@ -2724,8 +2606,9 @@ #. language code: smj #: ../zypp/LanguageCode.cc:1044 +#, fuzzy msgid "Lule Sami" -msgstr "" +msgstr "Sami (norte)" # SD # fuzzy @@ -2747,26 +2630,22 @@ msgstr "Thai" # LU -# fuzzy #. :LTU:440: #: ../zypp/CountryCode.cc:354 msgid "Luxembourg" msgstr "Luxemburgo" # LU -# fuzzy #. language code: ltz lb #: ../zypp/LanguageCode.cc:756 -#, fuzzy msgid "Luxembourgish" -msgstr "Luxemburgo" +msgstr "Luxemburgués" # MO -# fuzzy #. :MNG:496: #: ../zypp/CountryCode.cc:366 msgid "Macao" -msgstr "Kanu" +msgstr "Macau" # MK #. :MHL:584: @@ -2775,14 +2654,15 @@ msgstr "Macedonia" #. language code: mac mkd mk -#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774 +#: ../zypp/LanguageCode.cc:772 +#: ../zypp/LanguageCode.cc:774 msgid "Macedonian" msgstr "Macedonio" #. :MDA:498: #: ../zypp/CountryCode.cc:360 msgid "Madagascar" -msgstr "" +msgstr "Madagascar" # MV # fuzzy @@ -2817,27 +2697,23 @@ msgstr "Kanu" # MY -# fuzzy #. language code: mlg mg #: ../zypp/LanguageCode.cc:820 -#, fuzzy msgid "Malagasy" -msgstr "Kanu" +msgstr "Malgaxe" # MW -# fuzzy #. :MDV:462: #: ../zypp/CountryCode.cc:374 msgid "Malawi" -msgstr "Kanu" +msgstr "" # MT -# fuzzy #. language code: may msa ms -#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802 -#, fuzzy +#: ../zypp/LanguageCode.cc:800 +#: ../zypp/LanguageCode.cc:802 msgid "Malay" -msgstr "Kanu" +msgstr "Malaio" # MY # fuzzy @@ -2845,47 +2721,41 @@ #: ../zypp/LanguageCode.cc:786 #, fuzzy msgid "Malayalam" -msgstr "Kanu" +msgstr "Malayalam" # MY -# fuzzy #. :MEX:484: #: ../zypp/CountryCode.cc:376 msgid "Malaysia" -msgstr "Kanu" +msgstr "Malaisia" # MV -# fuzzy #. :MUS:480: #: ../zypp/CountryCode.cc:373 msgid "Maldives" -msgstr "Kanu" +msgstr "Maldivas" #: ../zypp/media/MediaException.cc:115 msgid "Malformed URI" msgstr "" # ML -# fuzzy #. :MKD:807: #: ../zypp/CountryCode.cc:363 msgid "Mali" -msgstr "Kanu" +msgstr "Malí" # MT -# fuzzy #. :MSR:500: #: ../zypp/CountryCode.cc:371 msgid "Malta" -msgstr "Kanu" +msgstr "Malta" # MV -# fuzzy #. language code: mlt mt #: ../zypp/LanguageCode.cc:822 -#, fuzzy msgid "Maltese" -msgstr "Kanu" +msgstr "Maltés" #. language code: mnc #: ../zypp/LanguageCode.cc:824 @@ -2917,16 +2787,17 @@ #: ../zypp/LanguageCode.cc:828 #, fuzzy msgid "Manobo Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" #. language code: glv gv #: ../zypp/LanguageCode.cc:562 #, fuzzy msgid "Manx" -msgstr "Manual" +msgstr "Manx" #. language code: mao mri mi -#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792 +#: ../zypp/LanguageCode.cc:790 +#: ../zypp/LanguageCode.cc:792 msgid "Maori" msgstr "Maorí" @@ -2934,7 +2805,7 @@ #: ../zypp/LanguageCode.cc:796 #, fuzzy msgid "Marathi" -msgstr "Maorí" +msgstr "Márata" #. language code: chm #: ../zypp/LanguageCode.cc:406 @@ -2952,16 +2823,15 @@ #. language code: mah mh #: ../zypp/LanguageCode.cc:780 +#, fuzzy msgid "Marshallese" -msgstr "" +msgstr "Marsellés" # MU -# fuzzy #. :MNP:580: #: ../zypp/CountryCode.cc:368 -#, fuzzy msgid "Martinique" -msgstr "Lituano" +msgstr "Martinica" #. language code: mwr #: ../zypp/LanguageCode.cc:846 @@ -2970,32 +2840,27 @@ msgstr "Maorí" # MW -# fuzzy #. language code: mas #: ../zypp/LanguageCode.cc:798 -#, fuzzy msgid "Masai" -msgstr "Kanu" +msgstr "Masai" # MR -# fuzzy #. :MTQ:474: #: ../zypp/CountryCode.cc:369 msgid "Mauritania" -msgstr "Lituano" +msgstr "Mauritania" # MU -# fuzzy #. :MLT:470: #: ../zypp/CountryCode.cc:372 msgid "Mauritius" -msgstr "Lituano" +msgstr "Mauricio" #. language code: myn #: ../zypp/LanguageCode.cc:848 -#, fuzzy msgid "Mayan Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Linguas Maias" #. :YEM:887: #: ../zypp/CountryCode.cc:461 @@ -3013,8 +2878,9 @@ msgstr "" #: ../zypp/media/MediaException.cc:72 +#, fuzzy msgid "Medium not attached" -msgstr "" +msgstr "Non amosar" #: ../zypp/media/MediaException.cc:53 #, c-format @@ -3030,7 +2896,7 @@ #. :FRA:250: #: ../zypp/CountryCode.cc:298 msgid "Metropolitan France" -msgstr "" +msgstr "Francia Metropolitana" # MX #. :MWI:454: @@ -3049,18 +2915,16 @@ msgstr "" # FM -# fuzzy #. language code: mwl #: ../zypp/LanguageCode.cc:844 -#, fuzzy msgid "Mirandese" -msgstr "Macedonia" +msgstr "Mirandés" #. language code: mis #: ../zypp/LanguageCode.cc:816 #, fuzzy msgid "Miscellaneous Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" #. language code: moh #: ../zypp/LanguageCode.cc:830 @@ -3075,15 +2939,13 @@ # BO #. language code: mol mo #: ../zypp/LanguageCode.cc:832 -#, fuzzy msgid "Moldavian" -msgstr "Bolivia" +msgstr "Moldavo" #. :MCO:492: #: ../zypp/CountryCode.cc:359 -#, fuzzy msgid "Moldova" -msgstr "Eslovaco" +msgstr "Moldavia" #. language code: mkh #: ../zypp/LanguageCode.cc:818 @@ -3091,12 +2953,10 @@ msgstr "" # MO -# fuzzy #. :MAR:504: #: ../zypp/CountryCode.cc:358 -#, fuzzy msgid "Monaco" -msgstr "Kanu" +msgstr "Mónaco" #. language code: lol #: ../zypp/LanguageCode.cc:752 @@ -3106,13 +2966,12 @@ #. :MMR:104: #: ../zypp/CountryCode.cc:365 msgid "Mongolia" -msgstr "" +msgstr "Mongolia" #. language code: mon mn #: ../zypp/LanguageCode.cc:834 -#, fuzzy msgid "Mongolian" -msgstr "Macedonio" +msgstr "Mongol" #. :MRT:478: #: ../zypp/CountryCode.cc:370 @@ -3122,7 +2981,7 @@ #. :LBY:434: #: ../zypp/CountryCode.cc:357 msgid "Morocco" -msgstr "" +msgstr "Marrocos" #. language code: mos #: ../zypp/LanguageCode.cc:836 @@ -3133,25 +2992,25 @@ #. :MYS:458: #: ../zypp/CountryCode.cc:377 msgid "Mozambique" -msgstr "" +msgstr "Mozambique" #. language code: mul #: ../zypp/LanguageCode.cc:838 #, fuzzy msgid "Multiple Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" #. language code: mun #: ../zypp/LanguageCode.cc:840 +#, fuzzy msgid "Munda languages" -msgstr "" +msgstr "Tódalas linguas" # MM -# fuzzy #. :MLI:466: #: ../zypp/CountryCode.cc:364 msgid "Myanmar" -msgstr "Panamá" +msgstr "Birmania" #. language code: nah #: ../zypp/LanguageCode.cc:852 @@ -3160,49 +3019,51 @@ msgstr "Manual" # GM -# fuzzy #. :MOZ:508: #: ../zypp/CountryCode.cc:378 -#, fuzzy msgid "Namibia" -msgstr "Xamaica" +msgstr "Namibia" #. language code: nau na #. :NPL:524: -#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:387 +#: ../zypp/LanguageCode.cc:858 +#: ../zypp/CountryCode.cc:387 msgid "Nauru" -msgstr "" +msgstr "Nauru" #. language code: nav nv #: ../zypp/LanguageCode.cc:860 +#, fuzzy msgid "Navajo" -msgstr "" +msgstr "Navaxo" #. language code: nde nd #: ../zypp/LanguageCode.cc:864 +#, fuzzy msgid "Ndebele, North" -msgstr "" +msgstr "Ndebele (norte)" #. language code: nbl nr #: ../zypp/LanguageCode.cc:862 +#, fuzzy msgid "Ndebele, South" -msgstr "" +msgstr "Ndebele (sur)" #. language code: ndo ng #: ../zypp/LanguageCode.cc:866 #, fuzzy msgid "Ndonga" -msgstr "Ningún" +msgstr "Ndonga" #. language code: nap #: ../zypp/LanguageCode.cc:856 msgid "Neapolitan" -msgstr "" +msgstr "Napolitano" #. :NOR:578: #: ../zypp/CountryCode.cc:386 msgid "Nepal" -msgstr "" +msgstr "Nepal" #. language code: new #: ../zypp/LanguageCode.cc:872 @@ -3215,7 +3076,7 @@ #: ../zypp/LanguageCode.cc:870 #, fuzzy msgid "Nepali" -msgstr "Kanu" +msgstr "Nepalés" # NL #. :NIC:558: @@ -3224,18 +3085,16 @@ msgstr "Países Baixos" # AN -# fuzzy #. :ARM:051: #: ../zypp/CountryCode.cc:231 msgid "Netherlands Antilles" -msgstr "Países Baixos" +msgstr "Antillas Neerlandesas" # NC -# fuzzy #. :NAM:516: #: ../zypp/CountryCode.cc:379 msgid "New Caledonia" -msgstr "Macedonia" +msgstr "Nova Caledonia" # NZ #. :NIU:570: @@ -3249,19 +3108,16 @@ msgstr "" # NI -# fuzzy #. :NGA:566: #: ../zypp/CountryCode.cc:383 msgid "Nicaragua" -msgstr "Paraguai" +msgstr "Nicaragua" # NG -# fuzzy #. :NCL:540: #: ../zypp/CountryCode.cc:380 -#, fuzzy msgid "Niger" -msgstr "Serbia" +msgstr "Níxer" #. language code: nic #: ../zypp/LanguageCode.cc:876 @@ -3269,11 +3125,10 @@ msgstr "" # NG -# fuzzy #. :NFK:574: #: ../zypp/CountryCode.cc:382 msgid "Nigeria" -msgstr "Serbia" +msgstr "Nixeria" #. language code: ssa #: ../zypp/LanguageCode.cc:1072 @@ -3282,9 +3137,8 @@ #. :NRU:520: #: ../zypp/CountryCode.cc:388 -#, fuzzy msgid "Niue" -msgstr "Número" +msgstr "Niue" # NG # fuzzy @@ -3296,14 +3150,16 @@ #. Defined LanguageCode constants #. Defined CountryCode constants -#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215 +#: ../zypp/LanguageCode.cc:225 +#: ../zypp/CountryCode.cc:215 #, fuzzy msgid "No Code" -msgstr "Modo" +msgstr "Código da lingua" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 +#, fuzzy msgid "No url in repository." -msgstr "" +msgstr "Non hai alias de URL dispoñibles" #. language code: nog #: ../zypp/LanguageCode.cc:884 @@ -3312,17 +3168,16 @@ msgstr "Autenticación" # FO -# fuzzy #. :NER:562: #: ../zypp/CountryCode.cc:381 -#, fuzzy msgid "Norfolk Island" -msgstr "Irlanda" +msgstr "Illa de Norfolk" #. language code: non #: ../zypp/LanguageCode.cc:886 +#, fuzzy msgid "Norse, Old" -msgstr "" +msgstr "fai %age" #. language code: nai #: ../zypp/LanguageCode.cc:854 @@ -3332,7 +3187,7 @@ #. :KNA:659: #: ../zypp/CountryCode.cc:341 msgid "North Korea" -msgstr "" +msgstr "Corea do Norte" #. :MAC:446: #: ../zypp/CountryCode.cc:367 @@ -3341,13 +3196,15 @@ #. language code: sme se #: ../zypp/LanguageCode.cc:1040 +#, fuzzy msgid "Northern Sami" -msgstr "" +msgstr "Sami (norte)" #. language code: nso #: ../zypp/LanguageCode.cc:890 +#, fuzzy msgid "Northern Sotho" -msgstr "" +msgstr "Sami (norte)" # NO #. :NLD:528: @@ -3362,25 +3219,23 @@ #. language code: nob nb #: ../zypp/LanguageCode.cc:882 -#, fuzzy msgid "Norwegian Bokmal" -msgstr "Noruegués" +msgstr "Noruegués Bokmal" #. language code: nno nn #: ../zypp/LanguageCode.cc:880 -#, fuzzy msgid "Norwegian Nynorsk" -msgstr "Noruegués" +msgstr "Noruegués Nynorsk" #: ../zypp/target/hal/HalContext.cc:828 +#, fuzzy msgid "Not a CDROM drive" -msgstr "" +msgstr "Non amosar" #. language code: nub #: ../zypp/LanguageCode.cc:892 -#, fuzzy msgid "Nubian Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Linguas Nubias" #. language code: nym #: ../zypp/LanguageCode.cc:898 @@ -3405,8 +3260,9 @@ #. language code: oci oc #: ../zypp/LanguageCode.cc:906 +#, fuzzy msgid "Occitan (post 1500)" -msgstr "" +msgstr "Erro ao almacenar o artigo." #. language code: oji oj #: ../zypp/LanguageCode.cc:908 @@ -3415,9 +3271,8 @@ #. :NZL:554: #: ../zypp/CountryCode.cc:390 -#, fuzzy msgid "Oman" -msgstr "Alemán" +msgstr "Omán" #: ../zypp/media/MediaException.cc:145 msgid "Operation not supported by medium" @@ -3429,12 +3284,13 @@ #: ../zypp/LanguageCode.cc:910 #, fuzzy msgid "Oriya" -msgstr "Serbia" +msgstr "Orillés" #. language code: orm om #: ../zypp/LanguageCode.cc:912 +#, fuzzy msgid "Oromo" -msgstr "" +msgstr "Oromo" #. language code: osa #: ../zypp/LanguageCode.cc:914 @@ -3445,13 +3301,13 @@ #: ../zypp/LanguageCode.cc:916 #, fuzzy msgid "Ossetian" -msgstr "Ruso" +msgstr "Oseto" #. language code: oto #: ../zypp/LanguageCode.cc:920 #, fuzzy msgid "Otomian Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" #. TranslatorExplanation %s = package being checked for integrity #: ../zypp/repo/PackageProvider.cc:314 @@ -3476,11 +3332,10 @@ msgstr "Taiwán" # PW -# fuzzy #. :PRT:620: #: ../zypp/CountryCode.cc:403 msgid "Palau" -msgstr "Paraguai" +msgstr "" # PW # fuzzy @@ -3493,7 +3348,7 @@ #. :PRI:630: #: ../zypp/CountryCode.cc:401 msgid "Palestinian Territory" -msgstr "" +msgstr "Territorios Palestinos" # ML # fuzzy @@ -3501,7 +3356,7 @@ #: ../zypp/LanguageCode.cc:946 #, fuzzy msgid "Pali" -msgstr "Kanu" +msgstr "Pali" # PY #. language code: pam @@ -3532,12 +3387,13 @@ #. language code: pap #: ../zypp/LanguageCode.cc:932 msgid "Papiamento" -msgstr "" +msgstr "Papiamento" #. :PYF:258: #: ../zypp/CountryCode.cc:394 +#, fuzzy msgid "Papua New Guinea" -msgstr "" +msgstr "crear libros novos" #. language code: paa #: ../zypp/LanguageCode.cc:922 @@ -3560,24 +3416,16 @@ 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 +#, fuzzy, c-format msgid "Permission to access '%s' denied." -msgstr "" +msgstr "Principais errores de \"acceso denegado\"" #. language code: per fas fa -#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 -#, fuzzy +#: ../zypp/LanguageCode.cc:938 +#: ../zypp/LanguageCode.cc:940 msgid "Persian" -msgstr "Serbio" +msgstr "Persa" #. language code: peo #: ../zypp/LanguageCode.cc:936 @@ -3598,13 +3446,12 @@ #. :PNG:598: #: ../zypp/CountryCode.cc:395 msgid "Philippines" -msgstr "" +msgstr "Filipinas" #. language code: phn #: ../zypp/LanguageCode.cc:944 -#, fuzzy msgid "Phoenician" -msgstr "Esloveno" +msgstr "Fenicio" #. :SPM:666: #: ../zypp/CountryCode.cc:399 @@ -3643,7 +3490,7 @@ #: ../zypp/LanguageCode.cc:954 #, fuzzy msgid "Prakrit Languages" -msgstr "Australia" +msgstr "Tódalas linguas" #. language code: pro #: ../zypp/LanguageCode.cc:956 @@ -3652,9 +3499,8 @@ #. :PCN:612: #: ../zypp/CountryCode.cc:400 -#, fuzzy msgid "Puerto Rico" -msgstr "&Protocolo" +msgstr "Porto Rico" #. language code: pus ps #: ../zypp/LanguageCode.cc:958 @@ -3662,31 +3508,34 @@ msgstr "" # QA -# fuzzy #. :PRY:600: #: ../zypp/CountryCode.cc:405 msgid "Qatar" -msgstr "Kanu" +msgstr "" #. language code: que qu #: ../zypp/LanguageCode.cc:960 msgid "Quechua" -msgstr "" +msgstr "Quechua" -#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229 +#: ../zypp/url/UrlBase.cc:782 +#: ../zypp/url/UrlBase.cc:1229 msgid "Query string parsing not supported for this URL" msgstr "" #. 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 "" +msgstr "Cron executouse con fallas" #. language code: roh rm #: ../zypp/LanguageCode.cc:970 +#, fuzzy msgid "Raeto-Romance" -msgstr "" +msgstr "Retorrománico" # TJ # fuzzy @@ -3708,34 +3557,30 @@ msgid "Rarotongan" msgstr "" -#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131 +#: ../zypp/url/UrlBase.cc:1117 +#: ../zypp/url/UrlBase.cc:1131 msgid "Relative path not allowed if authority exists" msgstr "" -#: ../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 "" +msgstr "Eliminando o repositorio '%s'" #: ../zypp/parser/susetags/RepoParser.cc:232 msgid "Required file is missing: " -msgstr "" +msgstr "Falta o ficheiro requirido: " #. :QAT:634: #: ../zypp/CountryCode.cc:406 -#, fuzzy msgid "Reunion" -msgstr "Resolución" +msgstr "Reunión" #. language code: roa #: ../zypp/LanguageCode.cc:968 +#, fuzzy msgid "Romance (Other)" -msgstr "" +msgstr "Retorrománico" # RO #. :REU:638: @@ -3744,7 +3589,8 @@ msgstr "Romanía" #. language code: rum ron ro -#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976 +#: ../zypp/LanguageCode.cc:974 +#: ../zypp/LanguageCode.cc:976 msgid "Romanian" msgstr "Romanés" @@ -3771,19 +3617,18 @@ #. :ROU:642: #: ../zypp/CountryCode.cc:408 msgid "Russian Federation" -msgstr "" +msgstr "Federación Rusa" # RW -# fuzzy #. :RUS:643: #: ../zypp/CountryCode.cc:409 msgid "Rwanda" -msgstr "Canadá" +msgstr "Ruanda" #. :SGP:702: #: ../zypp/CountryCode.cc:416 msgid "Saint Helena" -msgstr "" +msgstr "Santa Helena" # KN # fuzzy @@ -3794,10 +3639,8 @@ msgstr "Saint Kitts e Nevis" # LC -# fuzzy #. :LBN:422: #: ../zypp/CountryCode.cc:348 -#, fuzzy msgid "Saint Lucia" msgstr "Santa Lucía" @@ -3818,7 +3661,7 @@ #: ../zypp/LanguageCode.cc:990 #, fuzzy msgid "Salishan Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" #. language code: sam #: ../zypp/LanguageCode.cc:992 @@ -3827,26 +3670,25 @@ #. language code: smi #: ../zypp/LanguageCode.cc:1042 +#, fuzzy msgid "Sami Languages (Other)" -msgstr "" +msgstr "Linguas xa engadidas" # KH -# fuzzy #. :WLF:876: #: ../zypp/CountryCode.cc:459 -#, fuzzy msgid "Samoa" -msgstr "Colombia" +msgstr "Samoa" #. language code: smo sm #: ../zypp/LanguageCode.cc:1048 msgid "Samoan" -msgstr "" +msgstr "Samoano" #. :SLE:694: #: ../zypp/CountryCode.cc:421 msgid "San Marino" -msgstr "" +msgstr "San Marino" # CA #. language code: sad @@ -3861,13 +3703,12 @@ #: ../zypp/LanguageCode.cc:984 #, fuzzy msgid "Sango" -msgstr "Son" +msgstr "Sango" #. language code: san sa #: ../zypp/LanguageCode.cc:994 -#, fuzzy msgid "Sanskrit" -msgstr "Inicio" +msgstr "Sánscrito" #. language code: sat #: ../zypp/LanguageCode.cc:998 @@ -3881,12 +3722,10 @@ msgstr "" # MR -# fuzzy #. language code: srd sc #: ../zypp/LanguageCode.cc:1068 -#, fuzzy msgid "Sardinian" -msgstr "Lituano" +msgstr "Sardo" #. language code: sas #: ../zypp/LanguageCode.cc:996 @@ -3896,12 +3735,13 @@ #. :RWA:646: #: ../zypp/CountryCode.cc:410 msgid "Saudi Arabia" -msgstr "" +msgstr "Arabia Saudita" #. language code: sco #: ../zypp/LanguageCode.cc:1006 +#, fuzzy msgid "Scots" -msgstr "" +msgstr "Gaélico Escocés" #. language code: sel #: ../zypp/LanguageCode.cc:1012 @@ -3916,17 +3756,17 @@ #. :SMR:674: #: ../zypp/CountryCode.cc:422 -#, fuzzy msgid "Senegal" -msgstr "Núcleo" +msgstr "Senegal" #. :CRI:188: #: ../zypp/CountryCode.cc:273 msgid "Serbia and Montenegro" -msgstr "" +msgstr "Serbia e Montenegro" #. language code: scc srp sr -#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002 +#: ../zypp/LanguageCode.cc:1000 +#: ../zypp/LanguageCode.cc:1002 msgid "Serbian" msgstr "Serbio" @@ -3954,7 +3794,7 @@ #: ../zypp/LanguageCode.cc:1052 #, fuzzy msgid "Shona" -msgstr "Eslovenia" +msgstr "Sonés" # LT # fuzzy @@ -3967,7 +3807,7 @@ #. language code: scn #: ../zypp/LanguageCode.cc:1004 msgid "Sicilian" -msgstr "" +msgstr "Siciliano" #. language code: sid #: ../zypp/LanguageCode.cc:1022 @@ -3981,13 +3821,14 @@ #. language code: sgn #: ../zypp/LanguageCode.cc:1018 +#, fuzzy msgid "Sign Languages" -msgstr "" +msgstr "Tódalas linguas" #: ../zypp/KeyRing.cc:568 -#, c-format +#, fuzzy, c-format msgid "Signature file %s not found" -msgstr "" +msgstr "Páxina 404 (non atopada) por defecto" #. language code: bla #: ../zypp/LanguageCode.cc:354 @@ -3996,13 +3837,14 @@ #. language code: snd sd #: ../zypp/LanguageCode.cc:1054 +#, fuzzy msgid "Sindhi" -msgstr "" +msgstr "Sindino" #. :SWE:752: #: ../zypp/CountryCode.cc:415 msgid "Singapore" -msgstr "" +msgstr "Singapur" #. language code: sin si #: ../zypp/LanguageCode.cc:1024 @@ -4018,12 +3860,13 @@ #: ../zypp/LanguageCode.cc:1026 #, fuzzy msgid "Siouan Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" #. language code: sms #: ../zypp/LanguageCode.cc:1050 +#, fuzzy msgid "Skolt Sami" -msgstr "" +msgstr "Sami (norte)" #. language code: den #: ../zypp/LanguageCode.cc:460 @@ -4036,16 +3879,16 @@ msgstr "" #. language code: slo slk sk -#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034 +#: ../zypp/LanguageCode.cc:1032 +#: ../zypp/LanguageCode.cc:1034 msgid "Slovak" msgstr "Eslovaco" # SK -# fuzzy #. :SJM:744: #: ../zypp/CountryCode.cc:419 msgid "Slovakia" -msgstr "Eslovaco" +msgstr "Eslovaquia" # SI #. :SHN:654: @@ -4067,12 +3910,15 @@ msgstr "Son" # FO -# fuzzy #. :SAU:682: #: ../zypp/CountryCode.cc:411 -#, fuzzy msgid "Solomon Islands" -msgstr "Irlanda" +msgstr "Illas Salomón" + +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "Inglés (proporcionado por Drupal)" # SO # fuzzy @@ -4080,14 +3926,13 @@ #: ../zypp/LanguageCode.cc:1060 #, fuzzy msgid "Somali" -msgstr "Romanía" +msgstr "Somalí" # SO -# fuzzy #. :SEN:686: #: ../zypp/CountryCode.cc:423 msgid "Somalia" -msgstr "Romanía" +msgstr "Somalia" #. language code: son #: ../zypp/LanguageCode.cc:1062 @@ -4104,7 +3949,7 @@ #: ../zypp/LanguageCode.cc:1196 #, fuzzy msgid "Sorbian Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" #. language code: sot st #: ../zypp/LanguageCode.cc:1064 @@ -4115,7 +3960,7 @@ #. :MYT:175: #: ../zypp/CountryCode.cc:462 msgid "South Africa" -msgstr "África do Sur" +msgstr "Sudáfrica" #. language code: sai #: ../zypp/LanguageCode.cc:988 @@ -4130,9 +3975,8 @@ # ZA #. :PRK:408: #: ../zypp/CountryCode.cc:342 -#, fuzzy msgid "South Korea" -msgstr "África do Sur" +msgstr "Corea do Sur" # ZA #. language code: alt @@ -4143,8 +3987,9 @@ #. language code: sma #: ../zypp/LanguageCode.cc:1038 +#, fuzzy msgid "Southern Sami" -msgstr "" +msgstr "Sami (norte)" # ES #. :ERI:232: @@ -4164,11 +4009,10 @@ msgstr "Serbio" # SD -# fuzzy #. :SYC:690: #: ../zypp/CountryCode.cc:413 msgid "Sudan" -msgstr "Son" +msgstr "Sudán" #. language code: suk #: ../zypp/LanguageCode.cc:1076 @@ -4177,9 +4021,8 @@ #. language code: sux #: ../zypp/LanguageCode.cc:1082 -#, fuzzy msgid "Sumerian" -msgstr "Serbio" +msgstr "Sumerio" # SD # fuzzy @@ -4214,7 +4057,7 @@ #: ../zypp/LanguageCode.cc:1084 #, fuzzy msgid "Swahili" -msgstr "Tailandia" +msgstr "Suaxili" # ES #. language code: ssw ss @@ -4224,11 +4067,10 @@ msgstr "España" # SZ -# fuzzy #. :SYR:760: #: ../zypp/CountryCode.cc:428 msgid "Swaziland" -msgstr "Tailandia" +msgstr "" # SE #. :SDN:736: @@ -4248,19 +4090,16 @@ msgstr "Suíza" # SY -# fuzzy #. :SLV:222: #: ../zypp/CountryCode.cc:427 msgid "Syria" -msgstr "Serbia" +msgstr "Siria" # SY -# fuzzy #. language code: syr #: ../zypp/LanguageCode.cc:1088 -#, fuzzy msgid "Syriac" -msgstr "Serbia" +msgstr "Sirio" #: ../zypp/media/MediaException.cc:91 #, c-format @@ -4275,14 +4114,14 @@ #. language code: tgl tl #: ../zypp/LanguageCode.cc:1108 msgid "Tagalog" -msgstr "" +msgstr "Tagalo" # TW #. language code: tah ty #: ../zypp/LanguageCode.cc:1090 #, fuzzy msgid "Tahitian" -msgstr "Taiwán" +msgstr "Tahitiano" #. language code: tai #: ../zypp/LanguageCode.cc:1092 @@ -4301,14 +4140,13 @@ #: ../zypp/LanguageCode.cc:1106 #, fuzzy msgid "Tajik" -msgstr "Taiwán" +msgstr "Taxiko" # TJ -# fuzzy #. :THA:764: #: ../zypp/CountryCode.cc:434 msgid "Tajikistan" -msgstr "Taiwán" +msgstr "" #. language code: tmh #: ../zypp/LanguageCode.cc:1128 @@ -4323,7 +4161,7 @@ #. :TWN:158: #: ../zypp/CountryCode.cc:444 msgid "Tanzania" -msgstr "" +msgstr "Tanzania" # QA # fuzzy @@ -4331,14 +4169,14 @@ #: ../zypp/LanguageCode.cc:1096 #, fuzzy msgid "Tatar" -msgstr "Kanu" +msgstr "Tártaro" # BE #. language code: tel te #: ../zypp/LanguageCode.cc:1098 #, fuzzy msgid "Telugu" -msgstr "Bélxica" +msgstr "Telugo" #. language code: ter #: ../zypp/LanguageCode.cc:1102 @@ -4354,7 +4192,7 @@ #. language code: tha th #: ../zypp/LanguageCode.cc:1110 msgid "Thai" -msgstr "Thai" +msgstr "Tailandés" # TH #. :TGO:768: @@ -4362,16 +4200,16 @@ 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 "" # TW #. language code: tib bod bo -#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114 -#, fuzzy +#: ../zypp/LanguageCode.cc:1112 +#: ../zypp/LanguageCode.cc:1114 msgid "Tibetan" -msgstr "Taiwán" +msgstr "Tibetano" #. language code: tig #: ../zypp/LanguageCode.cc:1116 @@ -4384,7 +4222,7 @@ #: ../zypp/LanguageCode.cc:1118 #, fuzzy msgid "Tigrinya" -msgstr "Serbia" +msgstr "Tigriñés" #: ../zypp/media/MediaException.cc:207 #, c-format @@ -4418,14 +4256,16 @@ #. language code: tkl #. :TJK:762: -#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:435 +#: ../zypp/LanguageCode.cc:1122 +#: ../zypp/CountryCode.cc:435 msgid "Tokelau" msgstr "" #. :TUN:788: #: ../zypp/CountryCode.cc:438 +#, fuzzy msgid "Tonga" -msgstr "" +msgstr "Tongués" #. language code: tog #: ../zypp/LanguageCode.cc:1130 @@ -4459,7 +4299,7 @@ #: ../zypp/LanguageCode.cc:1140 #, fuzzy msgid "Tsonga" -msgstr "Estonia" +msgstr "Tsonga" # TW #. language code: tsn tn @@ -4474,17 +4314,16 @@ msgstr "" # TN -# fuzzy #. :TKM:795: #: ../zypp/CountryCode.cc:437 msgid "Tunisia" -msgstr "Rusia" +msgstr "" #. language code: tup #: ../zypp/LanguageCode.cc:1146 #, fuzzy msgid "Tupi Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" # TR #. :TLS:626: @@ -4507,7 +4346,7 @@ #: ../zypp/LanguageCode.cc:1142 #, fuzzy msgid "Turkmen" -msgstr "Turquía" +msgstr "Turcomano" # TJ # fuzzy @@ -4524,9 +4363,10 @@ #. language code: tvl #. :TTO:780: -#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:442 +#: ../zypp/LanguageCode.cc:1152 +#: ../zypp/CountryCode.cc:442 msgid "Tuvalu" -msgstr "" +msgstr "Tuvalu" # TN # fuzzy @@ -4538,8 +4378,9 @@ #. language code: twi tw #: ../zypp/LanguageCode.cc:1154 +#, fuzzy msgid "Twi" -msgstr "" +msgstr "Tui" #. language code: udm #: ../zypp/LanguageCode.cc:1158 @@ -4547,11 +4388,10 @@ msgstr "" # UG -# fuzzy #. :UKR:804: #: ../zypp/CountryCode.cc:446 msgid "Uganda" -msgstr "Canadá" +msgstr "Uganda" #. language code: uga #: ../zypp/LanguageCode.cc:1160 @@ -4560,8 +4400,9 @@ #. language code: uig ug #: ../zypp/LanguageCode.cc:1162 +#, fuzzy msgid "Uighur" -msgstr "" +msgstr "Uighur" # UA #. :TZA:834: @@ -4572,9 +4413,8 @@ # UA #. language code: ukr uk #: ../zypp/LanguageCode.cc:1164 -#, fuzzy msgid "Ukrainian" -msgstr "Ucraína" +msgstr "Ucraíno" #. language code: umb #: ../zypp/LanguageCode.cc:1166 @@ -4593,7 +4433,8 @@ msgid "Unable to initalize HAL context -- hald not running?" msgstr "" -#: ../zypp/Url.cc:322 ../zypp/Url.cc:336 +#: ../zypp/Url.cc:322 +#: ../zypp/Url.cc:336 msgid "Unable to parse Url components" msgstr "" @@ -4613,34 +4454,27 @@ #. :GAB:266: #: ../zypp/CountryCode.cc:300 msgid "United Kingdom" -msgstr "" +msgstr "Reino Unido" # US -# fuzzy #. :UMI:581: #: ../zypp/CountryCode.cc:448 msgid "United States" msgstr "Estados Unidos de América" # UM -# fuzzy #. :UGA:800: #: ../zypp/CountryCode.cc:447 msgid "United States Minor Outlying Islands" -msgstr "Estados Unidos de América" +msgstr "" #: ../zypp/CountryCode.cc:135 msgid "Unknown country: " -msgstr "" +msgstr "País descoñecido: " #: ../zypp/LanguageCode.cc:145 msgid "Unknown language: " -msgstr "" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -#, fuzzy -msgid "Unlock these resolvables" -msgstr "Instalando o controlador..." +msgstr "Lingua descoñecida: " #: ../zypp/media/MediaUserAuth.cc:97 #, c-format @@ -4669,7 +4503,7 @@ #. language code: urd ur #: ../zypp/LanguageCode.cc:1170 msgid "Urdu" -msgstr "" +msgstr "Urdu" #: ../zypp/url/UrlBase.cc:154 #, c-format @@ -4712,8 +4546,9 @@ #. language code: uzb uz #: ../zypp/LanguageCode.cc:1172 +#, fuzzy msgid "Uzbek" -msgstr "" +msgstr "Uzbequés" # TJ # fuzzy @@ -4743,7 +4578,7 @@ #: ../zypp/LanguageCode.cc:1176 #, fuzzy msgid "Venda" -msgstr "Vendedor" +msgstr "Venda" # VE #. :VCT:670: @@ -4752,11 +4587,10 @@ msgstr "Venezuela" # VN -# fuzzy #. :VIR:850: #: ../zypp/CountryCode.cc:456 msgid "Vietnam" -msgstr "Trepadeiras" +msgstr "Vietnam" # VN # fuzzy @@ -4764,14 +4598,13 @@ #: ../zypp/LanguageCode.cc:1178 #, fuzzy msgid "Vietnamese" -msgstr "Trepadeiras" +msgstr "Vietnamita" # VI -# fuzzy #. :VGB:092: #: ../zypp/CountryCode.cc:455 msgid "Virgin Islands, U.S." -msgstr "Finlandia" +msgstr "" #. language code: vol vo #: ../zypp/LanguageCode.cc:1180 @@ -4787,7 +4620,7 @@ #: ../zypp/LanguageCode.cc:1184 #, fuzzy msgid "Wakashan Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" #. language code: wal #: ../zypp/LanguageCode.cc:1186 @@ -4796,13 +4629,14 @@ #. :VUT:548: #: ../zypp/CountryCode.cc:458 +#, fuzzy msgid "Wallis and Futuna" -msgstr "" +msgstr "Data e hora" #. language code: wln wa #: ../zypp/LanguageCode.cc:1198 msgid "Walloon" -msgstr "" +msgstr "Valón" # PY #. language code: war @@ -4817,24 +4651,26 @@ msgstr "" #. language code: wel cym cy -#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194 +#: ../zypp/LanguageCode.cc:1192 +#: ../zypp/LanguageCode.cc:1194 msgid "Welsh" -msgstr "" +msgstr "Galés" #. :EGY:818: #: ../zypp/CountryCode.cc:288 msgid "Western Sahara" -msgstr "" +msgstr "Sáhara Occidental" #. language code: wol wo #: ../zypp/LanguageCode.cc:1200 +#, fuzzy msgid "Wolof" -msgstr "" +msgstr "Uolof" #. language code: xho xh #: ../zypp/LanguageCode.cc:1204 msgid "Xhosa" -msgstr "" +msgstr "Xhosa" #. language code: sah #: ../zypp/LanguageCode.cc:986 @@ -4855,13 +4691,13 @@ #. :WSM:882: #: ../zypp/CountryCode.cc:460 msgid "Yemen" -msgstr "" +msgstr "Iemén" #. language code: yid yi #: ../zypp/LanguageCode.cc:1210 #, fuzzy msgid "Yiddish" -msgstr "Finalizar" +msgstr "Xidish" # CU # fuzzy @@ -4869,20 +4705,19 @@ #: ../zypp/LanguageCode.cc:1212 #, fuzzy msgid "Yoruba" -msgstr "Colombia" +msgstr "Ioruba" #. language code: ypk #: ../zypp/LanguageCode.cc:1214 #, fuzzy msgid "Yupik Languages" -msgstr "Seleccione a súa lingua:" +msgstr "Tódalas linguas" # ZM -# fuzzy #. :ZAF:710: #: ../zypp/CountryCode.cc:463 msgid "Zambia" -msgstr "Xamaica" +msgstr "Zambia" #. language code: znd #: ../zypp/LanguageCode.cc:1222 @@ -4892,7 +4727,7 @@ #. language code: zap #: ../zypp/LanguageCode.cc:1216 msgid "Zapotec" -msgstr "" +msgstr "Zapoteca" # GD #. language code: zen @@ -4903,8 +4738,9 @@ #. language code: zha za #: ../zypp/LanguageCode.cc:1220 +#, fuzzy msgid "Zhuang" -msgstr "" +msgstr "Zhuang" #. :ZMB:894: #: ../zypp/CountryCode.cc:464 @@ -4914,103 +4750,90 @@ #. language code: zul zu #: ../zypp/LanguageCode.cc:1224 msgid "Zulu" -msgstr "" +msgstr "Zulú" #. language code: zun #: ../zypp/LanguageCode.cc:1226 msgid "Zuni" -msgstr "" +msgstr "Zuñi" #: ../zypp/repo/PackageProvider.cc:233 +#, fuzzy msgid "applydeltarpm check failed." -msgstr "" +msgstr "Cron executouse con fallas" #: ../zypp/repo/PackageProvider.cc:247 +#, fuzzy msgid "applydeltarpm failed." -msgstr "" +msgstr "Cron executouse con fallas" -#: ../zypp/sat/SATResolver.cc:951 -#, c-format +#: ../zypp/solver/detail/SATResolver.cc:1129 +#, fuzzy, c-format msgid "architecture change of %s to %s" -msgstr "" +msgstr "Responder ó comentario" -#: ../zypp/sat/SATResolver.cc:704 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:875 +#, c-format msgid "cannot install both %s and %s" -msgstr "Instalando en:" +msgstr "non se puido instalar %s e %s" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 msgid "conflicting requests" msgstr "" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 -#, c-format +#: ../zypp/target/rpm/RpmDb.cc:2327 +#, fuzzy, c-format msgid "created backup %s" -msgstr "" +msgstr "Termo %term creado." -#: ../zypp/sat/SATResolver.cc:978 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:1156 +#, c-format msgid "deinstallation of %s" -msgstr "Instalando en:" - -#. 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 "Eliminar" +msgstr "desinstalación de %s" -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 +#, fuzzy msgid "deleted providers: " -msgstr "" +msgstr "Categoría %category borrada." -#: ../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 "Instalando o controlador..." -#: ../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 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:1015 +#, c-format msgid "do not forbid installation of %s" -msgstr "Instalando en:" +msgstr "non prohibir a instalación de %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 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:994 +#: ../zypp/solver/detail/SATResolver.cc:1033 +#, c-format msgid "do not install %s" -msgstr "Instalando en:" +msgstr "non instalar %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 -#, fuzzy, c-format -msgid "do not keep %s installed" -msgstr "Instalando en:" - -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:989 #, c-format -msgid "downgrade of %s to %s" -msgstr "" +msgid "do not keep %s installed" +msgstr "non manter instalado %s" -#. 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 #, fuzzy, c-format -msgid "install %s" -msgstr "Instalando en:" +msgid "downgrade of %s to %s" +msgstr "Responder ó comentario" -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -5019,10 +4842,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 "" @@ -5035,91 +4856,61 @@ 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 -#, c-format +#: ../zypp/solver/detail/SATResolver.cc:1144 +#, fuzzy, c-format msgid "replacement of %s with %s" -msgstr "" +msgstr "Rexistrarse cun servidor Drupal" #. %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 "Instalar" -#. 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 -#, fuzzy -msgid "unlock all resolvables" -msgstr "Instalando o controlador..." - -#, fuzzy -#~ msgid "Establishing %s" -#~ msgstr "Instalando en:" - -#, fuzzy -#~ msgid " Error!" -#~ msgstr "Erro" - -#~ msgid "Ok" -#~ msgstr "Aceptar" - -#~ msgid "Default" -#~ msgstr "Predeterminada" - -#~ msgid "unknown" -#~ msgstr "descoñecido" - -#, fuzzy -#~ msgid "installed" -#~ msgstr "Instalar" Modified: trunk/libzypp/po/gu.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/gu.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/gu.po (original) +++ trunk/libzypp/po/gu.po Mon Apr 28 15:25:19 2008 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: nis\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-11 18:41+0530\n" "Last-Translator: Priyavert Sharma\n" "Language-Team: AgreeYa Solutions\n" @@ -11,7 +11,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 #, fuzzy msgid "" "\n" @@ -23,61 +23,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 "" @@ -102,12 +90,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 આઉટપુટ:" @@ -320,7 +308,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 "" @@ -584,7 +572,7 @@ msgid "Buginese" msgstr "બુગિનેઝ" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -634,7 +622,7 @@ msgid "Cameroon" msgstr "કેમેરુન" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 #, fuzzy msgid "Can not create sat-pool." msgstr "ફાઈલ બનાવી શકાતી નથી." @@ -643,10 +631,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)." @@ -676,6 +660,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)." @@ -686,12 +675,7 @@ msgid "Can't open pty (%s)." msgstr "ફાઈલ ખુલી શકતી નથી: %1." -#: ../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 પૂરું પાડી શકાતું નથી" @@ -700,10 +684,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 "રિકર્સિવ મ્યૂટેક્ષ ગુણધર્મ સેટ કરી શકાયો નથી" @@ -799,7 +779,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 માટે કન્ફિગ્યુરેશન ફાઈલો બદલાઇ:" @@ -1065,11 +1045,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" @@ -1115,7 +1090,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 "" @@ -1228,11 +1203,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" @@ -1273,7 +1243,7 @@ msgid "Failed to delete key." msgstr "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 "" @@ -1283,7 +1253,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: @@ -1816,27 +1786,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 @@ -1883,23 +1836,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 "સૂચના પ્રમાણે સ્થાપન અટકાવેલું હતું." @@ -1973,7 +1910,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 "" @@ -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 "આ રિઝોલ્વેબલ્સ અનલોક કરો" - #: ../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 "%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" @@ -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 "%s તરીકે rpm એ %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 @@ "%s તરીકે rpm એ %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 "%s તરીકે rpm એ %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 @@ "%s તરીકે rpm એ %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/he.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/he.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/he.po (original) +++ trunk/libzypp/po/he.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: 2004-08-09 10:24+0200\n" "Last-Translator: xxx \n" "Language-Team: Hebrew \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 #, fuzzy, 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 #, fuzzy, 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 #, fuzzy, c-format msgid "%s remove failed" msgstr "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 "" @@ -107,12 +95,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 "מידע נוסף" @@ -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 "" @@ -649,7 +637,7 @@ msgid "Buginese" msgstr "סינית" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -705,7 +693,7 @@ msgid "Cameroon" msgstr "" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "" @@ -713,10 +701,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)." @@ -746,6 +730,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)." @@ -756,12 +745,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 "" @@ -770,10 +754,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 "" @@ -884,7 +864,7 @@ # Commandline help title #. 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 "קורא קובץ הגדרות" @@ -1177,11 +1157,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 #, fuzzy @@ -1232,7 +1207,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 "" @@ -1347,10 +1322,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" @@ -1396,7 +1367,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 "" @@ -1406,7 +1377,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 "" @@ -1653,8 +1624,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: @@ -1972,26 +1943,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 @@ -2041,24 +1995,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 "מתקין דריבר..." - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "" @@ -2135,7 +2072,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 "" @@ -2191,11 +2133,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" @@ -2336,11 +2273,6 @@ msgid "Kazakhstan" msgstr "פקיסטן" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -#, fuzzy -msgid "Keep resolvables" -msgstr "מתקין דריבר..." - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -3172,7 +3104,7 @@ msgid "No Code" msgstr "מצב" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3420,14 +3352,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." @@ -3538,8 +3462,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 "" @@ -3571,16 +3495,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 "" @@ -3925,6 +3844,11 @@ msgid "Solomon Islands" msgstr "איי פר-אר" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "" + # RO #. language code: som so #: ../zypp/LanguageCode.cc:1060 @@ -4203,7 +4127,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 "" @@ -4463,11 +4387,6 @@ msgid "Unknown language: " msgstr "" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -#, fuzzy -msgid "Unlock these resolvables" -msgstr "מתקין דריבר..." - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4750,95 +4669,77 @@ 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 "" # Frame title for installation target hard disk / partition(s) -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, fuzzy, 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 #, fuzzy, c-format msgid "created backup %s" msgstr "אל תיצור גיבויים" # Frame title for installation target hard disk / partition(s) -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "מתקין על:" -# main dialog: Button Delete partition -#. 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 "&מחק" - -#: ../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 "מתקין דריבר..." -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, fuzzy, c-format msgid "do not forbid installation of %s" msgstr "מתקין על:" # Frame title for installation target hard disk / partition(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 "מתקין על:" -#: ../zypp/sat/SATResolver.cc:911 +#: ../zypp/solver/detail/SATResolver.cc:1089 #, c-format msgid "do not install most recent version of %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: ../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 #, c-format msgid "downgrade of %s to %s" msgstr "" -# Frame title for installation target hard disk / partition(s) -#. 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 "מתקין על:" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4847,10 +4748,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 "" @@ -4863,52 +4762,52 @@ 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" @@ -4916,21 +4815,48 @@ msgstr "" # IT -#: ../zypp/sat/SATResolver.cc:759 +#: ../zypp/solver/detail/SATResolver.cc:935 #, fuzzy msgid "uninstallable providers: " msgstr "התקן" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, fuzzy, c-format -msgid "unlock %s" -msgstr "שעונים" +#, fuzzy +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "מתקין דריבר..." -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 #, fuzzy -msgid "unlock all resolvables" -msgstr "מתקין דריבר..." +#~ msgid "Install missing resolvables" +#~ msgstr "מתקין דריבר..." + +#, fuzzy +#~ msgid "Keep resolvables" +#~ msgstr "מתקין דריבר..." + +#, fuzzy +#~ msgid "Unlock these resolvables" +#~ msgstr "מתקין דריבר..." + +# main dialog: Button Delete partition +#, fuzzy +#~ msgid "delete %s" +#~ msgstr "&מחק" + +# Frame title for installation target hard disk / partition(s) +#, fuzzy +#~ msgid "install %s" +#~ msgstr "מתקין על:" + +#, fuzzy +#~ msgid "unlock %s" +#~ msgstr "שעונים" + +#, fuzzy +#~ msgid "unlock all resolvables" +#~ msgstr "מתקין דריבר..." + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Couldn't open file: %s." #, fuzzy #~ msgid "No need to install %s" Modified: trunk/libzypp/po/hi.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hi.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/hi.po (original) +++ trunk/libzypp/po/hi.po Mon Apr 28 15:25:19 2008 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: zypp.hi\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-24 22:33+0530\n" "Last-Translator: Sangeeta Kumari \n" "Language-Team: Hindi \n" @@ -14,7 +14,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" @@ -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 #, 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 "" @@ -105,12 +93,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 आउटपुट :" @@ -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 #, fuzzy msgid "Can not create sat-pool." msgstr "फाइल को सृजित नहीं कर सकता है।" @@ -646,10 +634,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)." @@ -679,6 +663,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)." @@ -689,12 +678,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 प्रदान नहीं कर सकता" @@ -703,10 +687,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 "रिकर्सिव म्यूटेक्स गुण को सेट नहीं कर सकता" @@ -802,7 +782,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: के लिए परिवर्तित कंफिगरेशन फाइलें" @@ -1068,11 +1048,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" @@ -1118,7 +1093,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 "" @@ -1231,11 +1206,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" @@ -1276,7 +1246,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 "" @@ -1286,7 +1256,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 "सार्वजनिक कुंजी को प्राप्त करने में अक्षम।" @@ -1525,9 +1495,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: @@ -1818,27 +1788,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 @@ -1885,23 +1838,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 "जैसा निर्देशित था, संस्थापन छोड़ दिया गया।" @@ -1975,7 +1912,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 "कूटशब्द बदलो" @@ -2025,11 +1967,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" @@ -2155,10 +2092,6 @@ msgid "Kazakhstan" msgstr "कज़ाकिस्तान" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "रिजॉल्वेबल्स रखें" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2874,7 +2807,7 @@ msgid "No Code" msgstr "कोई कोड नहीं" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 #, fuzzy msgid "No url in repository." msgstr "कोष में फाइल %1 नहीं प्राप्त हुई।" @@ -3098,14 +3031,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." @@ -3206,8 +3131,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 "विफल" @@ -3236,16 +3161,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 "" @@ -3545,6 +3465,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" @@ -3780,7 +3705,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 "" @@ -4020,10 +3945,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'" @@ -4286,90 +4207,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" @@ -4378,10 +4283,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 रखें" @@ -4394,34 +4297,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" @@ -4430,18 +4333,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" @@ -4450,20 +4353,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/hr.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hr.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/hr.po (original) +++ trunk/libzypp/po/hr.po Mon Apr 28 15:25:19 2008 @@ -1,23 +1,26 @@ +# translation of zypp.hr.po to Croatian # Croatian message file for YaST2 (@memory@) # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002 SuSE Linux AG. # Copyright (C) 2001 SuSE GmbH. -# Vlatko Kosturjak , 2001 # +# Vlatko Kosturjak , 2001. +# Krešimir Jozić , 2008. msgid "" msgstr "" -"Project-Id-Version: YaST (@memory@)\n" +"Project-Id-Version: zypp.hr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-31 15:30+0200\n" -"PO-Revision-Date: 2001-07-17 16:22+0200\n" -"Last-Translator: Vlatko Kosturjak \n" -"Language-Team: Croatian \n" +"POT-Creation-Date: 2008-04-21 18:58+0200\n" +"PO-Revision-Date: 2008-04-17 20:00+0200\n" +"Last-Translator: Krešimir Jozić \n" +"Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: KBabel 1.11.4\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -28,61 +31,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 -#, fuzzy, c-format +#: ../zypp/target/rpm/RpmDb.cc:2054 +#, c-format msgid "%s install failed" -msgstr "Instaliraj &inetd" +msgstr "" #. %s = filename of rpm package #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2065 -#, fuzzy, c-format -msgid "%s installed ok" -msgstr "će biti instaliran kao:" - -#: ../zypp/sat/SATResolver.cc:695 -#, fuzzy, c-format -msgid "%s is not installable" -msgstr "Instaliraj &inetd" - -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/target/rpm/RpmDb.cc:2063 #, c-format -msgid "%s obsoletes %s provided by %s" +msgid "%s installed ok" msgstr "" -#. 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" +msgid "%s is not installable" msgstr "" -#. 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" +msgid "%s obsoletes %s provided by %s" 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 "" @@ -90,15 +81,13 @@ # AZ #. language code: abk ab #: ../zypp/LanguageCode.cc:240 -#, fuzzy msgid "Abkhazian" -msgstr "Azerbedžan" +msgstr "" #. language code: ace #: ../zypp/LanguageCode.cc:242 -#, fuzzy msgid "Achinese" -msgstr "Kineski" +msgstr "" #. language code: ach #: ../zypp/LanguageCode.cc:244 @@ -107,16 +96,15 @@ #. language code: ada #: ../zypp/LanguageCode.cc:246 -#, fuzzy msgid "Adangme" -msgstr "Range" +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 "" @@ -127,9 +115,8 @@ #. language code: aar aa #: ../zypp/LanguageCode.cc:238 -#, fuzzy msgid "Afar" -msgstr "Afrika" +msgstr "" # AF #. :ARE:784: @@ -154,15 +141,13 @@ #. language code: ain #: ../zypp/LanguageCode.cc:256 -#, fuzzy msgid "Ainu" -msgstr "Linux" +msgstr "" #. language code: aka ak #: ../zypp/LanguageCode.cc:258 -#, fuzzy msgid "Akan" -msgstr "Afrikkans" +msgstr "" #. language code: akk #: ../zypp/LanguageCode.cc:260 @@ -172,9 +157,8 @@ # KY #. :ABW:533: #: ../zypp/CountryCode.cc:239 -#, fuzzy msgid "Aland Islands" -msgstr "Kajmansko otočje" +msgstr "" #. :AIA:660: #: ../zypp/CountryCode.cc:229 @@ -183,15 +167,13 @@ #. language code: alb sqi sq #: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264 -#, fuzzy msgid "Albanian" -msgstr "Albanija" +msgstr "Albanski" #. language code: ale #: ../zypp/LanguageCode.cc:266 -#, fuzzy msgid "Aleut" -msgstr "Aleutian" +msgstr "" #. :DOM:214: #: ../zypp/CountryCode.cc:284 @@ -200,9 +182,8 @@ #. language code: alg #: ../zypp/LanguageCode.cc:268 -#, fuzzy msgid "Algonquian Languages" -msgstr "Izaberite vaš jezik:" +msgstr "" #. language code: tut #: ../zypp/LanguageCode.cc:1150 @@ -217,9 +198,8 @@ #. language code: amh am #: ../zypp/LanguageCode.cc:272 -#, fuzzy msgid "Amharic" -msgstr "Automatski" +msgstr "" # AD #: ../zypp/CountryCode.cc:224 @@ -252,9 +232,8 @@ #. language code: apa #: ../zypp/LanguageCode.cc:276 -#, fuzzy msgid "Apache Languages" -msgstr "Jezik" +msgstr "" #. language code: ara ar #: ../zypp/LanguageCode.cc:278 @@ -268,9 +247,8 @@ #. language code: arc #: ../zypp/LanguageCode.cc:280 -#, fuzzy msgid "Aramaic" -msgstr "Arapski" +msgstr "" #. language code: arp #: ../zypp/LanguageCode.cc:290 @@ -280,9 +258,8 @@ # AZ #. language code: arn #: ../zypp/LanguageCode.cc:288 -#, fuzzy msgid "Araucanian" -msgstr "Azerbedžan" +msgstr "" #. language code: arw #: ../zypp/LanguageCode.cc:294 @@ -303,9 +280,8 @@ # AM #. language code: arm hye hy #: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286 -#, fuzzy msgid "Armenian" -msgstr "Armenija" +msgstr "Armenijski" #. language code: art #: ../zypp/LanguageCode.cc:292 @@ -320,21 +296,18 @@ #. language code: asm as #: ../zypp/LanguageCode.cc:296 -#, fuzzy msgid "Assamese" -msgstr "Poruke" +msgstr "" #. language code: ast #: ../zypp/LanguageCode.cc:298 -#, fuzzy msgid "Asturian" -msgstr "Austrija" +msgstr "" #. language code: ath #: ../zypp/LanguageCode.cc:300 -#, fuzzy msgid "Athapascan Languages" -msgstr "Australija" +msgstr "" #. :AUT:040: #: ../zypp/CountryCode.cc:237 @@ -343,9 +316,8 @@ #. language code: aus #: ../zypp/LanguageCode.cc:302 -#, fuzzy msgid "Australian Languages" -msgstr "Australija" +msgstr "" #. :ASM:016: #: ../zypp/CountryCode.cc:236 @@ -357,22 +329,20 @@ 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 "" #. language code: ava av #: ../zypp/LanguageCode.cc:304 -#, fuzzy msgid "Avaric" -msgstr "Arapski" +msgstr "" #. language code: ave ae #: ../zypp/LanguageCode.cc:306 -#, fuzzy msgid "Avestan" -msgstr "Aleutian" +msgstr "" #. language code: awa #: ../zypp/LanguageCode.cc:308 @@ -393,9 +363,8 @@ # AZ #. language code: aze az #: ../zypp/LanguageCode.cc:312 -#, fuzzy msgid "Azerbaijani" -msgstr "Azerbedžan" +msgstr "" #: ../zypp/media/MediaException.cc:47 #, c-format @@ -419,9 +388,8 @@ #. language code: ban #: ../zypp/LanguageCode.cc:324 -#, fuzzy msgid "Balinese" -msgstr "Kineski" +msgstr "" #. language code: bat #: ../zypp/LanguageCode.cc:332 @@ -435,21 +403,18 @@ #. language code: bam bm #: ../zypp/LanguageCode.cc:322 -#, fuzzy msgid "Bambara" -msgstr "Samarkand" +msgstr "" #. language code: bai #: ../zypp/LanguageCode.cc:316 -#, fuzzy msgid "Bamileke Languages" -msgstr "Jezik" +msgstr "" #. language code: bad #: ../zypp/LanguageCode.cc:314 -#, fuzzy msgid "Banda" -msgstr "Kanada" +msgstr "" # BD #. :BRB:052: @@ -469,15 +434,13 @@ #. language code: bas #: ../zypp/LanguageCode.cc:330 -#, fuzzy msgid "Basa" -msgstr "Baskijski" +msgstr "" #. language code: bak ba #: ../zypp/LanguageCode.cc:318 -#, fuzzy msgid "Bashkir" -msgstr "Brazil" +msgstr "" #. language code: baq eus eu #: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328 @@ -486,9 +449,8 @@ #. language code: btk #: ../zypp/LanguageCode.cc:364 -#, fuzzy msgid "Batak (Indonesia)" -msgstr "Indonezija" +msgstr "" #. language code: bej #: ../zypp/LanguageCode.cc:334 @@ -502,9 +464,8 @@ #. language code: bel be #: ../zypp/LanguageCode.cc:336 -#, fuzzy msgid "Belarusian" -msgstr "Bjelorusija" +msgstr "Bjeloruski" #. :BGD:050: #: ../zypp/CountryCode.cc:244 @@ -519,16 +480,14 @@ #. language code: bem #: ../zypp/LanguageCode.cc:338 -#, fuzzy msgid "Bemba" -msgstr "Bermuda" +msgstr "" # BJ #. language code: ben bn #: ../zypp/LanguageCode.cc:340 -#, fuzzy msgid "Bengali" -msgstr "Benin" +msgstr "" # BJ #. :BDI:108: @@ -559,9 +518,8 @@ #. language code: bih bh #: ../zypp/LanguageCode.cc:346 -#, fuzzy msgid "Bihari" -msgstr "Bahrein" +msgstr "" #. language code: bik #: ../zypp/LanguageCode.cc:348 @@ -571,9 +529,8 @@ # BJ #. language code: bin #: ../zypp/LanguageCode.cc:350 -#, fuzzy msgid "Bini" -msgstr "Benin" +msgstr "" #. language code: bis bi #: ../zypp/LanguageCode.cc:352 @@ -582,9 +539,8 @@ #. language code: byn #: ../zypp/LanguageCode.cc:376 -#, fuzzy msgid "Blin" -msgstr "Belgijski" +msgstr "" #. :BRN:096: #: ../zypp/CountryCode.cc:252 @@ -600,9 +556,8 @@ # BJ #. language code: bos bs #: ../zypp/LanguageCode.cc:358 -#, fuzzy msgid "Bosnian" -msgstr "Benin" +msgstr "Bosanski" #. :BVT:074: #: ../zypp/CountryCode.cc:257 @@ -618,9 +573,8 @@ # BR #. language code: bra #: ../zypp/LanguageCode.cc:360 -#, fuzzy msgid "Braj" -msgstr "Brazil" +msgstr "" # BR #. :BOL:068: @@ -643,9 +597,8 @@ # fuzzy #. :VEN:862: #: ../zypp/CountryCode.cc:454 -#, fuzzy msgid "British Virgin Islands" -msgstr "Faroe Otočje" +msgstr "" # BN #. :BMU:060: @@ -655,11 +608,10 @@ #. language code: bug #: ../zypp/LanguageCode.cc:368 -#, fuzzy msgid "Buginese" -msgstr "Kineski" +msgstr "" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -676,9 +628,8 @@ #. language code: bua #: ../zypp/LanguageCode.cc:366 -#, fuzzy msgid "Buriat" -msgstr "Bugarska" +msgstr "" # BF #. :BEL:056: @@ -688,9 +639,8 @@ #. language code: bur mya my #: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374 -#, fuzzy msgid "Burmese" -msgstr "Sabirnica" +msgstr "" # BI #. :BHR:048: @@ -701,9 +651,8 @@ # TD #. language code: cad #: ../zypp/LanguageCode.cc:378 -#, fuzzy msgid "Caddo" -msgstr "Čad" +msgstr "" # KH #. :KGZ:417: @@ -717,19 +666,14 @@ msgid "Cameroon" msgstr "Kamerun" -#: ../zypp/sat/detail/PoolImpl.cc:100 -#, fuzzy +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." -msgstr "Ne mogu stvoriti %s privremenu datoteku: %m" +msgstr "" #: ../zypp/thread/Mutex.cc:77 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)." @@ -747,9 +691,9 @@ msgstr "" #: ../zypp/ExternalProgram.cc:267 -#, fuzzy, c-format +#, c-format msgid "Can't fork (%s)." -msgstr "Ne mogu pronaći %s." +msgstr "" #: ../zypp/thread/Mutex.cc:33 msgid "Can't initialize mutex attributes" @@ -759,22 +703,22 @@ msgid "Can't initialize recursive mutex" msgstr "" -#: ../zypp/ExternalProgram.cc:174 +#: ../zypp/base/InterProcessMutex.cc:79 #, fuzzy, c-format -msgid "Can't open pipe (%s)." +msgid "Can't open lock file: %s" msgstr "Ne mogu otvoriti datoteku '%1'." +#: ../zypp/ExternalProgram.cc:174 +#, c-format +msgid "Can't open pipe (%s)." +msgstr "" + #: ../zypp/ExternalProgram.cc:163 -#, fuzzy, c-format +#, c-format msgid "Can't open pty (%s)." -msgstr "Ne mogu pronaći %s." - -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "Ne mogu otvoriti datoteku '%1'." +msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "" @@ -783,10 +727,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 "" @@ -806,26 +746,25 @@ msgstr "" #: ../zypp/media/MediaException.cc:184 -#, fuzzy, c-format +#, c-format msgid "Cannot eject media '%s'" -msgstr "Ne mogu pokrenuti naredbu \"%s\"" +msgstr "" #: ../zypp/media/MediaException.cc:67 -#, fuzzy, c-format +#, c-format msgid "Cannot write file '%s'." -msgstr "Ne mogu otvoriti datoteku '%1'." +msgstr "" # CV #. :CUB:192: #: ../zypp/CountryCode.cc:275 msgid "Cape Verde" -msgstr "Cape Verde" +msgstr "Capo Verde" #. language code: car #: ../zypp/LanguageCode.cc:382 -#, fuzzy msgid "Carib" -msgstr "Maorski" +msgstr "" #. language code: cat ca #: ../zypp/LanguageCode.cc:384 @@ -845,9 +784,8 @@ #. language code: ceb #: ../zypp/LanguageCode.cc:388 -#, fuzzy msgid "Cebuano" -msgstr "Libanon" +msgstr "" #. language code: cel #: ../zypp/LanguageCode.cc:390 @@ -874,35 +812,31 @@ #. language code: chg #: ../zypp/LanguageCode.cc:398 -#, fuzzy msgid "Chagatai" -msgstr "Shangai" +msgstr "" #. language code: cmc #: ../zypp/LanguageCode.cc:422 -#, fuzzy msgid "Chamic Languages" -msgstr "Jezik" +msgstr "" # KM #. language code: cha ch #: ../zypp/LanguageCode.cc:392 -#, fuzzy msgid "Chamorro" -msgstr "Comoros" +msgstr "" #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1879 -#, fuzzy, c-format +#: ../zypp/target/rpm/RpmDb.cc:1877 +#, c-format msgid "Changed configuration files for %s:" -msgstr "Pohraniti postavke u datoteke" +msgstr "" #. language code: che ce #: ../zypp/LanguageCode.cc:396 -#, fuzzy msgid "Chechen" -msgstr "Cache" +msgstr "" #. language code: chr #: ../zypp/LanguageCode.cc:414 @@ -916,15 +850,13 @@ #. language code: chb #: ../zypp/LanguageCode.cc:394 -#, fuzzy msgid "Chibcha" -msgstr "Kina" +msgstr "" #. language code: nya ny #: ../zypp/LanguageCode.cc:896 -#, fuzzy msgid "Chichewa" -msgstr "Čile" +msgstr "" #. :COK:184: #: ../zypp/CountryCode.cc:268 @@ -953,9 +885,8 @@ #. language code: cho #: ../zypp/LanguageCode.cc:410 -#, fuzzy msgid "Choctaw" -msgstr "Ch-korijen" +msgstr "" # CX #. :CPV:132: @@ -970,9 +901,8 @@ #. language code: chk #: ../zypp/LanguageCode.cc:404 -#, fuzzy msgid "Chuukese" -msgstr "Kineski" +msgstr "" #. language code: chv cv #: ../zypp/LanguageCode.cc:418 @@ -981,9 +911,8 @@ #. language code: nwc #: ../zypp/LanguageCode.cc:894 -#, fuzzy msgid "Classical Newari" -msgstr "Ime klase" +msgstr "" # CC #. :CAN:124: @@ -1101,7 +1030,7 @@ #. :HND:340: #: ../zypp/CountryCode.cc:320 msgid "Croatia" -msgstr "Htvatska" +msgstr "Hrvatska" #. language code: scr hrv hr #: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010 @@ -1137,9 +1066,8 @@ #. language code: dak #: ../zypp/LanguageCode.cc:450 -#, fuzzy msgid "Dakota" -msgstr "Dakar" +msgstr "" #. language code: dan da #: ../zypp/LanguageCode.cc:452 @@ -1148,21 +1076,18 @@ #. language code: dar #: ../zypp/LanguageCode.cc:454 -#, fuzzy msgid "Dargwa" -msgstr "Darwin" +msgstr "" #. language code: day #: ../zypp/LanguageCode.cc:456 -#, fuzzy msgid "Dayak" -msgstr "Dakar" +msgstr "" #. language code: del #: ../zypp/LanguageCode.cc:458 -#, fuzzy msgid "Delaware" -msgstr "Odgoda" +msgstr "" #. :DJI:262: #: ../zypp/CountryCode.cc:281 @@ -1171,31 +1096,23 @@ #. language code: din #: ../zypp/LanguageCode.cc:464 -#, fuzzy msgid "Dinka" -msgstr "Disk" +msgstr "" #. language code: div dv #: ../zypp/LanguageCode.cc:466 -#, fuzzy msgid "Divehi" -msgstr "Upravljački program" +msgstr "" #. :DEU:276: #: ../zypp/CountryCode.cc:280 msgid "Djibouti" msgstr "Djibouti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -#, fuzzy -msgid "Do not install or delete the resolvables concerned" -msgstr "Postaviti konfiguracijske vrijednosti." - #. language code: doi #: ../zypp/LanguageCode.cc:468 -#, fuzzy msgid "Dogri" -msgstr "Maorski" +msgstr "" #. language code: dgr #: ../zypp/LanguageCode.cc:462 @@ -1233,12 +1150,11 @@ #. language code: dua #: ../zypp/LanguageCode.cc:474 -#, fuzzy msgid "Duala" -msgstr "Palau" +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 "" @@ -1255,9 +1171,8 @@ #. language code: dyu #: ../zypp/LanguageCode.cc:482 -#, fuzzy msgid "Dyula" -msgstr "Dubai" +msgstr "" #. language code: dzo dz #: ../zypp/LanguageCode.cc:484 @@ -1322,9 +1237,8 @@ #. language code: eng en #: ../zypp/LanguageCode.cc:494 -#, fuzzy msgid "English" -msgstr "Engleski (UK)" +msgstr "Engleski" #. language code: enm #: ../zypp/LanguageCode.cc:496 @@ -1354,10 +1268,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" @@ -1391,15 +1301,14 @@ #. language code: ewo #: ../zypp/LanguageCode.cc:504 -#, fuzzy msgid "Ewondo" -msgstr "Kraj " +msgstr "" #: ../zypp/KeyRing.cc:558 msgid "Failed to delete key." msgstr "" -#: ../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 "" @@ -1409,15 +1318,15 @@ msgid "Failed to mount %s on %s" msgstr "Ne mogu otvoriti %s - %s\n" -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "" #: ../zypp/media/MediaException.cc:41 -#, fuzzy, c-format +#, c-format msgid "Failed to unmount %s" -msgstr "Failed copying %s." +msgstr "" # FK #. :FJI:242: @@ -1427,15 +1336,13 @@ #. language code: fan #: ../zypp/LanguageCode.cc:506 -#, fuzzy msgid "Fang" -msgstr "Range" +msgstr "" #. language code: fat #: ../zypp/LanguageCode.cc:510 -#, fuzzy msgid "Fanti" -msgstr "Atlantik" +msgstr "" #. :FSM:583: #: ../zypp/CountryCode.cc:296 @@ -1444,9 +1351,8 @@ #. language code: fao fo #: ../zypp/LanguageCode.cc:508 -#, fuzzy msgid "Faroese" -msgstr "Slobodno:" +msgstr "" #. :FLK:238: #: ../zypp/CountryCode.cc:295 @@ -1460,9 +1366,8 @@ #. language code: fij fj #: ../zypp/LanguageCode.cc:512 -#, fuzzy msgid "Fijian" -msgstr "Fiji" +msgstr "" #: ../devel/devel.mvidner/installation_sources.cc:99 #, c-format @@ -1659,8 +1564,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: @@ -1986,26 +1891,9 @@ msgstr "Zanemari" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145 -#, fuzzy, c-format -msgid "Ignore that %s is already set to install" -msgstr "Direktorij %1 je već na listi." - -#. 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 +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 #, 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 @@ -2055,24 +1943,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 "Instaliram upravljački program..." - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "" @@ -2149,7 +2020,12 @@ msgid "Invalid port component '%s'" msgstr "Neispravan URI komponente: " -#: ../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 "Nesipravna lozinka" @@ -2202,11 +2078,6 @@ msgid "Israel" msgstr "Izrael" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Ne mogu otvoriti datoteku '%1'." - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2347,11 +2218,6 @@ msgid "Kazakhstan" msgstr "Kazakhstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -#, fuzzy -msgid "Keep resolvables" -msgstr "Instaliram upravljački program..." - # KE #. :JPN:392: #: ../zypp/CountryCode.cc:335 @@ -3175,7 +3041,7 @@ msgid "No Code" msgstr "ništa" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3428,14 +3294,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." @@ -3541,8 +3399,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 "Skidanje nije uspjelo: " @@ -3575,16 +3433,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Relativna putanja nije dozvoljena ako postoji autoritet" -#: ../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 "" @@ -3915,6 +3768,11 @@ msgid "Solomon Islands" msgstr "Cook Islands" +#: ../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 @@ -4177,7 +4035,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 "" @@ -4442,11 +4300,6 @@ msgid "Unknown language: " msgstr "" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -#, fuzzy -msgid "Unlock these resolvables" -msgstr "Instaliram upravljački program..." - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4733,88 +4586,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 na:" -#: ../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 #, fuzzy, c-format msgid "created backup %s" msgstr "Stvori Arhiv Pohrane Podataka" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "Instalacija" -#. 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 "&Obriši" - -#: ../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 "Postaviti konfiguracijske vrijednosti." -#: ../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 na:" -#. 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 na:" -#: ../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 na:" -#: ../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 na:" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4823,10 +4660,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 "" @@ -4839,147 +4674,87 @@ 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 "naredba za deinstalaciju paketa" -#: ../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 "&Nemoj instalirati" -#. 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 -#, fuzzy -msgid "unlock all resolvables" -msgstr "Instaliram upravljački program..." - #, fuzzy -#~ msgid "Software management is already running." -#~ msgstr "Daemon je već pokrenut" +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Direktorij %1 je već na listi." #, fuzzy -#~ msgid "%s is not installed and has been marked as uninstallable" -#~ msgstr "Ovi paketi trebaju biti instalirani:" +#~ msgid "Install missing resolvables" +#~ msgstr "Instaliram upravljački program..." #, fuzzy -#~ msgid "No need to install %s" -#~ msgstr "će biti instaliran kao:" +#~ msgid "Keep resolvables" +#~ msgstr "Instaliram upravljački program..." #, fuzzy -#~ msgid "%s is lacking the requirement %s" -#~ msgstr "Izlistaj sve zahtjeve paketa" +#~ msgid "Unlock these resolvables" +#~ msgstr "Instaliram upravljački program..." #, fuzzy -#~ msgid ", Action: " -#~ msgstr "Akcija" - -#~ msgid "system" -#~ msgstr "sustav" +#~ msgid "delete %s" +#~ msgstr "&Obriši" #, fuzzy -#~ msgid "Establishing %s" +#~ msgid "install %s" #~ msgstr "Instaliram na:" #, fuzzy -#~ msgid "Installing %s" -#~ msgstr "Instaliram na:" - -#, fuzzy -#~ msgid "Skipping %s: already installed" -#~ msgstr "Provjeravam već instalirane skenere" - -#, fuzzy -#~ msgid "%s is locked and cannot be uninstalled." -#~ msgstr "Ovi paketi trebaju biti instalirani:" - -#, fuzzy -#~ msgid " Error!" -#~ msgstr "Greška" - -#, fuzzy -#~ msgid " Important!" -#~ msgstr "Uvoz podataka" - -#, fuzzy -#~ msgid "Downloading %s" -#~ msgstr "Skidam liste paketa" - -#~ msgid "Ok" -#~ msgstr "U redu" - -#, fuzzy -#~ msgid "Default" -#~ msgstr "&Standardna" - -#, fuzzy -#~ msgid "ignore architecture" -#~ msgstr "Arhitektura" - -#~ msgid "unknown" -#~ msgstr "nepoznato" - -#, fuzzy -#~ msgid "installed" -#~ msgstr "&Instaliraj" - -#, fuzzy -#~ msgid "to be installed (soft)" -#~ msgstr "će biti instaliran kao:" - -#, fuzzy -#~ msgid "to be uninstalled" -#~ msgstr "će biti instaliran kao:" +#~ msgid "unlock all resolvables" +#~ msgstr "Instaliram upravljački program..." Modified: trunk/libzypp/po/hu.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/hu.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/hu.po (original) +++ trunk/libzypp/po/hu.po Mon Apr 28 15:25:19 2008 @@ -16,17 +16,17 @@ msgstr "" "Project-Id-Version: zypp.hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-31 15:30+0200\n" -"PO-Revision-Date: 2008-04-13 20:51+0200\n" +"POT-Creation-Date: 2008-04-21 18:58+0200\n" +"PO-Revision-Date: 2008-04-23 14:58+0200\n" "Last-Translator: Kalman Kemenczy \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -39,70 +39,50 @@ msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr " hiba az SSL-tanúsítvánnyal, ellenőrizze, hogy megfelelő-e a CA tanúsítványa a következőhöz: '%s'." -#: ../zypp/sat/SATResolver.cc:709 +#: ../zypp/solver/detail/SATResolver.cc:880 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%s ütközik a(z) %s csomaggal, amit %s biztosít" #. %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 telepítése meghiúsult" #. %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 telepítése OK" # modules/inst_target_part.ycp:676 -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, c-format msgid "%s is not installable" msgstr "%s nem telepíthető" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s elavulttá teszi a(z) %s csomagot, amit %s biztosít" -#. 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 biztosítja a kívánt függőséget, de megváltoztatja a telepített csomag " -"architektúráját" - -#. 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 biztosítja a kívánt függőséget, de megváltoztatja a telepített csomag " -"gyártóját" - #. %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 eltávolítása meghiúsult" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" msgstr "%s eltávolítása 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 "%s igényli %s -t, de ez a függőség nem teljesíthető" @@ -127,12 +107,12 @@ msgid "Adangme" msgstr "adangme" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "A(z) '%s' telepítési forrás hozzáadása" -#: ../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 "További rpm kimenet:" @@ -364,7 +344,7 @@ msgid "Austronesian (Other)" msgstr "ausztronéziai (egyéb)" -#: ../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 "Felhasználó-azonosítás szükséges ehhez: '%s'" @@ -651,7 +631,7 @@ msgid "Buginese" msgstr "buginéz" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "A(z) '%s' telepítési forrás gyorsítótárának felépítése" @@ -706,7 +686,7 @@ msgid "Cameroon" msgstr "Kamerun" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "Nem hozható létre sat-pool." @@ -714,10 +694,6 @@ msgid "Can't acquire the mutex lock" msgstr "A mutex zárolás sikertelen" -#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147 -msgid "Can't add solvables to norepo." -msgstr "A feloldhatók hozzáadása a norepo-hoz sikertelen." - #: ../zypp/ExternalProgram.cc:245 #, c-format msgid "Can't chdir to '/' inside chroot (%s)." @@ -747,6 +723,11 @@ msgid "Can't initialize recursive mutex" msgstr "Rekurzív mutex attributum inicializációja sikertelen" +#: ../zypp/base/InterProcessMutex.cc:79 +#, c-format +msgid "Can't open lock file: %s" +msgstr "A zárolt fájl nem nyitható meg: %s" + #: ../zypp/ExternalProgram.cc:174 #, c-format msgid "Can't open pipe (%s)." @@ -757,11 +738,7 @@ msgid "Can't open pty (%s)." msgstr "A pty nem nyitható meg (%s)." -#: ../zypp/Repository.cc:136 -msgid "Can't open solv-file: " -msgstr "A solv-fájl nem nyitható meg: " - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "A(z) '%s' fájlt nem biztosítja a(z) '%s' telepítési forrás" @@ -770,10 +747,6 @@ msgid "Can't release the mutex lock" msgstr "A mutex zárolásának feloldása sikertelen" -#: ../zypp/Repository.cc:101 -msgid "Can't set RepoInfo for norepo." -msgstr "A RepoInfo beállítása a norepo-hoz sikertelen." - #: ../zypp/thread/Mutex.cc:40 msgid "Can't set recursive mutex attribute" msgstr "Rekurzív mutex attributum nem állítható be" @@ -878,7 +851,7 @@ # menuentries/menuentry_lan_sendmail.ycp:14 #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. -#: ../zypp/target/rpm/RpmDb.cc:1879 +#: ../zypp/target/rpm/RpmDb.cc:1877 #, c-format msgid "Changed configuration files for %s:" msgstr "%s módosított konfigurációs fájljai:" @@ -1158,10 +1131,6 @@ msgid "Djibouti" msgstr "Dzsibuti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "Ne telepítse vagy törölje a vonatkozó feloldhatókat" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1210,7 +1179,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 "'%s' bizonytalan típus %u byte, ellenőrzőösszeg '%s'" @@ -1326,10 +1295,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "Hiba történt a '%s' letöltési (curl) beállításainak beállítása közben:" -#: ../zypp/Repository.cc:141 -msgid "Error reading solv-file: " -msgstr "Hiba a solv-fájl olvasásakor: " - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1372,7 +1337,7 @@ msgid "Failed to delete key." msgstr "A kulcs törlése sikertelen." -#: ../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 "Nem sikerült a(z) %s fájlból importálni a publikus kulcsot: %s" @@ -1382,7 +1347,7 @@ msgid "Failed to mount %s on %s" msgstr "Nem sikerült a(z) %s felcsatolása ide: %s" -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "A(z) %s publikus kulcs eltávolítása sikertelen: %s" @@ -1638,9 +1603,9 @@ msgid "Geez" msgstr "geez" -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65 -msgid "Generally ignore this requirement" -msgstr "Követelmény figyelmen kívül hagyása csak itt" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" +msgstr "Néhány függőség figyelmen kívül hagyása" #. :GRD:308: #: ../zypp/CountryCode.cc:302 @@ -1953,27 +1918,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 telepítésre megjelölése figyelmen kívül marad" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "%s elavulásának (%s miatt) figyelmen kívül hagyása" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 #, c-format -msgid "Ignore this conflict of %s" -msgstr "%s ezen ütközése figyelmen kívül marad" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Követelmény figyelmen kívül hagyása csak itt" +msgid "Ignore some dependencies of %s" +msgstr "A(z) %s néhány függőségének figyelmen kívül hagyása" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -2022,23 +1970,7 @@ msgid "Ingush" msgstr "ingus" -#. 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 telepítése, habár ez megváltoztatja az architektúrát" - -#. 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 telepítése, habár ennek más a gyártója" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Hiányzó feloldhatók telepítése" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "A kérésnek megfelelően a telepítés megszakad." @@ -2113,7 +2045,12 @@ msgid "Invalid port component '%s'" msgstr "Érvénytelen port komponens: '%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 "Érvénytelen reguláris kifejezés '%s': regcomp visszatérési értéke: %d" + +#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "Érvénytelen felhasználói név és/vagy jelszó." @@ -2165,11 +2102,6 @@ msgid "Israel" msgstr "Izrael" -#: ../zypp/base/InterProcessMutex.cc:68 -#, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Eredménye %d, a zárolt fájl nem nyitható meg: %s" - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2301,10 +2233,6 @@ msgid "Kazakhstan" msgstr "Kazahsztán" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Feloldhatók megtartása" - # KE #. :JPN:392: #: ../zypp/CountryCode.cc:335 @@ -3078,7 +3006,7 @@ msgid "No Code" msgstr "Nincs kód" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "A telepítés forrás nem tartalmaz url-t." @@ -3307,14 +3235,6 @@ msgid "Path '%s' on medium '%s' is not a file." msgstr "A(z) '%s' elérési út a(z) '%s' adathordozón nem fájl." -#: ../zypp/url/UrlBase.cc:1184 -msgid "Path Parameter parsing not supported for this URL" -msgstr "Az elérési útvonal feldolgozása ehhez az URL-hez nem támogatott" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "Az elérési út feldolgozása ehhez az URL-hez nem támogatott" - #: ../zypp/media/MediaException.cc:200 #, c-format msgid "Permission to access '%s' denied." @@ -3417,8 +3337,8 @@ msgstr "A lekérdezés feldolgozása ehhez az URL-hez nem támogatott" #. 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 sikertelen: " @@ -3449,16 +3369,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Megadott hitelesítő esetén a relatív elérési útvonal megadása nem támogatott" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, c-format msgid "Removing repository '%s'" msgstr "A(z) '%s' telepítési forrás eltávolítása" -#: ../zypp/Repository.cc:104 -#, c-format -msgid "RepoInfo alias (%s) does not match repository name (%s)" -msgstr "A RepoInfo álneve (%s) nem egyezik a telepítési forrás nevével (%s)" - #: ../zypp/parser/susetags/RepoParser.cc:232 msgid "Required file is missing: " msgstr "A következő szükséges fájl hiányzik: " @@ -3782,6 +3697,11 @@ msgid "Solomon Islands" msgstr "Salamon-szigetek" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%s ütközik a(z) %s csomaggal, amit saját maga biztosít" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3955,12 +3875,8 @@ #: ../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 "" -"A rendszerkezelőt a %d pid-del rendelkező folyamat zárolta. Kérem, zárja be " -"az alkalmazást, majd próbálja újra." +msgid "System management is locked by the application with pid %d. Please close this application before trying again." +msgstr "A rendszerkezelőt a %d pid-del rendelkező folyamat zárolta. Kérem, zárja be az alkalmazást, majd próbálja újra." # src/trans.h:116 #. language code: tgl tl @@ -4039,7 +3955,7 @@ msgid "Thailand" msgstr "Thaiföld" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." msgstr "Ezt a folyamatot már elindította egy másik program." @@ -4294,10 +4210,6 @@ msgid "Unknown language: " msgstr "Ismeretlen nyelv: " -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "Feloldhatók zárolásának feloldása" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4577,92 +4489,76 @@ msgid "applydeltarpm failed." msgstr "az applydeltarpm futtatása sikertelen." -#: ../zypp/sat/SATResolver.cc:951 +#: ../zypp/solver/detail/SATResolver.cc:1129 #, c-format msgid "architecture change of %s to %s" msgstr "architektúra váltás erről: %s erre: %s" # modules/inst_target_part.ycp:676 -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, c-format msgid "cannot install both %s and %s" msgstr "nem telepíthető %s és %s is" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 msgid "conflicting requests" msgstr "ütköző kérelmek" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" msgstr "%s másolata létrehozva" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, c-format msgid "deinstallation of %s" msgstr "%s eltávolítása" -#. 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 törlése" - -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 msgid "deleted providers: " msgstr "törölt feloldhatók: " -#: ../zypp/sat/SATResolver.cc:899 +#: ../zypp/solver/detail/SATResolver.cc:1077 #, c-format msgid "do not ask to delete all solvables providing %s" msgstr "ne kérdezzen rá a %s-t biztosító feloldhatók eltávolítására" -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "ne kérdezzen rá a %s-t biztosító feloldható telepítésére" # modules/inst_target_part.ycp:676 -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, c-format msgid "do not forbid installation of %s" msgstr "ne tagadja meg %s telepítését" # modules/inst_target_part.ycp:676 -#. 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 "ne telepítse: %s" -#: ../zypp/sat/SATResolver.cc:911 +#: ../zypp/solver/detail/SATResolver.cc:1089 #, c-format msgid "do not install most recent version of %s" msgstr "ne telepítse %s legújabb verzióját" # modules/inst_target_part.ycp:676 -#: ../zypp/sat/SATResolver.cc:811 +#: ../zypp/solver/detail/SATResolver.cc:989 #, c-format msgid "do not keep %s installed" msgstr "ne hagyja feltelepítve: %s" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, c-format msgid "downgrade of %s to %s" msgstr "régebbi verzió telepítése %s helyett: %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 telepítése" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4675,10 +4571,8 @@ "-->\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 megtartása" @@ -4691,34 +4585,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: A dbus kapcsolat beállítása sikertelen" -#: ../zypp/sat/SATResolver.cc:699 +#: ../zypp/solver/detail/SATResolver.cc:870 #, c-format msgid "nothing provides %s needed by %s" msgstr "semmi sem biztosítja a %s által igényelt %s csomagot" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, c-format msgid "nothing provides requested %s" msgstr "semmi nem biztosítja az igényelt %s képességet" -#: ../zypp/sat/SATResolver.cc:685 +#: ../zypp/solver/detail/SATResolver.cc:856 #, c-format msgid "problem with installed package %s" msgstr "probléma a telepített csomaggal: %s" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" msgstr "%s cseréje erre: %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 "Az rpm létrehozta %s-t, mint %s, de nem sikerült megállapítani a különbséget" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2048 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4727,18 +4621,18 @@ "Az rpm létrehozta %s-t, mint %s.\n" "A különbség első 25 sora:\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 "Az rpm parancs kimenete:" #. %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 "Az rpm elmentette %s-t, mint %s, de nem sikerült megállapítani a különbséget" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:2043 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -4747,17 +4641,7 @@ "Az rpm elmentette %s-t, mint %s.\n" "A különbség első 25 sora:\n" -#: ../zypp/sat/SATResolver.cc:759 +#: ../zypp/solver/detail/SATResolver.cc:935 msgid "uninstallable providers: " msgstr "nem eltávolítható szolgáltatók: " -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "%s zárolásának feloldása" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "Összes feloldhatók zárolásának feloldása" - Modified: trunk/libzypp/po/id.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/id.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/id.po (original) +++ trunk/libzypp/po/id.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: 2002-10-08 13:38+0200\n" "Last-Translator: I Made Wiryana \n" "Language-Team: Indonesian \n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -28,61 +28,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 #, fuzzy, c-format msgid "%s is not installable" msgstr "Italia" -#: ../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 "" @@ -110,12 +98,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 "" @@ -363,7 +351,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 "" @@ -680,7 +668,7 @@ msgid "Buginese" msgstr "Cina" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -739,7 +727,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 "Tidak dapat membuat file temp %s: %m" @@ -748,10 +736,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)." @@ -781,6 +765,11 @@ msgid "Can't initialize recursive mutex" msgstr "" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Tidak dapat membuka %s: %m" + #: ../zypp/ExternalProgram.cc:174 #, fuzzy, c-format msgid "Can't open pipe (%s)." @@ -791,12 +780,7 @@ msgid "Can't open pty (%s)." msgstr "Tidak dapat membuka %s: %m" -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "Tidak dapat membuka %s: %m" - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "" @@ -805,10 +789,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 "" @@ -917,7 +897,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 "" @@ -1216,10 +1196,6 @@ msgid "Djibouti" msgstr "Jibouti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "" - #. language code: doi #: ../zypp/LanguageCode.cc:468 #, fuzzy @@ -1270,7 +1246,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 "" @@ -1391,10 +1367,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" @@ -1437,7 +1409,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 "" @@ -1447,7 +1419,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 "" @@ -1711,8 +1683,8 @@ msgid "Geez" msgstr "Yunani" -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65 -msgid "Generally ignore this requirement" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" msgstr "" # GE @@ -2050,26 +2022,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 @@ -2121,24 +2076,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 "Italia" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "" @@ -2219,7 +2157,12 @@ msgid "Invalid port component '%s'" msgstr "Data komponen url '%2' tidak valid %1" -#: ../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 "" @@ -2275,11 +2218,6 @@ msgid "Israel" msgstr "Palestina" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Tidak dapat membuka %s: %m" - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2426,10 +2364,6 @@ msgid "Kazakhstan" msgstr "Kazakhstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "" - # KE #. :JPN:392: #: ../zypp/CountryCode.cc:335 @@ -3288,7 +3222,7 @@ msgid "No Code" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3547,16 +3481,6 @@ msgid "Path '%s' on medium '%s' is not a file." msgstr "" -#: ../zypp/url/UrlBase.cc:1184 -#, fuzzy -msgid "Path Parameter parsing not supported for this URL" -msgstr "Parsing Parameter Path tidak didukung untuk url ini" - -#: ../zypp/url/UrlBase.cc:727 -#, fuzzy -msgid "Path parameter parsing not supported for this URL" -msgstr "Parsing parameter path tidak didukung untuk url ini" - #: ../zypp/media/MediaException.cc:200 #, c-format msgid "Permission to access '%s' denied." @@ -3671,8 +3595,8 @@ msgstr "Parsing string query tidak didukung untuk url ini" #. 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 "" @@ -3704,16 +3628,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Path relatif tidak dibolehkan bila otorita ada" -#: ../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 "" @@ -4073,6 +3992,11 @@ msgid "Solomon Islands" msgstr "Pulau Sulaiman" +#: ../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 @@ -4357,7 +4281,7 @@ msgid "Thailand" msgstr "Muangthai" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." msgstr "" @@ -4640,10 +4564,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'" @@ -4944,88 +4864,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 "Italia" -#: ../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 "Instalasi" -#. 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 "Italia" -#. 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 "Italia" -#: ../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 "Italia" -#: ../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 "Italia" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -5034,10 +4938,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 "" @@ -5050,72 +4952,85 @@ 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 "" +#, fuzzy +#~ msgid "Install missing resolvables" +#~ msgstr "Italia" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 #, fuzzy -msgid "unlock all resolvables" -msgstr "Italia" +#~ msgid "install %s" +#~ msgstr "Italia" + +#, fuzzy +#~ msgid "unlock all resolvables" +#~ msgstr "Italia" + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Tidak dapat membuka %s: %m" + +#, fuzzy +#~ msgid "Path Parameter parsing not supported for this URL" +#~ msgstr "Parsing Parameter Path tidak didukung untuk url ini" + +#, fuzzy +#~ msgid "Path parameter parsing not supported for this URL" +#~ msgstr "Parsing parameter path tidak didukung untuk url ini" #, fuzzy #~ msgid "Establishing %s" Modified: trunk/libzypp/po/it.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/it.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/it.po (original) +++ trunk/libzypp/po/it.po Mon Apr 28 15:25:19 2008 @@ -1,3 +1,4 @@ +# translation of zypp.po to Italiano # Italian message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002 SuSE Linux AG. @@ -6,14 +7,15 @@ # Franca Delcarlo , 1999, 2000, 2001. # Karl Eichwalder , 2000. # Bevacqua Giuseppe , 2008. +# Andrea Florio , 2008. msgid "" msgstr "" -"Project-Id-Version: YaST (@memory@)\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-11 10:10-0600\n" -"Last-Translator: Alberto Passalacqua \n" -"Language-Team: Italian <>\n" +"POT-Creation-Date: 2008-04-21 18:58+0200\n" +"PO-Revision-Date: 2008-04-23 16:17+0200\n" +"Last-Translator: Andrea Florio \n" +"Language-Team: Italiano \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -21,29 +23,29 @@ "X-Poedit-Language: Italian\n" "X-Poedit-Country: ITALY\n" "X-Poedit-Bookmarks: 370,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" -"X-Generator: LoKalize 0.2\n" +"X-Generator: KBabel 1.11.4\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " msgstr "" "\n" -"provider non installabili:" +"provider non installabili: " #: ../zypp/media/MediaException.cc:214 #, c-format msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr "Problemi con il certificato SSL, verificare che il cert CA è valido per '%s'." -#: ../zypp/sat/SATResolver.cc:709 +#: ../zypp/solver/detail/SATResolver.cc:880 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%s in conflitto con %s fornito da %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 "Impossibile installare %s " @@ -51,48 +53,36 @@ # TLABEL modules/inst_target_part.ycp:680 #. %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 "Installazione di %s completata" # TLABEL modules/inst_target_part.ycp:680 -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, c-format msgid "%s is not installable" msgstr "%s non è installabile" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s obsoleti %s forniti da %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 fornisce questa dipendenza ma modifica l'architettura dell'elemento installato" - -#. 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 fornisce questa dipendenza ma modifica il rivenditore dell'elemento installato" - #. %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 "Impossibile rimuovere %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" msgstr "Rimozione di %s completata" -#: ../zypp/sat/SATResolver.cc:745 +#: ../zypp/solver/detail/SATResolver.cc:921 #, c-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "%s richiede %s, ma non è possibile fornire questa richiesta." @@ -117,13 +107,12 @@ msgid "Adangme" msgstr "Adangme" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "Aggiunto il 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 "Output aggiuntivo di rpm:" @@ -183,8 +172,7 @@ msgstr "Albania" #. language code: alb sqi sq -#: ../zypp/LanguageCode.cc:262 -#: ../zypp/LanguageCode.cc:264 +#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264 msgid "Albanian" msgstr "Albanese" @@ -288,8 +276,7 @@ msgstr "Armenia" #. language code: arm hye hy -#: ../zypp/LanguageCode.cc:284 -#: ../zypp/LanguageCode.cc:286 +#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286 msgid "Armenian" msgstr "Armeno" @@ -338,8 +325,7 @@ msgid "Austronesian (Other)" msgstr "Austronesiano (Altre)" -#: ../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 "È richiesta l'autenticazione per '%s'" @@ -449,8 +435,7 @@ msgstr "Bashkir" #. language code: baq eus eu -#: ../zypp/LanguageCode.cc:326 -#: ../zypp/LanguageCode.cc:328 +#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328 msgid "Basque" msgstr "Basco" @@ -604,7 +589,7 @@ msgid "Buginese" msgstr "Buginese" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "Costruzione della cache del repository '%s'" @@ -630,8 +615,7 @@ msgstr "Burkina Faso" #. language code: bur mya my -#: ../zypp/LanguageCode.cc:372 -#: ../zypp/LanguageCode.cc:374 +#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374 msgid "Burmese" msgstr "Burmese" @@ -655,7 +639,7 @@ msgid "Cameroon" msgstr "Camerun" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "Impossibile creare sat-pool." @@ -663,11 +647,6 @@ msgid "Can't acquire the mutex lock" msgstr "Impossibile acquisire il blocco mutex" -#: ../zypp/Repository.cc:130 -#: ../zypp/Repository.cc:147 -msgid "Can't add solvables to norepo." -msgstr "Impossibile aggiungere risolvibili a norepo." - #: ../zypp/ExternalProgram.cc:245 #, c-format msgid "Can't chdir to '/' inside chroot (%s)." @@ -698,6 +677,11 @@ msgid "Can't initialize recursive mutex" msgstr "Impossibile inizializzare l'attributo mutex ricorsivo" +#: ../zypp/base/InterProcessMutex.cc:79 +#, c-format +msgid "Can't open lock file: %s" +msgstr "Impossibile aprire il file bloccato: %s" + #: ../zypp/ExternalProgram.cc:174 #, c-format msgid "Can't open pipe (%s)." @@ -709,11 +693,7 @@ msgid "Can't open pty (%s)." msgstr "Impossibile aprire pty (%s)." -#: ../zypp/Repository.cc:136 -msgid "Can't open solv-file: " -msgstr "Impossibile aprire solv-file:" - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Impossibile fornire il file %s dalla sorgente di installazione '%s'" @@ -722,10 +702,6 @@ msgid "Can't release the mutex lock" msgstr "Impossibile rilasciare il blocco mutex" -#: ../zypp/Repository.cc:101 -msgid "Can't set RepoInfo for norepo." -msgstr "Non è possibile impostare Repoinfo per norepo." - #: ../zypp/thread/Mutex.cc:40 msgid "Can't set recursive mutex attribute" msgstr "Impossibile impostare l'attributo mutex ricorsivo" @@ -821,7 +797,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 "File di configurazione modificati per %s:" @@ -862,8 +838,7 @@ msgstr "Cina" #. language code: chi zho zh -#: ../zypp/LanguageCode.cc:400 -#: ../zypp/LanguageCode.cc:402 +#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402 msgid "Chinese" msgstr "Cinese" @@ -938,8 +913,7 @@ #. :CCK:166: #. :CAF:140: -#: ../zypp/CountryCode.cc:262 -#: ../zypp/CountryCode.cc:264 +#: ../zypp/CountryCode.cc:262 ../zypp/CountryCode.cc:264 msgid "Congo" msgstr "Congo" @@ -1014,8 +988,7 @@ msgstr "Croazia" #. language code: scr hrv hr -#: ../zypp/LanguageCode.cc:1008 -#: ../zypp/LanguageCode.cc:1010 +#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010 msgid "Croatian" msgstr "Croato" @@ -1035,8 +1008,7 @@ msgstr "Cipro" #. language code: cze ces cs -#: ../zypp/LanguageCode.cc:446 -#: ../zypp/LanguageCode.cc:448 +#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448 msgid "Czech" msgstr "Ceco" @@ -1090,10 +1062,6 @@ msgid "Djibouti" msgstr "Gibuti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "Non installare o eliminare i risolvibili interessati" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1142,14 +1110,13 @@ 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 '%s' incerto per %u byte checksum '%s'" #. language code: dut nld nl -#: ../zypp/LanguageCode.cc:478 -#: ../zypp/LanguageCode.cc:480 +#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480 msgid "Dutch" msgstr "Olandese" @@ -1255,10 +1222,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "Si è verificato un errore durante l'impostazione delle opzioni di download (curl) per '%s': " -#: ../zypp/Repository.cc:141 -msgid "Error reading solv-file: " -msgstr "Errore durante la lettura del solv-file:" - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1298,7 +1261,7 @@ msgid "Failed to delete key." msgstr "Eliminazione della chiave non riuscita" -#: ../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 "Importazione della chiave pubblica dal file %s non riuscita: %s" @@ -1308,7 +1271,7 @@ msgid "Failed to mount %s on %s" msgstr "Montaggio di %s su %s non riuscito" -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "Rimozione della chiave pubblica %s non riuscito: %s" @@ -1458,8 +1421,7 @@ msgstr "Francia" #. language code: fre fra fr -#: ../zypp/LanguageCode.cc:522 -#: ../zypp/LanguageCode.cc:524 +#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524 msgid "French" msgstr "Francese" @@ -1548,9 +1510,9 @@ msgid "Geez" msgstr "Ge'ez" -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65 -msgid "Generally ignore this requirement" -msgstr "Ignora questo requisito globalmente" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" +msgstr "Ignora generalmente alcune dipendenze" #. :GRD:308: #: ../zypp/CountryCode.cc:302 @@ -1558,14 +1520,12 @@ msgstr "Georgia" #. language code: geo kat ka -#: ../zypp/LanguageCode.cc:544 -#: ../zypp/LanguageCode.cc:546 +#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546 msgid "Georgian" msgstr "Georgiano" #. language code: ger deu de -#: ../zypp/LanguageCode.cc:548 -#: ../zypp/LanguageCode.cc:550 +#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550 msgid "German" msgstr "Tedesco" @@ -1635,8 +1595,7 @@ msgstr "Greco antico (fino al 1453)" #. language code: gre ell el -#: ../zypp/LanguageCode.cc:578 -#: ../zypp/LanguageCode.cc:580 +#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580 msgid "Greek, Modern (1453-)" msgstr "Greco moderno (1453-)" @@ -1710,8 +1669,7 @@ msgid "Haitian" msgstr "Haitiano" -#: ../zypp/target/hal/HalException.h:46 -#: ../zypp/target/hal/HalException.h:55 +#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55 #: ../zypp/target/hal/HalException.h:64 msgid "Hal Exception" msgstr "Eccezione Hal" @@ -1829,8 +1787,7 @@ msgstr "Islanda" #. language code: ice isl is -#: ../zypp/LanguageCode.cc:622 -#: ../zypp/LanguageCode.cc:624 +#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624 msgid "Icelandic" msgstr "Islandese" @@ -1845,27 +1802,10 @@ msgstr "Igbo" #. 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 "Ignora che %s è già impostato per l'installazione" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "Ignora %s obsoleto in %s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 -#, c-format -msgid "Ignore this conflict of %s" -msgstr "Ignora questo conflitto di %s" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Ignora questo requisito solo qui" +msgid "Ignore some dependencies of %s" +msgstr "iignora alcune dipendenze di %s" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1912,23 +1852,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 "Installa %s anche se l'architettura viene modificata" - -#. 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 "Installa %s benché ciò cambi il rivenditore" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Installa risolvibili mancanti" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "L'installazione è stata interrotta come indicato." @@ -2002,8 +1926,12 @@ msgid "Invalid port component '%s'" msgstr "Componente della porta '%s' non valido" -#: ../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 "Espressione regolare '%s' non valida: regcomp ha restituito %d" + +#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "Nome utente e/o password non validi." @@ -2052,11 +1980,6 @@ msgid "Israel" msgstr "Israele" -#: ../zypp/base/InterProcessMutex.cc:68 -#, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "%d, Impossibile aprire il file bloccato: %s" - # TLABEL modules/inst_target_part.ycp:680 #. language code: ita it #: ../zypp/LanguageCode.cc:654 @@ -2183,10 +2106,6 @@ msgid "Kazakhstan" msgstr "Kazakhstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Mantieni risolvibili" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2478,8 +2397,7 @@ msgstr "Macedonia" #. language code: mac mkd mk -#: ../zypp/LanguageCode.cc:772 -#: ../zypp/LanguageCode.cc:774 +#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774 msgid "Macedonian" msgstr "Macedone" @@ -2519,8 +2437,7 @@ msgstr "Malawi" #. language code: may msa ms -#: ../zypp/LanguageCode.cc:800 -#: ../zypp/LanguageCode.cc:802 +#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802 msgid "Malay" msgstr "Malay" @@ -2589,8 +2506,7 @@ msgstr "Manx" #. language code: mao mri mi -#: ../zypp/LanguageCode.cc:790 -#: ../zypp/LanguageCode.cc:792 +#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792 msgid "Maori" msgstr "Maori" @@ -2795,8 +2711,7 @@ #. language code: nau na #. :NPL:524: -#: ../zypp/LanguageCode.cc:858 -#: ../zypp/CountryCode.cc:387 +#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:387 msgid "Nauru" msgstr "Nauru" @@ -2902,12 +2817,11 @@ #. Defined LanguageCode constants #. Defined CountryCode constants -#: ../zypp/LanguageCode.cc:225 -#: ../zypp/CountryCode.cc:215 +#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215 msgid "No Code" msgstr "Nessun codice" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "Nessuna URL nella sorgente di installazione." @@ -3130,22 +3044,13 @@ msgid "Path '%s' on medium '%s' is not a file." msgstr "Il percorso '%s' sul dispositivo '%s' non è un file." -#: ../zypp/url/UrlBase.cc:1184 -msgid "Path Parameter parsing not supported for this URL" -msgstr "Analisi sintattica del parametro del percorso non supportata per questo URL" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "Analisi sintattica del parametro del percorso non supportata per questo URL" - #: ../zypp/media/MediaException.cc:200 #, c-format msgid "Permission to access '%s' denied." msgstr "Permesso di accesso a '%s' negato." #. language code: per fas fa -#: ../zypp/LanguageCode.cc:938 -#: ../zypp/LanguageCode.cc:940 +#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 msgid "Persian" msgstr "Persiano" @@ -3234,15 +3139,13 @@ msgid "Quechua" msgstr "Quechua" -#: ../zypp/url/UrlBase.cc:782 -#: ../zypp/url/UrlBase.cc:1229 +#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229 msgid "Query string parsing not supported for this URL" msgstr "Analisi sintattica della stringa di interrogazione non supportata per questo 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 non riuscito:" @@ -3266,21 +3169,15 @@ msgid "Rarotongan" msgstr "Rarotongan" -#: ../zypp/url/UrlBase.cc:1117 -#: ../zypp/url/UrlBase.cc:1131 +#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131 msgid "Relative path not allowed if authority exists" msgstr "Percorso relativo non consentito se l'autorità esiste già" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, c-format msgid "Removing repository '%s'" msgstr "Rimozione della sorgente di installazione '%s'" -#: ../zypp/Repository.cc:104 -#, c-format -msgid "RepoInfo alias (%s) does not match repository name (%s)" -msgstr "L'alias RepoInfo (%s) non corrisponde al nome (%s) della sorgente di installazione" - #: ../zypp/parser/susetags/RepoParser.cc:232 msgid "Required file is missing: " msgstr "Il file richiesto risulta mancante:" @@ -3301,8 +3198,7 @@ msgstr "Romania" #. language code: rum ron ro -#: ../zypp/LanguageCode.cc:974 -#: ../zypp/LanguageCode.cc:976 +#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976 msgid "Romanian" msgstr "Romanian" @@ -3452,8 +3348,7 @@ msgstr "Serbia e Montenegro" #. language code: scc srp sr -#: ../zypp/LanguageCode.cc:1000 -#: ../zypp/LanguageCode.cc:1002 +#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002 msgid "Serbian" msgstr "Serbo" @@ -3553,8 +3448,7 @@ msgstr "Slavo (Altre)" #. language code: slo slk sk -#: ../zypp/LanguageCode.cc:1032 -#: ../zypp/LanguageCode.cc:1034 +#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034 msgid "Slovak" msgstr "Slovacco" @@ -3583,6 +3477,11 @@ msgid "Solomon Islands" msgstr "Isole Solomon" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "Il risolubile %s è in conflitto con %s fornito da se stesso" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3818,13 +3717,12 @@ 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 "Questa azione è stata eseguita già da un altro programma." #. language code: tib bod bo -#: ../zypp/LanguageCode.cc:1112 -#: ../zypp/LanguageCode.cc:1114 +#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114 msgid "Tibetan" msgstr "Tibetano" @@ -3870,8 +3768,7 @@ #. language code: tkl #. :TJK:762: -#: ../zypp/LanguageCode.cc:1122 -#: ../zypp/CountryCode.cc:435 +#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:435 msgid "Tokelau" msgstr "Tokelau" @@ -3962,8 +3859,7 @@ #. language code: tvl #. :TTO:780: -#: ../zypp/LanguageCode.cc:1152 -#: ../zypp/CountryCode.cc:442 +#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:442 msgid "Tuvalu" msgstr "Tuvalu" @@ -4024,8 +3920,7 @@ msgid "Unable to initalize HAL context -- hald not running?" msgstr "Impossibile inizializzare il contesto HAL - Verificare che hald non sia in esecuzione." -#: ../zypp/Url.cc:322 -#: ../zypp/Url.cc:336 +#: ../zypp/Url.cc:322 ../zypp/Url.cc:336 msgid "Unable to parse Url components" msgstr "Impossibile analizzare sintatticamente i componenti dell'Url" @@ -4062,10 +3957,6 @@ msgid "Unknown language: " msgstr "Lingua sconosciuta:" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "Sblocca questi risolvibili" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4226,8 +4117,7 @@ msgstr "Washo" #. language code: wel cym cy -#: ../zypp/LanguageCode.cc:1192 -#: ../zypp/LanguageCode.cc:1194 +#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194 msgid "Welsh" msgstr "Gallese" @@ -4329,94 +4219,76 @@ msgid "applydeltarpm failed." msgstr "applydeltarpm non riuscito." -#: ../zypp/sat/SATResolver.cc:951 +#: ../zypp/solver/detail/SATResolver.cc:1129 #, c-format msgid "architecture change of %s to %s" msgstr "architettura modificata da %s a %s" # TLABEL modules/inst_target_part.ycp:680 -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, c-format msgid "cannot install both %s and %s" msgstr "Impossibile installare sia %s che %s" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 msgid "conflicting requests" msgstr "richieste in conflitto" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" msgstr "Copia di backup di %s creata" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, c-format msgid "deinstallation of %s" msgstr "Disinstallazione di %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 "cancella %s" - -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 msgid "deleted providers: " msgstr "providers cancellati:" -#: ../zypp/sat/SATResolver.cc:899 +#: ../zypp/solver/detail/SATResolver.cc:1077 #, c-format msgid "do not ask to delete all solvables providing %s" msgstr "non chiedere di eliminare tutti i risolvibili fornendo %s" -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "non chiedere di installare un risolvibile fornendo %s" # TLABEL modules/inst_target_part.ycp:680 -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, c-format msgid "do not forbid installation of %s" msgstr "Non vietare l'installazione di %s" # TLABEL modules/inst_target_part.ycp:680 -#. 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 "non installare %s" -#: ../zypp/sat/SATResolver.cc:911 +#: ../zypp/solver/detail/SATResolver.cc:1089 #, c-format msgid "do not install most recent version of %s" msgstr "non installare la versione più recente di %s" # TLABEL modules/inst_target_part.ycp:680 -#: ../zypp/sat/SATResolver.cc:811 +#: ../zypp/solver/detail/SATResolver.cc:989 #, c-format msgid "do not keep %s installed" msgstr "non conservare %s installato" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, c-format msgid "downgrade of %s to %s" msgstr "downgrade di %s a %s" -# TLABEL modules/inst_target_part.ycp:680 -#. 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 "installa %s" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4429,11 +4301,8 @@ "-->\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 "mantieni %s" @@ -4446,34 +4315,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: impossibile impostare la connessione dbus" -#: ../zypp/sat/SATResolver.cc:699 +#: ../zypp/solver/detail/SATResolver.cc:870 #, c-format msgid "nothing provides %s needed by %s" msgstr "niente fornisce %s necessario a %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, c-format msgid "nothing provides requested %s" msgstr "Nessun providers richiede %s" -#: ../zypp/sat/SATResolver.cc:685 +#: ../zypp/solver/detail/SATResolver.cc:856 #, c-format msgid "problem with installed package %s" msgstr "problema con il pacchetto installato %s" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" msgstr "sostituzione di %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 creato %s come %s, tuttavia non è stato possibile determinare la differenza" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2048 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4482,19 +4351,18 @@ "rpm ha creato %s come %s.\n" "Di seguito sono riportate le prime 25 righe di differenza:\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 "Output 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 salvato %s come %s, tuttavia non è stato possibile determinare la differenza" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:2043 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -4503,168 +4371,7 @@ "rpm ha salvato %s come %s.\n" "Di seguito sono riportate le prime 25 righe di differenza:\n" -#: ../zypp/sat/SATResolver.cc:759 +#: ../zypp/solver/detail/SATResolver.cc:935 msgid "uninstallable providers: " msgstr "provider non installabili:" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "Sblocca %s" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "sblocca tutti i risolvibili" - -#~ msgid "Reading '%s' repository cache" -#~ msgstr "Lettura della cache del repository '%s'" -#~ msgid "Reading patch and delta rpms from '%s' repository cache" -#~ msgstr "Lettura degli rpm delle patch e dei delta dalla cache del repository '%s'" -#~ msgid "Cleaning repository '%s' cache" -#~ msgstr "Pulizia della cache del repository '%s'" -#~ msgid "Reading repository '%s' cache" -#~ msgstr "Lettura della cache del repository '%s'" -#~ msgid "Software management is already running." -#~ msgstr "Le gestione software è già in esecuzione." -#~ msgid "%s is replaced by %s" -#~ msgstr "%s sostituito da %s" -#~ msgid "%s replaced by %s" -#~ msgstr "%s sostituito da %s" -#~ msgid "%s will be deleted by the user.\n" -#~ msgstr "%s verrà cancellato dall'utente.\n" -#~ msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "'%s' verrà cancellato da un'altra applicazione. (ApplLow/ApplHigh)\n" -#~ msgid "%s will be installed by the user.\n" -#~ msgstr "%s verrà installato dall'utente.\n" -#~ msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "%s verrà installato da un'altra applicazione. (ApplLow/ApplHigh)\n" -#~ msgid "No valid solution found within %d seconds" -#~ msgstr "Non è stata trovata alcuna soluzione valida in %d secondi" -#~ msgid "The solver has reached a defined timout" -#~ msgstr "Il risolutore ha raggiunto il timeout predefinito" -#~ msgid "No valid solution found with just resolvables of best architecture." -#~ msgstr "Usando solo i risolubili per la migliore architettura compatibile non è stata trovata alcuna soluzione valida." -#~ msgid "With this run only resolvables with the best architecture have been regarded.\n" -#~ msgstr "Con questo tentativo sono stati analizzati solo i risolubili con la migliore architettura.\n" -#~ msgid "Regarding all possible resolvables takes time, but can come to a valid result." -#~ msgstr "Analizzare tutti i possibili risolvibili richiede del tempo ma può anche fornire un risultato valido." -#~ msgid "Invalid information" -#~ msgstr "Informazioni non valide" -#~ msgid "%s is needed by other resolvables" -#~ msgstr "%s è richiesto da altri risolvibili" -#~ msgid "" -#~ "%s is needed by:\n" -#~ "%s" -#~ msgstr "" -#~ "%s è richiesto da:\n" -#~ "%s" -#~ msgid "%s conflicts with other resolvables" -#~ msgstr "%s è in conflitto con altri risolvibili" -#~ msgid "" -#~ "%s conflicts with:\n" -#~ "%s" -#~ msgstr "" -#~ "%s è in conflitto con:\n" -#~ "%s" -#~ msgid "%s obsoletes other resolvables" -#~ msgstr "%s non è più utilizzato dagli altri risolvibili" -#~ msgid "%s obsoletes:%s" -#~ msgstr "%s non più utilizzato:%s" -#~ msgid "" -#~ "\n" -#~ "These resolvables will be deleted from the system." -#~ msgstr "" -#~ "\n" -#~ "Questi risolvibili verranno eliminati dal sistema." -#~ msgid "%s depends on other resolvables" -#~ msgstr "%s dipende da altri risolvibili" -#~ msgid "%s depends on %s" -#~ msgstr "%s dipende da %s" -#~ msgid "%s depends on:%s" -#~ msgstr "%s dipende da:%s" -#~ msgid "Child of" -#~ msgstr "Figlio di" -#~ msgid "" -#~ "\n" -#~ "There is no resource available which supports this requirement." -#~ msgstr "" -#~ "\n" -#~ "Nessuna risorsa disponibile che supporta questo requisito." -#~ msgid "Due to the problems described above/below, this resolution will not solve all dependencies" -#~ msgstr "A causa dei problemi descritti in alto o di seguito, questa risoluzione non risolverà le dipendenze" -#~ msgid "Cannot install %s, because it is conflicting with %s" -#~ msgstr "Impossibile installare %s perché in conflitto con %s" -#~ msgid "%s is not installed and has been marked as uninstallable" -#~ msgstr "%s non è installato ed è stato contrassegnato come non installabile" -#~ msgid "Cannot install %s due to dependency problems" -#~ msgstr "Impossibile installare %s a causa di problemi di dipendenze" -#~ msgid "%s has unfulfilled requirements" -#~ msgstr "%s presenta requisiti non soddisfatti" -#~ msgid "%s has missing dependencies" -#~ msgstr "Dipendenze mancanti in %s " -#~ msgid "%s cannot be installed due to missing dependencies" -#~ msgstr "Impossibile installare %s. Alcune dipendenze sono mancanti" -#~ msgid "%s fulfills dependencies of %s but will be uninstalled" -#~ msgstr "%s soddisfa le dipendenze di %s ma verrà disinstallato" -#~ msgid "%s fulfills dependencies of %s but will be kept on your system" -#~ msgstr "%s soddisfa le dipendenze di %s ma verrà mantenuto nel sistema" -#~ msgid "No need to install %s" -#~ msgstr "Non è necessario installare %s" -#~ msgid "Cannot install %s to fulfill the dependencies of %s" -#~ msgstr "Impossibile installare %s per soddisfare le dipendenze di %s" -#~ msgid "Cannot install %s to fulfil the dependencies of %s" -#~ msgstr "Impossibile installare %s per soddisfare le dipendenze di %s" -#~ msgid "%s will not be uninstalled, because it is still required" -#~ msgstr "%s non sarà disinstallato perché ancora richiesto" -#~ msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." -#~ msgstr "%s rende obsoleto %s. Tuttavia, non è possibile eliminare %s perché bloccato." -#~ msgid "Cannot install %s, because it is conflicting" -#~ msgstr "Impossibile installare %s perché in conflitto" -#~ msgid "%s is uninstallable due to conflicts with %s" -#~ msgstr "%s non può essere installato perché in conflitto con %s" -#~ msgid "Requirememt %s cannot be fulfilled." -#~ msgstr "Il requisito %s non può essere soddisfatto." -#~ msgid "for requiring %s for %s when upgrading %s" -#~ msgstr "affinché %s richieda %s durante l'aggiornamento di %s" -#~ msgid "%s is lacking the requirement %s" -#~ msgstr "%s manca il requisito %s" -#~ msgid ", Action: " -#~ msgstr ", Azione:" -#~ msgid ", Trigger: " -#~ msgstr ", Trigger:" -#~ msgid "package" -#~ msgstr "pacchetto " -#~ msgid "selection" -#~ msgstr "selezione" -#~ msgid "pattern" -#~ msgstr "modello" -#~ msgid "product" -#~ msgstr "prodotto" -#~ msgid "patch" -#~ msgstr "patch" -#~ msgid "script" -#~ msgstr "script" -#~ msgid "message" -#~ msgstr "messaggio" -#~ msgid "atom" -#~ msgstr "parte più piccola" -#~ msgid "system" -#~ msgstr "sistema" -#~ msgid "Resolvable" -#~ msgstr "Risolvibile" -#~ msgid "Marking this resolution attempt as invalid." -#~ msgstr "Contrassegno in corso di questo tentativo di risoluzione come non valido." -#~ msgid "Marking resolvable %s as uninstallable" -#~ msgstr "Contrassegno in corso del risolvibile %s come disinstallabile" -#~ msgid "%s is scheduled to be installed, but this is impossible due to dependency problems." -#~ msgstr "%s è pianificato per la disinstallazione, tuttavia ciò non è possibile a causa di problemi di dipendenza." -#~ msgid "Can't install %s since it is already marked as needed to be uninstalled" -#~ msgstr "Impossibile installare %s perché è già contrassegnato come da disinstallare" -#~ msgid "Can't install %s, because it does not apply to this system." -#~ msgstr "Impossibile installare %s perché non è applicabile a questo sistema." -#~ msgid "Can't install %s, because %s is already marked as needed to for installation" -#~ msgstr "Impossibile installare %s perché %s è già contrassegnato come richiesto dall'installazione" -#~ msgid "This would invalidate %s." -#~ msgstr "Ciò annullerebbe %s." - Modified: trunk/libzypp/po/ja.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ja.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/ja.po (original) +++ trunk/libzypp/po/ja.po Mon Apr 28 15:25:19 2008 @@ -10,8 +10,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-04-03 21:28+0900\n" +"POT-Creation-Date: 2008-04-21 18:58+0200\n" +"PO-Revision-Date: 2008-04-23 20:07+0900\n" "Last-Translator: Yasuhiko Kamata \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: KBabel 1.11.4\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -33,61 +33,49 @@ msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr " SSL 証明書に問題があります。 '%s' について証明機関に問題がないかどうか確認してください。" -#: ../zypp/sat/SATResolver.cc:709 +#: ../zypp/solver/detail/SATResolver.cc:880 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%1$s は %2$s から提供されている %3$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 #, c-format msgid "%s is not installable" msgstr "%s はインストールできません" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%1$s は %3$s から提供されている %2$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 はこの依存関係を提供しますが、インストールしたパッケージのアーキテクチャを変更します" - -#. 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 はこの依存関係を提供しますが、インストールしたパッケージの製造元を変更します" - #. %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 "%s は %s を必要としていますが、この要求を解決する方法がありません" @@ -112,12 +100,12 @@ msgid "Adangme" msgstr "アダングメ語" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, 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 出力:" @@ -330,7 +318,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 "'%s' にアクセスするにはユーザ認証が必要です" @@ -594,7 +582,7 @@ msgid "Buginese" msgstr "ブギス語" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "リポジトリ '%s' のキャッシュを構築中" @@ -644,7 +632,7 @@ msgid "Cameroon" msgstr "カメルーン" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "sat-pool を作成できません。" @@ -652,10 +640,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 "norepo に解決方法を追加することができません。" - #: ../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 "再帰相互排他機能を初期化できません" +#: ../zypp/base/InterProcessMutex.cc:79 +#, c-format +msgid "Can't open lock file: %s" +msgstr "ロックファイルを開けません: %s" + #: ../zypp/ExternalProgram.cc:174 #, c-format msgid "Can't open pipe (%s)." @@ -695,11 +684,7 @@ msgid "Can't open pty (%s)." msgstr "議事端末 (%s) を開くことができません。" -#: ../zypp/Repository.cc:136 -msgid "Can't open solv-file: " -msgstr "解決方法ファイルを開くことができません: " - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "リポジトリ %2$s からファイル %1$s を提供することができません" @@ -708,10 +693,6 @@ msgid "Can't release the mutex lock" msgstr "相互排他機能の権利を開放できません" -#: ../zypp/Repository.cc:101 -msgid "Can't set RepoInfo for norepo." -msgstr "norepo に RepoInfo を設定できません。" - #: ../zypp/thread/Mutex.cc:40 msgid "Can't set recursive mutex attribute" msgstr "再帰相互排他機能の属性を設定できません" @@ -807,7 +788,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,10 +1053,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" @@ -1124,7 +1101,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 "%2$u バイトのチェックサム '%3$s' は疑わしい種類 '%1$s' です" @@ -1236,10 +1213,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "'%s' のダウンロード (curl) オプションを設定する際にエラーが発生しました:" -#: ../zypp/Repository.cc:141 -msgid "Error reading solv-file: " -msgstr "解決方法ファイルの読み込みでエラー:" - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1279,7 +1252,7 @@ msgid "Failed to delete key." msgstr "キーの削除に失敗しました。" -#: ../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 "公開鍵をファイル %s からインポートすることができませんでした: %s" @@ -1289,7 +1262,7 @@ msgid "Failed to mount %s on %s" msgstr "%s を %s にマウントすることができませんでした" -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "公開鍵 %s を削除することができませんでした: %s" @@ -1528,9 +1501,9 @@ msgid "Geez" msgstr "ゲーズ語" -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65 -msgid "Generally ignore this requirement" -msgstr "この要件を今後も無視します" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" +msgstr "いくつかの依存関係をおおよそ無視する" #. :GRD:308: #: ../zypp/CountryCode.cc:302 @@ -1820,27 +1793,10 @@ 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 "%s をインストールするように既に設定されているため無視します" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "%2$s 内の古い %1$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 "この要件をここでだけ無視します" +msgid "Ignore some dependencies of %s" +msgstr "%s の依存関係を無視" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1887,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 -#, 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 "指示通りにインストールが中止されました。" @@ -1977,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 "正規表現 '%s' が正しくありません。 regcomp は %d を返しました" + +#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "ユーザ名かパスワードが誤っています。" @@ -2026,11 +1971,6 @@ msgid "Israel" msgstr "イスラエル" -#: ../zypp/base/InterProcessMutex.cc:68 -#, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "%d, ロックファイルを開けません: %s" - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2156,10 +2096,6 @@ msgid "Kazakhstan" msgstr "カザフスタン" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "解決方法を維持する" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2875,7 +2811,7 @@ msgid "No Code" msgstr "コードなし" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "リポジトリに URL が設定されていません。" @@ -3098,14 +3034,6 @@ msgid "Path '%s' on medium '%s' is not a file." msgstr "メディア '%2$s' 上のパス '%1$s' はファイルではありません。" -#: ../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 #, c-format msgid "Permission to access '%s' denied." @@ -3206,8 +3134,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 msgid "RPM failed: " msgstr "RPM の失敗: " @@ -3235,16 +3163,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 "リポジトリ '%s' を削除しています" -#: ../zypp/Repository.cc:104 -#, c-format -msgid "RepoInfo alias (%s) does not match repository name (%s)" -msgstr "RepoInfo 別名 (%s) はリポジトリ名 (%s) に適合しません" - #: ../zypp/parser/susetags/RepoParser.cc:232 msgid "Required file is missing: " msgstr "必要なファイルがありません: " @@ -3544,6 +3467,11 @@ msgid "Solomon Islands" msgstr "ソロモン諸島" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "解決方法 %s は自分自身で提供している %s と競合しています" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3779,7 +3707,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 "この作業は既に他のプログラムで実行されています。" @@ -4019,10 +3947,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'" @@ -4285,88 +4209,72 @@ 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 "アーキテクチャを %s から %s に変更" -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, c-format msgid "cannot install both %s and %s" msgstr "%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 "バックアップ %s が作成されました" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, c-format msgid "deinstallation of %s" msgstr "%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 "%s を削除" - -#: ../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 "%s で提供される解決方法の削除について問い合わせない" -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, 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 #, 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 "%s の最新バージョンをインストールしない" -#: ../zypp/sat/SATResolver.cc:811 +#: ../zypp/solver/detail/SATResolver.cc:989 #, c-format msgid "do not keep %s installed" msgstr "%s のインストールを保持しない" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, 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" @@ -4379,10 +4287,8 @@ "-->\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 を維持" @@ -4395,34 +4301,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 #, c-format msgid "nothing provides %s needed by %s" msgstr "%2$s で必要としている %1$s はどこからも提供されていません" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, 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 "インストール済みのパッケージ %s に問題が発生しました。" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" msgstr "%s を %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 は %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" @@ -4431,18 +4337,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 #, 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" @@ -4451,17 +4357,7 @@ "rpm は %s を %s として保存しました。\n" "以下は差異のある最初の25行です。\n" -#: ../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 "%s をアンロックする" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "すべての解決方法をアンロックする" - Modified: trunk/libzypp/po/ka.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ka.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/ka.po (original) +++ trunk/libzypp/po/ka.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: 2005-05-18 10:33+0200\n" "Last-Translator: Aiet Kolkhi \n" "Language-Team: Georgian \n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\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 #, 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 "" @@ -106,12 +94,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 "" @@ -324,7 +312,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 "" @@ -588,7 +576,7 @@ msgid "Buginese" msgstr "" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -638,7 +626,7 @@ msgid "Cameroon" msgstr "" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "" @@ -646,10 +634,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)." @@ -679,6 +663,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)." @@ -689,12 +678,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 "" @@ -703,10 +687,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 "" @@ -802,7 +782,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 "" @@ -1067,10 +1047,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" @@ -1116,7 +1092,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 "" @@ -1228,10 +1204,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" @@ -1272,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 "" @@ -1282,7 +1254,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 "" @@ -1506,8 +1478,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: @@ -1798,26 +1770,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 @@ -1865,23 +1820,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 "" -#: ../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 "" @@ -2004,11 +1948,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" @@ -2134,10 +2073,6 @@ msgid "Kazakhstan" msgstr "" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2853,7 +2788,7 @@ msgid "No Code" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3076,14 +3011,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." @@ -3184,8 +3111,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 "" @@ -3213,16 +3140,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 "" @@ -3522,6 +3444,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" @@ -3757,7 +3684,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 "" @@ -3997,10 +3924,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'" @@ -4260,88 +4183,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 #, 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 "" - -#: ../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" @@ -4350,10 +4257,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 "" @@ -4366,68 +4271,62 @@ 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." Modified: trunk/libzypp/po/km.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/km.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/km.po (original) +++ trunk/libzypp/po/km.po Mon Apr 28 15:25:19 2008 @@ -1,94 +1,83 @@ -# translation of zypp.km.po to Khmer +# translation of zypp.km.po to khmer # Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg # This file is distributed under the same license as the PACKAGE package. # # Eng Vannak , 2006. -# Khoem Sokhem , 2006, 2007. -# Auk Piseth , 2007. +# Khoem Sokhem , 2006, 2007, 2008. +# Auk Piseth , 2007, 2008. msgid "" msgstr "" "Project-Id-Version: zypp.km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-31 15:30+0200\n" -"PO-Revision-Date: 2007-09-07 08:39+0700\n" -"Last-Translator: Khoem Sokhem \n" -"Language-Team: Khmer \n" +"POT-Creation-Date: 2008-04-21 18:58+0200\n" +"PO-Revision-Date: 2008-04-23 07:33+0700\n" +"Last-Translator: Auk Piseth \n" +"Language-Team: khmer \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: 0\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: ../zypp/sat/SATResolver.cc:757 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " -msgstr "មិន​មាន​អ្នក​ផ្ដល់ %s ដែល​អាច​ដំឡើង​បាន" +msgstr "" +"\n" +"លុបក្រុមហ៊ុនផ្ដល់ ៖ " #: ../zypp/media/MediaException.cc:214 #, c-format msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." -msgstr "" +msgstr " បញ្ហា​វិញ្ញាបនបត្រ SSL ផ្ទៀងផ្ទាត់​ថា​វិញ្ញាបនបត្រ CA គឺ​ត្រឹមត្រូវ​សម្រាប់ '%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 ប៉ះ​ទង្គិច​ជាមួយ​នឹង %s" +msgstr "%s ប៉ះទង្គិច​ជាមួយ %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 -#, fuzzy, c-format -msgid "%s is not installable" -msgstr "មិន​បាន​ដំឡើង" - -#: ../zypp/sat/SATResolver.cc:714 -#, 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 +#: ../zypp/solver/detail/SATResolver.cc:866 #, c-format -msgid "%s provides this dependency, but would change the architecture of the installed item" -msgstr "%s ផ្ដល់​នូវ​ភាព​អាស្រ័យ​នេះ ប៉ុន្តែ​នឹង​ផ្លាស់ប្ដូរ​ស្ថាបនត្យកម្ម​របស់​ធាតុ​ដែល​បាន​ដំឡើង" +msgid "%s is not installable" +msgstr "%s មិនអាច​ដំឡើងបាន" -#. 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 ផ្ដល់​ភាព​អាស្រ័យ​នេះ​ ប៉ុន្តែ​នឹង​ផ្លាស់ប្ដូរ​ក្រុមហ៊ុន​លក់​របស់​ធាតុ​ដែល​បាន​ដំឡើង" +msgid "%s obsoletes %s provided by %s" +msgstr "%s លែងប្រើ %s ដែល​ផ្ដល់ដោយ %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 "" +msgstr "%s ត្រូវការ %s ប៉ុន្តែ​តម្រូវការ​នេះ​មិនអាច​ផ្ដល់​បានទេ" #. language code: abk ab #: ../zypp/LanguageCode.cc:240 @@ -110,12 +99,12 @@ msgid "Adangme" msgstr "អាដង់ម៉េ" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, 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 បន្ថែមទៀត ៖" @@ -328,7 +317,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 "បាន​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​សម្រាប់ '%s'" @@ -366,11 +355,11 @@ #: ../zypp/media/MediaException.cc:47 #, c-format msgid "Bad file name: %s" -msgstr "" +msgstr "ឯកសារ​ខូច​ឈ្មោះ ៖ %s" #: ../zypp/media/MediaException.cc:77 msgid "Bad media attach point" -msgstr "" +msgstr "ចំណុច​ភ្ជាប់​ឧបករណ៍​ផ្ទុក​មិនត្រឹមត្រូវ" #. :BRA:076: #: ../zypp/CountryCode.cc:254 @@ -592,7 +581,7 @@ msgid "Buginese" msgstr "ប៊ុយហ្គីណេសេ" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "កំពុង​ស្ថាបនា​ឃ្លាំង '%s'" @@ -620,7 +609,7 @@ #. language code: bur mya my #: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374 msgid "Burmese" -msgstr "ប៊ុយហ្គីណេសេ" +msgstr "ភូមា" #. :BHR:048: #: ../zypp/CountryCode.cc:248 @@ -642,39 +631,34 @@ msgid "Cameroon" msgstr "កាមេរ៉ូន" -#: ../zypp/sat/detail/PoolImpl.cc:100 -#, fuzzy +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." -msgstr "មិន​អាច​បង្កើត​ឯកសារ​បាន​ឡើយ ។" +msgstr "មិនអាច​បង្កើត sat-pool បានទេ ។" #: ../zypp/thread/Mutex.cc:77 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)." -msgstr "" +msgstr "មិនអាច chdir ទៅ '/' ក្នុង chroot (%s) បានទេ ។" #: ../zypp/ExternalProgram.cc:238 #, c-format msgid "Can't chroot to '%s' (%s)." -msgstr "" +msgstr "មិនអាច chroot ទៅ '%s' (%s) បានទេ ។" #. don't want to get here #: ../zypp/ExternalProgram.cc:259 #, c-format msgid "Can't exec '%s' (%s)." -msgstr "" +msgstr "មិនអាច​ប្រតិបត្តិ '%s' (%s) បានទេ ។" #: ../zypp/ExternalProgram.cc:267 -#, fuzzy, c-format +#, c-format msgid "Can't fork (%s)." -msgstr "មិន​អាច​រក %s ។" +msgstr "មិនអាច​បែងចែក (%s) បានទេ ។" #: ../zypp/thread/Mutex.cc:33 msgid "Can't initialize mutex attributes" @@ -684,34 +668,30 @@ msgid "Can't initialize recursive mutex" msgstr "មិនអាច​ចាប់ផ្ដើម mutex ហៅខ្លួន​ឯង​បាន​ឡើយ" +#: ../zypp/base/InterProcessMutex.cc:79 +#, c-format +msgid "Can't open lock file: %s" +msgstr "មិនអាច​បើក​ឯកសារ​សោ ៖ %s" + #: ../zypp/ExternalProgram.cc:174 -#, fuzzy, c-format +#, c-format msgid "Can't open pipe (%s)." -msgstr "មិន​អាច​បើក​ឯកសារ %1 បាន​ឡើយ ។" +msgstr "មិនអាច​បើក​បំពង់ (%s) ។" #: ../zypp/ExternalProgram.cc:163 -#, fuzzy, c-format +#, c-format msgid "Can't open pty (%s)." -msgstr "មិន​អាច​បើក​ឯកសារ ៖ %s ។" - -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "មិន​អាច​បើក​ឯកសារ %1 បាន​ឡើយ ។" +msgstr "មិនអាច​បើក pty (%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 "មិន​អាច​ផ្ដល់​ឯកសារ %s ពី​ឃ្លាំង %s" +msgstr "មិនអាច​ផ្ដល់​ឯកសារ '%s' ពី​ឃ្លាំង '%s' បានទេ" #: ../zypp/thread/Mutex.cc:87 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 ហៅ​ខ្លួនឯង​បានឡើយ" @@ -724,22 +704,21 @@ #: ../zypp/KeyRing.cc:276 #, c-format msgid "Cannot create public key %s from %s keyring to file %s" -msgstr "" +msgstr "មិនអាច​បង្កើត​សោ​សាធារណៈ %s ពី keyring %s ទៅ​ឯកសារ %s បានទេ" #: ../zypp/media/MediaException.cc:182 -#, fuzzy msgid "Cannot eject any media" -msgstr "មិន​អាច​រក​គ្រោងការណ៍ ។" +msgstr "មិនអាច​ច្រាន​ឧបករណ៍​ផ្ទុក​ណាមួយ​ចេញ​ឡើយ" #: ../zypp/media/MediaException.cc:184 -#, fuzzy, c-format +#, c-format msgid "Cannot eject media '%s'" -msgstr "មិន​អាច​បើក​ធាតុ​របស់​ផ្ទៃតុ '%s'" +msgstr "មិនអាច​ច្រាន​ឧបករណ៍​ផ្ទុក '%s' ចេញបានទេ" #: ../zypp/media/MediaException.cc:67 -#, fuzzy, c-format +#, c-format msgid "Cannot write file '%s'." -msgstr "មិនអាច​សរសេរ​ទៅ​កាន់​ឯកសារ %1 បាន​ឡើយ ។" +msgstr "មិនអាច​សរសេរ​ឯកសារ '%s' បានទេ ។" #. :CUB:192: #: ../zypp/CountryCode.cc:275 @@ -808,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 "បាន​ប្ដូរ​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​សម្រាប់ %s ៖" @@ -906,17 +885,16 @@ #: ../zypp/ExternalProgram.cc:346 #, c-format msgid "Command exited with status %d." -msgstr "" +msgstr "ពាក្យ​បញ្ជា​បាន​ចេញ​ដោយ​ស្ថានភាព %d ។" #: ../zypp/ExternalProgram.cc:371 -#, fuzzy msgid "Command exited with unknown error." -msgstr "ពាក្យ​បញ្ជា​បានប្រតិបត្តិ នៅ​ពេល​តភ្ជាប់" +msgstr "ពាក្យ​បញ្ជា​បាន​ចេញ ដោយ​មាន​កំហុស​មិន​ស្គាល់ ។" #: ../zypp/ExternalProgram.cc:366 #, c-format msgid "Command was killed by signal %d (%s)." -msgstr "" +msgstr "ពាក្យ​បញ្ជា​ត្រូវ​បាន​ផ្ដាច់​ដោយ​សញ្ញា %d (%s) ។" #. :KIR:296: #: ../zypp/CountryCode.cc:339 @@ -1074,10 +1052,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" @@ -1105,12 +1079,15 @@ "Error code: %s\n" "Error message: %s\n" msgstr "" +"ទាញយក​កំហុស​សម្រាប់ '%s' ៖\n" +"កូដ​កំហុស ៖ %s\n" +"សារ​កំហុស ៖ %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 "ទាញយក​ការ​ចាប់ផ្ដើម​បាន​បរាជ័យ​សម្រាប់ '%s'" #. language code: dra #: ../zypp/LanguageCode.cc:470 @@ -1123,10 +1100,10 @@ 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 "" +msgstr "ប្រភេទ​មិនច្បាស់ '%s' សម្រាប់ %u បៃ ឆេកសាំ '%s'" #. language code: dut nld nl #: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480 @@ -1190,16 +1167,15 @@ #: ../zypp/media/MediaException.cc:135 msgid "Empty destination in URI" -msgstr "" +msgstr "គោលដៅ​ទទេ​នៅ​ក្នុង URI" #: ../zypp/media/MediaException.cc:130 msgid "Empty filesystem in URI" -msgstr "" +msgstr "ប្រព័ន្ធ​ឯកសា​ទទេ​នៅ​ក្នុង URI" #: ../zypp/media/MediaException.cc:125 -#, fuzzy msgid "Empty host name in URI" -msgstr "ឈ្មោះ CA ទទេ ។" +msgstr "ឈ្មោះ​ម៉ាស៊ីន​ទទេ​ក្នុង URI" #: ../zypp/url/UrlUtils.cc:111 msgid "Encoded string contains a NUL byte" @@ -1234,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 "កំហុស​ខណៈពេល​អាន​ឃ្លាំង ៖" +msgstr "កំហុស​នៅពេល​កំណត់​ជម្រើស​ទាញយក​សម្រាប់ '%s' ៖" #. language code: myv #: ../zypp/LanguageCode.cc:850 @@ -1277,29 +1248,28 @@ msgstr "អេវ៉ុងដូ" #: ../zypp/KeyRing.cc:558 -#, fuzzy msgid "Failed to delete key." -msgstr "បរាជ័យ​ក្នុងការ​ចាប់ផ្ដើម VM ។" +msgstr "បរាជ័យ​ក្នុង​ការ​លុប​សោ ។" -#: ../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 "បរាជ័យក្នុង​ការ​នាំចូល​សោ​សាធារណៈ​ពី​ឯកសារ %s: %s" #: ../zypp/media/MediaException.cc:31 -#, fuzzy, c-format +#, c-format msgid "Failed to mount %s on %s" -msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ញែក ៖ %s ។" +msgstr "បរាជ័យ​ក្នុង​ការ​ម៉ោន %s លើ %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 "មិន​អាច​យក​សោរ​សាធារណៈ​បានទេ ។" +msgstr "បរាជ័យ​ក្នុងការ​យក​សោ​សាធារណៈ %s: %s" #: ../zypp/media/MediaException.cc:41 -#, fuzzy, c-format +#, c-format msgid "Failed to unmount %s" -msgstr "បរាជ័យ​ក្នុង​ការ​ផ្ទុក​ម៉ូឌុល \"%s\" ។" +msgstr "បរាជ័យ​ក្នុងការ​អាន់ម៉ោន %s" #. :FJI:242: #: ../zypp/CountryCode.cc:294 @@ -1402,9 +1372,9 @@ "ទោះ​ជាយ៉ាង​ណា​ក៏ដោយ ប្រើ​ឯកសារ​នេះ​ឬ ?" #: ../zypp/media/MediaException.cc:60 -#, fuzzy, c-format +#, c-format msgid "File '%s' not found on medium '%s'" -msgstr "រក​មិន​ឃើញ​ឯកសារ %1 នៅ​ក្នុង​ឃ្លាំង​ទេ ។" +msgstr "រក​មិនឃើញ​ឯកសារ '%s' នៅ​លើ​ឧបករណ៍​ផ្ទុក​ទេ '%s'" #. language code: fil #: ../zypp/LanguageCode.cc:514 @@ -1427,9 +1397,8 @@ msgstr "ហ្វាំងណូ អ៊ុយហ្គ្រីយ៉ាន (ផ្សេង​ទៀត)" #: ../zypp/solver/detail/ProblemSolutionCombi.cc:73 -#, fuzzy msgid "Following actions will be done:" -msgstr "កញ្ចប់​ដូច​ខាង​ក្រោម​នេះ​នឹង​ត្រូវ​បាន​ធ្វើ​ឲ្យ​ទាន់សម័យ ៖\n" +msgstr "អំពើ​ខាងក្រោម​នឹង​ត្រូវបាន​ធ្វើ​រួច ៖" #. language code: fon #: ../zypp/LanguageCode.cc:520 @@ -1531,9 +1500,9 @@ msgid "Geez" msgstr "ហ្គី" -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65 -msgid "Generally ignore this requirement" -msgstr "ជា​ទូទៅ មិនអើពើ​តម្រូវ​កា​រនេះ" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" +msgstr "ជាទូទៅ មិនអើពើ​នឹង​ភាព​អាស្រ័យ​មួយ​ចំនួន" #. :GRD:308: #: ../zypp/CountryCode.cc:302 @@ -1823,27 +1792,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 +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 #, 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 "មិន​អើពើ​នឹង​តម្រូវ​ការ​នេះ​តែនៅ​ទីនេះ" +msgid "Ignore some dependencies of %s" +msgstr "មិន​អើពើ​នឹង​ភាពអាស្រ័យ %s មួយ​ចំនួន" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1890,23 +1842,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 -#, 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 +1916,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 "កន្សោម​ធម្មតា​មិនត្រឹមត្រូវ '%s' ៖ regcomp បាន​ត្រឡប់ %d" + +#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "ឈ្មោះ​អ្នកប្រើ ឬ​ពាក្យ​សម្ងាត់ មិន​ត្រឹមត្រូវ ។" @@ -2029,11 +1970,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" @@ -2159,10 +2095,6 @@ msgid "Kazakhstan" msgstr "កាហ្សាក់ស្តង់" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "រក្សា​កញ្ចប់​ដោះស្រាយ" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2515,7 +2447,7 @@ #: ../zypp/media/MediaException.cc:115 msgid "Malformed URI" -msgstr "" +msgstr "URI មាន​ទ្រង់ទ្រាយ​មិនត្រឹមត្រូវ" #. :MKD:807: #: ../zypp/CountryCode.cc:363 @@ -2625,21 +2557,21 @@ #: ../zypp/media/MediaException.cc:169 #, c-format msgid "Media source '%s' does not contain the desired medium" -msgstr "" +msgstr "ប្រភព​ឧបករណ៍​ផ្ទុក '%s' មិនមាន​ឧបករណ៍​ផ្ទុក​ដែល​ត្រូវការ​ទេ" #: ../zypp/media/MediaException.cc:175 #, c-format msgid "Medium '%s' is in use by another instance" -msgstr "" +msgstr "ឧបករណ៍​ផ្ទុក '%s' គឺ​កំពុង​ប្រើ​ដោយ​ឧបករណ៍​ផ្សេង" #: ../zypp/media/MediaException.cc:72 msgid "Medium not attached" -msgstr "" +msgstr "មិនបាន​ភ្ជាប់​ឧបករណ៍​ផ្ទុក" #: ../zypp/media/MediaException.cc:53 #, c-format msgid "Medium not opened when trying to perform action '%s'." -msgstr "" +msgstr "ឧបករណ៍​ផ្ទុក​មិនបាន​បើក នៅពេល​ធ្វើ​អំពើ '%s' ។" #. language code: men #: ../zypp/LanguageCode.cc:808 @@ -2878,7 +2810,7 @@ msgid "No Code" msgstr "គ្មាន​កូដ" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "គ្មាន url នៅ​ក្នុង​ឃ្លាំង ។" @@ -2987,9 +2919,8 @@ msgstr "អូម៉ង់" #: ../zypp/media/MediaException.cc:145 -#, fuzzy msgid "Operation not supported by medium" -msgstr "ទម្រង់កំណែ​​មិន​ត្រូវ​បាន​គាំទ្រ​ដោ​យ​ម៉ូឌុល​ Apparmor ឡើយ\n" +msgstr "ប្រតិបត្តិការ​មិនបាន​គាំទ្រ​ដោយ​ឧបករណ៍​ផ្ទុក​ទេ" #. language code: ori or #: ../zypp/LanguageCode.cc:910 @@ -2999,7 +2930,7 @@ #. language code: orm om #: ../zypp/LanguageCode.cc:912 msgid "Oromo" -msgstr "អុរុមុ" +msgstr "អូរ៉ូម៉ូ​" #. language code: osa #: ../zypp/LanguageCode.cc:914 @@ -3093,27 +3024,19 @@ msgstr "ប៉ារ៉ាហ្គាយ" #: ../zypp/media/MediaException.cc:106 -#, fuzzy, c-format +#, c-format msgid "Path '%s' on medium '%s' is not a directory." -msgstr "'%1' មិន​មែន​ជា​ថត​ទេ​ ។" +msgstr "ផ្លូវ '%s' នៅលើ​ឧបករណ៍​ផ្ទុក '%s' មិនមែន​ជា​ថត​ទេ ។" #: ../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 "មិនបាន​គាំទ្រ​ការ​ញែក​ប៉ារ៉ាម៉ែត្រ​ផ្លូវ​សម្រាប់ URL នេះ​ឡើយ" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "មិនបាន​គាំទ្រ​ការញែក​ប៉ារ៉ាម៉ែត្រ​ផ្លូវ​សម្រាប់ URL នេះ​ឡើយ" +msgstr "ផ្លូវ '%s' នៅលើ​ឧបករណ៍​ផ្ទុក '%s' មិនមែន​ជា​ឯកសារ​ទេ ។" #: ../zypp/media/MediaException.cc:200 -#, fuzzy, c-format +#, c-format msgid "Permission to access '%s' denied." -msgstr "សិទ្ធិ​ត្រូវ​បាន​បដិសេធ ។" +msgstr "សិទ្ធិ​ចូល​ដំណើរការ​ទៅ '%s' បាន​បដិសេធ ។" #. language code: per fas fa #: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 @@ -3193,7 +3116,7 @@ #. language code: pus ps #: ../zypp/LanguageCode.cc:958 msgid "Pushto" -msgstr "ពុយហ្សតូ" +msgstr "ពុហ្សតូ" #. :PRY:600: #: ../zypp/CountryCode.cc:405 @@ -3210,11 +3133,10 @@ 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 -#, fuzzy +#: ../zypp/target/rpm/RpmDb.cc:888 ../zypp/target/rpm/RpmDb.cc:2057 +#: ../zypp/target/rpm/RpmDb.cc:2177 msgid "RPM failed: " -msgstr "បាន​បរាជ័យ" +msgstr "RPM បាន​បរាជ័យ ៖ " #. language code: roh rm #: ../zypp/LanguageCode.cc:970 @@ -3240,16 +3162,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 "យក​ឃ្លាំង '%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 "បាត់​ឯកសារ​ដែល​ត្រូវ​ការ ៖ " @@ -3282,7 +3199,7 @@ #. language code: run rn #: ../zypp/LanguageCode.cc:978 msgid "Rundi" -msgstr "រ៉ុងឌី" +msgstr "រុន្ឌី" #. language code: rus ru #: ../zypp/LanguageCode.cc:980 @@ -3470,9 +3387,9 @@ msgstr "ភាសា​សញ្ញា" #: ../zypp/KeyRing.cc:568 -#, fuzzy, c-format +#, c-format msgid "Signature file %s not found" -msgstr "រក​មិន​​ឃើញ​កញ្ចប់​ប្រភព '%s' ។" +msgstr "រក​មិនឃើញ​ឯកសារ​ហត្ថលេខា %s ទេ" #. language code: bla #: ../zypp/LanguageCode.cc:354 @@ -3549,6 +3466,11 @@ msgid "Solomon Islands" msgstr "កោះ​សូឡូម៉ូន" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "កញ្ចប់​ដោះស្រាយ %s ប៉ះទង្គិច​នឹង %s ដែល​បាន​ផ្ដល់​ដោយ​ខ្លួនវា​ផ្ទាល់" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3702,12 +3624,12 @@ #: ../zypp/media/MediaException.cc:91 #, c-format msgid "System exception '%s' on medium '%s'." -msgstr "" +msgstr "ករណី​លើកលែង​ប្រព័ន្ធ '%s' នៅលើ​ឧបករណ៍​ផ្ទុក '%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 "ការ​គ្រប់គ្រង​ប្រព័ន្ធ​ត្រូវបាន​ចាក់សោ​ដោយ​កម្មវិធី​ដែល​មាន pid %d ។ សូម​បិទ​កម្មវិធី​នេះ មុនពេល​ព្យាយាម​ម្ដងទៀត ។" #. language code: tgl tl #: ../zypp/LanguageCode.cc:1108 @@ -3784,9 +3706,9 @@ msgid "Thailand" msgstr "ថៃ" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." -msgstr "" +msgstr "អំពើ​នេះ កំពុង​រត់​ដោយ​កម្មវិធី​ផ្សេង​មួយ​ទៀត ។" #. language code: tib bod bo #: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114 @@ -3801,12 +3723,12 @@ #. language code: tir ti #: ../zypp/LanguageCode.cc:1118 msgid "Tigrinya" -msgstr "ទី​ក្រីនយ៉ា" +msgstr "ទី​គ្រីនយ៉ា" #: ../zypp/media/MediaException.cc:207 #, c-format msgid "Timeout exceed when access '%s'." -msgstr "" +msgstr "អស់ពេល នៅពេល​ចូល​ដំណើរការ '%s' ។" #. language code: tem #: ../zypp/LanguageCode.cc:1100 @@ -3831,7 +3753,7 @@ #. language code: tpi #: ../zypp/LanguageCode.cc:1134 msgid "Tok Pisin" -msgstr "តុក ពិសាំង" +msgstr "Tok Pisin" #. language code: tkl #. :TJK:762: @@ -3857,7 +3779,7 @@ #: ../zypp/KeyRing.cc:507 #, c-format msgid "Tried to import not existant key %s into keyring %s" -msgstr "" +msgstr "នាំចូល​សោ %s ដែល​មិនមាន​ទៅ​ក្នុង keyring %s" #. :TUR:792: #: ../zypp/CountryCode.cc:441 @@ -3877,7 +3799,7 @@ #. language code: tsn tn #: ../zypp/LanguageCode.cc:1138 msgid "Tswana" -msgstr "វ៉ាន់ណា" +msgstr "ស្វាណា" #. language code: tum #: ../zypp/LanguageCode.cc:1144 @@ -4026,19 +3948,15 @@ 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'" msgstr "មិនបាន​គាំទ្រ​វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ភាពត្រឹមត្រូវ HTTP '%s' ឡើយ" #: ../zypp/media/MediaException.cc:140 -#, fuzzy, c-format +#, c-format msgid "Unsupported URI scheme in '%s'." -msgstr "គ្រោងការណ៍ URL '%1' មិនត្រឹមត្រូវ ។" +msgstr "គ្រោងការណ៍ URI ដែល​មិនបាន​គាំទ្រ​នៅ​ក្នុង '%s' ។" #: ../devel/devel.mvidner/installation_sources.cc:75 #, c-format @@ -4292,90 +4210,72 @@ 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 "" +msgstr "ការ​ផ្លាស់ប្ដូរ​ស្ថាបត្យកម្ម​នៃ %s ទៅ %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" +msgstr "មិនអាច​ដំឡើង​ទាំង %s និង %s" -#: ../zypp/sat/SATResolver.cc:688 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:859 msgid "conflicting requests" -msgstr "សំណើ​ការតភ្ជាប់​ទៅ ៖ " +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 -#, fuzzy, c-format -msgid "deinstallation of %s" -msgstr "ការ​ដំឡើង %s បាន​បរាជ័យ ៖" - -#. 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" +msgid "deinstallation of %s" +msgstr "ការ​លុប​នៃ %s" -#: ../zypp/sat/SATResolver.cc:747 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:923 msgid "deleted providers: " -msgstr "គ្មាន​កញ្ចប់​ណា​ផ្ដល់ %s" +msgstr "ក្រុមហ៊ុន​ផ្ដល់​ដែល​បាន​លុប ៖ " -#: ../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 "កុំ​ដំឡើង ឬ​លុប​អ្វី​ដែលអាច​ដោះស្រាយ​បាន​ដែល​ទាក់ទង" +msgstr "កុំ​ស្នើ​ឲ្យ​លុប​កញ្ចប់​ដោះស្រាយ​ទាំងអស់​ដោយ​ផ្ដល់ %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 "មិន​មាន​អ្នក​ផ្ដល់ %s ដែល​អាច​ដំឡើង​បាន" +msgstr "កុំ​ស្នើ​ឲ្យ​ដំឡើង​កញ្ចប់​ដោះស្រាយ​ដោយ​ផ្ដល់ %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 "កុំ​ដំឡើង %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 "" +msgstr "កុំ​ដំឡើង​កំណែ​ថ្មីរបស់ %s" -#: ../zypp/sat/SATResolver.cc:811 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:989 +#, c-format msgid "do not keep %s installed" -msgstr "មិន​បាន​ដំឡើង" +msgstr "កុំ​ទុក %s ឲ្យ​នៅ​ដំឡើង" -#: ../zypp/sat/SATResolver.cc:944 -#, 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 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, c-format -msgid "install %s" -msgstr "ដំឡើង %s" +msgid "downgrade of %s to %s" +msgstr "បន្ទាប %s ទៅ %s" -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4383,11 +4283,13 @@ "-->\n" " %s" msgstr "" +"ដំឡើង %s (ជាមួយ​នឹង​ការ​ផ្លាស់ប្ដូរ​ក្រុមហ៊ុន​លក់)\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" @@ -4400,34 +4302,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection ៖ មិនអាច​​កំណត់​ការ​តភ្ជាប់ 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 ត្រូវការ​ដោយ %s" +msgstr "គ្មាន​អ្វី​ផ្ដល់ %s ដែល​ត្រូវការ​ដោយ %s ទេ" -#: ../zypp/sat/SATResolver.cc:691 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:862 +#, c-format msgid "nothing provides requested %s" -msgstr "គ្មាន​កញ្ចប់​ណា​ផ្ដល់ %s" +msgstr "គ្មាន​អ្វី​ផ្ដល់ %s ដែលបាន​ស្នើ​ទេ" -#: ../zypp/sat/SATResolver.cc:685 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:856 +#, c-format msgid "problem with installed package %s" -msgstr "បញ្ហា​ក្នុង​ការ​ដំឡើង​កញ្ចប់​ប្រភព %s-%s ៖" +msgstr "បញ្ហា​ជាមួយ​កញ្ចប់​ដែល​បាន​ដំឡើង %s" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" -msgstr "" +msgstr "ការ​ជំនួស %s ជាមួយ %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 បាន​បង្កើត %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" @@ -4436,18 +4338,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 #, 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" @@ -4456,339 +4358,7 @@ "rpm បាន​រក្សាទុក %s ជា %s ។\n" "នេះ​ជា​បន្ទាត់ ២៥ ជួរ​ដំបូង​ខុសគ្នា៖\n" -#: ../zypp/sat/SATResolver.cc:759 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:935 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" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "ដោះសោរ​កញ្ចប់​ដោះ​ស្រាយ​ទាំងអស់" - -#~ msgid "Reading '%s' repository cache" -#~ msgstr "កំពុង​អាន​ឃ្លាំង '%s'" - -#~ msgid "Reading patch and delta rpms from '%s' repository cache" -#~ msgstr "កំពុង​អាន​បំណះ និង​ rpms ដែល​តា​ពីឃ្លាំង '%s'" - -#~ msgid "Cleaning repository '%s' cache" -#~ msgstr "កំពុង​សម្អាតឃ្លាំង '%s'" - -#~ msgid "Reading repository '%s' cache" -#~ msgstr "កំពុង​អាន​​ឃ្លាំង '%s'" - -#~ msgid "Software management is already running." -#~ msgstr "ការ​គ្រប់គ្រង​​កម្មវិធី គឺ​កំពុង​រត់​រួចហើយ ។" - -#~ msgid "%s is replaced by %s" -#~ msgstr "%s ត្រូវ​ជំនួស​ដោយ %s" - -#~ msgid "%s replaced by %s" -#~ msgstr "%s បាន​ជំនួស​ដោយ %s" - -#~ msgid "%s will be deleted by the user.\n" -#~ msgstr "%s នឹង​ត្រូវ​បាន​លុប​ដោយ​អ្នក​ប្រើ ។\n" - -#~ msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "%s នឹង​ត្រូវ​បានលុប​ដោយ​កម្មវិធី​ផ្សេង ។ (ApplLow/ApplHigh)\n" - -#~ msgid "%s will be installed by the user.\n" -#~ msgstr "%s នឹង​ត្រូវ​បាន​ដំឡើង​ដោយ​​អ្នក​ប្រើ ។\n" - -#~ msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "%s នឹង​ត្រូវ​បាន​ដំឡើង​ដោយ​កម្មវិធី​ផ្សេង ។ (ApplLow/ApplHigh)\n" - -#~ msgid "No valid solution found within %d seconds" -#~ msgstr "រក​មិន​ឃើញ​ដំណោះ​ស្រាយ​ត្រឹមត្រូវ​ក្នុង​រយៈ​ពេល %d វិនាទី ។" - -#~ msgid "The solver has reached a defined timout" -#~ msgstr "កម្មវិធី​ដោះស្រាយ​បាន​ឈាន​ដល់​ពេល​សម្រាក​ដែល​បាន​កំណត់" - -#~ msgid "No valid solution found with just resolvables of best architecture." -#~ msgstr "រក​មិន​ឃើញ​ដំណោះ​ស្រាយ​ ដែល​មិន​អាច​ដោះស្រាយ​នៃ​ស្ថាបត្យកម្ម​ដ៏​ល្អ​បំផុត ។" - -#~ msgid "With this run only resolvables with the best architecture have been regarded.\n" -#~ msgstr "ដោយ​ឲ្យវា​រត់​សម្រាប់​តែ​អ្វី​អាច​ដោះស្រាយ​បាន​ជា​មួយ​ស្ថាបត្យកម្ម​ដ៏​ល្អ​បំផុត​ត្រូវ​បាន​គេ​ពិចារណា ។\n" - -#~ msgid "Regarding all possible resolvables takes time, but can come to a valid result." -#~ msgstr "ដោយ​ទាក់ទង​ទៅ​នឹង​អ្វី​ដែល​អាច​ដោះស្រាយ​បាន​ទាំង​អស់​ត្រូវ​ការ​ពេលវេលា​ ប៉ុន្តែ​អាច​ទទួល​បានលទ្ធផល​ត្រឹមត្រូវ ។" - -#~ msgid "Invalid information" -#~ msgstr "ព័ត៌មាន​មិន​ត្រឹមត្រូវ" - -#~ msgid "%s is needed by other resolvables" -#~ msgstr "%s ត្រូវការ​ដោយ​កញ្ចប់​ដោះស្រាយ​ផ្សេងៗ" - -#~ msgid "" -#~ "%s is needed by:\n" -#~ "%s" -#~ msgstr "" -#~ "%s ត្រូវ​ការ​ដោយ ៖\n" -#~ "%s" - -#~ msgid "%s conflicts with other resolvables" -#~ msgstr "%s ប៉ះទង្គិច​ជាមួយ​កញ្ចប់ដោះស្រាយ​ផ្សេងៗ" - -#~ msgid "" -#~ "%s conflicts with:\n" -#~ "%s" -#~ msgstr "" -#~ "%s ប៉ះ​ទង្គិច​ជាមួយ ៖\n" -#~ "%s" - -#~ msgid "%s obsoletes other resolvables" -#~ msgstr "%s លែង​ប្រើ​កញ្ចប់ដោះស្រាយ​ផ្សេងៗ" - -#~ msgid "%s obsoletes:%s" -#~ msgstr "%s លែង​ប្រើ  ៖ %s" - -#~ msgid "" -#~ "\n" -#~ "These resolvables will be deleted from the system." -#~ msgstr "" -#~ "\n" -#~ "កញ្ចប់ដោះស្រាយទាំងនេះ​នឹង​ត្រូវ​បាន​លុប​ចេញ​ពី​ប្រព័ន្ធ ។" - -#~ msgid "%s depends on other resolvables" -#~ msgstr "%s ផ្អែក​លើកញ្ចប់ដោះស្រាយ​ផ្សេងៗ" - -#~ msgid "%s depends on %s" -#~ msgstr "%s ផ្អែកលើ %s" - -#~ msgid "%s depends on:%s" -#~ msgstr "%s ផ្អែកលើ ៖ %s" - -#~ msgid "Child of" -#~ msgstr "កូន​របស់" - -#~ msgid "" -#~ "\n" -#~ "There is no resource available which supports this requirement." -#~ msgstr "" -#~ "\n" -#~ "មិនមាន​ធនធាន​ដែល​គាំទ្រ​តម្រូវ​ការ​នេះ ។" - -#~ msgid "Due to the problems described above/below, this resolution will not solve all dependencies" -#~ msgstr "ដោយ​សារ​តែ​មាន​បញ្ហា​​ដូច​បាន​ពិពណ៌នា​ខាង​លើ/ខាង​ក្រោម ដំណោះស្រាយ​នេះ​នឹង​មិន​អាច​ដោះស្រាយ​ភាព​អាស្រ័យ​ទាំងអស់​បាន​ទេ" - -#~ msgid "Cannot install %s, because it is conflicting with %s" -#~ msgstr "មិន​អាច​ដំឡើង %s ពីព្រោះ​វា​ប៉ះទង្គិច​ជា​មួយ %s" - -#~ msgid "%s is not installed and has been marked as uninstallable" -#~ msgstr "មិន​បាន​ដំឡើង %s ឡើយ ហើយ​បាន​សម្គាល់​វា​ថា អាច​លុប​បាន" - -#~ msgid "Cannot install %s due to dependency problems" -#~ msgstr "មិន​អាច​ដំឡើង %s ដោយ​សារ​តែមានបញ្ហា​ភាព​អាស្រ័យ" - -#~ msgid "%s has unfulfilled requirements" -#~ msgstr "%s មាន​តម្រូវ​ការ​ដែល​មិន​បាន​បំពេញ" - -#~ msgid "%s has missing dependencies" -#~ msgstr "%s មាន​ភាព​អាស្រ័យ​ដែល​បាត់" - -#~ msgid "%s cannot be installed due to missing dependencies" -#~ msgstr "មិន​អាច​ដំឡើង %s បានទេ ដោយ​សារ​បាត់​ភាព​អាស្រ័យ" - -#~ msgid "%s fulfills dependencies of %s but will be uninstalled" -#~ msgstr "%s បំពេញ​ភាព​អាស្រ័យ​របស់ %s ប៉ុន្តែ​នឹង​ត្រូវ​បានលុប" - -#~ msgid "%s fulfills dependencies of %s but will be kept on your system" -#~ msgstr "%s បំពេញ​ភាពអាស្រ័យ​របស់ %s ប៉ុន្តែ​នឹង​ត្រូវ​បាន​រក្សាទុក​នៅ​ក្នុង​ប្រព័ន្ធ​របស់​អ្នក" - -#~ msgid "No need to install %s" -#~ msgstr "មិន​ចាំបាច់​ដំឡើង %s" - -#~ msgid "Cannot install %s to fulfill the dependencies of %s" -#~ msgstr "មិន​អាច​ដំឡើង %s ដើម្បី​បំពេញ​ភាព​អាស្រ័យ​របស់ %s" - -#~ msgid "Cannot install %s to fulfil the dependencies of %s" -#~ msgstr "មិន​អាច​ដំឡើង %s ដើម្បី​បំពេញកញ្ចប់​តម្រូវការ​របស់ %s" - -#~ msgid "%s will not be uninstalled, because it is still required" -#~ msgstr "%s នឹង​មិន​ត្រូវ​បាន​លុប​ទេ ពីព្រោះ​វា​នៅ​តែ​ត្រូវ​ការ" - -#~ msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." -#~ msgstr "%s លែងប្រើ %s ។ ប៉ុន្តែ %s មិន​អាច​ត្រូវ​បានលុប ពីព្រោះ​វា​ជាប់សោ ។" - -#~ msgid "Cannot install %s, because it is conflicting" -#~ msgstr "មិន​អាច​ដំឡើង %s ពីព្រោះ​វា​កំពុង​ប៉ះទង្គិច" - -#~ msgid "%s is uninstallable due to conflicts with %s" -#~ msgstr "មិន​អាច​លុប %s បានទេ​ ព្រោះ​វា​ប៉ះទង្គិច​ជា​មួយ​នឹង %s" - -#~ msgid "Requirememt %s cannot be fulfilled." -#~ msgstr "មិន​អាច​បំពេញ​តម្រូវ​ការ %s" - -#~ msgid "for requiring %s for %s when upgrading %s" -#~ msgstr "សម្រាប់​ការទាមទារ %s ចំពោះ %s ខណៈពេល​ធ្វើ​ឲ្យ %s ទាន់​សម័យ" - -#~ msgid "%s is lacking the requirement %s" -#~ msgstr "%s ខ្វះ​តម្រូវ​ការ %s" - -#~ msgid ", Action: " -#~ msgstr " សកម្មភាព ៖ " - -#~ msgid ", Trigger: " -#~ msgstr " គន្លឹះ ៖ " - -#~ msgid "package" -#~ msgstr "កញ្ចប់" - -#~ msgid "selection" -#~ msgstr "ការជ្រើស​រើស" - -#~ msgid "pattern" -#~ msgstr "លំនាំ" - -#~ msgid "product" -#~ msgstr "ផលិតផល" - -#~ msgid "patch" -#~ msgstr "បំណះ" - -#~ msgid "script" -#~ msgstr "ស្គ្រីប" - -#~ msgid "message" -#~ msgstr "សារ" - -#~ msgid "atom" -#~ msgstr "អាតូម" - -#~ msgid "system" -#~ msgstr "ប្រព័ន្ធ" - -#~ msgid "Resolvable" -#~ msgstr "កញ្ចប់​ដោះស្រាយ" - -#~ msgid "Marking this resolution attempt as invalid." -#~ msgstr "សម្គាល់​ការដោះស្រាយ​នេះ​ជា មិនត្រឹមត្រូវ ។" - -#~ msgid "Marking resolvable %s as uninstallable" -#~ msgstr "សម្គាល់​កញ្ចប់​ដោះស្រាយ %s ជា អាច​លុប​បាន" - -#~ msgid "%s is scheduled to be installed, but this is impossible due to dependency problems." -#~ msgstr "%s ត្រូវ​បាន​កំណត់​ពេលវេលា​ដំឡើង ប៉ុន្តែ​វា​មិនអាច​ ដោយសារ​តែ​បញ្ហា​ភាព​អាស្រ័យ ។" - -#~ msgid "Can't install %s since it is already marked as needed to be uninstalled" -#~ msgstr "មិនអាច​ដំឡើង %s ព្រោះថា​វា​ត្រូវ​បាន​សម្គាល់​ជា​ចាំបាច់​ត្រូវ​លុប" - -#~ msgid "Can't install %s, because it does not apply to this system." -#~ msgstr "មិន​អាច​ដំឡើង %s ពីព្រោះ​វា​មិន​អនុវត្ត​ប្រព័ន្ធ​នេះ ។" - -#~ msgid "Can't install %s, because %s is already marked as needed to for installation" -#~ msgstr "មិន​អាច​ដំឡើង %s ពីព្រោះ %s ត្រូវ​បាន​សម្គាល់​ថា​ចាំបាច់​​សម្រាប់​ដំឡើង" - -#~ msgid "This would invalidate %s." -#~ msgstr "វានេះ​នឹង​ធ្វើ​ឲ្យ %s គ្មាន​តម្លៃ ។" - -#~ msgid "Establishing %s" -#~ msgstr "កំពុង​ស្ថាបនា %s" - -#~ msgid "Installing %s" -#~ msgstr "កំពុង​ដំឡើង %s" - -#~ msgid "Skipping %s: already installed" -#~ msgstr "កំពុង​រំលង %s ៖ បាន​ដំឡើង​រួច​ហើយ" - -#~ msgid "There are no alternative providers of %s installed" -#~ msgstr "គ្មាន​ក្រុមហ៊ុន​ផ្ដល់​ជា​ជំនួស​​របស់ %s បាន​ដំឡើង" - -#~ msgid "for %s" -#~ msgstr "សម្រាប់ %s" - -#~ msgid "Upgrading to %s to avoid removing %s is not possible." -#~ msgstr "មិន​អាច​ធ្វើ​ឲ្យ %s ប្រសើរ ដើម្បីជៀសវាងការ​​យក %s ចេញ​ ។" - -#~ msgid "%s provides %s, but is scheduled to be uninstalled." -#~ msgstr "%s ផ្ដល់ %s ប៉ុន្តែ​ត្រូវ​បាន​កំណត់​ថា លុប ។" - -#~ msgid "%s provides %s, but another version of that %s is already installed." -#~ msgstr "%s ផ្ដល់ %s ប៉ុន្តែ​កំណែ​មួយ​ផ្សេងរបស់ %s នោះ​ត្រូវ​បាន​ដំឡើងហើយ ។" - -#~ msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details." -#~ msgstr "%s ផ្ដល់ %s ប៉ុន្តែ​វា​អាច​លុប​បាន ។ ព្យាយាយាយាម​ដំវាឡើង​ដោយ​ផ្ទដើម្បី​ទទួលបាន​លម្អិត្ថែម ។" - -#~ msgid "%s provides %s, but it is locked." -#~ msgstr "%s ផ្ដល់ %s ប៉ុន្តែ​វា​ជាប់​សោហើយ ។" - -#~ msgid "%s provides %s, but is scheduled to be kept." -#~ msgstr "%s ផ្ដល់ %s ប៉ុន្តែ​ត្រូវ​បាន​កំណត់​ថា ត្រូវ​រក្សាទុក ។" - -#~ msgid "%s provides %s, but has another architecture." -#~ msgstr "%s ផ្ដល់ %s ប៉ុន្តែ​មាន​ស្ថាបត្យកម្ម​ផ្សេង ។" - -#~ msgid "%s provides %s, but has another vendor (%s)." -#~ msgstr "%s ផ្ដល់ %s ប៉ុន្តែ​មាន​ក្រុមហ៊ុន​លក់​ផ្សេង (%s) ។" - -#~ msgid "Can't satisfy requirement %s for %s" -#~ msgstr "មិន​អាច​បំពេញ​តាម​តម្រូវការ %s សម្រាប់ %s" - -#~ msgid "%s is required by another resolvable selected for installation, so it won't be unlinked." -#~ msgstr "%s ត្រូវ​បានទាមទារ​ដោយ​អ្វី​ដែល​អាច​ដោះស្រាយ​បាន​ផ្សេង​ទៀត​ដែល​បាន​ជ្រើស​សម្រាប់​ដំឡើង ដូច្នេះ​វា​នឹង​មិន​ត្រូវបាន​តភ្ជាប់ទេ ។" - -#~ msgid "%s is required by another installed resolvable, so it won't be unlinked." -#~ msgstr "%s ត្រូវ​បាន​ទាមទារ​ដោយ​អ្វី​ដែល​អាច​ដែល​អាច​ដោះស្រាយ​បាន​ផ្សេង ដូច្នេះ​វា​នឹង​មិន​ត្រូវ​បាន​តភ្ជាប់​ទេ ។" - -#~ msgid "%s is locked and cannot be uninstalled." -#~ msgstr "%s ជាប់សោ និង​មិន​អាច​លុប​បាន​ឡើយ ។" - -#~ msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation" -#~ msgstr "ការ​ប៉ះទង្គិច %s (%s) ទាមទារ​ឲ្យ​យក %s ចេញ ដែល​ត្រូវ​បាន​កំណត់​ពេលវេលា​សម្រាប់​ដំឡើង" - -#~ msgid "Marking %s as uninstallable due to conflicts over %s" -#~ msgstr "សម្គាល់ %s ថា អាច​លុប​បាន ដោយ​សារ​តែ​ការ​ប៉ះទង្គិចលើ %s" - -#~ msgid "from %s" -#~ msgstr "ពី %s" - -#~ msgid " Error!" -#~ msgstr " កំហុស!" - -#~ msgid " Important!" -#~ msgstr " សំខាន់!" - -#~ msgid "Make a solver run with ALL possibilities." -#~ msgstr "ធ្វើឲ្យ​អ្នក​ដោះស្រាយ​រត់​ជាមួយ​លទ្ធភាព​ទាំងអស់ ។" - -#~ msgid "Regarding all resolvables with a compatible architecture." -#~ msgstr "ទាក់ទង​នឹង​អ្វី​ដែល​អាច​ដោះស្រាយ​បាន​ទាំង​អស់​​ជា​មួយ​ស្ថាបត្យ​កម្ម​ដែល​ឆប​គ្នា ។" - -#~ msgid "Make a solver run with best architecture only." -#~ msgstr "ធ្វើឲ្យ​កម្មវិធី​​ដោះស្រាយ​រត់​​តែ​ជា​មួយ​ស្ថាបត្យកម្ម​ដែល​ល្អ​បំផុត​​​ប៉ុណ្ណោះ ។" - -#~ msgid "Regarding resolvables with best architecture only." -#~ msgstr "ទាក់ទង​នឹង​អ្វី​ដែល​អាច​ដោះស្រាយ​បាន​​តែ​​​ជា​មួយ​ស្ថាបត្យកម្ម​ដែល​ល្អ​បំផុត​ប៉ុណ្ណោះ ។" - -#~ msgid "%s depended on %s" -#~ msgstr "%s អាស្រ័យ​លើ %s" - -#~ msgid "%s is recommended by %s" -#~ msgstr "%s ត្រូវ​បាន​ផ្ដល់​អនុសាសន៍​ដោយ %s" - -#~ msgid "%s is suggested by %s" -#~ msgstr "%s ត្រូវ​បាន​ស្នើ​ដោយ %s" - -#~ msgid "%s will be evaluated for installation (freshened) by %s" -#~ msgstr "%s នឹង​ត្រូវ​បាន​វាយ​តម្លៃ​សម្រាប់​កា​រដំឡើង (បាន​ធ្វើ​ឲ្យ​ស្រស់) ដោយ %s" - -#~ msgid "%s is enhanced by %s" -#~ msgstr "%s ត្រូវ​បាន​ធ្វើ​ឲ្យ​ប្រសើរ​ដោយ %s" - -#~ msgid "%s is supplemented by %s" -#~ msgstr "%s ត្រូវ​បាន​បន្ថែម​ដោយ %s" - -#~ msgid "%s part of %s" -#~ msgstr "%s ជា​ផ្នែក​នៃ %s" - -#~ msgid "Double timeout" -#~ msgstr "ពេលសម្រាក​ទ្វេដង" +msgstr "ក្រុមហ៊ុន​លក់​ដែល​អាច​លុបបាន ៖ " -#~ msgid "Start the next solver run with doubled timeout." -#~ msgstr "ចាប់ផ្ដើម​កម្មវិធី​ដោះស្រាយ​បន្ទាប់​​រត់​ជា​មួយ​ពេល​សម្រាក​ទ្វេដង ។" Modified: trunk/libzypp/po/ko.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ko.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/ko.po (original) +++ trunk/libzypp/po/ko.po Mon Apr 28 15:25:19 2008 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: zypp.ko\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-04-07 01:23+0900\n" "Last-Translator: YunSeok Choi \n" "Language-Team: Korean \n" @@ -20,7 +20,7 @@ "X-Poedit-Country: KOREA, REPUBLIC OF\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -33,61 +33,49 @@ msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr " SSL 인증서에 문제, '%s'에 임해서 증명 기관에 문제가 있는지 확인 해보세요." -#: ../zypp/sat/SATResolver.cc:709 +#: ../zypp/solver/detail/SATResolver.cc:880 #, fuzzy, c-format msgid "%s conflicts with %s provided by %s" msgstr "%1은 %2와 충돌합니다" #. %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 #, 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 "저자로 찾기" -#. 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 "%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 "" @@ -114,14 +102,13 @@ msgid "Adangme" msgstr "아당메어" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "'%s' 저장소 추가 중" # dialog caption -#: ../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 "C 헤더 파일을 출력합니다" @@ -186,8 +173,7 @@ msgstr "알바니아" #. language code: alb sqi sq -#: ../zypp/LanguageCode.cc:262 -#: ../zypp/LanguageCode.cc:264 +#: ../zypp/LanguageCode.cc:262 ../zypp/LanguageCode.cc:264 msgid "Albanian" msgstr "알바니아어" @@ -299,8 +285,7 @@ # AM #. language code: arm hye hy -#: ../zypp/LanguageCode.cc:284 -#: ../zypp/LanguageCode.cc:286 +#: ../zypp/LanguageCode.cc:284 ../zypp/LanguageCode.cc:286 msgid "Armenian" msgstr "아르메니아어" @@ -352,8 +337,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 "%s 인증 방법을 지원하지 않습니다" @@ -464,8 +448,7 @@ msgstr "바슈키르어" #. language code: baq eus eu -#: ../zypp/LanguageCode.cc:326 -#: ../zypp/LanguageCode.cc:328 +#: ../zypp/LanguageCode.cc:326 ../zypp/LanguageCode.cc:328 msgid "Basque" msgstr "바스크어" @@ -625,7 +608,7 @@ msgid "Buginese" msgstr "부기어" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, fuzzy, c-format msgid "Building repository '%s' cache" msgstr "타일 캐쉬 크기(_s):" @@ -651,8 +634,7 @@ msgstr "부르키나 파소" #. language code: bur mya my -#: ../zypp/LanguageCode.cc:372 -#: ../zypp/LanguageCode.cc:374 +#: ../zypp/LanguageCode.cc:372 ../zypp/LanguageCode.cc:374 msgid "Burmese" msgstr "브루나이" @@ -678,7 +660,7 @@ msgid "Cameroon" msgstr "카메룬" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "" @@ -686,12 +668,6 @@ msgid "Can't acquire the mutex lock" msgstr "" -#: ../zypp/Repository.cc:130 -#: ../zypp/Repository.cc:147 -#, fuzzy -msgid "Can't add solvables to norepo." -msgstr "압축 파일 자신을 더할 수 없습니다." - #: ../zypp/ExternalProgram.cc:245 #, c-format msgid "Can't chdir to '/' inside chroot (%s)." @@ -721,6 +697,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)." @@ -731,12 +712,7 @@ msgid "Can't open pty (%s)." msgstr "파일을 열 수 없습니다" -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "파일을 열 수 없습니다" - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "" @@ -745,11 +721,6 @@ msgid "Can't release the mutex lock" msgstr "" -#: ../zypp/Repository.cc:101 -#, fuzzy -msgid "Can't set RepoInfo for norepo." -msgstr "찾은 결과에 대한 바로가기를 설정할 수 있습니다." - #: ../zypp/thread/Mutex.cc:40 msgid "Can't set recursive mutex attribute" msgstr "" @@ -850,7 +821,7 @@ # progress stage #. 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 의 설정 파일 변경됨:" @@ -895,8 +866,7 @@ msgstr "중국" #. language code: chi zho zh -#: ../zypp/LanguageCode.cc:400 -#: ../zypp/LanguageCode.cc:402 +#: ../zypp/LanguageCode.cc:400 ../zypp/LanguageCode.cc:402 msgid "Chinese" msgstr "중국어" @@ -973,8 +943,7 @@ # CG #. :CCK:166: #. :CAF:140: -#: ../zypp/CountryCode.cc:262 -#: ../zypp/CountryCode.cc:264 +#: ../zypp/CountryCode.cc:262 ../zypp/CountryCode.cc:264 msgid "Congo" msgstr "콩고" @@ -1050,8 +1019,7 @@ msgstr "크로아티아" #. language code: scr hrv hr -#: ../zypp/LanguageCode.cc:1008 -#: ../zypp/LanguageCode.cc:1010 +#: ../zypp/LanguageCode.cc:1008 ../zypp/LanguageCode.cc:1010 msgid "Croatian" msgstr "크로아티아어" @@ -1072,8 +1040,7 @@ msgstr "키프로스" #. language code: cze ces cs -#: ../zypp/LanguageCode.cc:446 -#: ../zypp/LanguageCode.cc:448 +#: ../zypp/LanguageCode.cc:446 ../zypp/LanguageCode.cc:448 msgid "Czech" msgstr "체코어" @@ -1130,11 +1097,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" @@ -1180,14 +1142,13 @@ 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 "" #. language code: dut nld nl -#: ../zypp/LanguageCode.cc:478 -#: ../zypp/LanguageCode.cc:480 +#: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480 msgid "Dutch" msgstr "화란어" @@ -1298,11 +1259,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "" -#: ../zypp/Repository.cc:141 -#, fuzzy -msgid "Error reading solv-file: " -msgstr "메일파일을 읽는 중 오류 발생: %s" - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1344,7 +1300,7 @@ msgid "Failed to delete key." msgstr "연락처를 지우는 데 실패했습니다" -#: ../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 "" @@ -1354,7 +1310,7 @@ msgid "Failed to mount %s on %s" msgstr "`%s'의 허가권을 설정하는 데 실패: %s" -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, fuzzy, c-format msgid "Failed to remove public key %s: %s" msgstr "중단 키 %s을(를) 설정 해제하는 데 실패했습니다: %s\n" @@ -1491,8 +1447,7 @@ msgstr "프랑스" #. language code: fre fra fr -#: ../zypp/LanguageCode.cc:522 -#: ../zypp/LanguageCode.cc:524 +#: ../zypp/LanguageCode.cc:522 ../zypp/LanguageCode.cc:524 msgid "French" msgstr "프랑스어" @@ -1591,9 +1546,9 @@ msgstr "게에즈어" # text is shown in a column of a package list entry -#: ../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: @@ -1602,14 +1557,12 @@ msgstr "조지아" #. language code: geo kat ka -#: ../zypp/LanguageCode.cc:544 -#: ../zypp/LanguageCode.cc:546 +#: ../zypp/LanguageCode.cc:544 ../zypp/LanguageCode.cc:546 msgid "Georgian" msgstr "그루지야어" #. language code: ger deu de -#: ../zypp/LanguageCode.cc:548 -#: ../zypp/LanguageCode.cc:550 +#: ../zypp/LanguageCode.cc:548 ../zypp/LanguageCode.cc:550 msgid "German" msgstr "독어" @@ -1682,8 +1635,7 @@ msgstr "그리스어 (고대) (1453년 이전)" #. language code: gre ell el -#: ../zypp/LanguageCode.cc:578 -#: ../zypp/LanguageCode.cc:580 +#: ../zypp/LanguageCode.cc:578 ../zypp/LanguageCode.cc:580 msgid "Greek, Modern (1453-)" msgstr "그리스어 (현대) (1453년 이후)" @@ -1761,8 +1713,7 @@ msgid "Haitian" msgstr "아이티 크리올어" -#: ../zypp/target/hal/HalException.h:46 -#: ../zypp/target/hal/HalException.h:55 +#: ../zypp/target/hal/HalException.h:46 ../zypp/target/hal/HalException.h:55 #: ../zypp/target/hal/HalException.h:64 #, fuzzy msgid "Hal Exception" @@ -1889,8 +1840,7 @@ msgstr "아이스란드" #. language code: ice isl is -#: ../zypp/LanguageCode.cc:622 -#: ../zypp/LanguageCode.cc:624 +#: ../zypp/LanguageCode.cc:622 ../zypp/LanguageCode.cc:624 msgid "Icelandic" msgstr "아이슬란드어" @@ -1906,29 +1856,10 @@ msgstr "이그보어" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145 -#, fuzzy, c-format -msgid "Ignore that %s is already set to install" -msgstr "%1 디렉토리는 이미 목록에 있습니다." - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, fuzzy, 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 +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 #, fuzzy, c-format -msgid "Ignore this conflict of %s" -msgstr "쪽지 충돌 감지" - -# text is shown in a column of a package list entry -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -#, fuzzy -msgid "Ignore this requirement just here" -msgstr "해결할수 없는 요구사항..." +msgid "Ignore some dependencies of %s" +msgstr "의존성을 만족하지 못함:" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1975,24 +1906,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 "%s에 대한 인자가 빠졌습니다" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "" @@ -2066,8 +1980,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 "사용자 이름에 잘못된 글자가 있습니다" @@ -2120,11 +2038,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" @@ -2254,11 +2167,6 @@ msgid "Kazakhstan" msgstr "카자흐스탄" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -#, fuzzy -msgid "Keep resolvables" -msgstr "배경 유지" - # KE #. :JPN:392: #: ../zypp/CountryCode.cc:335 @@ -2564,8 +2472,7 @@ msgstr "마케도니아" #. language code: mac mkd mk -#: ../zypp/LanguageCode.cc:772 -#: ../zypp/LanguageCode.cc:774 +#: ../zypp/LanguageCode.cc:772 ../zypp/LanguageCode.cc:774 msgid "Macedonian" msgstr "마케도니아어" @@ -2611,8 +2518,7 @@ msgstr "말라위" #. language code: may msa ms -#: ../zypp/LanguageCode.cc:800 -#: ../zypp/LanguageCode.cc:802 +#: ../zypp/LanguageCode.cc:800 ../zypp/LanguageCode.cc:802 msgid "Malay" msgstr "말레이어" @@ -2704,8 +2610,7 @@ # tree node string #. language code: mao mri mi -#: ../zypp/LanguageCode.cc:790 -#: ../zypp/LanguageCode.cc:792 +#: ../zypp/LanguageCode.cc:790 ../zypp/LanguageCode.cc:792 msgid "Maori" msgstr "마오리어" @@ -2930,8 +2835,7 @@ #. language code: nau na #. :NPL:524: -#: ../zypp/LanguageCode.cc:858 -#: ../zypp/CountryCode.cc:387 +#: ../zypp/LanguageCode.cc:858 ../zypp/CountryCode.cc:387 msgid "Nauru" msgstr "나우루" @@ -3048,13 +2952,12 @@ # TextEntry label for phone network Areacode (german Vorwahl) #. Defined LanguageCode constants #. Defined CountryCode constants -#: ../zypp/LanguageCode.cc:225 -#: ../zypp/CountryCode.cc:215 +#: ../zypp/LanguageCode.cc:225 ../zypp/CountryCode.cc:215 #, fuzzy msgid "No Code" msgstr "C 소스 코드" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 #, fuzzy msgid "No url in repository." msgstr "'%s'에서 경로를 찾을 수 없습니다" @@ -3287,22 +3190,13 @@ msgid "Path '%s' on medium '%s' is not a file." msgstr "이 파일시스템에서 파일 감시는 지원되지 않습니다.\n" -#: ../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." msgstr "키 모음에 접근할 수 없습니다." #. language code: per fas fa -#: ../zypp/LanguageCode.cc:938 -#: ../zypp/LanguageCode.cc:940 +#: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 msgid "Persian" msgstr "페르시아어" @@ -3391,15 +3285,13 @@ msgid "Quechua" msgstr "케추아어" -#: ../zypp/url/UrlBase.cc:782 -#: ../zypp/url/UrlBase.cc:1229 +#: ../zypp/url/UrlBase.cc:782 ../zypp/url/UrlBase.cc:1229 msgid "Query string parsing not supported for this URL" msgstr "" #. 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 "불러오기 실패" @@ -3427,21 +3319,15 @@ msgid "Rarotongan" msgstr "라로통가어" -#: ../zypp/url/UrlBase.cc:1117 -#: ../zypp/url/UrlBase.cc:1131 +#: ../zypp/url/UrlBase.cc:1117 ../zypp/url/UrlBase.cc:1131 msgid "Relative path not allowed if authority exists" msgstr "" -#: ../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 #, fuzzy msgid "Required file is missing: " @@ -3463,8 +3349,7 @@ msgstr "루마니아" #. language code: rum ron ro -#: ../zypp/LanguageCode.cc:974 -#: ../zypp/LanguageCode.cc:976 +#: ../zypp/LanguageCode.cc:974 ../zypp/LanguageCode.cc:976 msgid "Romanian" msgstr "루마니아어" @@ -3594,7 +3479,7 @@ #. language code: sco #: ../zypp/LanguageCode.cc:1006 msgid "Scots" -msgstr " 스코트어" +msgstr "\t스코트어" #. language code: sel #: ../zypp/LanguageCode.cc:1012 @@ -3618,8 +3503,7 @@ msgstr "" #. language code: scc srp sr -#: ../zypp/LanguageCode.cc:1000 -#: ../zypp/LanguageCode.cc:1002 +#: ../zypp/LanguageCode.cc:1000 ../zypp/LanguageCode.cc:1002 msgid "Serbian" msgstr "세르비아어" @@ -3721,8 +3605,7 @@ msgstr "슬라브어파 (기타)" #. language code: slo slk sk -#: ../zypp/LanguageCode.cc:1032 -#: ../zypp/LanguageCode.cc:1034 +#: ../zypp/LanguageCode.cc:1032 ../zypp/LanguageCode.cc:1034 msgid "Slovak" msgstr "슬로바키아어" @@ -3751,6 +3634,11 @@ msgid "Solomon Islands" msgstr "솔로몬 제도" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%1은 %2와 충돌합니다" + # SO #. language code: som so #: ../zypp/LanguageCode.cc:1060 @@ -3998,15 +3886,14 @@ msgid "Thailand" msgstr "태국" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." msgstr "" # TW # fuzzy #. language code: tib bod bo -#: ../zypp/LanguageCode.cc:1112 -#: ../zypp/LanguageCode.cc:1114 +#: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114 msgid "Tibetan" msgstr "티베트어" @@ -4055,8 +3942,7 @@ #. language code: tkl #. :TJK:762: -#: ../zypp/LanguageCode.cc:1122 -#: ../zypp/CountryCode.cc:435 +#: ../zypp/LanguageCode.cc:1122 ../zypp/CountryCode.cc:435 msgid "Tokelau" msgstr "토켈라우" @@ -4149,8 +4035,7 @@ #. language code: tvl #. :TTO:780: -#: ../zypp/LanguageCode.cc:1152 -#: ../zypp/CountryCode.cc:442 +#: ../zypp/LanguageCode.cc:1152 ../zypp/CountryCode.cc:442 msgid "Tuvalu" msgstr "투발루어" @@ -4216,8 +4101,7 @@ msgid "Unable to initalize HAL context -- hald not running?" msgstr "" -#: ../zypp/Url.cc:322 -#: ../zypp/Url.cc:336 +#: ../zypp/Url.cc:322 ../zypp/Url.cc:336 #, fuzzy msgid "Unable to parse Url components" msgstr "메세지 내용을 파싱할 수 없습니다" @@ -4258,11 +4142,6 @@ msgid "Unknown language: " msgstr "알 수 없음(%s)" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -#, fuzzy -msgid "Unlock these resolvables" -msgstr "메모 잠그기/잠금 해제" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4425,8 +4304,7 @@ msgstr "와쇼어" #. language code: wel cym cy -#: ../zypp/LanguageCode.cc:1192 -#: ../zypp/LanguageCode.cc:1194 +#: ../zypp/LanguageCode.cc:1192 ../zypp/LanguageCode.cc:1194 msgid "Welsh" msgstr "웨일스어" @@ -4535,94 +4413,77 @@ msgid "applydeltarpm failed." msgstr "불러오기 실패" -#: ../zypp/sat/SATResolver.cc:951 +#: ../zypp/solver/detail/SATResolver.cc:1129 #, fuzzy, c-format msgid "architecture change of %s to %s" msgstr "%s 장치로 바꾸기" # Frame title for installation target hard disk / partition(s) -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, fuzzy, 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 "무제한 요청" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, fuzzy, 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 "설치" -#. 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 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 "%s 로 제공되는 사항의 삭제에 대해 묻지 않음" -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, c-format msgid "do not forbid installation of %s" msgstr "%s 의 설치를 금지하지 않음" # Frame title for installation target hard disk / partition(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 "" # Frame title for installation target hard disk / partition(s) -#: ../zypp/sat/SATResolver.cc:811 +#: ../zypp/solver/detail/SATResolver.cc:989 #, c-format msgid "do not keep %s installed" msgstr "%s 의 설치를 그대로 두지 않음" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, 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" @@ -4635,11 +4496,8 @@ "-->\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 유지" @@ -4652,72 +4510,122 @@ 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 "요구한 %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 를 %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 "" #. %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 출력:" #. %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 "%s 잠금 해제" +#, fuzzy +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "%1은 %2와 충돌합니다" + +#, fuzzy +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "%1 디렉토리는 이미 목록에 있습니다." + +#, fuzzy +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "최상위 위젯의 포커스" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "모든 사항 잠금을 해제" +#, fuzzy +#~ msgid "Ignore this conflict of %s" +#~ msgstr "쪽지 충돌 감지" + +# text is shown in a column of a package list entry +#, fuzzy +#~ msgid "Ignore this requirement just here" +#~ msgstr "해결할수 없는 요구사항..." + +#, fuzzy +#~ msgid "Install missing resolvables" +#~ msgstr "%s에 대한 인자가 빠졌습니다" + +#, fuzzy +#~ msgid "Keep resolvables" +#~ msgstr "배경 유지" + +#, fuzzy +#~ 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 add solvables to norepo." +#~ msgstr "압축 파일 자신을 더할 수 없습니다." + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "파일을 열 수 없습니다" + +#, fuzzy +#~ msgid "Can't set RepoInfo for norepo." +#~ msgstr "찾은 결과에 대한 바로가기를 설정할 수 있습니다." + +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "메일파일을 읽는 중 오류 발생: %s" #, fuzzy #~ msgid "%s conflicts with other resolvables" @@ -4751,10 +4659,6 @@ #~ msgstr "다시 설치해야 합니다." #, fuzzy -#~ msgid "Cannot install %s to fulfill the dependencies of %s" -#~ msgstr "의존성을 만족하지 못함:" - -#, fuzzy #~ msgid "%s will not be uninstalled, because it is still required" #~ msgstr "의존성을 만족하지 못함:" @@ -4765,6 +4669,7 @@ #, fuzzy #~ msgid ", Action: " #~ msgstr "작동" + #~ msgid "patch" #~ msgstr "패치" @@ -4798,4 +4703,3 @@ #, fuzzy #~ msgid "Ignore this requirement generally" #~ msgstr "해결할수 없는 요구사항..." - Modified: trunk/libzypp/po/lo.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/lo.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/lo.po (original) +++ trunk/libzypp/po/lo.po Mon Apr 28 15:25:19 2008 @@ -5,7 +5,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-01-04 08:58+0100\n" "Last-Translator: i18n@suse.de\n" "Language-Team: Lao \n" @@ -14,7 +14,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: " @@ -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 #, 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 "" @@ -104,12 +92,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 "" @@ -322,7 +310,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 "" @@ -586,7 +574,7 @@ msgid "Buginese" msgstr "" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -636,7 +624,7 @@ msgid "Cameroon" msgstr "" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 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 "Couldn't open file: %s." + #: ../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 "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 "" @@ -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 "" @@ -1065,10 +1045,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" @@ -1114,7 +1090,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 "" @@ -1226,10 +1202,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" @@ -1270,7 +1242,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 "" @@ -1280,7 +1252,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 "" @@ -1504,8 +1476,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: @@ -1796,26 +1768,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 @@ -1863,23 +1818,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 "" @@ -1953,7 +1892,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 "" @@ -2002,11 +1946,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" @@ -2132,10 +2071,6 @@ msgid "Kazakhstan" msgstr "" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2851,7 +2786,7 @@ msgid "No Code" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3074,14 +3009,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." @@ -3182,8 +3109,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 "" @@ -3211,16 +3138,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 "" @@ -3520,6 +3442,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" @@ -3755,7 +3682,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 "" @@ -3995,10 +3922,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'" @@ -4258,88 +4181,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 #, 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 "" - -#: ../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" @@ -4348,10 +4255,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 "" @@ -4364,68 +4269,62 @@ 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." Modified: trunk/libzypp/po/lt.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/lt.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/lt.po (original) +++ trunk/libzypp/po/lt.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-11-17 16:13+0300\n" "Last-Translator: Andrius Štikonas \n" "Language-Team: Lietuvių \n" @@ -20,7 +20,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.4\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -31,61 +31,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 konfliktuoja su %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 įdiegimas nesėkmingas" #. %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 įdiegtas sėkmingai" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, fuzzy, c-format msgid "%s is not installable" msgstr "neįdiegta" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, fuzzy, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s reikalingas %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 "" - -#. 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 "%s šalinimas nepavyko" #. 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 "" @@ -112,12 +100,12 @@ msgid "Adangme" msgstr "Ruožas" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, fuzzy, c-format msgid "Adding repository '%s'" msgstr "Pridedami resursai" -#: ../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 "Papildoma rpm išvestis:" @@ -344,7 +332,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 "" @@ -634,7 +622,7 @@ msgid "Buginese" msgstr "Kinų" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -688,7 +676,7 @@ msgid "Cameroon" msgstr "Kamerūnas" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 #, fuzzy msgid "Can not create sat-pool." msgstr "Nepavyksta sukurti failo." @@ -697,10 +685,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)." @@ -730,6 +714,11 @@ msgid "Can't initialize recursive mutex" msgstr "" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Nepavyksta atidaryti failo %1." + #: ../zypp/ExternalProgram.cc:174 #, fuzzy, c-format msgid "Can't open pipe (%s)." @@ -740,12 +729,7 @@ msgid "Can't open pty (%s)." msgstr "Nepavyksta atverti failo: %s." -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "Nepavyksta atidaryti failo %1." - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, fuzzy, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Niekas nepateikia %s" @@ -754,10 +738,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 "" @@ -863,7 +843,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 "Pakeisti %s konfigūracios failai:" @@ -1149,11 +1129,6 @@ msgid "Djibouti" msgstr "Džibutis" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -#, fuzzy -msgid "Do not install or delete the resolvables concerned" -msgstr "%1 konfliktuoja su %2" - #. language code: doi #: ../zypp/LanguageCode.cc:468 #, fuzzy @@ -1201,7 +1176,7 @@ msgstr "Dakaras" #. 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 "" @@ -1315,11 +1290,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "" -#: ../zypp/Repository.cc:141 -#, fuzzy -msgid "Error reading solv-file: " -msgstr "Klaida skaitant sektorių %u." - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1363,7 +1333,7 @@ msgid "Failed to delete key." msgstr "Nepavyko paleisti 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 "" @@ -1373,7 +1343,7 @@ msgid "Failed to mount %s on %s" msgstr "Nepavyksta atverti %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 "Nepavyksta gauti viešąjį raktą" @@ -1627,9 +1597,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 "turi neišsprendžiamų reikalavimų..." #. :GRD:308: @@ -1937,28 +1907,10 @@ msgstr "Ignoruoti" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145 -#, fuzzy, c-format -msgid "Ignore that %s is already set to install" -msgstr "Katalogas %1 jau yra sąraše." - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, fuzzy, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "%1 konfliktuoja su %2" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 #, fuzzy, c-format -msgid "Ignore this conflict of %s" -msgstr "%1 konfliktuoja su %2" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -#, fuzzy -msgid "Ignore this requirement just here" -msgstr "turi neišsprendžiamų reikalavimų..." +msgid "Ignore some dependencies of %s" +msgstr "nepavyksta išspręsti priklausomybių" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -2007,24 +1959,7 @@ msgid "Ingush" msgstr "Anglų" -#. 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 "Įdiegti trūkstamus paketus" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "" @@ -2099,7 +2034,12 @@ msgid "Invalid port component '%s'" msgstr "Klaidingas prievado komponentas „%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 "Klaidingas CA spaltažodis." @@ -2152,11 +2092,6 @@ msgid "Israel" msgstr "Izraelis" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Nepavyksta atidaryti failo %1." - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2293,11 +2228,6 @@ msgid "Kazakhstan" msgstr "Taivanis" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -#, fuzzy -msgid "Keep resolvables" -msgstr "Įdiegti trūkstamus paketus" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -3091,7 +3021,7 @@ msgid "No Code" msgstr "Ko&das" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 #, fuzzy msgid "No url in repository." msgstr "Pridedami resursai" @@ -3336,14 +3266,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." @@ -3447,8 +3369,8 @@ msgstr "Užklausos eilutės nagrinėjimas nepalaikomas šiam 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 "nepavyko" @@ -3480,16 +3402,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 "Pridedami resursai" -#: ../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 "" @@ -3815,6 +3732,11 @@ msgid "Solomon Islands" msgstr "Saliamono salos" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%s konfliktuoja su %s" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -4075,7 +3997,7 @@ msgid "Thailand" msgstr "Tailandas" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." msgstr "" @@ -4334,11 +4256,6 @@ msgid "Unknown language: " msgstr "Nežinoma kalba: " -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -#, fuzzy -msgid "Unlock these resolvables" -msgstr "%1 konfliktuoja su %2" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4624,89 +4541,73 @@ msgid "applydeltarpm failed." msgstr "applydeltarpm nepavyko." -#: ../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 "Negaliu įdiegti %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 "padaryta %s atsarginė kopija" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "Diegimas" -#. 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 "pašalinti %s" - -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 #, fuzzy msgid "deleted providers: " msgstr "Niekas nepateikia %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 konfliktuoja su %2" -#: ../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 "neįdiegti %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 "neįdiegti %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 "neįdiegta" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, fuzzy, c-format msgid "downgrade of %s to %s" msgstr "Atsiųsta %s iš %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 "įdiegti %s" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4715,10 +4616,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 "išlaikyti %s" @@ -4731,73 +4630,115 @@ 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 reikalingas %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, fuzzy, c-format msgid "nothing provides requested %s" msgstr "Niekas nepateikia %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 #, 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švestis:" #. %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 "Prieinami profiliai" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "atrakinti %s" +#, fuzzy +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "%1 konfliktuoja su %2" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 #, fuzzy -msgid "unlock all resolvables" -msgstr "%1 konfliktuoja su %2" +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Katalogas %1 jau yra sąraše." + +#, fuzzy +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "%1 konfliktuoja su %2" + +#, fuzzy +#~ msgid "Ignore this conflict of %s" +#~ msgstr "%1 konfliktuoja su %2" + +#, fuzzy +#~ msgid "Ignore this requirement just here" +#~ msgstr "turi neišsprendžiamų reikalavimų..." + +#, fuzzy +#~ msgid "Install missing resolvables" +#~ msgstr "Įdiegti trūkstamus paketus" + +#, fuzzy +#~ msgid "Keep resolvables" +#~ msgstr "Įdiegti trūkstamus paketus" + +#, fuzzy +#~ msgid "Unlock these resolvables" +#~ msgstr "%1 konfliktuoja su %2" + +#~ msgid "delete %s" +#~ msgstr "pašalinti %s" + +#~ msgid "install %s" +#~ msgstr "įdiegti %s" + +#~ msgid "unlock %s" +#~ msgstr "atrakinti %s" + +#, fuzzy +#~ msgid "unlock all resolvables" +#~ msgstr "%1 konfliktuoja su %2" + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Nepavyksta atidaryti failo %1." + +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "Klaida skaitant sektorių %u." #, fuzzy #~ msgid "Software management is already running." Modified: trunk/libzypp/po/mk.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/mk.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/mk.po (original) +++ trunk/libzypp/po/mk.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: 2001-07-17 16:12+0200\n" "Last-Translator: Зоран Димовски \n" "Language-Team: Macedonian \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 "" @@ -106,12 +94,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 "" @@ -353,7 +341,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 "" @@ -654,7 +642,7 @@ msgid "Buginese" msgstr "Кинески" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -707,7 +695,7 @@ msgid "Cameroon" msgstr "" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "" @@ -715,10 +703,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)." @@ -748,6 +732,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)." @@ -758,12 +747,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 "" @@ -772,10 +756,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 "" @@ -881,7 +861,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 "" @@ -1160,10 +1140,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" @@ -1212,7 +1188,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 "" @@ -1330,10 +1306,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" @@ -1377,7 +1349,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 "" @@ -1387,7 +1359,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 "" @@ -1627,8 +1599,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 "" # GE @@ -1938,26 +1910,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 @@ -2012,23 +1967,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 "" @@ -2102,7 +2041,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 "" @@ -2157,11 +2101,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" @@ -2302,10 +2241,6 @@ msgid "Kazakhstan" msgstr "Тајван" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -3101,7 +3036,7 @@ msgid "No Code" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3344,14 +3279,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." @@ -3459,8 +3386,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 "" @@ -3490,16 +3417,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 "" @@ -3821,6 +3743,11 @@ msgid "Solomon Islands" msgstr "Ирска" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "" + # SO # fuzzy #. language code: som so @@ -4087,7 +4014,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 "" @@ -4350,10 +4277,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'" @@ -4627,88 +4550,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 #, 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 "" - -#: ../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" @@ -4717,10 +4624,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 "" @@ -4733,71 +4638,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." # CL #, fuzzy Modified: trunk/libzypp/po/mr.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/mr.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/mr.po (original) +++ trunk/libzypp/po/mr.po Mon Apr 28 15:25:19 2008 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: Check hardware-2.0\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-13 12:55+0530\n" "Last-Translator: Priyavert Sharma \n" "Language-Team: AgreeYa Solutions \n" @@ -12,7 +12,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" @@ -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 "अतिरिक्त rpm आऊटपुट" @@ -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 #, 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 "फाईल उघडता येत नाही %1." -#: ../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 "संबंधित रिझॉल्व्हेबल्स स्थापित किंवा पुसून टाकू नका" - #. 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 "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 "" @@ -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 "सार्वजनिक की मिळवणे अशक्य" @@ -1523,9 +1493,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: @@ -1816,27 +1786,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 @@ -1883,23 +1836,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 "निर्देशानुसार स्थापना मधेच सोडली" @@ -1973,7 +1910,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 "" @@ -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 "ही रिझॉल्व्हेबल्स अनलॉक करा" - #: ../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 "%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 "% वरून % डाऊनलोड करत आहे" -#. 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,72 +4294,128 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr " libhal_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 ला %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" "Here are the first 25 lines of difference:\n" msgstr "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" "Here are the first 25 lines of difference:\n" msgstr "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/nb.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/nb.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/nb.po (original) +++ trunk/libzypp/po/nb.po Mon Apr 28 15:25:19 2008 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: zypp.nb\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-09-17 14:24+0200\n" "Last-Translator: Rune Nordbøe Skillingstad \n" "Language-Team: Norwegian\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 er i konflikt med %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 installasjon mislyktes" #. %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 installasjon ok" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, fuzzy, c-format msgid "%s is not installable" msgstr "ikke installert" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, fuzzy, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s forelder %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 oppfyller denne avhengigheten, men vil endre arkitekturen for det installerte elementet" - -#. 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 oppfyller denne avhengigheten, men vil endre leverandør av det installerte elementet" - #. %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 avinstallasjon mislyktes" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" msgstr "%s avinstallasjon 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 "" @@ -112,12 +100,12 @@ msgid "Adangme" msgstr "Adangme" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "Legger til arkiv '%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 "Flere rpm-resultater:" @@ -341,7 +329,7 @@ msgid "Austronesian (Other)" msgstr "Austronesisk (annet)" -#: ../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 "Autentisering kreves for '%s'" @@ -618,7 +606,7 @@ msgid "Buginese" msgstr "Buginesisk" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "Bygger arkivmellomlager '%s'" @@ -670,7 +658,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 "Kan ikke opprette filen." @@ -679,10 +667,6 @@ msgid "Can't acquire the mutex lock" msgstr "Kan ikke oppnå mutekslås" -#: ../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)." @@ -712,6 +696,11 @@ msgid "Can't initialize recursive mutex" msgstr "Kan ikke initialisere rekursiv muteks" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Kan ikke åpne filen %1." + #: ../zypp/ExternalProgram.cc:174 #, fuzzy, c-format msgid "Can't open pipe (%s)." @@ -722,12 +711,7 @@ msgid "Can't open pty (%s)." msgstr "Kunne ikke åpne filen: %s." -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "Kan ikke åpne filen %1." - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, fuzzy, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Kan ikke finne filen %s i arkivet %s" @@ -736,10 +720,6 @@ msgid "Can't release the mutex lock" msgstr "Kan ikke frigi mutekslås" -#: ../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 ikke angi rekursive muteksattributter" @@ -840,7 +820,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 "Endrede konfigurasjonsfiler for %s:" @@ -1108,10 +1088,6 @@ msgid "Djibouti" msgstr "Djibouti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "Ikke installer eller slett berørte nødvendige ressurser" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1157,7 +1133,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 "" @@ -1270,11 +1246,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "" -#: ../zypp/Repository.cc:141 -#, fuzzy -msgid "Error reading solv-file: " -msgstr "Feil under lesing av arkiv:" - # SY # fuzzy #. language code: myv @@ -1319,7 +1290,7 @@ msgid "Failed to delete key." msgstr "Kunne ikke starte VM-en." -#: ../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 "" @@ -1329,7 +1300,7 @@ msgid "Failed to mount %s on %s" msgstr "Kunnne ikke analysere: %s." -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, fuzzy, c-format msgid "Failed to remove public key %s: %s" msgstr "Kunne ikke hente offentlig nøkkel." @@ -1577,8 +1548,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 "Ignorerer dette kravet generelt" #. :GRD:308: @@ -1875,27 +1847,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 "Ignorer at %s allerede er valgt for installasjon" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "Ignorer foreldet %s i %s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 -#, c-format -msgid "Ignore this conflict of %s" -msgstr "Ignorerer denne konflikten for %s" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Ignorerer dette kravet, men bare her" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 +#, fuzzy, c-format +msgid "Ignore some dependencies of %s" +msgstr "kunne ikke løse avhengigheter" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1942,23 +1897,7 @@ msgid "Ingush" msgstr "Ingusj" -#. 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 "Installer %s selv om arkitekturen vil bli endret" - -#. 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 "Installer %s selv om arkitekturen vil bli endret" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Installer manglende nødvendige pakker" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "Installasjonen er avbrutt som angitt." @@ -2032,7 +1971,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 "" + +#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "Ugyldig brukernavn eller passord." @@ -2083,11 +2027,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 åpne filen %1." - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2217,10 +2156,6 @@ msgid "Kazakhstan" msgstr "Kasakhstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Behold nødvendige ressurser" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2970,7 +2905,7 @@ msgid "No Code" msgstr "Ingen kode" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "Ingen nettadresse i arkiv." @@ -3196,14 +3131,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 "Analyse av baneparameter støttes ikke for denne URL-en" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "Analyse av baneparameter støttes ikke for denne URL-en" - #: ../zypp/media/MediaException.cc:200 #, fuzzy, c-format msgid "Permission to access '%s' denied." @@ -3304,8 +3231,8 @@ msgstr "Analyse av spørringsstreng støttes ikke for denne URL-en" #. 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 "mislyktes" @@ -3336,16 +3263,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Relativ sti ikke tillatt hvis autoritet finnes" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, c-format msgid "Removing repository '%s'" msgstr "Fjerner arkivet '%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 "Mangler obligatorisk fil: " @@ -3653,6 +3575,11 @@ msgid "Solomon Islands" msgstr "Solomonøyene" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%s er i konflikt med %s" + # SO # fuzzy #. language code: som so @@ -3900,7 +3827,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 "" @@ -4149,10 +4076,6 @@ msgid "Unknown language: " msgstr "Ukjent språk: " -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "Fjern beskyttelse for disse nødvendige pakkene" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4423,90 +4346,74 @@ msgid "applydeltarpm failed." msgstr "applydeltarpm mislyktes." -#: ../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 ikke installere %s" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 #, fuzzy msgid "conflicting requests" msgstr "Forespørsel om tilkobling til: " #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" msgstr "opprettet sikkerhetskopi %s" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "Installasjon av %s mislyktes:" -#. 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 "slett %s" - -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 #, fuzzy msgid "deleted providers: " msgstr "Ingen pakker inneholder %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 "Ikke installer eller slett berørte nødvendige ressurser" -#: ../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 "Det er ingen installerbare pakker som inneholder %s" -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, fuzzy, c-format msgid "do not forbid installation of %s" msgstr "Ikke installer %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 "Ikke installer %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 "ikke installert" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, fuzzy, c-format msgid "downgrade of %s to %s" msgstr "Oppgraderer %s til %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 "installer %s" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4515,10 +4422,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 "behold %s" @@ -4531,34 +4436,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: Kan ikke angi dbus-tilkobling" -#: ../zypp/sat/SATResolver.cc:699 +#: ../zypp/solver/detail/SATResolver.cc:870 #, fuzzy, c-format msgid "nothing provides %s needed by %s" msgstr "%s kreves av %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, fuzzy, c-format msgid "nothing provides requested %s" msgstr "Ingen pakker inneholder %s" -#: ../zypp/sat/SATResolver.cc:685 +#: ../zypp/solver/detail/SATResolver.cc:856 #, fuzzy, c-format msgid "problem with installed package %s" msgstr "Problemer med å Installerer kildekodepakken %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 opprettet %s som %s, men det var umulig å finne noen forskjell" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2048 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4567,18 +4472,18 @@ "rpm opprettet %s som %s.\n" "Her er de 25 første avvikende linjene:\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-resultat:" #. %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 lagret %s som %s, men det var umulig å finne noen forskjell" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:2043 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -4587,20 +4492,72 @@ "rpm lagret %s som %s.\n" "Her er de 25 første avvikende linjene:\n" -#: ../zypp/sat/SATResolver.cc:759 +#: ../zypp/solver/detail/SATResolver.cc:935 #, fuzzy msgid "uninstallable providers: " msgstr "Det er ingen installerbare pakker som inneholder %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "fjern beskyttelse %s" +#~ msgid "%s provides this dependency, but would change the architecture of the installed item" +#~ msgstr "%s oppfyller denne avhengigheten, men vil endre arkitekturen for det installerte elementet" + +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s oppfyller denne avhengigheten, men vil endre leverandør av det installerte elementet" + +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "Ikke installer eller slett berørte nødvendige ressurser" + +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Ignorer at %s allerede er valgt for installasjon" + +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "Ignorer foreldet %s i %s" + +#~ msgid "Ignore this conflict of %s" +#~ msgstr "Ignorerer denne konflikten for %s" + +#~ msgid "Ignore this requirement just here" +#~ msgstr "Ignorerer dette kravet, men bare her" + +#~ msgid "Install %s although it would change the architecture" +#~ msgstr "Installer %s selv om arkitekturen vil bli endret" + +#~ msgid "Install %s although it would change the vendor" +#~ msgstr "Installer %s selv om arkitekturen vil bli endret" + +#~ msgid "Install missing resolvables" +#~ msgstr "Installer manglende nødvendige pakker" + +#~ msgid "Keep resolvables" +#~ msgstr "Behold nødvendige ressurser" + +#~ msgid "Unlock these resolvables" +#~ msgstr "Fjern beskyttelse for disse nødvendige pakkene" + +#~ msgid "delete %s" +#~ msgstr "slett %s" + +#~ msgid "install %s" +#~ msgstr "installer %s" + +#~ msgid "unlock %s" +#~ msgstr "fjern beskyttelse %s" + +#~ msgid "unlock all resolvables" +#~ msgstr "fjern beskyttelse for alle nødvendige pakker" + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Kan ikke åpne filen %1." + +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "Feil under lesing av arkiv:" + +#~ msgid "Path Parameter parsing not supported for this URL" +#~ msgstr "Analyse av baneparameter støttes ikke for denne URL-en" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "fjern beskyttelse for alle nødvendige pakker" +#~ msgid "Path parameter parsing not supported for this URL" +#~ msgstr "Analyse av baneparameter støttes ikke for denne URL-en" #~ msgid "Reading '%s' repository cache" #~ msgstr "Leser arkivmellomlager '%s'" Modified: trunk/libzypp/po/nl.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/nl.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/nl.po (original) +++ trunk/libzypp/po/nl.po Mon Apr 28 15:25:19 2008 @@ -15,7 +15,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: 2008-04-07 21:59+0200\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -25,7 +25,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: " @@ -38,61 +38,49 @@ msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr " SSL-certificaatprobleem, controleer of de CA-cert OK is voor '%s'." -#: ../zypp/sat/SATResolver.cc:709 +#: ../zypp/solver/detail/SATResolver.cc:880 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%s is in conflict met %s die geleverd is door %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 "Installeren van %s is mislukt" #. %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 is met succes geïnstalleerd" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, c-format msgid "%s is not installable" msgstr "%s is niet geïnstalleerd" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s maakt %s verouderd en is geleverd door %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 levert deze afhankelijkheid maar zou de architectuur van het geïnstalleerde item wijzigen." - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:93 -#, c-format -msgid "%s provides this dependency, but would change the vendor of the installed item" -msgstr "%s levert deze afhankelijkheid maar zou de uitgever van het geïnstalleerde item wijzigen." - #. %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 "Verwijderen van %s is mislukt" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" msgstr "%s is met succes verwijderd" -#: ../zypp/sat/SATResolver.cc:745 +#: ../zypp/solver/detail/SATResolver.cc:921 #, c-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "%s vereist %s, Maar aan deze eis kan niet voldaan worden" @@ -117,13 +105,13 @@ msgid "Adangme" msgstr "Adangme" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "Bron '%s' toevoegen" # /usr/lib/YaST2/clients/lan_inetd_custom.ycp:162 -#: ../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 "Aanvullende rpm-uitvoer:" @@ -337,7 +325,7 @@ msgid "Austronesian (Other)" msgstr "Austronesisch (Overige)" -#: ../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 "Authenticatie vereist voor '%s'" @@ -601,7 +589,7 @@ msgid "Buginese" msgstr "Buginees" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "Cache van bron '%s' bouwen" @@ -651,7 +639,7 @@ msgid "Cameroon" msgstr "Kameroen" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "Kan sat-pool niet aanmaken." @@ -659,10 +647,6 @@ msgid "Can't acquire the mutex lock" msgstr "Kan mutex-vergrendeling niet verkrijgen" -#: ../zypp/Repository.cc:130 ../zypp/Repository.cc:147 -msgid "Can't add solvables to norepo." -msgstr "Kan oplossingen niet toevoegen aan norepo." - #: ../zypp/ExternalProgram.cc:245 #, c-format msgid "Can't chdir to '/' inside chroot (%s)." @@ -692,6 +676,11 @@ msgid "Can't initialize recursive mutex" msgstr "Kan recursieve mutex niet initialiseren" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Het %d, kan blokkeringsbestand niet openen: %s" + #: ../zypp/ExternalProgram.cc:174 #, c-format msgid "Can't open pipe (%s)." @@ -702,11 +691,7 @@ msgid "Can't open pty (%s)." msgstr "Kon pty (%s) niet openen." -#: ../zypp/Repository.cc:136 -msgid "Can't open solv-file: " -msgstr "Kan solv-bestand niet openen:" - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Kan bestand '%s' niet leveren uit installatiebron '%s'" @@ -715,10 +700,6 @@ msgid "Can't release the mutex lock" msgstr "Kan mutex-vergrendeling niet ontgrendelen" -#: ../zypp/Repository.cc:101 -msgid "Can't set RepoInfo for norepo." -msgstr "Kan RepoInfo niet installen voor norepo." - #: ../zypp/thread/Mutex.cc:40 msgid "Can't set recursive mutex attribute" msgstr "Kan recursief mutex-kenmerk niet instellen" @@ -814,7 +795,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 "Configuratiebestanden gewijzigd voor %s:" @@ -1081,10 +1062,6 @@ msgid "Djibouti" msgstr "Djibouti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "Installeer of verwijder de desbetreffende oplossingspakketten niet" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1133,7 +1110,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 "Twijfelachtig type '%s' voor %u bytes checksum '%s'" @@ -1245,10 +1222,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "Fout bij het instellen downloadopties (curl) voor '%s':" -#: ../zypp/Repository.cc:141 -msgid "Error reading solv-file: " -msgstr "Fout bij lezen van solv-bestand: " - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1288,7 +1261,7 @@ msgid "Failed to delete key." msgstr "Verwijderen van sleutel is mislukt." -#: ../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 "Importeren van publieke sleutel uit bestand %s is mislukt: %s" @@ -1298,7 +1271,7 @@ msgid "Failed to mount %s on %s" msgstr "Annkoppelen van %s op %s is mislukt" -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "Verwijderen van publieke sleutel %s is mislukt: %s" @@ -1535,8 +1508,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 "Negeer deze vereiste normaliter" #. :GRD:308: @@ -1827,27 +1801,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 "Negeer dat %s al is ingesteld op installeren" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "Negeer oude %s in %s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 -#, c-format -msgid "Ignore this conflict of %s" -msgstr "Negeer dit conflict van %s" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Negeer deze vereiste hier" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 +#, fuzzy, c-format +msgid "Ignore some dependencies of %s" +msgstr "kon de afhankelijkheden niet oplossen" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1894,23 +1851,7 @@ msgid "Ingush" msgstr "Ingoesjetisch" -#. 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 installeren alhoewel het de architectuur zal wijzigen" - -#. 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 installeren alhoewel het de uitgever zal wijzigen" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Ontbrekende oplossingspakketten installeren" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "Installatie is afgebroken volgens de instructies." @@ -1984,7 +1925,12 @@ msgid "Invalid port component '%s'" msgstr "Ongeldige poortcomponent '%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 "Ongeldige gebruikersnaam of ongeldig wachtwoord." @@ -2033,11 +1979,6 @@ msgid "Israel" msgstr "Israël" -#: ../zypp/base/InterProcessMutex.cc:68 -#, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Het %d, kan blokkeringsbestand niet openen: %s" - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2163,10 +2104,6 @@ msgid "Kazakhstan" msgstr "Kazachstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Oplossingspakketten behouden" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2883,7 +2820,7 @@ msgid "No Code" msgstr "Geen code" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "Geen url in bron." @@ -3106,14 +3043,6 @@ msgid "Path '%s' on medium '%s' is not a file." msgstr "Patd '%s' op medium '%s' is geen bestand." -#: ../zypp/url/UrlBase.cc:1184 -msgid "Path Parameter parsing not supported for this URL" -msgstr "Parseren van padparameter wordt niet ondersteund voor deze URL" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "Parseren van padparameter wordt niet ondersteund voor deze URL" - #: ../zypp/media/MediaException.cc:200 #, c-format msgid "Permission to access '%s' denied." @@ -3214,8 +3143,8 @@ msgstr "Parseren van queryreeks wordt niet ondersteund voor deze 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 is mislukt: " @@ -3243,16 +3172,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Relatief pad is niet toegestaan als authority bestaat" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, c-format msgid "Removing repository '%s'" msgstr "Bron '%s' verwijderen" -#: ../zypp/Repository.cc:104 -#, c-format -msgid "RepoInfo alias (%s) does not match repository name (%s)" -msgstr "RepoInfo-alias (%s) komt niet overeen met naam installatiebron (%s)" - #: ../zypp/parser/susetags/RepoParser.cc:232 msgid "Required file is missing: " msgstr "Vereist bestand ontbreekt: " @@ -3552,6 +3476,11 @@ msgid "Solomon Islands" msgstr "Solomon Eilanden" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%s is in conflict met %s die geleverd is door %s" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3787,7 +3716,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 "Deze actie is al bezig vanuit een ander programma." @@ -4027,10 +3956,6 @@ msgid "Unknown language: " msgstr "Onbekende taal: " -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "Deze oplossingspakketten ontgrendelen" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4294,88 +4219,72 @@ msgid "applydeltarpm failed." msgstr "applydeltarpm mislukt." -#: ../zypp/sat/SATResolver.cc:951 +#: ../zypp/solver/detail/SATResolver.cc:1129 #, c-format msgid "architecture change of %s to %s" msgstr "architectuurverandering van %s naar %s" -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, c-format msgid "cannot install both %s and %s" msgstr "kan %s end %s niet beide installeren" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 msgid "conflicting requests" msgstr "conflicterende verzoeken" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" msgstr "reservekopie %s aangemaakt" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, c-format msgid "deinstallation of %s" msgstr "deïnstallatie van %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 "%s verwijderen" - -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 msgid "deleted providers: " msgstr "verwijderde leveranciers: " -#: ../zypp/sat/SATResolver.cc:899 +#: ../zypp/solver/detail/SATResolver.cc:1077 #, c-format msgid "do not ask to delete all solvables providing %s" msgstr "vraag niet om alle oplossingspakketten die %s leveren te verwijderen" -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "vraag niet om een oplossingspakket die %s levert te installeren" -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, c-format msgid "do not forbid installation of %s" msgstr "verbied de installatie van %s niet" -#. 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 niet installeren" -#: ../zypp/sat/SATResolver.cc:911 +#: ../zypp/solver/detail/SATResolver.cc:1089 #, c-format msgid "do not install most recent version of %s" msgstr "installeer de meest recente versie van %s niet" -#: ../zypp/sat/SATResolver.cc:811 +#: ../zypp/solver/detail/SATResolver.cc:989 #, c-format msgid "do not keep %s installed" msgstr "houd %s niet geïnstalleerd" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, c-format msgid "downgrade of %s to %s" msgstr "waardeer %s af tot %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 installeren" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4388,10 +4297,8 @@ "-->\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 behouden" @@ -4404,34 +4311,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: Kan dbus-verbinding niet instellen" -#: ../zypp/sat/SATResolver.cc:699 +#: ../zypp/solver/detail/SATResolver.cc:870 #, c-format msgid "nothing provides %s needed by %s" msgstr "niets levert %s nodig door %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, c-format msgid "nothing provides requested %s" msgstr "Niets levert het gevraagde %s" -#: ../zypp/sat/SATResolver.cc:685 +#: ../zypp/solver/detail/SATResolver.cc:856 #, c-format msgid "problem with installed package %s" msgstr "probleem met geïnstalleerd pakket %s" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" msgstr "vervanging van %s door %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 maakte %s aan als %s, maar het was niet mogelijk om het verschil te achterhalen" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2048 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4440,18 +4347,18 @@ "rpm maakt %s aan als %s.\n" "Dit zijn de eerste 25 regels die verschillen:\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-uitvoer:" #. %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 sloeg %s op als %s, maar het was niet mogelijk om het verschil te achterhalen" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:2043 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -4460,17 +4367,75 @@ "rpm sloeg %s op als %s.\n" "Dit zijn de eerste 25 regels die verschillend zijn:\n" -#: ../zypp/sat/SATResolver.cc:759 +#: ../zypp/solver/detail/SATResolver.cc:935 msgid "uninstallable providers: " msgstr "niet-installeerbare aanbieders: " -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "%s ontgrendelen" +#~ msgid "%s provides this dependency, but would change the architecture of the installed item" +#~ msgstr "%s levert deze afhankelijkheid maar zou de architectuur van het geïnstalleerde item wijzigen." + +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s levert deze afhankelijkheid maar zou de uitgever van het geïnstalleerde item wijzigen." + +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "Installeer of verwijder de desbetreffende oplossingspakketten niet" + +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Negeer dat %s al is ingesteld op installeren" + +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "Negeer oude %s in %s" + +#~ msgid "Ignore this conflict of %s" +#~ msgstr "Negeer dit conflict van %s" + +#~ msgid "Ignore this requirement just here" +#~ msgstr "Negeer deze vereiste hier" + +#~ msgid "Install %s although it would change the architecture" +#~ msgstr "%s installeren alhoewel het de architectuur zal wijzigen" + +#~ msgid "Install %s although it would change the vendor" +#~ msgstr "%s installeren alhoewel het de uitgever zal wijzigen" + +#~ msgid "Install missing resolvables" +#~ msgstr "Ontbrekende oplossingspakketten installeren" + +#~ msgid "Keep resolvables" +#~ msgstr "Oplossingspakketten behouden" + +#~ msgid "Unlock these resolvables" +#~ msgstr "Deze oplossingspakketten ontgrendelen" + +#~ msgid "delete %s" +#~ msgstr "%s verwijderen" + +#~ msgid "install %s" +#~ msgstr "%s installeren" + +#~ msgid "unlock %s" +#~ msgstr "%s ontgrendelen" + +#~ msgid "unlock all resolvables" +#~ msgstr "alle oplossingspakketten ontgrendelen" + +#~ msgid "Can't add solvables to norepo." +#~ msgstr "Kan oplossingen niet toevoegen aan norepo." + +#~ msgid "Can't open solv-file: " +#~ msgstr "Kan solv-bestand niet openen:" + +#~ msgid "Can't set RepoInfo for norepo." +#~ msgstr "Kan RepoInfo niet installen voor norepo." + +#~ msgid "Error reading solv-file: " +#~ msgstr "Fout bij lezen van solv-bestand: " + +#~ msgid "Path Parameter parsing not supported for this URL" +#~ msgstr "Parseren van padparameter wordt niet ondersteund voor deze URL" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "alle oplossingspakketten ontgrendelen" +#~ msgid "Path parameter parsing not supported for this URL" +#~ msgstr "Parseren van padparameter wordt niet ondersteund voor deze URL" +#~ msgid "RepoInfo alias (%s) does not match repository name (%s)" +#~ msgstr "RepoInfo-alias (%s) komt niet overeen met naam installatiebron (%s)" Modified: trunk/libzypp/po/pa.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pa.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/pa.po (original) +++ trunk/libzypp/po/pa.po Mon Apr 28 15:25:19 2008 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: zypp.pa\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-23 19:28+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Panjabi \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 msgid "" "\n" "uninstallable providers: " @@ -31,61 +31,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 -#, 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 "%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 "" @@ -110,12 +98,12 @@ msgid "Adangme" msgstr "ਅਡਾਨਗਮੀ" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, 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 ਆਉਟਪੁੱਟ:" @@ -328,7 +316,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 "'%s' ਲਈ ਪਰਮਾਣਿਕਤ ਲੋੜੀਦੀ ਹੈ" @@ -592,7 +580,7 @@ msgid "Buginese" msgstr "ਬੁਗੀਨੀਆ" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "ਰਿਪੋਜ਼ਟਰੀ '%s' ਕੈਚੇ ਬਿਲਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ" @@ -642,7 +630,7 @@ msgid "Cameroon" msgstr "ਕੈਮਰੂਨ" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 #, fuzzy msgid "Can not create sat-pool." msgstr "ਫਾਇਲ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ ਹੈ।" @@ -651,10 +639,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)." @@ -684,6 +668,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)." @@ -694,12 +683,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 "ਰਿਪੋਜ਼ਟਰੀ ਤੋਂ ਪਰੋਫਾਇਲ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ: " @@ -708,10 +692,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 "" @@ -808,7 +788,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 ਲਈ ਸੰਰਚਨਾ ਫਾਇਲਾਂ ਬਦਲੀਆਂ:" @@ -1074,10 +1054,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" @@ -1123,7 +1099,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 "" @@ -1236,11 +1212,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "" -#: ../zypp/Repository.cc:141 -#, fuzzy -msgid "Error reading solv-file: " -msgstr "ਰਿਪੋਜ਼ਟਰੀ ਤੋਂ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ:" - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1281,7 +1252,7 @@ msgid "Failed to delete key." msgstr "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 "" @@ -1291,7 +1262,7 @@ msgid "Failed to mount %s on %s" msgstr "ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਫੇਲ੍ਹ: %s।" -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, fuzzy, c-format msgid "Failed to remove public key %s: %s" msgstr "ਪਬਲਿਕ ਕੁੰਜੀ ਲੈਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।" @@ -1531,8 +1502,9 @@ msgid "Geez" msgstr "ਗਾਜ਼ਾ" -#: ../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 "ਆਮ ਤੌਰ ਉੱਤੇ ਇਹ ਲੋੜ ਅਣਡਿੱਠੀ ਕਰੋ" #. :GRD:308: @@ -1823,27 +1795,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 "" - -#. 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 +1845,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 "%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 +1919,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 "ਗਲਤ ਯੂਜ਼ਰ ਨਾਂ ਜਾਂ ਪਾਸਵਰਡ ਹੈ।" @@ -2029,11 +1973,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" @@ -2159,10 +2098,6 @@ msgid "Kazakhstan" msgstr "ਕਜ਼ਾਕਸਤਾਨ" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "ਹੱਲ-ਯੋਗ ਰੱਖੋ" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2878,7 +2813,7 @@ msgid "No Code" msgstr "ਕੋਡ ਨਹੀਂ" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "ਰਿਪੋਜ਼ਟਰੀ ਵਿੱਚ ਕੋਈ URL ਨਹੀਂ ਹੈ।" @@ -3102,14 +3037,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." @@ -3210,8 +3137,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 "ਫੇਲ੍ਹ" @@ -3240,16 +3167,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 "ਰਿਪੋਜ਼ਟਰੀ '%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 "ਲੋੜੀ ਫਾਇਲ ਗੁੰਮ ਹੈ: " @@ -3549,6 +3471,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" @@ -3784,7 +3711,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 "" @@ -4024,10 +3951,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'" @@ -4290,91 +4213,75 @@ 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 ਦਾ ਬੈਕਅੱਪ ਬਣਿਆ" # %s is either BOOTP or DHCP -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "%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 "%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 #, 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 "%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 +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 "%s ਰੱਖੋ" @@ -4399,72 +4304,103 @@ 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 "ਸੋਰਸ ਪੈਕੇਜ %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 "" #. %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 ਆਉਟਪੁੱਟ:" #. %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 "ਉਪਲੱਬਧ ਪਰੋਫਾਇਲ" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "%s ਅਣਲਾਕ" +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "ਇੰਸਟਾਲ ਕਰਨ ਲਈ ਸੈੱਟ ਕੀਤੇ ਉਸ %s ਨੂੰ ਅਣਡਿੱਠਾ ਕਰੋ" + +#~ msgid "Ignore this conflict of %s" +#~ msgstr "%s ਦਾ ਇਹ ਅਪਵਾਦ ਅਣਡਿੱਠਾ ਕਰੋ" + +#~ msgid "Ignore this requirement just here" +#~ msgstr "ਇਹ ਲੋੜ ਇੱਥੇ ਹੀ ਅਣਡਿੱਠੀ ਕਰੋ" + +#~ msgid "Install %s although it would change the vendor" +#~ msgstr "%s ਇੰਸਟਾਲ ਕਰੋ, ਭਾਵੇਂ ਇਹ ਵੇਂਡਰ ਬਦਲ ਦੇਵੇਗਾ" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "ਸਭ ਹੱਲਯੋਗ ਅਣਲਾਕ ਕਰੋ" +#~ 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 "ਰਿਪੋਜ਼ਟਰੀ ਤੋਂ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ:" #~ msgid "Reading '%s' repository cache" #~ msgstr "'%s' ਰਿਪੋਜ਼ਟਰੀ ਕੈਚੇ ਪੜ੍ਹੀ ਜਾ ਰਹੀ ਹੈ" Modified: trunk/libzypp/po/pl.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pl.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/pl.po (original) +++ trunk/libzypp/po/pl.po Mon Apr 28 15:25:19 2008 @@ -1,94 +1,85 @@ -# translation of zypp.po to +# translation of zypp.po to # translation of zypp.po to Polish # Polish message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2003 SuSE Linux AG. +# # Wojciech Kapusta , 2006. # Marek Stepien , 2006. -# +# wadim dziedzic , 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-19 00:38+0100\n" +"POT-Creation-Date: 2008-04-21 18:58+0200\n" +"PO-Revision-Date: 2008-04-24 00:08+0100\n" "Last-Translator: wadim dziedzic \n" -"Language-Team: \n" +"Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: KBabel 1.11.4\n" -#: ../zypp/sat/SATResolver.cc:757 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " -msgstr "Nie ma możliwych do instalacji dostawców %s" +msgstr "" +"\n" +"nieinstalowalni dostawcy: " #: ../zypp/media/MediaException.cc:214 #, c-format msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." -msgstr "" +msgstr "Problem z certyfikatem SSL, proszę sprawdzić, czy certyfikat CA jest odpowiedni dla \"%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 jest w konflikcie z %s" +msgstr "%s jest w konflikcie z %s dostarczonym przez %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 "Instalacja %s nie powiodła się" #. %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 "Pakiet %s poprawnie zainstalowany" -#: ../zypp/sat/SATResolver.cc:695 -#, fuzzy, c-format -msgid "%s is not installable" -msgstr "niezainstalowany" - -#: ../zypp/sat/SATResolver.cc:714 -#, fuzzy, c-format -msgid "%s obsoletes %s provided by %s" -msgstr "%s dezaktualizuje %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 dostarcza tę zależność, ale zmieniłby architekturę zainstalowanego elementu" +msgid "%s is not installable" +msgstr "%s jest nieinstalowalny" -#. 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 dostarcza tę zależność, ale zmieniłby dostawcę zainstalowanego elementu" +msgid "%s obsoletes %s provided by %s" +msgstr "%s dezaktualizuje %s dostarczony przez %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 "Usunięcie %s nie powiodło się" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" msgstr "Usunięcie %s powiodło się" -#: ../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 wymaga %s, lecz to wymaganie nie może zostać spełnione" #. language code: abk ab #: ../zypp/LanguageCode.cc:240 @@ -110,12 +101,12 @@ msgid "Adangme" msgstr "adangme" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "Dodawanie repozytorium \"%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 "Dodatkowe wyjście rpm:" @@ -334,7 +325,7 @@ msgid "Austronesian (Other)" msgstr "języki malajo-polinezyjskie" -#: ../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 "Wymagane uwierzytelnienie dla \"%s\"" @@ -375,11 +366,11 @@ #: ../zypp/media/MediaException.cc:47 #, c-format msgid "Bad file name: %s" -msgstr "" +msgstr "Błędna nazwa pliku: %s" #: ../zypp/media/MediaException.cc:77 msgid "Bad media attach point" -msgstr "" +msgstr "Błędny punkt dołączenia nośnika" # BS #. :BRA:076: @@ -608,7 +599,7 @@ msgid "Buginese" msgstr "bugijski" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "Budowanie pamięci podręcznej repozytorium \"%s\"" @@ -659,39 +650,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 "Nie można utworzyć pliku." +msgstr "Nie można utworzyć \"sat-pool\"" #: ../zypp/thread/Mutex.cc:77 msgid "Can't acquire the mutex lock" msgstr "Nie można pobrać blokady muteksu." -#: ../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 "Nie można zmienić katalogu na \"./\" wewnątrz chroot (%s)/" #: ../zypp/ExternalProgram.cc:238 #, c-format msgid "Can't chroot to '%s' (%s)." -msgstr "" +msgstr "Nie można wykonać chroot do \"%s\" (%s)/" #. don't want to get here #: ../zypp/ExternalProgram.cc:259 #, c-format msgid "Can't exec '%s' (%s)." -msgstr "" +msgstr "Nie można wykonać exec \"%s\" (%s)." #: ../zypp/ExternalProgram.cc:267 -#, fuzzy, c-format +#, c-format msgid "Can't fork (%s)." -msgstr "Nie można znaleźć %s." +msgstr "Nie można wykonać fork (%s)." #: ../zypp/thread/Mutex.cc:33 msgid "Can't initialize mutex attributes" @@ -701,34 +687,30 @@ msgid "Can't initialize recursive mutex" msgstr "Nie można zainicjować rekursyjnego muteksu" +#: ../zypp/base/InterProcessMutex.cc:79 +#, c-format +msgid "Can't open lock file: %s" +msgstr "Nie można otworzyć pliku blokady : %s" + #: ../zypp/ExternalProgram.cc:174 -#, fuzzy, c-format +#, c-format msgid "Can't open pipe (%s)." -msgstr "Utworzenie pliku %1 nie powiodło się." +msgstr "Nie można otworzyć pipe (%s)." #: ../zypp/ExternalProgram.cc:163 -#, fuzzy, c-format +#, c-format msgid "Can't open pty (%s)." -msgstr "Otwarcie pliku %s nie powiodło się." - -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "Utworzenie pliku %1 nie powiodło się." +msgstr "Nie można otworzyć pty (%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 " Nie można pobrać pliku %s z repozytorium %s." +msgstr " Nie można dostarczyć pliku %s z repozytorium %s." #: ../zypp/thread/Mutex.cc:87 msgid "Can't release the mutex lock" msgstr "Nie można zwolnic blokacy muteksu." -#: ../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 "Nie można ustawić atrybutu rekurencyjności muteksu" @@ -741,22 +723,21 @@ #: ../zypp/KeyRing.cc:276 #, c-format msgid "Cannot create public key %s from %s keyring to file %s" -msgstr "" +msgstr "Nie można utworzyć klucza publicznego %s z zestawu %s do pliku %s" #: ../zypp/media/MediaException.cc:182 -#, fuzzy msgid "Cannot eject any media" -msgstr "Nie można znaleźć żadnego schematu" +msgstr "Nie można wysunąć żadnego nośnika" #: ../zypp/media/MediaException.cc:184 -#, fuzzy, c-format +#, c-format msgid "Cannot eject media '%s'" -msgstr "NIe można otworzyć elementu pulpitu \"%s\"" +msgstr "Nie można wysunąć nośnika \"%s\"" #: ../zypp/media/MediaException.cc:67 -#, fuzzy, c-format +#, c-format msgid "Cannot write file '%s'." -msgstr "Zapis do pliku %1 nie powiódł się." +msgstr "Nie można zapisywać do pliku \"%s\"." #. :CUB:192: #: ../zypp/CountryCode.cc:275 @@ -827,7 +808,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 "Zmienione pliki konfiguracyjne dla %s:" @@ -925,17 +906,16 @@ #: ../zypp/ExternalProgram.cc:346 #, c-format msgid "Command exited with status %d." -msgstr "" +msgstr "Polecenie zakończone statusem %d." #: ../zypp/ExternalProgram.cc:371 -#, fuzzy msgid "Command exited with unknown error." -msgstr "Polecenie wykonywane podczas łączenia" +msgstr "Polecenie zakończone nieznanym błędem." #: ../zypp/ExternalProgram.cc:366 #, c-format msgid "Command was killed by signal %d (%s)." -msgstr "" +msgstr "Polecenie zakończone przez sygnał %d (%s)." #. :KIR:296: #: ../zypp/CountryCode.cc:339 @@ -1094,10 +1074,6 @@ msgid "Djibouti" msgstr "Dżibuti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "Nie instaluj ani nie usuwaj danych obiektów" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1125,12 +1101,15 @@ "Error code: %s\n" "Error message: %s\n" msgstr "" +"Błąd pobierania (curl) dla \"%s\":\n" +"Kod błędu: %s\n" +"Komunikat błędu: %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 "Inicjalizacja pobierania (curl) dla \"%s\" zakończona niepowodzeniem " #. language code: dra #: ../zypp/LanguageCode.cc:470 @@ -1143,10 +1122,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 "Podejrzany typ \"%s\" dla %u-bajtowej sumy kontrolnej \"%s\"" #. language code: dut nld nl #: ../zypp/LanguageCode.cc:478 ../zypp/LanguageCode.cc:480 @@ -1210,16 +1189,15 @@ #: ../zypp/media/MediaException.cc:135 msgid "Empty destination in URI" -msgstr "" +msgstr "Pusty cel w adresie URI" #: ../zypp/media/MediaException.cc:130 msgid "Empty filesystem in URI" -msgstr "" +msgstr "Pusty system plików w adresie URI" #: ../zypp/media/MediaException.cc:125 -#, fuzzy msgid "Empty host name in URI" -msgstr "Pusta nazwa CA." +msgstr "Pusta nazwa hosta w adresie URI." #: ../zypp/url/UrlUtils.cc:111 msgid "Encoded string contains a NUL byte" @@ -1254,12 +1232,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 "Błąd odczytu repozytoriów:" +msgstr "Napotkano błąd podczas ustawiania opcji pobierania (curl) dla \"%s\":" #. language code: myv #: ../zypp/LanguageCode.cc:850 @@ -1298,29 +1271,28 @@ msgstr "ewondo" #: ../zypp/KeyRing.cc:558 -#, fuzzy msgid "Failed to delete key." -msgstr "Uruchomienie maszyny wirtualnej nie powiodło się." +msgstr "Usunięcie klucza nie powiodło się." -#: ../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 "Nieudany import klucza publicznego z pliku %s: %s" #: ../zypp/media/MediaException.cc:31 -#, fuzzy, c-format +#, c-format msgid "Failed to mount %s on %s" -msgstr "Otwarcie %s nie powiodło się - %s\n" +msgstr "Montowanie %s na %s nie powiodło się" -#: ../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 "Uzyskanie klucza publicznego nie powiodło się." +msgstr "Usunięcie klucza publicznego nie powiodło się %s: %s" #: ../zypp/media/MediaException.cc:41 -#, fuzzy, c-format +#, c-format msgid "Failed to unmount %s" -msgstr "Wczytanie modułu \"%s\" nie powiodło się" +msgstr "Odmontowanie %s nie powiodło się" #. :FJI:242: #: ../zypp/CountryCode.cc:294 @@ -1422,9 +1394,9 @@ "Czy użyć go mimo to?" #: ../zypp/media/MediaException.cc:60 -#, fuzzy, c-format +#, c-format msgid "File '%s' not found on medium '%s'" -msgstr "Plik %1 nie został znaleziony w repozytorium." +msgstr "Plik \"%s\" nie został znaleziony na nośniku \"%s\"" #. language code: fil #: ../zypp/LanguageCode.cc:514 @@ -1447,9 +1419,8 @@ msgstr "ugrofińskie (inne)" #: ../zypp/solver/detail/ProblemSolutionCombi.cc:73 -#, fuzzy msgid "Following actions will be done:" -msgstr "Zaktualizowane zostaną następujące pakiety:\n" +msgstr "Wykonane zostaną następujące czynności:" #. language code: fon #: ../zypp/LanguageCode.cc:520 @@ -1553,9 +1524,9 @@ msgid "Geez" msgstr "ge'ez" -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65 -msgid "Generally ignore this requirement" -msgstr "Zignoruj ten wymóg ogólnie" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" +msgstr "Zignoruj ogólnie niektóre zależności" #. :GRD:308: #: ../zypp/CountryCode.cc:302 @@ -1847,27 +1818,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 "Zignoruj fakt, że %s jest już zaznaczony do instalacji" - -#. 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 "Zignoruj dezaktualizację %s w %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 "Zignoruj ten konflikt %s" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Zignoruj ten wymóg tylko tutaj" +msgid "Ignore some dependencies of %s" +msgstr "Zignoruj niektóre zależności %s" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1914,23 +1868,7 @@ msgid "Ingush" msgstr "inguski" -#. 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 "Zainstaluj %s pomimo, że zmieniłoby to architekturę" - -#. 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 "Zainstaluj %s pomimo, że zmieniłoby to dostawcę" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Zainstaluj brakujące pakiety" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "Instalacja przerwana zgodnie z życzeniem." @@ -2004,7 +1942,12 @@ msgid "Invalid port component '%s'" msgstr "Nieprawidłowy komponent 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 "Niepoprawne wyrażenie regularne \"%s\": regcomp zwróciło %d" + +#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "Błędna nazwa użytkownika lub hasło." @@ -2054,11 +1997,6 @@ msgid "Israel" msgstr "Izrael" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Utworzenie pliku %1 nie powiodło się." - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2187,10 +2125,6 @@ msgid "Kazakhstan" msgstr "Kazachstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Zachowaj rozwiązywalne pakiety" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2549,7 +2483,7 @@ #: ../zypp/media/MediaException.cc:115 msgid "Malformed URI" -msgstr "" +msgstr "Błędny adres URI" # ML #. :MKD:807: @@ -2663,21 +2597,21 @@ #: ../zypp/media/MediaException.cc:169 #, c-format msgid "Media source '%s' does not contain the desired medium" -msgstr "" +msgstr "Nośnik źródła \"%s\" nie zawiera żądanego nośnika" #: ../zypp/media/MediaException.cc:175 #, c-format msgid "Medium '%s' is in use by another instance" -msgstr "" +msgstr "Nośnik \"%s\" jest używany przez inną instację" #: ../zypp/media/MediaException.cc:72 msgid "Medium not attached" -msgstr "" +msgstr "Nośnik nie jest dołączony" #: ../zypp/media/MediaException.cc:53 #, c-format msgid "Medium not opened when trying to perform action '%s'." -msgstr "" +msgstr "Nieotwarty nośnik podczas próby wykonania czynności \"%s\"." #. language code: men #: ../zypp/LanguageCode.cc:808 @@ -2924,7 +2858,7 @@ msgid "No Code" msgstr "Bez kodu" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "W repozytorium nie ma żadnego adresu URL." @@ -3033,9 +2967,8 @@ msgstr "Oman" #: ../zypp/media/MediaException.cc:145 -#, fuzzy msgid "Operation not supported by medium" -msgstr "Wersja profilu nie jest obsługiwana przez moduł Apparmor\n" +msgstr "Operacja nie obsługiwana przez nośnik" # SY #. language code: ori or @@ -3140,27 +3073,19 @@ msgstr "Paragwaj" #: ../zypp/media/MediaException.cc:106 -#, fuzzy, c-format +#, c-format msgid "Path '%s' on medium '%s' is not a directory." -msgstr "%1 nie jest katalogiem." +msgstr "Ścieżka \"%s\" na nośniku \"%s\" nie wskazuje na katalog." #: ../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 "Analiza parametru ścieżki nie jest obsługiwana dla tego URL" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "Analiza parametru ścieżki nie jest obsługiwana dla tego adresu URL" +msgstr "Ścieżka \"%s\" na nośniku \"%s\" nie wskazuje na plik." #: ../zypp/media/MediaException.cc:200 -#, fuzzy, c-format +#, c-format msgid "Permission to access '%s' denied." -msgstr "Brak dostępu" +msgstr "Brak dostępu do \"%s\"." #. language code: per fas fa #: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 @@ -3257,11 +3182,10 @@ msgstr "Analiza zapytania nie jest obsługiwana dla tego adresu 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 "nieudany" +msgstr "Błąd RPM:" #. language code: roh rm #: ../zypp/LanguageCode.cc:970 @@ -3287,16 +3211,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Względna ścieżka nie jest dozwolona, jeśli usługa istnieje" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, c-format msgid "Removing repository '%s'" msgstr "Usuwanie repozytorium '%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 "Brak wymaganego pliku:" @@ -3522,9 +3441,9 @@ msgstr "języki migowe" #: ../zypp/KeyRing.cc:568 -#, fuzzy, c-format +#, c-format msgid "Signature file %s not found" -msgstr "Pakiet z kodem źródłowym \"%s\" nie został znaleziony." +msgstr "Nie znaleziono pliku sygnatury %s" #. language code: bla #: ../zypp/LanguageCode.cc:354 @@ -3601,6 +3520,11 @@ msgid "Solomon Islands" msgstr "Wyspy Salomona" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "El. rozwiązywalny %s jest w konflikcie z %s dostarczonym przez siebie" + # SO #. language code: som so #: ../zypp/LanguageCode.cc:1060 @@ -3759,12 +3683,12 @@ #: ../zypp/media/MediaException.cc:91 #, c-format msgid "System exception '%s' on medium '%s'." -msgstr "" +msgstr "Wyjątek systemowy \"%s\" na nośniku \"%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 "Zarządzanie systemem jest zablokowane przez aplikację z numerem pid %d. Proszę zamknąć tą aplikację i spróbowac ponownie." #. language code: tgl tl #: ../zypp/LanguageCode.cc:1108 @@ -3842,9 +3766,9 @@ msgid "Thailand" msgstr "Tajlandia" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." -msgstr "" +msgstr "Ta czynność jest już wykonywana przez inny program." # TW #. language code: tib bod bo @@ -3867,7 +3791,7 @@ #: ../zypp/media/MediaException.cc:207 #, c-format msgid "Timeout exceed when access '%s'." -msgstr "" +msgstr "Przekroczono limit czasu podczas dostępu do \"%s\"." #. language code: tem #: ../zypp/LanguageCode.cc:1100 @@ -3918,7 +3842,7 @@ #: ../zypp/KeyRing.cc:507 #, c-format msgid "Tried to import not existant key %s into keyring %s" -msgstr "" +msgstr "Próba importu nieistniejącego klucza %s do bazy kluczy %s" # TT #. :TUR:792: @@ -4089,19 +4013,15 @@ msgid "Unknown language: " msgstr "Nieznany język:" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "Odblokuj te pakiety rozwiązywalne" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" msgstr "Nieobsługiwana metoda uwierzytelniania HTTP: \"%s\"" #: ../zypp/media/MediaException.cc:140 -#, fuzzy, c-format +#, c-format msgid "Unsupported URI scheme in '%s'." -msgstr "Nieprawidłowy schemat URL \"%1\"." +msgstr "Nieobsługiwany schemat URI w \"%s\"." #: ../devel/devel.mvidner/installation_sources.cc:75 #, c-format @@ -4360,90 +4280,72 @@ msgid "applydeltarpm failed." msgstr "applydeltarpm zakończone niepowodzeniem." -#: ../zypp/sat/SATResolver.cc:951 +#: ../zypp/solver/detail/SATResolver.cc:1129 #, c-format msgid "architecture change of %s to %s" -msgstr "" +msgstr "zmiana architektury %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 "Nie można zainstalować %s" +msgstr "nie można zainstalować %s i %s na raz" -#: ../zypp/sat/SATResolver.cc:688 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:859 msgid "conflicting requests" -msgstr "Żądanie połączenie z:" +msgstr "sprzeczne żądania" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" msgstr "utworzono zapasowy %s" -#: ../zypp/sat/SATResolver.cc:978 -#, fuzzy, c-format -msgid "deinstallation of %s" -msgstr "Błąd podczas instalacji %s:" - -#. 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 "usuń %s" +msgid "deinstallation of %s" +msgstr "usunięcie %s" -#: ../zypp/sat/SATResolver.cc:747 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:923 msgid "deleted providers: " -msgstr "Żaden nie dostarcza %s" +msgstr "usunięci dostawcy:" -#: ../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 "Nie instaluj ani nie usuwaj danych obiektów" +msgstr "nie pytaj o usunięcie wszystkich elementów rozwiązywalnych dostarczających %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 "Nie ma możliwych do instalacji dostawców %s" +msgstr "nie pytaj o instalację wszystkich elementów rozwiązywalnych dostarczających %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 "nie instaluj %s" +msgstr "nie zakazuj instalacji %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 "nie instaluj %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 "nie instaluj najnowszej wersji %s" -#: ../zypp/sat/SATResolver.cc:811 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:989 +#, c-format msgid "do not keep %s installed" -msgstr "niezainstalowany" - -#: ../zypp/sat/SATResolver.cc:944 -#, fuzzy, c-format -msgid "downgrade of %s to %s" -msgstr "Aktualizacja %s do %s" +msgstr "nie utrzymuj %s zainstalowanego" -#. 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 "zainstaluj %s" +msgid "downgrade of %s to %s" +msgstr "przywróć %s do %s" -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4451,11 +4353,13 @@ "-->\n" " %s" msgstr "" +"zainstaluj %s (ze zmianą dostawcy)\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 "zachowaj %s" @@ -4468,34 +4372,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: nie można ustanowić połączenia 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 jest wymagany przez %s" +msgstr "żaden pakiet nie dostarcza %s wymaganego przez %s" -#: ../zypp/sat/SATResolver.cc:691 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:862 +#, c-format msgid "nothing provides requested %s" -msgstr "Żaden nie dostarcza %s" +msgstr "żaden pakiet nie dostarcza żądanego %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 podczas instalacji pakietu z kodem źródłowym %s-%s" +msgstr "problem z zainstalowanym pakietem %s" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" -msgstr "" +msgstr "zamiana %s na %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 utworzył %s jako %s, ale można było określić różnicy" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2048 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4504,18 +4408,18 @@ "rpm utworzył %s jako %s.\n" "Oto pierwszych 25 linii różnicy:\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 "Wyjście 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 zapisał %s jako %s, ale można było określić różnicy" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:2043 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -4524,399 +4428,70 @@ "rpm zapisał %s jako %s.\n" "Oto pierwszych 25 linii różnicy:\n" -#: ../zypp/sat/SATResolver.cc:759 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:935 msgid "uninstallable providers: " -msgstr "Nie ma możliwych do instalacji dostawców %s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "odblokuj %s" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "Odblokuj wszystkie pakiety rozwiązywalne" - -#~ msgid "Reading '%s' repository cache" -#~ msgstr "Wczytywanie pamięci podręcznej repozytorium \"%s\"" - -#~ msgid "Reading patch and delta rpms from '%s' repository cache" -#~ msgstr "Wczytywanie pakietów rpm z pamięci podręcznej repozytorium \"%s\"" - -#~ msgid "Cleaning repository '%s' cache" -#~ msgstr "Czyszczenie pamięci podręcznej repozytorium \"%s\"" - -#~ msgid "Reading repository '%s' cache" -#~ msgstr "Wczytywanie pamięci podręcznej repozytorium \"%s\"" - -#~ msgid "Software management is already running." -#~ msgstr "Demon zarządzania oprogramowaniem jest już uruchomiony" - -#~ msgid "%s is replaced by %s" -#~ msgstr "%s jest zastępowany przez %s" - -#~ msgid "%s replaced by %s" -#~ msgstr "%s zastąpiony przez %s" - -#~ msgid "%s will be deleted by the user.\n" -#~ msgstr "%s zostanie usunięty przez użytkownika.\n" - -#~ msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "%s zostanie usunięty przez inną aplikację. (ApplLow/ApplHigh)\n" - -#~ msgid "%s will be installed by the user.\n" -#~ msgstr "%s zostanie zainstalowany przez użytkownika.\n" - -#~ msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "%s zostanie zainstalowany przez inną aplikację. (ApplLow/ApplHigh)\n" - -#~ msgid "No valid solution found within %d seconds" -#~ msgstr "Brak rozwiązania w czasie %d sekund" - -#~ msgid "The solver has reached a defined timout" -#~ msgstr "Rozwiązywanie przekroczyło zadany czas" - -#~ msgid "No valid solution found with just resolvables of best architecture." -#~ msgstr "Brak rozwiązania z tylko z obiektami z najlepszą architekturą." - -#~ msgid "With this run only resolvables with the best architecture have been regarded.\n" -#~ msgstr "W tym przebiegu pod uwagę wzięto tylko obiekty z najlepszą architekturą.\n" - -#~ msgid "Regarding all possible resolvables takes time, but can come to a valid result." -#~ msgstr "Uwzględnienie wszystkich obiektów może dać poprawne rozwiązanie, ale wymaga czasu." - -#~ msgid "Invalid information" -#~ msgstr "Nieprawidłowa informacja" - -#~ msgid "%s is needed by other resolvables" -#~ msgstr "%s jest wymagany przez inne pakiety" - -#~ msgid "" -#~ "%s is needed by:\n" -#~ "%s" -#~ msgstr "" -#~ "%s jest wymagany przez:\n" -#~ "%s" - -#~ msgid "%s conflicts with other resolvables" -#~ msgstr "%s jest w konflikcie z innymi pakietami" - -#~ msgid "" -#~ "%s conflicts with:\n" -#~ "%s" -#~ msgstr "" -#~ "%s jest w konflikcie z:\n" -#~ "%s" - -#~ msgid "%s obsoletes other resolvables" -#~ msgstr "%s dezaktualizuje inne pakiety" - -#~ msgid "%s obsoletes:%s" -#~ msgstr "%s dezaktualizuje:%s" - -#~ msgid "" -#~ "\n" -#~ "These resolvables will be deleted from the system." -#~ msgstr "" -#~ "\n" -#~ "Te pakiety zostaną usunięte z systemu." - -#~ msgid "%s depends on other resolvables" -#~ msgstr "%s zależy od innych pakietów" - -#~ msgid "%s depends on %s" -#~ msgstr "%s zależy od %s" - -#~ msgid "%s depends on:%s" -#~ msgstr "%s zależy od:%s" - -#~ msgid "Child of" -#~ msgstr "Potomek" - -#~ msgid "" -#~ "\n" -#~ "There is no resource available which supports this requirement." -#~ msgstr "" -#~ "\n" -#~ "Nie ma dostępnego zasobu, który spełniałby te wymaganie." - -#~ msgid "Due to the problems described above/below, this resolution will not solve all dependencies" -#~ msgstr "Z powodu powyżej/poniżej opisanych problemów, rozwiązanie to nie będzie mogło zaspokoić wszystkich zależności" - -#~ msgid "Cannot install %s, because it is conflicting with %s" -#~ msgstr "Nie można zainstalować %s, ponieważ jest w konflikcie z %s" - -#~ msgid "%s is not installed and has been marked as uninstallable" -#~ msgstr "%s nie jest zainstalowany i został oznaczony jako nie do odinstalowania" - -#~ msgid "Cannot install %s due to dependency problems" -#~ msgstr "Nie można zainstalować %s z powodu problemów z zależnościami" - -#~ msgid "%s has unfulfilled requirements" -#~ msgstr "%s ma niespełnione wymagania" - -#~ msgid "%s has missing dependencies" -#~ msgstr "%s ma brakujące zależności" - -#~ msgid "%s cannot be installed due to missing dependencies" -#~ msgstr "%s nie może zostać zainstalowany z powodu brakujących zależności" - -#~ msgid "%s fulfills dependencies of %s but will be uninstalled" -#~ msgstr "%s spełnia zależności %s, ale zostanie odinstalowany" - -#~ msgid "%s fulfills dependencies of %s but will be kept on your system" -#~ msgstr "%s spełnia zależności %s, ale będzie pozostawiony" - -#~ msgid "No need to install %s" -#~ msgstr "Nie ma potrzeby instalować %s" - -#~ msgid "Cannot install %s to fulfill the dependencies of %s" -#~ msgstr "Nie można zainstalować %s by spełnić zależności %s" - -#~ msgid "Cannot install %s to fulfil the dependencies of %s" -#~ msgstr "Nie można zainstalować %s by spełnić zależności %s" - -#~ msgid "%s will not be uninstalled, because it is still required" -#~ msgstr "%s nie zostanie odinstalowany, ponieważ jest nadal wymagany" - -#~ msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." -#~ msgstr "%s dezaktualizuje %s, ale %s nie może zostać usunięty, ponieważ jest zablokowany." +msgstr "nieinstalowalni dostawcy:" -#~ msgid "Cannot install %s, because it is conflicting" -#~ msgstr "Nie można zainstalować %s, ponieważ jest w konflikcie" +#~ msgid "%s provides this dependency, but would change the architecture of the installed item" +#~ msgstr "%s dostarcza tę zależność, ale zmieniłby architekturę zainstalowanego elementu" -#~ msgid "%s is uninstallable due to conflicts with %s" -#~ msgstr "%s jest nie do odinstalowania z powodu konfliktu z %s" +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s dostarcza tę zależność, ale zmieniłby dostawcę zainstalowanego elementu" -#~ msgid "Requirememt %s cannot be fulfilled." -#~ msgstr "Wymaganie %s nie może być spełnione." +#~ msgid "Can't add solvables to norepo." +#~ msgstr "Nie można dodać elementów rozwiązywalnych do \"nonrepo\"/" -#~ msgid "for requiring %s for %s when upgrading %s" -#~ msgstr "dla wymagania %s dla %s, podczas aktualizacji %s" +#~ msgid "Can't open solv-file: " +#~ msgstr "Nie można otworzyć \"solv-file\": " -#~ msgid "%s is lacking the requirement %s" -#~ msgstr "w %s brakuje wymogu %s" +#~ msgid "Can't set RepoInfo for norepo." +#~ msgstr "Nie można ustawić RepoInfo dla norepo" -#~ msgid ", Action: " -#~ msgstr ", czynność: " +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "Nie instaluj ani nie usuwaj danych obiektów" -#~ msgid ", Trigger: " -#~ msgstr ", wyzwalacz: " - -#~ msgid "package" -#~ msgstr "pakiet" - -#~ msgid "selection" -#~ msgstr "wybór" - -#~ msgid "pattern" -#~ msgstr "wzorzec" - -#~ msgid "product" -#~ msgstr "produkt" - -#~ msgid "patch" -#~ msgstr "poprawka" - -#~ msgid "script" -#~ msgstr "skrypt" - -#~ msgid "message" -#~ msgstr "wiadomość" - -#~ msgid "atom" -#~ msgstr "atom" - -#~ msgid "system" -#~ msgstr "system" - -#~ msgid "Resolvable" -#~ msgstr "Pakiet rozwiązywalny" - -#~ msgid "Marking this resolution attempt as invalid." -#~ msgstr "Oznaczanie tej próby rozwiązania jako nieprawidłowej." - -#~ msgid "Marking resolvable %s as uninstallable" -#~ msgstr "Oznaczanie pakietu %s jako nie do odinstalowania" - -#~ msgid "%s is scheduled to be installed, but this is impossible due to dependency problems." -#~ msgstr "%s jest zaplanowany do instalacji, ale nie jest to możliwe z powodu problemów z zależnościami." - -#~ msgid "Can't install %s since it is already marked as needed to be uninstalled" -#~ msgstr "Nie można zainstalować %s, ponieważ jest już zaznaczony do usunięcia" - -#~ msgid "Can't install %s, because it does not apply to this system." -#~ msgstr "Nie można zainstalować %s, ponieważ nie dotyczy on tego systemu." - -#~ msgid "Can't install %s, because %s is already marked as needed to for installation" -#~ msgstr "Nie można zainstalować %s, ponieważ %s jest już zaznaczony do instalacji" - -#~ msgid "This would invalidate %s." -#~ msgstr "To unieważniłoby %s." - -#~ msgid "Establishing %s" -#~ msgstr "Ustalanie: %s" - -#~ msgid "Installing %s" -#~ msgstr "Instalowanie: %s" - -#~ msgid "Skipping %s: already installed" -#~ msgstr "Pomijanie %s: już zainstalowany" - -#~ msgid "There are no alternative providers of %s installed" -#~ msgstr "Brak zainstalowanych alternatywnych dostawców %s" - -#~ msgid "for %s" -#~ msgstr "dla: %s" - -#~ msgid "Upgrading to %s to avoid removing %s is not possible." -#~ msgstr "Aktualizacja do %s w celu uniknięcia usunięcia %s nie jest możliwa." - -#~ msgid "%s provides %s, but is scheduled to be uninstalled." -#~ msgstr "%s dostarcza %s, ale jest zaplanowany do usunięcia." - -#~ msgid "%s provides %s, but another version of that %s is already installed." -#~ msgstr "%s dostarcza %s, ale inna wersja %s jest już zainstalowana." - -#~ msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details." -#~ msgstr "%s dostarcza %s, ale jest nie do odinstalowania. Należy spróbować zainstalować go osobno, by uzyskać więcej informacji." - -#~ msgid "%s provides %s, but it is locked." -#~ msgstr "%s dostarcza %s, ale jest zablokowany." - -#~ msgid "%s provides %s, but is scheduled to be kept." -#~ msgstr "%s dostarcza %s, ale jest zaplanowany do pozostawienia" - -#~ msgid "%s provides %s, but has another architecture." -#~ msgstr "%s dostarcza %s, ale ma inną architekturę." - -#~ msgid "%s provides %s, but has another vendor (%s)." -#~ msgstr "%s dostarcza %s, ale ma innego dostawcę (%s)." - -#~ msgid "Can't satisfy requirement %s for %s" -#~ msgstr "Nie można spełnić wymogu %s dla %s" - -#~ msgid "%s is required by another resolvable selected for installation, so it won't be unlinked." -#~ msgstr "%s jest wymagany przez inny wybrany do instalacji obiekt, więc powiązanie nie będzie usunięte." - -#~ msgid "%s is required by another installed resolvable, so it won't be unlinked." -#~ msgstr "%s jest wymagany przez inny zainstalowany pakiet, więc powiązanie nie będzie usunięte." - -#~ msgid "%s is locked and cannot be uninstalled." -#~ msgstr "%s jest zablokowany i nie może być odinstalowany." - -#~ msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation" -#~ msgstr "Konflikt dotyczący %s (%s) wymaga usunięcia pakietu %s planowanego do instalacji" - -#~ msgid "Marking %s as uninstallable due to conflicts over %s" -#~ msgstr "Oznaczanie %s jako nie do usunięcia z powodu konfliktów dotyczących %s" - -#~ msgid "from %s" -#~ msgstr "z %s" - -#~ msgid " Error!" -#~ msgstr " Błąd!" - -#~ msgid " Important!" -#~ msgstr " Ważne!" - -#~ msgid "Make a solver run with ALL possibilities." -#~ msgstr "Uruchom rozwiązywanie z WSZYSTKIMI możliwościami" - -#~ msgid "Regarding all resolvables with a compatible architecture." -#~ msgstr "Z uwzględnieniem wszystkich obiektów o kompatybilnej architekturze." - -#~ msgid "Make a solver run with best architecture only." -#~ msgstr "Uruchamia rozwiązywanie z tylko z najlepszą architekturą." - -#~ msgid "Regarding resolvables with best architecture only." -#~ msgstr "Z uwzględnieniem obiektów o najlepszej architekturze." - -#~ msgid "%s depended on %s" -#~ msgstr "%s zależał od %s" - -#~ msgid "%s is recommended by %s" -#~ msgstr "%s zalecany przez %s" - -#~ msgid "%s is suggested by %s" -#~ msgstr "%s sugerowany przez %s" - -#~ msgid "%s will be evaluated for installation (freshened) by %s" -#~ msgstr "%s zostanie odświeżone przez %s" - -#~ msgid "%s is enhanced by %s" -#~ msgstr "%s jest rozszerzany przez %s" - -#~ msgid "%s is supplemented by %s" -#~ msgstr "%s jest uzupełniany przez %s" - -#~ msgid "%s part of %s" -#~ msgstr "%s jest częścią %s" - -#~ msgid "Double timeout" -#~ msgstr "Podwójny limit czasu" - -#~ msgid "Start the next solver run with doubled timeout." -#~ msgstr "Uruchom rozwiązywanie z podwojonym limitem czasu." - -#~ msgid "%s is freshened by %s" -#~ msgstr "%s jest odświeżany przez %s" - -#~ msgid "Unable to parse Url authority" -#~ msgstr "Analiza nadrzędnego adresu URL nie powiodła się" - -#~ msgid "Ignore this requirement generally" -#~ msgstr "Zignoruj ten wymóg globalnie" - -#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked." -#~ msgstr "%s jest wymagany przez inny pakiet do zainstalowania, więc powiązanie nie będzie usunięte." - -#~ msgid "Cannot create a file needed to perform update installation." -#~ msgstr "Nie można utworzyć pliku wymaganego do instalacji uaktualnienia." - -#~ msgid "Unable to restore all sources." -#~ msgstr "Nie udało się odtworzyć wszystkich źródeł." +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "Błąd odczytu repozytoriów:" -#~ msgid "At least one source already registered, stored sources cannot be restored." -#~ msgstr "Przynajmniej jedno źródło jest już zarejestrowane, nie można odtworzyć przechowywanych źródeł." +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Zignoruj fakt, że %s jest już zaznaczony do instalacji" -#~ msgid "Cannot be install %s to fulfil the dependencies of %s" -#~ msgstr "Nie można zainstalować %s by spełnić zależności %s" +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "Zignoruj dezaktualizację %s w %s" -#~ msgid "%s dependend on %s" -#~ msgstr "%s zależny od %s" +#~ msgid "Ignore this requirement just here" +#~ msgstr "Zignoruj ten wymóg tylko tutaj" -#~ msgid "Reading index files" -#~ msgstr "Wczytywanie plików indeksu" +#~ msgid "Install %s although it would change the architecture" +#~ msgstr "Zainstaluj %s pomimo, że zmieniłoby to architekturę" -#~ msgid "The signed repomd.xml file failed the signature check." -#~ msgstr "Weryfikacja podpisu pliku repomd.xml zakończona niepowodzeniem." +#~ msgid "Install %s although it would change the vendor" +#~ msgstr "Zainstaluj %s pomimo, że zmieniłoby to dostawcę" -#~ msgid "Reading product from %s" -#~ msgstr "Wczytywanie produktu z %s" +#~ msgid "Install missing resolvables" +#~ msgstr "Zainstaluj brakujące pakiety" -#~ msgid "Reading filelist from %s" -#~ msgstr "Wczytywanie listy plików z %s" +#~ msgid "Keep resolvables" +#~ msgstr "Zachowaj rozwiązywalne pakiety" -#~ msgid "Reading packages from %s" -#~ msgstr "Wczytywanie pakietów z %s" +#~ msgid "Path Parameter parsing not supported for this URL" +#~ msgstr "Analiza parametru ścieżki nie jest obsługiwana dla tego URL" -#~ msgid "Reading selection from %s" -#~ msgstr "Wczytywanie wyboru z %s" +#~ msgid "Path parameter parsing not supported for this URL" +#~ msgstr "Analiza parametru ścieżki nie jest obsługiwana dla tego adresu URL" -#~ msgid "Reading pattern from %s" -#~ msgstr "Wczytywanie wzorców z %s" +#~ msgid "Unlock these resolvables" +#~ msgstr "Odblokuj te pakiety rozwiązywalne" -#~ msgid "Reading patches index %s" -#~ msgstr "Wczytywanie indeksu poprawek %s" +#~ msgid "delete %s" +#~ msgstr "usuń %s" -#~ msgid "Reading patch %s" -#~ msgstr "Wczytywanie poprawki %s" +#~ msgid "install %s" +#~ msgstr "zainstaluj %s" -#~ msgid "The script file failed the checksum test." -#~ msgstr "Niepoprawna suma kontrolna pliku skryptu." +#~ msgid "unlock %s" +#~ msgstr "odblokuj %s" -#~ msgid "Reading packages file" -#~ msgstr "Wczytywanie pliku pakietów" +#~ msgid "unlock all resolvables" +#~ msgstr "Odblokuj wszystkie pakiety rozwiązywalne" Modified: trunk/libzypp/po/pt.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pt.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/pt.po (original) +++ trunk/libzypp/po/pt.po Mon Apr 28 15:25:19 2008 @@ -12,18 +12,17 @@ msgstr "" "Project-Id-Version: zypp.pt\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-04-08 21:37+0100\n" "Last-Translator: Antonio Cardoso Martins \n" -"Language-Team: Portuguese \n" +"Language-Team: Portuguese \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:933 msgid "" "\n" "uninstallable providers: " @@ -36,61 +35,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 em conflicto com %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 "Falhou a instalação de %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 instalado com sucesso" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, fuzzy, c-format msgid "%s is not installable" msgstr "não instalado" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, fuzzy, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s obsoleto %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 fornece esta dependência mas alteraria a arquitectura do item instalado" - -#. 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 fornece esta dependência mas alteraria o fabricante do item instalado" - #. %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 "Falha ao remover %s " #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" msgstr "%s removido com sucesso" -#: ../zypp/sat/SATResolver.cc:745 +#: ../zypp/solver/detail/SATResolver.cc:921 #, c-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" @@ -115,12 +102,12 @@ msgid "Adangme" msgstr "Adangme" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "A Adicionar repositório '%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 "Resultado adicional do rpm:" @@ -346,7 +333,7 @@ msgid "Austronesian (Other)" msgstr "Austronésio (Outro)" -#: ../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 "Autenticação requerida para '%s'" @@ -631,7 +618,7 @@ msgid "Buginese" msgstr "Buginese" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "A construir a cache do repositório '%s'" @@ -685,7 +672,7 @@ msgid "Cameroon" msgstr "Camarões" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 #, fuzzy msgid "Can not create sat-pool." msgstr "Não é possível criar o ficheiro." @@ -694,10 +681,6 @@ msgid "Can't acquire the mutex lock" msgstr "Não foi possível adquirir o bloqueio da 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)." @@ -727,6 +710,11 @@ msgid "Can't initialize recursive mutex" msgstr "Não é possível inicializar a mutex recursiva" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Não é possível abrir ficheiro %1." + #: ../zypp/ExternalProgram.cc:174 #, fuzzy, c-format msgid "Can't open pipe (%s)." @@ -737,12 +725,7 @@ msgid "Can't open pty (%s)." msgstr "Não foi possível abrir o ficheiro: %s." -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "Não é possível abrir ficheiro %1." - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, fuzzy, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Não é possível fornecer o ficheiro %s do repositório %s" @@ -751,10 +734,6 @@ msgid "Can't release the mutex lock" msgstr "Não foi possível libertar o bloqueio da 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 "Não é possível definir o atributo da mutex recursiva" @@ -856,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 "Ficheiros de configuração modificados para %s:" @@ -1133,10 +1112,6 @@ msgid "Djibouti" msgstr "Jibuti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "Não instalar ou apagar os resolúveis em causa" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1183,7 +1158,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 "" @@ -1299,11 +1274,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "" -#: ../zypp/Repository.cc:141 -#, fuzzy -msgid "Error reading solv-file: " -msgstr "Erro na leitura dos repositórios:" - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1345,7 +1315,7 @@ msgid "Failed to delete key." msgstr "Falha na iniciação da MV." -#: ../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 "" @@ -1355,7 +1325,7 @@ msgid "Failed to mount %s on %s" msgstr "Falha na interpretação de %s." -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, fuzzy, c-format msgid "Failed to remove public key %s: %s" msgstr "Não é possível obter a chave pública." @@ -1609,8 +1579,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 "Ignorar geralmente este requisito" #. :GRD:308: @@ -1918,27 +1889,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 "Ignorar que %s já se encontra definido para instalar" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "A ignorar o %s obsoleto por %s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 -#, c-format -msgid "Ignore this conflict of %s" -msgstr "A ignorar este conflito de %s" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Ignorar este requisito apenas aqui" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 +#, fuzzy, c-format +msgid "Ignore some dependencies of %s" +msgstr "não foi possível resolver as dependências" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1985,23 +1939,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 "instalar %s apesar de alterar a arquitectura" - -#. 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 "Instalar %s apesar de ir alterar o fabricante" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Instalar resolúveis em falta" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "A instalação foi interrompida conforme indicado." @@ -2076,7 +2014,12 @@ msgid "Invalid port component '%s'" msgstr "Componente de porto invá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 "" + +#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "Nome de utilizador ou palavra passe inválidos." @@ -2125,11 +2068,6 @@ msgid "Israel" msgstr "Israel" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Não é possível abrir ficheiro %1." - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2258,10 +2196,6 @@ msgid "Kazakhstan" msgstr "Cazaquistão" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Manter resolúveis" - # name for KEN #. :JPN:392: #: ../zypp/CountryCode.cc:335 @@ -3037,7 +2971,7 @@ msgid "No Code" msgstr "Sem Código" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "Nenhum url no repositório." @@ -3270,14 +3204,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 "Interpretação de parâmetros de caminho não é suportada para este URL" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "A interpretação de parâmetros de caminho não são suportados para este URL" - #: ../zypp/media/MediaException.cc:200 #, fuzzy, c-format msgid "Permission to access '%s' denied." @@ -3379,8 +3305,8 @@ msgstr "Interpretação da cadeia de interrogação não é suportado para este 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 "falhou" @@ -3410,16 +3336,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Caminho relativo não é permitido se a autoridade existe" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, c-format msgid "Removing repository '%s'" msgstr "A remover o repositório '%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 "Está em falta um ficheiro necessário: " @@ -3740,6 +3661,11 @@ msgid "Solomon Islands" msgstr "Ilhas Salomão" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%s em conflicto com %s" + # name for SOM #. language code: som so #: ../zypp/LanguageCode.cc:1060 @@ -3986,7 +3912,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 "" @@ -4243,10 +4169,6 @@ msgid "Unknown language: " msgstr "Idioma desconhecido: " -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "destrancar estes resolúveis" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4517,90 +4439,74 @@ msgid "applydeltarpm failed." msgstr "falhou o 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 "Não foi possível instalar %s" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 #, fuzzy msgid "conflicting requests" msgstr "Solicitação de ligação a: " #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" msgstr "Criar Cópia de Segurança %s" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "A instalação de %s falhou:" -#. 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 "apagar %s" - -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 #, fuzzy msgid "deleted providers: " msgstr "Não fornece %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 "Não instalar ou apagar os resolúveis em causa" -#: ../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 "Não esta instalado nenhum pacote que forneça %s" -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, fuzzy, c-format msgid "do not forbid installation of %s" msgstr "não instalar %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 "não instalar %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 "não instalado" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, fuzzy, c-format msgid "downgrade of %s to %s" msgstr "A actualizar %s para %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 "instalar %s" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4609,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 "manter %s" @@ -4625,34 +4529,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: Não é possível definir a ligação dbus" -#: ../zypp/sat/SATResolver.cc:699 +#: ../zypp/solver/detail/SATResolver.cc:870 #, fuzzy, c-format msgid "nothing provides %s needed by %s" msgstr "%s necessita o %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, fuzzy, c-format msgid "nothing provides requested %s" msgstr "Não fornece %s" -#: ../zypp/sat/SATResolver.cc:685 +#: ../zypp/solver/detail/SATResolver.cc:856 #, fuzzy, c-format msgid "problem with installed package %s" msgstr "Problema ao instalar o pacote de código %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 "o rpm %s foi criado como %s, mas foi impossível determinar a diferença" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2048 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4661,18 +4565,18 @@ "o rpm %s foi criado com %s.\n" "Tem as primeiras 25 linhas diferentes:\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 "Resultado do 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 "o rpm %s foi guardado como %s, mas foi impossível determinar a diferença" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:2043 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -4681,18 +4585,69 @@ "o rpm %s foi guardado com %s.\n" "Tem as primeiras 25 linhas diferentes:\n" -#: ../zypp/sat/SATResolver.cc:759 +#: ../zypp/solver/detail/SATResolver.cc:935 #, fuzzy msgid "uninstallable providers: " msgstr "Não esta instalado nenhum pacote que forneça %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "destrancar %s" +#~ msgid "%s provides this dependency, but would change the architecture of the installed item" +#~ msgstr "%s fornece esta dependência mas alteraria a arquitectura do item instalado" + +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s fornece esta dependência mas alteraria o fabricante do item instalado" + +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "Não instalar ou apagar os resolúveis em causa" + +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Ignorar que %s já se encontra definido para instalar" + +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "A ignorar o %s obsoleto por %s" + +#~ msgid "Ignore this conflict of %s" +#~ msgstr "A ignorar este conflito de %s" + +#~ msgid "Ignore this requirement just here" +#~ msgstr "Ignorar este requisito apenas aqui" + +#~ msgid "Install %s although it would change the architecture" +#~ msgstr "instalar %s apesar de alterar a arquitectura" + +#~ msgid "Install %s although it would change the vendor" +#~ msgstr "Instalar %s apesar de ir alterar o fabricante" + +#~ msgid "Install missing resolvables" +#~ msgstr "Instalar resolúveis em falta" + +#~ msgid "Keep resolvables" +#~ msgstr "Manter resolúveis" + +#~ msgid "Unlock these resolvables" +#~ msgstr "destrancar estes resolúveis" + +#~ msgid "delete %s" +#~ msgstr "apagar %s" + +#~ msgid "install %s" +#~ msgstr "instalar %s" + +#~ msgid "unlock %s" +#~ msgstr "destrancar %s" + +#~ msgid "unlock all resolvables" +#~ msgstr "destrancar todos os resolúveis" + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Não é possível abrir ficheiro %1." + +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "Erro na leitura dos repositórios:" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "destrancar todos os resolúveis" +#~ msgid "Path Parameter parsing not supported for this URL" +#~ msgstr "Interpretação de parâmetros de caminho não é suportada para este URL" +#~ msgid "Path parameter parsing not supported for this URL" +#~ msgstr "A interpretação de parâmetros de caminho não são suportados para este URL" Modified: trunk/libzypp/po/pt_BR.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/pt_BR.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/pt_BR.po (original) +++ trunk/libzypp/po/pt_BR.po Mon Apr 28 15:25:19 2008 @@ -1,4 +1,4 @@ -# translation of zypp.po to Português Brasileiro +# translation of zypp.po to Brazilian Portuguese # Portugese (Brasilian) message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002 SuSE Linux AG. @@ -7,88 +7,80 @@ # Karl Eichwalder , 1999. # Ralf Lanz , 1999. # Isis Binder , 2008. +# Luiz Fernando Ranghetti , 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: 2008-04-05 21:20-0300\n" +"POT-Creation-Date: 2008-04-21 18:58+0200\n" +"PO-Revision-Date: 2008-04-28 02:50-0300\n" "Last-Translator: Luiz Fernando Ranghetti \n" -"Language-Team: Português Brasileiro \n" +"Language-Team: Brazilian Portuguese \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" +"X-Poedit-Language: Portuguese\n" +"X-Poedit-Country: BRAZIL\n" +"X-Poedit-SourceCharset: utf-8\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " msgstr "" "\n" -"provedores de não-instaláveis: " +"forncedores de não-instaláveis: " #: ../zypp/media/MediaException.cc:214 #, c-format msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr " Problema no certificado SSL, verifque se a certificação CA está correta para '%s'." -#: ../zypp/sat/SATResolver.cc:709 +#: ../zypp/solver/detail/SATResolver.cc:880 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%s conflita com %s, fornecido por %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 "Falha na instalação de %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 instalado com êxito" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, c-format msgid "%s is not installable" msgstr "%s não pode ser instalado" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s torna obsoleto %s, fornecido por %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 fornece esta dependência, porém mudaria a arquitetura do item instalado" - -#. 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 fornece esta dependência, porém mudaria o fabricante do item instalado" - #. %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 "Falha na remoção de %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" msgstr "%s removido com êxito" -#: ../zypp/sat/SATResolver.cc:745 +#: ../zypp/solver/detail/SATResolver.cc:921 #, c-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "%s requer %s, mas este requisito não pode ser fornecido" @@ -113,13 +105,13 @@ msgid "Adangme" msgstr "Circassiano" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "Adicionando repositório '%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 "Saída de rpm adicional:" @@ -334,8 +326,8 @@ msgid "Austronesian (Other)" msgstr "Austronésio (Outros)" -#: ../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 "Autenticação necessária para '%s'" @@ -600,7 +592,7 @@ msgid "Buginese" msgstr "Buginês" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "Construindo cache do repositório '%s'" @@ -651,77 +643,70 @@ msgid "Cameroon" msgstr "Camarões" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." -msgstr "Impossível criar o sat-pool." +msgstr "Não foi possível criar o sat-pool." #: ../zypp/thread/Mutex.cc:77 msgid "Can't acquire the mutex lock" -msgstr "Impossível adquirir o bloqueio mutex" - -#: ../zypp/Repository.cc:130 -#: ../zypp/Repository.cc:147 -msgid "Can't add solvables to norepo." -msgstr "Impossível adicionar resolvíveis a nenhum repositório." +msgstr "Não foi possível adquirir o bloqueio mutex" #: ../zypp/ExternalProgram.cc:245 #, c-format msgid "Can't chdir to '/' inside chroot (%s)." -msgstr "Impossível mudar diretório para '/' dentro do chroot (%s)" +msgstr "Não foi possível mudar o diretório para '/' dentro do chroot (%s)" #: ../zypp/ExternalProgram.cc:238 +#, c-format msgid "Can't chroot to '%s' (%s)." -msgstr "Impossível executar chroot em '%s' (%s)." +msgstr "Não foi possível executar o chroot em '%s' (%s)." #. don't want to get here #: ../zypp/ExternalProgram.cc:259 #, c-format msgid "Can't exec '%s' (%s)." -msgstr "Impossível executar '%s' (%s)" +msgstr "Não foi possível executar '%s' (%s)" #: ../zypp/ExternalProgram.cc:267 #, c-format msgid "Can't fork (%s)." -msgstr "Impossível dividir (%s)." +msgstr "Não foi possível dividir (%s)." #: ../zypp/thread/Mutex.cc:33 msgid "Can't initialize mutex attributes" -msgstr "Impossível inicializar atributos de mutex" +msgstr "Não foi possível inicializar os atributos do mutex" #: ../zypp/thread/Mutex.cc:47 msgid "Can't initialize recursive mutex" -msgstr "Impossível inicializar mutex recursivo" +msgstr "Não foi possível inicializar o mutex recursivo" + +#: ../zypp/base/InterProcessMutex.cc:79 +#, c-format +msgid "Can't open lock file: %s" +msgstr "Não foi possível abrir o arquivo de trava: %s" #: ../zypp/ExternalProgram.cc:174 #, c-format msgid "Can't open pipe (%s)." -msgstr "Impossível abrir o pipe (%s)." +msgstr "Não foi possível abrir o pipe (%s)." #: ../zypp/ExternalProgram.cc:163 #, c-format msgid "Can't open pty (%s)." -msgstr "Impossível abrir pty (%s)." +msgstr "Não foi possível abrir o pty (%s)." -#: ../zypp/Repository.cc:136 -msgid "Can't open solv-file: " -msgstr "Impossível abrir arquivo de resolvíveis: " - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" -msgstr "Impossível fornecer arquivo %s a partir do repositório %s" +msgstr "Não foi possível fornecer o arquivo %s a partir do repositório %s" #: ../zypp/thread/Mutex.cc:87 msgid "Can't release the mutex lock" -msgstr "Impossível liberar o bloqueio mutex" - -#: ../zypp/Repository.cc:101 -msgid "Can't set RepoInfo for norepo." -msgstr "Impossível enviar informações do repositório para nenhum repositório." +msgstr "Não foi possível liberar o bloqueio mutex" #: ../zypp/thread/Mutex.cc:40 msgid "Can't set recursive mutex attribute" -msgstr "Impossível definir atributo de mutex recursivo" +msgstr "Não foi possível definir o atributo do mutex recursivo" #. :BLZ:084: #: ../zypp/CountryCode.cc:260 @@ -731,21 +716,21 @@ #: ../zypp/KeyRing.cc:276 #, c-format msgid "Cannot create public key %s from %s keyring to file %s" -msgstr "Impossível criar chave pública %s do gerenciador de chaves %s para o arquivo %s" +msgstr "Não foi possível criar a chave pública %s do gerenciador de chaves %s para o arquivo %s" #: ../zypp/media/MediaException.cc:182 msgid "Cannot eject any media" -msgstr "Impossível ejetar qualquer mídia." +msgstr "Não foi possível ejetar qualquer mídia." #: ../zypp/media/MediaException.cc:184 #, c-format msgid "Cannot eject media '%s'" -msgstr "Impossível ejetar mídia '%s'" +msgstr "Não foi possível ejetar a mídia '%s'" #: ../zypp/media/MediaException.cc:67 #, c-format msgid "Cannot write file '%s'." -msgstr "Impossível gravar arquivo '%s'." +msgstr "Não foi possível salvar o arquivo '%s'." #. :CUB:192: #: ../zypp/CountryCode.cc:275 @@ -814,7 +799,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 "Arquivos de configuração alterados para %s:" @@ -1083,10 +1068,6 @@ msgid "Djibouti" msgstr "Djibuti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "Não instalar ou apagar resolúveis de interesse" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1135,7 +1116,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 duvidoso '%s' para %u byte checksum '%s'" @@ -1248,10 +1229,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "Erro ao configurar opções de download (curl) para '%s':" -#: ../zypp/Repository.cc:141 -msgid "Error reading solv-file: " -msgstr "Erro ao ler arquivo de resolvíveis: " - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1291,7 +1268,7 @@ msgid "Failed to delete key." msgstr "Falha ao remover chave." -#: ../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 "Falha ao importar chave pública do arquivo %s: %s" @@ -1301,7 +1278,7 @@ msgid "Failed to mount %s on %s" msgstr "Falha ao montar %s em %s." -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "falha ao remover chave pública %s: %s." @@ -1541,9 +1518,9 @@ msgid "Geez" msgstr "Ge'ez" -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65 -msgid "Generally ignore this requirement" -msgstr "Ignorar este requisito em geral" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" +msgstr "Geralmente ignorar algumas das dependências" #. :GRD:308: #: ../zypp/CountryCode.cc:302 @@ -1838,27 +1815,10 @@ 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 "Ignorar que %s já está definido para instalação" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "Ignorar o(s) %s obsoleto(s) de %s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 #, c-format -msgid "Ignore this conflict of %s" -msgstr "Ignorar este conflito de %s" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Ignorar este requisito apenas aqui" +msgid "Ignore some dependencies of %s" +msgstr "Ignorar algumas das dependências de %s" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1905,25 +1865,9 @@ 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 "Instalar %s apesar de ele mudar a arquitetura" - -#. 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 "Instalar %s apesar de mudar o fabricant" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Instalar resolvíveis ausentes" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." -msgstr "A instalação foi interrompida conforme instruções." +msgstr "A instalação foi cancelada conforme instruções." #. language code: ina ia #: ../zypp/LanguageCode.cc:638 @@ -1995,8 +1939,13 @@ msgid "Invalid port component '%s'" msgstr "Componente de porta invá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 "Expressão regular inválida '%s': o regcomp retornou %d" + +#: ../zypp/media/MediaCurl.cc:758 +#: ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "Nome de usuário ou senha inválido." @@ -2045,11 +1994,6 @@ msgid "Israel" msgstr "Israel" -#: ../zypp/base/InterProcessMutex.cc:68 -#, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "It %d, Impossível abrir arquivo bloqueado: %s" - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2175,10 +2119,6 @@ msgid "Kazakhstan" msgstr "Cazaquistão" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Manter resolvíveis" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2899,7 +2839,7 @@ msgid "No Code" msgstr "Sem Código" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "Nenhuma url no repositório." @@ -3122,14 +3062,6 @@ msgid "Path '%s' on medium '%s' is not a file." msgstr "Caminho '%s' no repositório '%s' não é um arquivo." -#: ../zypp/url/UrlBase.cc:1184 -msgid "Path Parameter parsing not supported for this URL" -msgstr "Análise do Parâmetro de Caminho não suportada para este URL" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "A análise de parâmetros de caminho não é suportada para este URL" - #: ../zypp/media/MediaException.cc:200 #, c-format msgid "Permission to access '%s' denied." @@ -3232,9 +3164,9 @@ msgstr "A análise de strings de consulta não é suportada para este 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 "fRPM falhou:" @@ -3263,15 +3195,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Caminho relativo não permitido se existir autoridade" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, c-format msgid "Removing repository '%s'" msgstr "Removendo repositório '%s'" -#: ../zypp/Repository.cc:104 -msgid "RepoInfo alias (%s) does not match repository name (%s)" -msgstr "Alias %s não combina com o nome do repositório (%s)" - #: ../zypp/parser/susetags/RepoParser.cc:232 msgid "Required file is missing: " msgstr "Arquivo necessário faltando:" @@ -3574,6 +3502,11 @@ msgid "Solomon Islands" msgstr "Ilhas Salomão" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "O resolvível %s conflita com %s fornecido por ele mesmo" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3725,13 +3658,14 @@ msgstr "Siríaco" #: ../zypp/media/MediaException.cc:91 +#, c-format msgid "System exception '%s' on medium '%s'." msgstr "Exceção do sistema '%s' no repositório '%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 "Gerenciamento do sistema está bloqueado pela aplicação de PID %d. Por favor, feche esta aplicação antes de tentar novamente." +msgstr "Gerenciamento do sistema está bloqueado pelo aplicativo de PID %d. Por favor, feche este aplicativo antes de tentar novamente." #. language code: tgl tl #: ../zypp/LanguageCode.cc:1108 @@ -3808,7 +3742,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 "Esta ação já está sendo executada por outro programa." @@ -4004,20 +3938,20 @@ #: ../zypp/Url.cc:296 msgid "Unable to clone Url object" -msgstr "Impossível clonar objeto Url" +msgstr "Não foi possível clonar o objeto Url" #: ../zypp/target/hal/HalContext.cc:206 msgid "Unable to create dbus connection" -msgstr "Impossível criar conexão com dbus" +msgstr "Não foi possível criar a conexão com o dbus" #: ../zypp/target/hal/HalContext.cc:249 msgid "Unable to initalize HAL context -- hald not running?" -msgstr "Impossível inicializar contexto HAL -- hald não está em execução?" +msgstr "Não foi possível inicializar o contexto HAL -- o hald não está em execução?" #: ../zypp/Url.cc:322 #: ../zypp/Url.cc:336 msgid "Unable to parse Url components" -msgstr "Impossível analisar os componentes do Url" +msgstr "Não foi possível analisar os componentes da Url" #. language code: und #: ../zypp/LanguageCode.cc:1168 @@ -4052,10 +3986,6 @@ msgid "Unknown language: " msgstr "Idioma desconhecido:" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "Desbloquear estes resolvíveis" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4319,89 +4249,72 @@ msgid "applydeltarpm failed." msgstr "Falha de applydeltarpm." -#: ../zypp/sat/SATResolver.cc:951 +#: ../zypp/solver/detail/SATResolver.cc:1129 #, c-format msgid "architecture change of %s to %s" msgstr "mudança de arquitetura de %s para %s" -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, c-format msgid "cannot install both %s and %s" -msgstr "impossível instalar ambos (%s e %s)" +msgstr "Não foi possível instalar ambos (%s e %s)" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 msgid "conflicting requests" msgstr "pedidos conflitantes" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" msgstr "backup %s criado" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, c-format msgid "deinstallation of %s" msgstr "desinstalação de %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 "apagar %s" - -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 msgid "deleted providers: " -msgstr "provedores removidos: " +msgstr "fornecedores removidos: " -#: ../zypp/sat/SATResolver.cc:899 +#: ../zypp/solver/detail/SATResolver.cc:1077 #, c-format msgid "do not ask to delete all solvables providing %s" -msgstr "não perguntar ao deletar todos os resolvíveis que fornecem %s" +msgstr "não perguntar ao remover todos os resolvíveis que fornecem %s" -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "não perguntar ao instalar um resolvível que fornece %s" -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, c-format msgid "do not forbid installation of %s" msgstr "não proibir a instalação de %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 "não instalar %s" -#: ../zypp/sat/SATResolver.cc:911 +#: ../zypp/solver/detail/SATResolver.cc:1089 #, c-format msgid "do not install most recent version of %s" msgstr "não instalar a versão mais recente de %s" -#: ../zypp/sat/SATResolver.cc:811 +#: ../zypp/solver/detail/SATResolver.cc:989 #, c-format msgid "do not keep %s installed" msgstr "não manter %s instalado" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, c-format msgid "downgrade of %s to %s" msgstr "downgrade de %s para %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 "instalar %s" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4414,51 +4327,48 @@ "-->\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 "manter %s" #: ../zypp/target/hal/HalContext.cc:219 msgid "libhal_ctx_new: Can't create libhal context" -msgstr "libhal_ctx_new: Não é possível criar contexto libhal" +msgstr "libhal_ctx_new: Não foi possível criar o contexto libhal" #: ../zypp/target/hal/HalContext.cc:234 msgid "libhal_set_dbus_connection: Can't set dbus connection" -msgstr "libhal_set_dbus_connection: Não é possível definir conexão com dbus" +msgstr "libhal_set_dbus_connection: Não foi possível definir a conexão com dbus" -#: ../zypp/sat/SATResolver.cc:699 +#: ../zypp/solver/detail/SATResolver.cc:870 #, c-format msgid "nothing provides %s needed by %s" msgstr "ninguém fornece %s que é necessário a %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, c-format msgid "nothing provides requested %s" msgstr "ninguém fornece o pacote requerido %s" -#: ../zypp/sat/SATResolver.cc:685 +#: ../zypp/solver/detail/SATResolver.cc:856 #, c-format msgid "problem with installed package %s" msgstr "problema com o pacote instalado %s" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" msgstr "substituição de %s por %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 criou %s como %s, mas foi impossível determinar a diferença" +msgstr "o rpm criou %s como %s, mas não foi possível determinar a diferença" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2048 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4467,38 +4377,28 @@ "rpm criou %s como %s.\n" "Aqui estão as 25 primeiras linhas de diferença:\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 "saída 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 gravou %s como %s, mas não foi possível determinar a diferença" +msgstr "o rpm salvou %s como %s, mas não foi possível determinar a diferença" #. %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 gravou %s como %s.\n" +"o rpm salvou %s como %s.\n" "Aqui estão as 25 primeiras linhas de diferença:\n" -#: ../zypp/sat/SATResolver.cc:759 +#: ../zypp/solver/detail/SATResolver.cc:935 msgid "uninstallable providers: " -msgstr "provedores de não-instaláveis:" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "desbloquear %s" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "desbloquear todos os resolvíveis" +msgstr "fornecedores de não-instaláveis:" Modified: trunk/libzypp/po/ro.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ro.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/ro.po (original) +++ trunk/libzypp/po/ro.po Mon Apr 28 15:25:19 2008 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: zypp.ro\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-01-20 13:18+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -17,7 +17,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: " @@ -28,61 +28,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 intră în conflict cu %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 "Instalarea %s a eşuat" #. %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 "Mărime instalată:" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, fuzzy, c-format msgid "%s is not installable" msgstr "Instalarea %s a eşuat" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, fuzzy, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s este recomandat de %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 "" - -#. 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 furnizează această dependenţă, dar va modifica vânzătorul elementului instalat" - #. %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 "Îndepărtarea %s a eşuat" #. 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 "" @@ -107,12 +95,12 @@ msgid "Adangme" msgstr "Adangme" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "Adaug sursa de instalare '%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 #, fuzzy msgid "Additional rpm output:" msgstr "&Opţiuni ipppd adiţionale" @@ -332,7 +320,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 "Pentru '%s' este necesară autentificarea" @@ -600,7 +588,7 @@ msgid "Buginese" msgstr "Buginese" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -651,7 +639,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 "Nu pot crea fişierul." @@ -660,10 +648,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)." @@ -693,6 +677,11 @@ msgid "Can't initialize recursive mutex" msgstr "Nu pot iniţializa mutex-ul recursiv" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Nu pot deschide fişierul %1." + #: ../zypp/ExternalProgram.cc:174 #, fuzzy, c-format msgid "Can't open pipe (%s)." @@ -703,12 +692,7 @@ msgid "Can't open pty (%s)." msgstr "Nu am putut deschide fişierul: %s." -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "Nu pot deschide fişierul %1." - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, fuzzy, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Nu pot furniza fişierul %s din sursa de instalare %s" @@ -717,10 +701,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 "Nu pot seta atributul mutex recursiv" @@ -821,7 +801,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 "Fişiere de configurare modificate pentru %s:" @@ -1098,11 +1078,6 @@ msgid "Djibouti" msgstr "Djibuti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -#, fuzzy -msgid "Do not install or delete the resolvables concerned" -msgstr "%1 intră în conflict cu %2" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1149,7 +1124,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 "" @@ -1263,11 +1238,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "" -#: ../zypp/Repository.cc:141 -#, fuzzy -msgid "Error reading solv-file: " -msgstr "Eroare la citirea sectorului %u." - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1308,7 +1278,7 @@ msgid "Failed to delete key." msgstr "Nu am putut porni maşina 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 "" @@ -1318,7 +1288,7 @@ msgid "Failed to mount %s on %s" msgstr "Nu pot deschide %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 "Nu pot obţine cheia publică." @@ -1555,8 +1525,9 @@ msgid "Geez" msgstr "Greacă" -#: ../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 "Ignoră această cerinţă în general" #. :GRD:308: @@ -1861,27 +1832,10 @@ msgstr "" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145 -#, fuzzy, c-format -msgid "Ignore that %s is already set to install" -msgstr "Directorul %1 se află deja în listă." - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, fuzzy, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "%1 intră în conflict cu %2" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 #, fuzzy, c-format -msgid "Ignore this conflict of %s" -msgstr "%1 intră în conflict cu %2" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Ignoră această cerinţă doar aici" +msgid "Ignore some dependencies of %s" +msgstr "Verific dependenţele..." #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1930,24 +1884,7 @@ msgid "Ingush" msgstr "Engleză" -#. 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 "Instalez driver-ul..." - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "" @@ -2022,7 +1959,12 @@ msgid "Invalid port component '%s'" msgstr "Componentă port invalidă '%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 "Nume de utilizator sau parolă invalidă." @@ -2072,11 +2014,6 @@ msgid "Israel" msgstr "Israel" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Nu pot deschide fişierul %1." - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2213,11 +2150,6 @@ msgid "Kazakhstan" msgstr "Kazahstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -#, fuzzy -msgid "Keep resolvables" -msgstr "Instalez driver-ul..." - #. :JPN:392: #: ../zypp/CountryCode.cc:335 #, fuzzy @@ -2991,7 +2923,7 @@ msgid "No Code" msgstr "Fără cod" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "Nici un url în sursa de instalare." @@ -3234,14 +3166,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." @@ -3348,8 +3272,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 "a eşuat." @@ -3381,16 +3305,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 "Îndepărtez sursa de instalare '%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 "Lipseşte un fişier necesar: " @@ -3712,6 +3631,11 @@ msgid "Solomon Islands" msgstr "Insulele Feroe" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%s intră în conflict cu %s" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3965,7 +3889,7 @@ msgid "Thailand" msgstr "Tailanda" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." msgstr "" @@ -4216,11 +4140,6 @@ msgid "Unknown language: " msgstr "Limbă necunoscută: " -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -#, fuzzy -msgid "Unlock these resolvables" -msgstr "%1 intră în conflict cu %2" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4493,89 +4412,73 @@ msgid "applydeltarpm failed." msgstr "applydeltarpm a eşuat." -#: ../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 "Nu pot instala %s" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 #, fuzzy msgid "conflicting requests" msgstr "Cererea de conexiune cu: " #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, fuzzy, c-format msgid "created backup %s" msgstr "Creează arhiva backup" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "Eroare la instalare" -#. 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 "şterge %s" - -#: ../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 "%1 intră în conflict cu %2" -#: ../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 "nu instala %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 "nu instala %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 "nu instala %s" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, fuzzy, c-format msgid "downgrade of %s to %s" msgstr "Actualizez %s la %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 "instalează %s" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4584,10 +4487,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 "păstrează %s" @@ -4600,41 +4501,41 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: Nu pot seta conexiunea dbus" -#: ../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 "comanda pentru deinstalarea de pachete" -#: ../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 "" @@ -4642,34 +4543,78 @@ "Command 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 "" #. %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 "Profile disponibile" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "deblochează %s" +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s furnizează această dependenţă, dar va modifica vânzătorul elementului instalat" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 #, fuzzy -msgid "unlock all resolvables" -msgstr "%1 intră în conflict cu %2" +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "%1 intră în conflict cu %2" + +#, fuzzy +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Directorul %1 se află deja în listă." + +#, fuzzy +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "%1 intră în conflict cu %2" + +#, fuzzy +#~ msgid "Ignore this conflict of %s" +#~ msgstr "%1 intră în conflict cu %2" + +#~ msgid "Ignore this requirement just here" +#~ msgstr "Ignoră această cerinţă doar aici" + +#, fuzzy +#~ msgid "Install missing resolvables" +#~ msgstr "Instalez driver-ul..." + +#, fuzzy +#~ msgid "Keep resolvables" +#~ msgstr "Instalez driver-ul..." + +#, fuzzy +#~ msgid "Unlock these resolvables" +#~ msgstr "%1 intră în conflict cu %2" + +#~ msgid "delete %s" +#~ msgstr "şterge %s" + +#~ msgid "install %s" +#~ msgstr "instalează %s" + +#~ msgid "unlock %s" +#~ msgstr "deblochează %s" + +#, fuzzy +#~ msgid "unlock all resolvables" +#~ msgstr "%1 intră în conflict cu %2" + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Nu pot deschide fişierul %1." + +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "Eroare la citirea sectorului %u." #~ msgid "%s is replaced by %s" #~ msgstr "%s este înlocuit de %s" @@ -4728,10 +4673,6 @@ #~ msgid "No need to install %s" #~ msgstr "Instalare automată" -#, fuzzy -#~ msgid "Cannot install %s to fulfill the dependencies of %s" -#~ msgstr "Verific dependenţele..." - #~ msgid "%s will not be uninstalled, because it is still required" #~ msgstr "%s nu va fi deinstalat deoarece mai este necesar" Modified: trunk/libzypp/po/ru.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ru.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/ru.po (original) +++ trunk/libzypp/po/ru.po Mon Apr 28 15:25:19 2008 @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: zypp.ru\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-04-11 21:28+0400\n" "Last-Translator: Nikolay Derkach \n" "Language-Team: Russian \n" @@ -23,7 +23,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.4\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -36,61 +36,49 @@ msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr "Проблема со сертификатов SSL, проверьте, всё ли в порядке с удостоверяющим центрои сертификата '%s'." -#: ../zypp/sat/SATResolver.cc:709 +#: ../zypp/solver/detail/SATResolver.cc:880 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%s конфликтует с %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 #, c-format msgid "%s is not installable" msgstr "%s недоступен для установки" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s делает устаревшим %s, предоставляемый %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 предоставляет эту зависимость, но будет изменена архитектура установленного пакета" - -#. 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 предоставляет эту зависимость, но будет изменен производитель установленного пакета" - #. %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 "%s требует %s, но это требование не может быть удовлетворено" @@ -117,13 +105,13 @@ msgid "Adangme" msgstr "Адангме" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "Добавляется репозитарий '%s'" # dialog caption -#: ../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 "Необходима аутентификация для '%s'" @@ -623,7 +611,7 @@ msgid "Buginese" msgstr "Бугийский" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "Собирается кэш репозитария '%s'" @@ -675,7 +663,7 @@ msgid "Cameroon" msgstr "Камерун" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "Не удаётся создать пул SAT." @@ -683,10 +671,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)." @@ -716,6 +700,11 @@ msgid "Can't initialize recursive mutex" msgstr "Не удаётся инициализировать рекурсивное взаимоисключение" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Не удаётся открыть solv-файл: " + #: ../zypp/ExternalProgram.cc:174 #, c-format msgid "Can't open pipe (%s)." @@ -726,11 +715,7 @@ msgid "Can't open pty (%s)." msgstr "Не удаётся открыть псевдо-терминал (%s)." -#: ../zypp/Repository.cc:136 -msgid "Can't open solv-file: " -msgstr "Не удаётся открыть solv-файл: " - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Не удаётся доставить файл '%s' из репозитария '%s'" @@ -739,10 +724,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 "Не удаётся установить атрибут рекурсивного взаимоисключения" @@ -843,7 +824,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:" @@ -1112,10 +1093,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" @@ -1164,7 +1141,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 "Подозрительный тип '%s' байта номер %u контрольной суммы '%s'" @@ -1276,10 +1253,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "Произошла ошибка при установлении параметров загрузки (curl) для '%s':" -#: ../zypp/Repository.cc:141 -msgid "Error reading solv-file: " -msgstr "Ошибка при чтении solv-файла: " - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1321,7 +1294,7 @@ msgid "Failed to delete key." msgstr "Не удалось удалить ключ." -#: ../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 "Не удалось смонтировать публичный ключ из файла %s: %s" @@ -1331,7 +1304,7 @@ msgid "Failed to mount %s on %s" msgstr "Не удалось смонтировать %s в %s" -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "Не удалось удалить публичный ключ %s: %s" @@ -1576,8 +1549,9 @@ msgid "Geez" msgstr "Геэз" -#: ../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 "Игнорировать это требование везде" #. :GRD:308: @@ -1876,27 +1850,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 @@ -1943,23 +1900,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 -#, 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 "Установка прервана согласно инструкции." @@ -2037,7 +1978,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 "Неверное имя пользователя или пароль." @@ -2088,11 +2034,6 @@ msgid "Israel" msgstr "Израиль" -#: ../zypp/base/InterProcessMutex.cc:68 -#, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "" - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2222,10 +2163,6 @@ msgid "Kazakhstan" msgstr "Казахстан" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Оставить объекты разрешения зависимостей" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2984,7 +2921,7 @@ msgid "No Code" msgstr "Нет кода" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "В репозитарии нет URL-адреса." @@ -3211,14 +3148,6 @@ msgid "Path '%s' on medium '%s' is not a file." msgstr "Путь '%s' на носителе '%s' не является файлом." -#: ../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 "Для данного URL-адреса анализ параметров пути не поддерживается" - #: ../zypp/media/MediaException.cc:200 #, c-format msgid "Permission to access '%s' denied." @@ -3321,8 +3250,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 msgid "RPM failed: " msgstr "Сбой RPM: " @@ -3352,16 +3281,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 "Удаляется репозитарий '%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 "Необходимый файл отсутствует: " @@ -3672,6 +3596,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, который предоставляется %s" + # SO # fuzzy #. language code: som so @@ -3918,7 +3847,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 "Это действие уже выполняется другой программой." @@ -4168,10 +4097,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'" @@ -4442,89 +4367,73 @@ 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 "изменение архитектуры %s на %s" -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, c-format msgid "cannot install both %s and %s" msgstr "Не удаётся установить оба %s и %s" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 msgid "conflicting requests" msgstr "конфликтующие запросы" # Proposal for backup during update #. 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 #, c-format msgid "deinstallation of %s" msgstr "удаление %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 "удалить %s" - -#: ../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 "не просить удалить все объекты разрешения зависимостей, предоставляющие %s" -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, 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 #, 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 "не устанавливать самую последнюю версию %s" -#: ../zypp/sat/SATResolver.cc:811 +#: ../zypp/solver/detail/SATResolver.cc:989 #, c-format msgid "do not keep %s installed" msgstr "не оставлять установленным %s" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, 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" @@ -4537,10 +4446,8 @@ "-->\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" @@ -4553,34 +4460,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 #, c-format msgid "nothing provides %s needed by %s" msgstr "ничто не предоставляет %s, необходимый для %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, 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 "проблема в установленном пакете %s" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" msgstr "замена %s на %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 создал %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" @@ -4589,18 +4496,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 #, 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" @@ -4609,17 +4516,63 @@ "rpm сохранил %s как %s.\n" "Первые 25 строк различий:\n" -#: ../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 "разблокировать %s" +#~ msgid "%s provides this dependency, but would change the architecture of the installed item" +#~ msgstr "%s предоставляет эту зависимость, но будет изменена архитектура установленного пакета" + +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s предоставляет эту зависимость, но будет изменен производитель установленного пакета" + +#~ 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 несмотря на то, что он изменит архитектуру" + +#~ 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 "разблокировать все объекты разрешения зависимостей" + +#~ msgid "Error reading solv-file: " +#~ msgstr "Ошибка при чтении solv-файла: " -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "разблокировать все объекты разрешения зависимостей" +#~ msgid "Path Parameter parsing not supported for this URL" +#~ msgstr "Для данного URL-адреса разбор параметра пути не поддерживается" +#~ msgid "Path parameter parsing not supported for this URL" +#~ msgstr "Для данного URL-адреса анализ параметров пути не поддерживается" Modified: trunk/libzypp/po/si.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/si.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/si.po (original) +++ trunk/libzypp/po/si.po Mon Apr 28 15:25:19 2008 @@ -5,7 +5,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: 2005-07-29 15:37+0530\n" "Last-Translator: i18n@suse.de\n" "Language-Team: Sinhala \n" @@ -14,7 +14,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: " @@ -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 #, 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 "" @@ -104,12 +92,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 "" @@ -322,7 +310,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 "" @@ -586,7 +574,7 @@ msgid "Buginese" msgstr "" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -636,7 +624,7 @@ msgid "Cameroon" msgstr "" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 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 "Couldn't open file: %s." + #: ../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 "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 "" @@ -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 "" @@ -1065,10 +1045,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" @@ -1114,7 +1090,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 "" @@ -1226,10 +1202,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" @@ -1270,7 +1242,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 "" @@ -1280,7 +1252,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: @@ -1802,26 +1774,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 @@ -1869,23 +1824,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 "" @@ -1959,7 +1898,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 "" @@ -2008,11 +1952,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" @@ -2138,10 +2077,6 @@ msgid "Kazakhstan" msgstr "" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2862,7 +2797,7 @@ msgid "No Code" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3091,14 +3026,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." @@ -3201,8 +3128,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 "" @@ -3230,16 +3157,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 "" @@ -3543,6 +3465,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" @@ -3782,7 +3709,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 +3952,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'" @@ -4288,88 +4211,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 #, 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 "" - -#: ../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" @@ -4378,10 +4285,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 "" @@ -4394,68 +4299,62 @@ 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." Modified: trunk/libzypp/po/sk.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sk.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/sk.po (original) +++ trunk/libzypp/po/sk.po Mon Apr 28 15:25:19 2008 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: zypp.sk\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-09-15 19:06+0200\n" "Last-Translator: Ján Kupec \n" "Language-Team: Slovak \n" @@ -22,7 +22,7 @@ "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 +#: ../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 je v konflikte 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 "Inštalácia %s zlyhala." #. %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 bol úspešne nainštalovaný" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, fuzzy, c-format msgid "%s is not installable" msgstr "nenainštalovaný" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, fuzzy, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s nahrádza %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 túto závislosť, ale zmenil by architektúru nainštalovaného systému" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:93 -#, c-format -msgid "%s provides this dependency, but would change the vendor of the installed item" -msgstr "%s poskytuje túto závislosť, ale zmenil by dodávateľa nainštalovaného balíčka" - #. %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 "Odstránenie %s zlyhalo" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" msgstr "%s bol úspešne odstránený" -#: ../zypp/sat/SATResolver.cc:745 +#: ../zypp/solver/detail/SATResolver.cc:921 #, c-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" @@ -115,12 +103,12 @@ msgid "Adangme" msgstr "Adangme" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "Pridávam repozitár '%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 "Ďalší výstup príkazu rpm:" @@ -346,7 +334,7 @@ msgid "Austronesian (Other)" msgstr "Austronézsky (ostatné)" -#: ../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' vyžaduje autentifikáciu" @@ -626,7 +614,7 @@ msgid "Buginese" msgstr "Buginese" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "Vytváram medzipamäť repozitára '%s'" @@ -681,7 +669,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 "Nepodarilo sa vytvoriť dočasný súbor %s: %m" @@ -690,10 +678,6 @@ msgid "Can't acquire the mutex lock" msgstr "Nemôžem získať zámok mutexu" -#: ../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)." @@ -723,6 +707,11 @@ msgid "Can't initialize recursive mutex" msgstr "Nemôžem inicializovať rekurzívny mutex" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Nemôžem otvoriť súbor '%1'." + #: ../zypp/ExternalProgram.cc:174 #, fuzzy, c-format msgid "Can't open pipe (%s)." @@ -733,12 +722,7 @@ msgid "Can't open pty (%s)." msgstr "Nepodarilo sa otvoriť %s: %m" -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "Nemôžem otvoriť súbor '%1'." - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, fuzzy, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Nepodarilo sa poskytnúť súbor %s z repozitára %s" @@ -747,10 +731,6 @@ msgid "Can't release the mutex lock" msgstr "Nemôžem uvoľniť zámok mutexu" -#: ../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 "Nemôžem nastaviť rekurzívny mutex" @@ -852,7 +832,7 @@ # progress stage #. 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 "Zmenené konfiguračné súbory pre '%s':" @@ -1135,10 +1115,6 @@ msgid "Djibouti" msgstr "Džibuti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "Neinštaluj ani neodstraňuj dotknuté balíčky" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1184,7 +1160,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 "" @@ -1300,11 +1276,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "" -#: ../zypp/Repository.cc:141 -#, fuzzy -msgid "Error reading solv-file: " -msgstr "Chyba pri čítaní repozitárov:" - # SY # fuzzy #. language code: myv @@ -1348,7 +1319,7 @@ msgid "Failed to delete key." msgstr "Nepodarilo sa načítať modul \"%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 +1329,7 @@ msgid "Failed to mount %s on %s" msgstr "Nepodarilo sa načítať modul \"%s\"." -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "" @@ -1608,8 +1579,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 "Ignoruj túto požiadavku pre všetky prípady" #. :GRD:308: @@ -1915,27 +1887,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 "Ignoruj fakt, že %s je už označený pre inštaláciu" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "Ignoruj nahradený %s v %s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 -#, c-format -msgid "Ignore this conflict of %s" -msgstr "Ignoruj tento konflikt s balíčkom %s" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Ignoruj túto požiadavku len pre tento prípad" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 +#, fuzzy, c-format +msgid "Ignore some dependencies of %s" +msgstr "nie je možné vyriešiť závislosti" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1982,23 +1937,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 "Nainštaluj %s, hoci to spôsobí zmenu architektúry" - -#. 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 "Nainštaluj %s, hoci to spôsobí zmenu dodávateľa" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Nainštaluj chýbajúce balíčky" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "Inštalácia bola podľa príkazu zrušená." @@ -2072,7 +2011,12 @@ msgid "Invalid port component '%s'" msgstr "Neplatný port '%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 "Neplatné meno používateľa alebo heslo." @@ -2123,11 +2067,6 @@ msgid "Israel" msgstr "Izrael" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Nemôžem otvoriť súbor '%1'." - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2259,10 +2198,6 @@ msgid "Kazakhstan" msgstr "Kazachstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Ponechať balíčky" - # KE #. :JPN:392: #: ../zypp/CountryCode.cc:335 @@ -3034,7 +2969,7 @@ msgid "No Code" msgstr "Žiadny kód" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "Pre tento repozitár nie je definovaná žiadna URL adresa." @@ -3265,14 +3200,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 parametre nie sú pre túto URL podporované" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "Path parametre nie sú pre túto URL podporované" - #: ../zypp/media/MediaException.cc:200 #, c-format msgid "Permission to access '%s' denied." @@ -3373,8 +3300,8 @@ msgstr "Query string nie je pre túto URL povolený" #. 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 "zlyhalo" @@ -3405,16 +3332,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Relatívna cesta nie je povolená v prípade, že je zadaná autorita" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, c-format msgid "Removing repository '%s'" msgstr "Odstraňujem repozitár '%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 "Chýba vyžadovaný súbor: " @@ -3735,6 +3657,11 @@ msgid "Solomon Islands" msgstr "Solomon ostrovy" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%s je v konflikte s %s" + # SO #. language code: som so #: ../zypp/LanguageCode.cc:1060 @@ -3987,7 +3914,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 "" @@ -4242,10 +4169,6 @@ msgid "Unknown language: " msgstr "Neznámy jazyk:" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "Odomkni tieto balíčky" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4519,90 +4442,74 @@ msgid "applydeltarpm failed." msgstr "Aplikovanie delta rpm zlyhalo." -#: ../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 "Nie je možné nainštalovať %s" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 #, fuzzy msgid "conflicting requests" msgstr "Požiadavka pripojenia k: " #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" msgstr "Bola vytvorená záloha %s" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "Zlyhala inštalácia %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 "odstrániť %s" - -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 #, fuzzy msgid "deleted providers: " msgstr "Žiaden balíček neposkytuje %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 "Neinštaluj ani neodstraňuj dotknuté balíčky" -#: ../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 "Nie sú k dispozícii žiadne inštalovateľné balíčky, ktoré by poskytovali %s" -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, fuzzy, c-format msgid "do not forbid installation of %s" msgstr "neinštaluj %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 "neinštaluj %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 "nenainštalovaný" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, fuzzy, c-format msgid "downgrade of %s to %s" msgstr "Aktualizujem %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 "nainštalovať %s" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4611,10 +4518,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 "ponechať %s" @@ -4627,34 +4532,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: Nie je možné nastaviť spojenie s dbus" -#: ../zypp/sat/SATResolver.cc:699 +#: ../zypp/solver/detail/SATResolver.cc:870 #, fuzzy, c-format msgid "nothing provides %s needed by %s" msgstr "%s je vyžadovaný balíčkom %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, fuzzy, c-format msgid "nothing provides requested %s" msgstr "Žiaden balíček neposkytuje %s" -#: ../zypp/sat/SATResolver.cc:685 +#: ../zypp/solver/detail/SATResolver.cc:856 #, fuzzy, c-format msgid "problem with installed package %s" msgstr "Problém pri inštalovaní zdrojového balíka %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 "Balíček rpm vytvoril %s as %s, ale nebolo možné určiť rozdiel" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2048 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4663,18 +4568,18 @@ "Balíček rpm vytvoril %s as %s.\n" "Tu je prvých 25 riadkov rozdielov:\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 príkazu 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 "Balíček rpm uložil %s ako %s, ale nebolo možné určiť rozdiel" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:2043 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -4683,20 +4588,72 @@ "Balíček rpm uložil %s ako %s.\n" "Tu je prvých 25 riadkov rozdielov:\n" -#: ../zypp/sat/SATResolver.cc:759 +#: ../zypp/solver/detail/SATResolver.cc:935 #, fuzzy msgid "uninstallable providers: " msgstr "Nie sú k dispozícii žiadne inštalovateľné balíčky, ktoré by poskytovali %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "odomkni %s" +#~ msgid "%s provides this dependency, but would change the architecture of the installed item" +#~ msgstr "%s poskytuje túto závislosť, ale zmenil by architektúru nainštalovaného systému" + +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s poskytuje túto závislosť, ale zmenil by dodávateľa nainštalovaného balíčka" + +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "Neinštaluj ani neodstraňuj dotknuté balíčky" + +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Ignoruj fakt, že %s je už označený pre inštaláciu" + +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "Ignoruj nahradený %s v %s" + +#~ msgid "Ignore this conflict of %s" +#~ msgstr "Ignoruj tento konflikt s balíčkom %s" + +#~ msgid "Ignore this requirement just here" +#~ msgstr "Ignoruj túto požiadavku len pre tento prípad" + +#~ msgid "Install %s although it would change the architecture" +#~ msgstr "Nainštaluj %s, hoci to spôsobí zmenu architektúry" + +#~ msgid "Install %s although it would change the vendor" +#~ msgstr "Nainštaluj %s, hoci to spôsobí zmenu dodávateľa" + +#~ msgid "Install missing resolvables" +#~ msgstr "Nainštaluj chýbajúce balíčky" + +#~ msgid "Keep resolvables" +#~ msgstr "Ponechať balíčky" + +#~ msgid "Unlock these resolvables" +#~ msgstr "Odomkni tieto balíčky" + +#~ msgid "delete %s" +#~ msgstr "odstrániť %s" + +#~ msgid "install %s" +#~ msgstr "nainštalovať %s" + +#~ msgid "unlock %s" +#~ msgstr "odomkni %s" + +#~ msgid "unlock all resolvables" +#~ msgstr "odomkni všetky balíčky" + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Nemôžem otvoriť súbor '%1'." + +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "Chyba pri čítaní repozitárov:" + +#~ msgid "Path Parameter parsing not supported for this URL" +#~ msgstr "Path parametre nie sú pre túto URL podporované" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "odomkni všetky balíčky" +#~ msgid "Path parameter parsing not supported for this URL" +#~ msgstr "Path parametre nie sú pre túto URL podporované" #~ msgid "Reading '%s' repository cache" #~ msgstr "Načítavam medzipamäť pre repozitár '%s'" Modified: trunk/libzypp/po/sl.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sl.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/sl.po (original) +++ trunk/libzypp/po/sl.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: 2001-10-18 11:02+0200\n" "Last-Translator: Janez Krek \n" "Language-Team: Slovenian\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 msgid "" "\n" "uninstallable providers: " @@ -28,61 +28,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 "%1 je v sporu s/z %2" #. %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 "Namestitev ni uspela." #. %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 "Nameščena verzija" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, fuzzy, c-format msgid "%s is not installable" msgstr "Namestitev ni uspela." -#: ../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 "rpm neuspešen." #. 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 "" @@ -110,12 +98,12 @@ msgid "Adangme" msgstr "Območje" -#: ../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 nastavitve skupine" @@ -354,7 +342,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 "" @@ -646,7 +634,7 @@ msgid "Buginese" msgstr "Kitajščina" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -703,7 +691,7 @@ msgid "Cameroon" msgstr "Kamerun" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "" @@ -711,10 +699,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)." @@ -744,6 +728,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)." @@ -754,12 +743,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 "" @@ -768,10 +752,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 "" @@ -877,7 +857,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 "Shrani nastavivene datoteke" @@ -1169,11 +1149,6 @@ msgid "Djibouti" msgstr "Dschibuti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -#, fuzzy -msgid "Do not install or delete the resolvables concerned" -msgstr "%1 je v sporu s/z %2" - #. language code: doi #: ../zypp/LanguageCode.cc:468 #, fuzzy @@ -1221,7 +1196,7 @@ msgstr "Dakar" #. 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 "" @@ -1337,11 +1312,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "" -#: ../zypp/Repository.cc:141 -#, fuzzy -msgid "Error reading solv-file: " -msgstr "Napaka pri branju odseka %u." - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1384,7 +1354,7 @@ msgid "Failed to delete key." msgstr "Napaka pri nalaganju modula \"%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 "" @@ -1394,7 +1364,7 @@ msgid "Failed to mount %s on %s" msgstr "Napaka pri nalaganju modula \"%s\"." -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "" @@ -1643,9 +1613,9 @@ msgid "Geez" msgstr "Grška" -#: ../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 "ima nerešene zahteve..." #. :GRD:308: @@ -1967,28 +1937,10 @@ msgstr "Ne upoštevaj" #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145 -#, fuzzy, c-format -msgid "Ignore that %s is already set to install" -msgstr "Imenik %1 je že na seznamu." - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, fuzzy, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "%1 je v sporu s/z %2" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 #, fuzzy, c-format -msgid "Ignore this conflict of %s" -msgstr "%1 je v sporu s/z %2" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -#, fuzzy -msgid "Ignore this requirement just here" -msgstr "ima nerešene zahteve..." +msgid "Ignore some dependencies of %s" +msgstr "Nezadoščene odvisnosti:" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -2037,24 +1989,7 @@ msgid "Ingush" msgstr "Angleščina" -#. 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 "Namesti manjkajoče pakete" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "" @@ -2128,7 +2063,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 "Nepravilno ime naprave." @@ -2180,11 +2120,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" @@ -2326,11 +2261,6 @@ msgid "Kazakhstan" msgstr "Kazahstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -#, fuzzy -msgid "Keep resolvables" -msgstr "Namesti manjkajoče pakete" - # KE #. :JPN:392: #: ../zypp/CountryCode.cc:335 @@ -3160,7 +3090,7 @@ msgid "No Code" msgstr "Ko&da" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3412,14 +3342,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." @@ -3525,8 +3447,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 "" @@ -3560,16 +3482,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 "" @@ -3911,6 +3828,11 @@ msgid "Solomon Islands" msgstr "Solomonovi otoki" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%1 je v sporu s/z %2" + # SO #. language code: som so #: ../zypp/LanguageCode.cc:1060 @@ -4178,7 +4100,7 @@ msgid "Thailand" msgstr "Tajska" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." msgstr "" @@ -4451,11 +4373,6 @@ msgid "Unknown language: " msgstr "" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -#, fuzzy -msgid "Unlock these resolvables" -msgstr "%1 je v sporu s/z %2" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4745,88 +4662,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 "Nameščam na:" -#: ../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 #, fuzzy, c-format msgid "created backup %s" msgstr "Ne Kreiraj Varnostnih Kopij" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "Namestitev" -#. 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 "Zbriši %1" - -#: ../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 "%1 je v sporu s/z %2" -#: ../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 "Nameščam na:" -#. 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 "Nameščam na:" -#: ../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 "Nameščam na:" -#: ../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 "Namesti %1" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4835,10 +4736,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 "" @@ -4851,41 +4750,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 "" @@ -4893,34 +4792,79 @@ "Izhod ukaza:" #. %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 "Samodejna namestitev" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, fuzzy, c-format -msgid "unlock %s" -msgstr "Ure" +#, fuzzy +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "%1 je v sporu s/z %2" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 #, fuzzy -msgid "unlock all resolvables" -msgstr "%1 je v sporu s/z %2" +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Imenik %1 je že na seznamu." + +#, fuzzy +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "%1 je v sporu s/z %2" + +#, fuzzy +#~ msgid "Ignore this conflict of %s" +#~ msgstr "%1 je v sporu s/z %2" + +#, fuzzy +#~ msgid "Ignore this requirement just here" +#~ msgstr "ima nerešene zahteve..." + +#, fuzzy +#~ msgid "Install missing resolvables" +#~ msgstr "Namesti manjkajoče pakete" + +#, fuzzy +#~ msgid "Keep resolvables" +#~ msgstr "Namesti manjkajoče pakete" + +#, fuzzy +#~ msgid "Unlock these resolvables" +#~ msgstr "%1 je v sporu s/z %2" + +#, fuzzy +#~ msgid "delete %s" +#~ msgstr "Zbriši %1" + +#, fuzzy +#~ msgid "install %s" +#~ msgstr "Namesti %1" + +#, fuzzy +#~ msgid "unlock %s" +#~ msgstr "Ure" + +#, fuzzy +#~ msgid "unlock all resolvables" +#~ msgstr "%1 je v sporu s/z %2" + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Couldn't open file: %s." + +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "Napaka pri branju odseka %u." #, fuzzy #~ msgid "Software management is already running." @@ -4961,10 +4905,6 @@ #~ msgstr "potrebno je ponovno namestiti" #, fuzzy -#~ msgid "Cannot install %s to fulfill the dependencies of %s" -#~ msgstr "Nezadoščene odvisnosti:" - -#, fuzzy #~ msgid "%s will not be uninstalled, because it is still required" #~ msgstr "Nezadoščene odvisnosti:" Modified: trunk/libzypp/po/sr.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sr.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/sr.po (original) +++ trunk/libzypp/po/sr.po Mon Apr 28 15:25:19 2008 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: YaST2 (@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: 2004-03-31 11:34+0200\n" "Last-Translator: Bojan Jovanovic \n" "Language-Team: Serbian \n" @@ -17,7 +17,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: " @@ -28,14 +28,14 @@ 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 "%1 je u konfliktu sa %2" #. %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 "Instalacioni proces nije uspešno završen." @@ -44,47 +44,35 @@ # PushButton: Allright, really start installation #. %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 "Instalacioni proces nije uspešno završen." -#: ../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 "rpm greška." #. 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,13 +97,13 @@ msgid "Adangme" msgstr "адангме" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "" # TextEntry label -#: ../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 ipppd opcije" @@ -345,7 +333,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 "" @@ -611,7 +599,7 @@ msgid "Buginese" msgstr "бугинезе" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -661,7 +649,7 @@ msgid "Cameroon" msgstr "Камерун" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "" @@ -669,10 +657,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)." @@ -702,6 +686,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)." @@ -712,12 +701,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 "" @@ -726,10 +710,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 "" @@ -828,7 +808,7 @@ # progress stage #. 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 "Snimi konfiguracione fajlove" @@ -1106,11 +1086,6 @@ msgid "Djibouti" msgstr "Afrika/Djibouti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -#, fuzzy -msgid "Do not install or delete the resolvables concerned" -msgstr "%1 je u konfliktu sa %2" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1156,7 +1131,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 "" @@ -1269,10 +1244,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 #, fuzzy @@ -1314,7 +1285,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 "" @@ -1324,7 +1295,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 "" @@ -1552,9 +1523,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 "ima neispunjene zahteve..." #. :GRD:308: @@ -1849,30 +1820,11 @@ msgid "Igbo" msgstr "игбо" -# error popup message #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145 +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 #, fuzzy, c-format -msgid "Ignore that %s is already set to install" -msgstr "Direktorijum %1 je već na listi." - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, fuzzy, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "%1 je u konfliktu sa %2" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 -#, fuzzy, c-format -msgid "Ignore this conflict of %s" -msgstr "%1 je u konfliktu sa %2" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -#, fuzzy -msgid "Ignore this requirement just here" -msgstr "ima neispunjene zahteve..." +msgid "Ignore some dependencies of %s" +msgstr "Proveravam međuzavisnost..." #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1919,25 +1871,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 "" - -# summary heder -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -#, fuzzy -msgid "Install missing resolvables" -msgstr "Instaliranje nedostajućih paketa" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "" @@ -2011,7 +1945,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 "" @@ -2062,11 +2001,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" @@ -2196,12 +2130,6 @@ msgid "Kazakhstan" msgstr "Казахстан" -# summary heder -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -#, fuzzy -msgid "Keep resolvables" -msgstr "Instaliranje nedostajućih paketa" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2938,7 +2866,7 @@ msgid "No Code" msgstr "Poz&ivni broj" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3173,14 +3101,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." @@ -3283,8 +3203,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 "" @@ -3312,16 +3232,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 "" @@ -3631,6 +3546,11 @@ msgid "Solomon Islands" msgstr "Соломонска острва" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%1 je u konfliktu sa %2" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3872,7 +3792,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 "" @@ -4116,11 +4036,6 @@ msgid "Unknown language: " msgstr "" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -#, fuzzy -msgid "Unlock these resolvables" -msgstr "%1 je u konfliktu sa %2" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4386,93 +4301,77 @@ 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 "" # Frame title for installation target hard disk / partition(s) -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, fuzzy, c-format msgid "cannot install both %s and %s" msgstr "Instaliram na:" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 msgid "conflicting requests" msgstr "" # Proposal for backup during update #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, fuzzy, c-format msgid "created backup %s" msgstr "Ne pravite sigurnosnu kopiju" -#: ../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 -#, fuzzy, c-format -msgid "delete %s" -msgstr "Obriši %1" - -#: ../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 "%1 je u konfliktu sa %2" -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, fuzzy, c-format msgid "do not forbid installation of %s" msgstr "Instaliram na:" # Frame title for installation target hard disk / partition(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 "Instaliram na:" -#: ../zypp/sat/SATResolver.cc:911 +#: ../zypp/solver/detail/SATResolver.cc:1089 #, c-format msgid "do not install most recent version of %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: ../zypp/sat/SATResolver.cc:811 +#: ../zypp/solver/detail/SATResolver.cc:989 #, fuzzy, c-format msgid "do not keep %s installed" msgstr "Instaliram na:" -#: ../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 "Instaliraj %1" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4481,10 +4380,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 "" @@ -4497,41 +4394,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 "" @@ -4539,34 +4436,78 @@ "Komandni izlaz:" #. %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 "Automatska Instalacija" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, fuzzy, c-format -msgid "unlock %s" -msgstr "Satovi" +#, fuzzy +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "%1 je u konfliktu sa %2" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 +# error popup message #, fuzzy -msgid "unlock all resolvables" -msgstr "%1 je u konfliktu sa %2" +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Direktorijum %1 je već na listi." + +#, fuzzy +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "%1 je u konfliktu sa %2" + +#, fuzzy +#~ msgid "Ignore this conflict of %s" +#~ msgstr "%1 je u konfliktu sa %2" + +#, fuzzy +#~ msgid "Ignore this requirement just here" +#~ msgstr "ima neispunjene zahteve..." + +# summary heder +#, fuzzy +#~ msgid "Install missing resolvables" +#~ msgstr "Instaliranje nedostajućih paketa" + +# summary heder +#, fuzzy +#~ msgid "Keep resolvables" +#~ msgstr "Instaliranje nedostajućih paketa" + +#, fuzzy +#~ msgid "Unlock these resolvables" +#~ msgstr "%1 je u konfliktu sa %2" + +#, fuzzy +#~ msgid "delete %s" +#~ msgstr "Obriši %1" + +#, fuzzy +#~ msgid "install %s" +#~ msgstr "Instaliraj %1" + +#, fuzzy +#~ msgid "unlock %s" +#~ msgstr "Satovi" + +#, fuzzy +#~ msgid "unlock all resolvables" +#~ msgstr "%1 je u konfliktu sa %2" + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Couldn't open file: %s." #, fuzzy #~ msgid "%s conflicts with other resolvables" @@ -4599,10 +4540,6 @@ #~ msgstr "mora da se reinstalira" #, fuzzy -#~ msgid "Cannot install %s to fulfill the dependencies of %s" -#~ msgstr "Proveravam međuzavisnost..." - -#, fuzzy #~ msgid "%s will not be uninstalled, because it is still required" #~ msgstr "Proveravam međuzavisnost..." Modified: trunk/libzypp/po/sv.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/sv.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/sv.po (original) +++ trunk/libzypp/po/sv.po Mon Apr 28 15:25:19 2008 @@ -11,7 +11,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-09-08 11:23+0200\n" "Last-Translator: Mattias Newzella \n" "Language-Team: \n" @@ -21,7 +21,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" @@ -33,61 +33,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 är i konflikt med %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 "Det gick inte att installera %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 har installerats" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, fuzzy, c-format msgid "%s is not installable" msgstr "inte installerad." -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, fuzzy, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s gör %s inaktuell" -#. 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 tillhandahåller detta beroende, men skulle förändra arkitekturen för det installerade objektet" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:93 -#, c-format -msgid "%s provides this dependency, but would change the vendor of the installed item" -msgstr "%s tillhandahåller detta beroende, men skulle förändra leverantören för det installerade objektet" - #. %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 "Det gick inte att ta bort %s" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" msgstr "%s borttagen 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 "" @@ -113,12 +101,12 @@ msgid "Adangme" msgstr "Adangme" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, c-format msgid "Adding repository '%s'" msgstr "Lägger till arkiv \"%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 "Ytterligare rpm-utmatning:" @@ -342,7 +330,7 @@ msgid "Austronesian (Other)" msgstr "Austronesiska språk (övriga)" -#: ../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 "Autentisering krävs för \"%s\"" @@ -616,7 +604,7 @@ msgid "Buginese" msgstr "Buginesiska" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "Bygger cache för arkiv \"%s\"" @@ -671,7 +659,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 "Det gick inte att skapa filen." @@ -680,10 +668,6 @@ msgid "Can't acquire the mutex lock" msgstr "Det går inte att hämta mutex-låset" -#: ../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)." @@ -713,6 +697,11 @@ msgid "Can't initialize recursive mutex" msgstr "Det går inte att initiera rekursivt mutex" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Det går inte att öppna filen %1." + #: ../zypp/ExternalProgram.cc:174 #, fuzzy, c-format msgid "Can't open pipe (%s)." @@ -723,12 +712,7 @@ msgid "Can't open pty (%s)." msgstr "Kan inte öppna fil: %s." -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "Det går inte att öppna filen %1." - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, fuzzy, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Kan inte tillhandahålla fil %s från arkiv %s" @@ -737,10 +721,6 @@ msgid "Can't release the mutex lock" msgstr "Det går inte att släppa mutex-låset" -#: ../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 "Det går inte att ange rekursiva mutex-attribut" @@ -841,7 +821,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 "Inställningsfiler har ändrats för %s:" @@ -1115,10 +1095,6 @@ msgid "Djibouti" msgstr "Djibouti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -msgid "Do not install or delete the resolvables concerned" -msgstr "Installera inte och ta inte bort resurser som berörs" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1164,7 +1140,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 "" @@ -1280,11 +1256,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "" -#: ../zypp/Repository.cc:141 -#, fuzzy -msgid "Error reading solv-file: " -msgstr "Fel vid läsning av arkiv:" - # http://www.geocities.com/forfader/samerna/uraliska.html #. language code: myv #: ../zypp/LanguageCode.cc:850 @@ -1327,7 +1298,7 @@ msgid "Failed to delete key." msgstr "Det gick inte att starta 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 "" @@ -1337,7 +1308,7 @@ msgid "Failed to mount %s on %s" msgstr "Kunde inte öppna %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 "Det gick inte att hämta den allmänna nyckeln." @@ -1585,8 +1556,9 @@ msgid "Geez" msgstr "Fornetiopiska (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 "Ignorera allmänt det här kravet" #. :GRD:308: @@ -1890,27 +1862,10 @@ msgstr "Ibo (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 "Ignorera att %s redan har angetts för installation" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "Ignorera det inaktuella %s i %s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 -#, c-format -msgid "Ignore this conflict of %s" -msgstr "Ignorera den här konflikten för %s" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Ignorera det här kravet här" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 +#, fuzzy, c-format +msgid "Ignore some dependencies of %s" +msgstr "det gick inte att lösa beroenden" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1957,23 +1912,7 @@ msgid "Ingush" msgstr "Ingusj" -#. 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 "Installera %s trots att det kommer att ändra 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 "Installera %s trots att det kommer att ändra leverantören" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Installera resurser som saknas" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "Installationen har avbrutits enligt instruktionerna." @@ -2047,7 +1986,12 @@ msgid "Invalid port component '%s'" msgstr "Portkomponenten %s är ogiltig" -#: ../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 "Ogiltigt användarnamn eller lösenord." @@ -2096,11 +2040,6 @@ msgid "Israel" msgstr "Israel" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Det går inte att öppna filen %1." - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2236,10 +2175,6 @@ msgid "Kazakhstan" msgstr "Kazakstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Behåll resurser" - # KE #. :JPN:392: #: ../zypp/CountryCode.cc:335 @@ -3000,7 +2935,7 @@ msgid "No Code" msgstr "Ingen kod" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "Ingen URL i arkiv." @@ -3233,14 +3168,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 "Analysering av sökvägsparameter stöds inte för den här URL-adressen" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "Analysering av sökvägsparameter stöds inte för den här URL-adressen" - #: ../zypp/media/MediaException.cc:200 #, fuzzy, c-format msgid "Permission to access '%s' denied." @@ -3342,8 +3269,8 @@ msgstr "Analysering av frågesträng stöds inte för den här URL-adressen" #. 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 "misslyckades" @@ -3372,16 +3299,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Relativa sökvägar tillåts inte om det finns behörighet" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, c-format msgid "Removing repository '%s'" msgstr "Tar bort arkiv \"%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 "Fil som krävs saknas: " @@ -3695,6 +3617,11 @@ msgid "Solomon Islands" msgstr "Salomonöarna" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%s är i konflikt med %s" + # Libris vill ha det så. #. language code: som so #: ../zypp/LanguageCode.cc:1060 @@ -3940,7 +3867,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 "" @@ -4188,10 +4115,6 @@ msgid "Unknown language: " msgstr "Okänt språk: " -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "Lås upp dessa resurser" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4460,90 +4383,74 @@ msgid "applydeltarpm failed." msgstr "applydeltarpm misslyckades." -#: ../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 "Det går inte att installera %s" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 #, fuzzy msgid "conflicting requests" msgstr "Anslutningsbegäran till" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" msgstr "skapade säkerhetskopian %s" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "Det gick inte att installera %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 "ta bort %s" - -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 #, fuzzy msgid "deleted providers: " msgstr "Ingen tillhandahåller %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 "Installera inte och ta inte bort resurser som berörs" -#: ../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 "Det finns inga installerbara leverantörer för %s" -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, fuzzy, c-format msgid "do not forbid installation of %s" msgstr "installera inte %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 "installera inte %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 "inte installerad." -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, fuzzy, c-format msgid "downgrade of %s to %s" msgstr "Uppdaterar %s till %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 "installera %s" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4552,10 +4459,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 "behåll %s" @@ -4568,34 +4473,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection: Det gick inte att ange dbus-anslutningen" -#: ../zypp/sat/SATResolver.cc:699 +#: ../zypp/solver/detail/SATResolver.cc:870 #, fuzzy, c-format msgid "nothing provides %s needed by %s" msgstr "%s behövs av %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, fuzzy, c-format msgid "nothing provides requested %s" msgstr "Ingen tillhandahåller %s" -#: ../zypp/sat/SATResolver.cc:685 +#: ../zypp/solver/detail/SATResolver.cc:856 #, fuzzy, c-format msgid "problem with installed package %s" msgstr "Problem med att installera källpaket %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 skapade %s som %s, men det gick inte att avgöra skillnaden" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2048 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4604,18 +4509,18 @@ "rpm skapade %s som %s.\n" "Här visas de första 25 raderna med skillnader:\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-utmatning:" #. %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 sparade %s som %s, men det gick inte att avgöra skillnaden" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:2043 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -4624,20 +4529,72 @@ "rpm sparade %s som %s.\n" "Här visas de första 25 raderna med skillnader:\n" -#: ../zypp/sat/SATResolver.cc:759 +#: ../zypp/solver/detail/SATResolver.cc:935 #, fuzzy msgid "uninstallable providers: " msgstr "Det finns inga installerbara leverantörer för %s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "lås upp %s" +#~ msgid "%s provides this dependency, but would change the architecture of the installed item" +#~ msgstr "%s tillhandahåller detta beroende, men skulle förändra arkitekturen för det installerade objektet" + +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s tillhandahåller detta beroende, men skulle förändra leverantören för det installerade objektet" + +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "Installera inte och ta inte bort resurser som berörs" + +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Ignorera att %s redan har angetts för installation" + +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "Ignorera det inaktuella %s i %s" + +#~ msgid "Ignore this conflict of %s" +#~ msgstr "Ignorera den här konflikten för %s" + +#~ msgid "Ignore this requirement just here" +#~ msgstr "Ignorera det här kravet här" + +#~ msgid "Install %s although it would change the architecture" +#~ msgstr "Installera %s trots att det kommer att ändra arkitekturen" + +#~ msgid "Install %s although it would change the vendor" +#~ msgstr "Installera %s trots att det kommer att ändra leverantören" + +#~ msgid "Install missing resolvables" +#~ msgstr "Installera resurser som saknas" + +#~ msgid "Keep resolvables" +#~ msgstr "Behåll resurser" + +#~ msgid "Unlock these resolvables" +#~ msgstr "Lås upp dessa resurser" + +#~ msgid "delete %s" +#~ msgstr "ta bort %s" + +#~ msgid "install %s" +#~ msgstr "installera %s" + +#~ msgid "unlock %s" +#~ msgstr "lås upp %s" + +#~ msgid "unlock all resolvables" +#~ msgstr "lås upp alla resurser" + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Det går inte att öppna filen %1." + +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "Fel vid läsning av arkiv:" + +#~ msgid "Path Parameter parsing not supported for this URL" +#~ msgstr "Analysering av sökvägsparameter stöds inte för den här URL-adressen" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "lås upp alla resurser" +#~ msgid "Path parameter parsing not supported for this URL" +#~ msgstr "Analysering av sökvägsparameter stöds inte för den här URL-adressen" #~ msgid "Reading '%s' repository cache" #~ msgstr "Läser \"%s\" arkivcache" Modified: trunk/libzypp/po/ta.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/ta.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/ta.po (original) +++ trunk/libzypp/po/ta.po Mon Apr 28 15:25:19 2008 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: NetworkManager-vpnc\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-06-26 01:20+0200\n" "Last-Translator: Priyavert Sharma \n" "Language-Team: AgreeYa Solutions \n" @@ -11,7 +11,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" @@ -23,61 +23,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 "" @@ -102,12 +90,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 "கூடுதல் ஆர்பிஎம் அவுட்புட்:" @@ -320,7 +308,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 "" @@ -584,7 +572,7 @@ msgid "Buginese" msgstr "º£É" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -634,7 +622,7 @@ msgid "Cameroon" msgstr "கேமரூன்" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 #, fuzzy msgid "Can not create sat-pool." msgstr "கோப்பை உருவாக்க முடியவில்லை." @@ -643,10 +631,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)." @@ -676,6 +660,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)." @@ -686,12 +675,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ஐ அளிக்க இயலாது" @@ -700,10 +684,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 "எதிர்ப்புத்தன்மையுள்ள மியூடெக்ஸ் பண்மப அமைக்க இயலாது" @@ -799,7 +779,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:க்காக உள்ளமைத்தல் கோப்புகள் மாற்றப்பட்டுள்ளன" @@ -1065,11 +1045,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" @@ -1115,7 +1090,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 "" @@ -1228,11 +1203,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" @@ -1273,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 "" @@ -1283,7 +1253,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 "இந்த யூஆர்எல்லுக்கு பாதை அளவீடு விளக்கம் ஆதரவளிக்கப்படவில்லை" - -#: ../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." @@ -3203,8 +3128,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 "தோல்வியுற்றது" @@ -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 "இத்தீர்வுகளைத் திறக்கவும்" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4283,90 +4204,74 @@ 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 #, 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" @@ -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: ஆல் டிபஸ் இணைப்பை அமைக்க இயலவில்லை" -#: ../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 "%s ஆக ஆர்பிஎம் உருவாf;கப்பட்டுள்ளது, ஆனால் வேறுபாட்டை நிர்ணயிக்க முடியவில்லை" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2048 #, fuzzy, c-format msgid "" "rpm created %s as %s.\n" @@ -4427,18 +4330,18 @@ "%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 "ஆர்பிஎம் அவுட்புட்:" #. %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 "%s ஆக ஆர்பிஎம் சேமிக்கப்பட்டுள்ளது, ஆனால் வேறுபாட்டை நிர்ணயிக்க முடியவில்லை" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:2043 #, fuzzy, c-format msgid "" "rpm saved %s as %s.\n" @@ -4447,20 +4350,76 @@ "%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 "கோப்பை %1 திறக்க முடியவில்லை." + +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "%u பிரிவை படிப்பதில் பிழை." + +#~ msgid "Path Parameter parsing not supported for this URL" +#~ msgstr "இந்த யூஆர்எல்லுக்கு பாதை அளவீடு விளக்கம் ஆதரவளிக்கப்படவில்லை" + +#~ msgid "Path parameter parsing not supported for this URL" +#~ msgstr "இந்த யூஆர்எல்லுக்கு பாதை அளவீடு விளக்கம் ஆதரவளிக்கப்படவில்லை" #~ msgid "Software management is already running." #~ msgstr "மென்பொருள் நிர்வாகம் ஏற்கனவே இயக்கத்திலுள்ளது." Modified: trunk/libzypp/po/tr.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/tr.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/tr.po (original) +++ trunk/libzypp/po/tr.po Mon Apr 28 15:25:19 2008 @@ -10,7 +10,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: 2001-10-18 10:13+0200\n" "Last-Translator: Görkem Çetin \n" "Language-Team: turkish \n" @@ -19,7 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -30,7 +30,7 @@ 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 "%1, %2 ile çakışıyor" @@ -38,55 +38,43 @@ # clients/online_update_start.ycp:171 #. %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 "Kurulum işlemi başarısız oldu." #. %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 "&Evet, kur" # clients/online_update_start.ycp:171 -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, fuzzy, c-format msgid "%s is not installable" msgstr "Kurulum işlemi başarısız oldu." -#: ../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 "rpm başarısız oldu." #. 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 "" @@ -116,12 +104,12 @@ msgid "Adangme" msgstr "Aralık" -#: ../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 "Ek grıp ayarları" @@ -373,7 +361,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 "" @@ -682,7 +670,7 @@ msgid "Buginese" msgstr "Çince" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -743,7 +731,7 @@ msgid "Cameroon" msgstr "Kamerun" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "" @@ -751,10 +739,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)." @@ -784,6 +768,11 @@ msgid "Can't initialize recursive mutex" msgstr "" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Modem kilit dosyası" + #: ../zypp/ExternalProgram.cc:174 #, c-format msgid "Can't open pipe (%s)." @@ -794,11 +783,7 @@ msgid "Can't open pty (%s)." msgstr "" -#: ../zypp/Repository.cc:136 -msgid "Can't open solv-file: " -msgstr "" - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "" @@ -807,10 +792,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 "" @@ -921,7 +902,7 @@ # clients/sw_single.ycp:310 #. 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 "Yapılandırma dosyalarını kaydet" @@ -1225,11 +1206,6 @@ msgid "Djibouti" msgstr "Cibuti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -#, fuzzy -msgid "Do not install or delete the resolvables concerned" -msgstr "%1, %2 ile çakışıyor" - # include/security/ui.ycp:695 #. language code: doi #: ../zypp/LanguageCode.cc:468 @@ -1279,7 +1255,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 "" @@ -1400,10 +1376,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" @@ -1447,7 +1419,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 "" @@ -1457,7 +1429,7 @@ msgid "Failed to mount %s on %s" msgstr "%s açılamadı - %s\n" -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "" @@ -1717,9 +1689,9 @@ msgid "Geez" msgstr "Yunanca" -#: ../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 "şu çözülmemiş gereksinimlere sahip:" # /usr/lib/YaST2/keyboard_raw.ycp:410 @@ -2062,29 +2034,12 @@ msgid "Igbo" msgstr "Görmezden gel" +# clients/inst_sw_single.ycp:742 #. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:145 -#, fuzzy, c-format -msgid "Ignore that %s is already set to install" -msgstr "%1 dizini zaten listede." - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, fuzzy, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "%1, %2 ile çakışıyor" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 #, fuzzy, c-format -msgid "Ignore this conflict of %s" -msgstr "%1, %2 ile çakışıyor" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -#, fuzzy -msgid "Ignore this requirement just here" -msgstr "şu çözülmemiş gereksinimlere sahip:" +msgid "Ignore some dependencies of %s" +msgstr "Yetersiz bağımlılıklar:" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -2134,24 +2089,7 @@ msgid "Ingush" msgstr "İngilizce" -#. 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 "Eksik paketleri kur" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "" @@ -2233,7 +2171,12 @@ msgid "Invalid port component '%s'" msgstr "Geçersiz özellik '{0}'" -#: ../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 "" @@ -2285,11 +2228,6 @@ msgid "Israel" msgstr "İsrail" -#: ../zypp/base/InterProcessMutex.cc:68 -#, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "" - # /usr/lib/YaST2/keyboard_raw.ycp:230 #. language code: ita it #: ../zypp/LanguageCode.cc:654 @@ -2438,11 +2376,6 @@ msgid "Kazakhstan" msgstr "Kazakistan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -#, fuzzy -msgid "Keep resolvables" -msgstr "Eksik paketleri kur" - # KE #. :JPN:392: #: ../zypp/CountryCode.cc:335 @@ -3307,7 +3240,7 @@ msgid "No Code" msgstr "&Kod" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3574,14 +3507,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." @@ -3696,8 +3621,8 @@ # clients/online_update_load.ycp:380 #. 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 "İndirme işlemi başarısız oldu:" @@ -3732,16 +3657,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 "" @@ -4107,6 +4027,11 @@ msgid "Solomon Islands" msgstr "Solomon Adaları" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%1, %2 ile çakışıyor" + # SO #. language code: som so #: ../zypp/LanguageCode.cc:1060 @@ -4397,7 +4322,7 @@ msgid "Thailand" msgstr "Tayland" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." msgstr "" @@ -4683,11 +4608,6 @@ msgid "Unknown language: " msgstr "" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -#, fuzzy -msgid "Unlock these resolvables" -msgstr "%1, %2 ile çakışıyor" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4985,93 +4905,77 @@ 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 "" # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, fuzzy, c-format msgid "cannot install both %s and %s" msgstr "Kurulan disk:" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 msgid "conflicting requests" msgstr "" # clients/inst_sw_backup.ycp:260 #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, fuzzy, c-format msgid "created backup %s" msgstr "Yedek oluşturma" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "Kurulum" -#. 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 "%1 paketini sil" - -#: ../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 "%1, %2 ile çakışıyor" -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, c-format msgid "do not ask to install a solvable providing %s" msgstr "" # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, fuzzy, c-format msgid "do not forbid installation of %s" msgstr "Kurulan disk:" # 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:994 +#: ../zypp/solver/detail/SATResolver.cc:1033 #, fuzzy, c-format msgid "do not install %s" msgstr "Kurulan disk:" -#: ../zypp/sat/SATResolver.cc:911 +#: ../zypp/solver/detail/SATResolver.cc:1089 #, c-format msgid "do not install most recent version of %s" msgstr "" # include/partitioning/auto_part_ui.ycp:200 include/partitioning/auto_part_ui.ycp:249 -#: ../zypp/sat/SATResolver.cc:811 +#: ../zypp/solver/detail/SATResolver.cc:989 #, fuzzy, c-format msgid "do not keep %s installed" msgstr "Kurulan disk:" -#: ../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 "%1 paketini kur" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -5080,10 +4984,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 "" @@ -5096,75 +4998,112 @@ 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 "Program çıktısı:\n" #. %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 "Otomatikman kur" +#, fuzzy +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "%1, %2 ile çakışıyor" + +#, fuzzy +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "%1 dizini zaten listede." + +#, fuzzy +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "%1, %2 ile çakışıyor" + +#, fuzzy +#~ msgid "Ignore this conflict of %s" +#~ msgstr "%1, %2 ile çakışıyor" + +#, fuzzy +#~ msgid "Ignore this requirement just here" +#~ msgstr "şu çözülmemiş gereksinimlere sahip:" + +#, fuzzy +#~ msgid "Install missing resolvables" +#~ msgstr "Eksik paketleri kur" + +#, fuzzy +#~ msgid "Keep resolvables" +#~ msgstr "Eksik paketleri kur" + +#, fuzzy +#~ msgid "Unlock these resolvables" +#~ msgstr "%1, %2 ile çakışıyor" + +#, fuzzy +#~ msgid "delete %s" +#~ msgstr "%1 paketini sil" + +#, fuzzy +#~ msgid "install %s" +#~ msgstr "%1 paketini kur" + # include/security/ui.ycp:774 -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, fuzzy, c-format -msgid "unlock %s" -msgstr "Saatler" +#, fuzzy +#~ msgid "unlock %s" +#~ msgstr "Saatler" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 #, fuzzy -msgid "unlock all resolvables" -msgstr "%1, %2 ile çakışıyor" +#~ msgid "unlock all resolvables" +#~ msgstr "%1, %2 ile çakışıyor" #, fuzzy #~ msgid "%s conflicts with other resolvables" @@ -5201,11 +5140,6 @@ # clients/inst_sw_single.ycp:742 #, fuzzy -#~ msgid "Cannot install %s to fulfill the dependencies of %s" -#~ msgstr "Yetersiz bağımlılıklar:" - -# clients/inst_sw_single.ycp:742 -#, fuzzy #~ msgid "%s will not be uninstalled, because it is still required" #~ msgstr "Yetersiz bağımlılıklar:" Modified: trunk/libzypp/po/uk.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/uk.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/uk.po (original) +++ trunk/libzypp/po/uk.po Mon Apr 28 15:25:19 2008 @@ -11,8 +11,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-04-02 16:32+0300\n" +"POT-Creation-Date: 2008-04-21 18:58+0200\n" +"PO-Revision-Date: 2008-04-23 18:53+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: KBabel 1.11.4\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -34,61 +34,49 @@ msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr " Проблема з сертифікатом SSL, перевірте чи все гаразд з сертифікатом CA для \"%s\"." -#: ../zypp/sat/SATResolver.cc:709 +#: ../zypp/solver/detail/SATResolver.cc:880 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%s конфліктує з %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 #, c-format msgid "%s is not installable" msgstr "%s не можливо встановити" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s робить застарілим %s, що надається %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 задовольняє цю залежність, але змінить архітектуру встановленого" - -#. 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 задовольняє цю залежність, але змінить виробника встановленого" - #. %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 "%s потребує %s, але цю залежність неможливо вдовольнити" @@ -113,12 +101,12 @@ msgid "Adangme" msgstr "Адангме" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, 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:" @@ -226,7 +214,7 @@ #. :ATG:028: #: ../zypp/CountryCode.cc:228 msgid "Anguilla" -msgstr "Ангілла" +msgstr "Ангілья" #. :AGO:024: #: ../zypp/CountryCode.cc:233 @@ -342,7 +330,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 "Потрібна автентифікація для \"%s\"" @@ -624,7 +612,7 @@ msgid "Buginese" msgstr "Бугійська" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "Створення кешу сховища \"%s\"" @@ -676,7 +664,7 @@ msgid "Cameroon" msgstr "Камерун" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "Неможливо створити sat-pool." @@ -684,10 +672,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 "Не вдалося додати розв’язувачі до norepo." - #: ../zypp/ExternalProgram.cc:245 #, c-format msgid "Can't chdir to '/' inside chroot (%s)." @@ -717,6 +701,11 @@ msgid "Can't initialize recursive mutex" msgstr "Неможливо започаткувати рекурсивний mutex" +#: ../zypp/base/InterProcessMutex.cc:79 +#, c-format +msgid "Can't open lock file: %s" +msgstr "Не вдалося відкрити файл замка: %s" + #: ../zypp/ExternalProgram.cc:174 #, c-format msgid "Can't open pipe (%s)." @@ -727,11 +716,7 @@ msgid "Can't open pty (%s)." msgstr "Не вдалося відкрити pty (%s)." -#: ../zypp/Repository.cc:136 -msgid "Can't open solv-file: " -msgstr "Неможливо відкрити solv-файл: " - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Неможливо надати файл \"%s\" зі сховища \"%s\"" @@ -740,10 +725,6 @@ msgid "Can't release the mutex lock" msgstr "Неможливо відпустити блокування mutex" -#: ../zypp/Repository.cc:101 -msgid "Can't set RepoInfo for norepo." -msgstr "Не вдалося встановити RepoInfo для norepo." - #: ../zypp/thread/Mutex.cc:40 msgid "Can't set recursive mutex attribute" msgstr "Неможливо встановити рекурсивний атрибут mutex" @@ -843,7 +824,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:" @@ -1112,10 +1093,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" @@ -1166,7 +1143,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 "Сумнівний тип \"%s\" для %u байтової контрольної суми \"%s\"" @@ -1278,10 +1255,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "Під час встановлення параметрів завантаження (curl) для \"%s\" сталася помилка:" -#: ../zypp/Repository.cc:141 -msgid "Error reading solv-file: " -msgstr "Помилка читання solv-файла: " - # SY # fuzzy #. language code: myv @@ -1325,7 +1298,7 @@ msgid "Failed to delete key." msgstr "Не вдалось вилучити ключ." -#: ../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 "Не вдалося імпортувати відкритий ключ з файла %s: %s" @@ -1337,7 +1310,7 @@ # ############################################################################### # Old yast2-agents.po -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "Не вдалося вилучити відкрити ключ %s: %s" @@ -1586,9 +1559,9 @@ msgid "Geez" msgstr "Ґіз" -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65 -msgid "Generally ignore this requirement" -msgstr "Ігнорувати цю вимогу в загальному" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" +msgstr "Загалом ігнорувати деякі залежності" #. :GRD:308: #: ../zypp/CountryCode.cc:302 @@ -1889,27 +1862,10 @@ 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 "Ігнорувати, що вже заплановано встановити %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 "Ігнорувати цю вимогу тільки тут" +msgid "Ignore some dependencies of %s" +msgstr "Ігнорувати деякі з залежностей %s" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1956,23 +1912,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 -#, 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 "Встановлення перервано відповідно до вказівки." @@ -2046,7 +1986,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 "Некоректний формальний вираз \"%s\": regcomp повернула %d" + +#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "Не чинне ім'я користувача або пароль." @@ -2097,11 +2042,6 @@ msgid "Israel" msgstr "Ізраїль" -#: ../zypp/base/InterProcessMutex.cc:68 -#, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Це %d, не вдалося відкрити файл замка: %s" - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2233,10 +2173,6 @@ msgid "Kazakhstan" msgstr "Тайвань" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Залишити потрібні пакунки" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -3006,7 +2942,7 @@ msgid "No Code" msgstr "Немає коду" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "В сховищі немає url." @@ -3149,7 +3085,7 @@ #: ../zypp/repo/PackageProvider.cc:314 #, c-format msgid "Package %s fails integrity check. Do you want to retry?" -msgstr "Пакунок %s не прошов перевірку достовірності. Повторити спробу?" +msgstr "Пакунок %s не пройшов перевірку достовірності. Повторити спробу?" # ML # fuzzy @@ -3239,14 +3175,6 @@ msgid "Path '%s' on medium '%s' is not a file." msgstr "Шлях \"%s\" на носії \"%s\" не є файлом." -#: ../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 #, c-format msgid "Permission to access '%s' denied." @@ -3347,8 +3275,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 msgid "RPM failed: " msgstr "Помилка RPM: " @@ -3378,16 +3306,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 "Вилучення сховища \"%s\"" -#: ../zypp/Repository.cc:104 -#, c-format -msgid "RepoInfo alias (%s) does not match repository name (%s)" -msgstr "Псевдонім RepoInfo (%s) не збігається з назвою сховища (%s)" - #: ../zypp/parser/susetags/RepoParser.cc:232 msgid "Required file is missing: " msgstr "Немає потрібного файла: " @@ -3699,6 +3622,11 @@ msgid "Solomon Islands" msgstr "Соломонові острови" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "Розв’язок %s конфліктує з %s, що у ньому міститься" + # SO # fuzzy #. language code: som so @@ -3946,7 +3874,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 "Цю дію вже запущено іншою програмою." @@ -4195,10 +4123,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'" @@ -4470,88 +4394,72 @@ msgid "applydeltarpm failed." msgstr "застосування дельти rpm зазнало невдачі." -#: ../zypp/sat/SATResolver.cc:951 +#: ../zypp/solver/detail/SATResolver.cc:1129 #, c-format msgid "architecture change of %s to %s" msgstr "зміна архітектури з %s на %s" -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, c-format msgid "cannot install both %s and %s" msgstr "неможливо встановити одночасно %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 "створено резервну копію %s" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, c-format msgid "deinstallation of %s" msgstr "вилучення %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 "вилучити %s" - -#: ../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 "не питати про вилучення всіх розв’язувачів, що надаються %s" -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, 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 #, 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 "не встановлювати ранішу версію %s" -#: ../zypp/sat/SATResolver.cc:811 +#: ../zypp/solver/detail/SATResolver.cc:989 #, c-format msgid "do not keep %s installed" msgstr "не залишати встановленим %s" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, 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" @@ -4564,10 +4472,8 @@ "-->\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" @@ -4580,34 +4486,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 #, c-format msgid "nothing provides %s needed by %s" msgstr "жоден з пакунків не надає %s, потрібного %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, 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 "проблема з встановленим пакунком %s" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" msgstr "заміна %s на %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 створила %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" @@ -4616,18 +4522,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 #, 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" @@ -4636,17 +4542,7 @@ "Програма rpm зберегла %s як %s.\n" "Ось перші 25 рядків відмінностей:\n" -#: ../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 "розблокувати %s" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "розблокувати ці потрібні пакунки" - Modified: trunk/libzypp/po/vi.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/vi.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/vi.po (original) +++ trunk/libzypp/po/vi.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: 2006-07-12 07:32+0200\n" "Last-Translator: Phan Vĩnh Thịnh \n" "Language-Team: Vietnamese \n" @@ -17,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -28,61 +28,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 "" @@ -107,12 +95,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 "" @@ -325,7 +313,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 "" @@ -589,7 +577,7 @@ msgid "Buginese" msgstr "" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -639,7 +627,7 @@ msgid "Cameroon" msgstr "" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "" @@ -647,10 +635,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)." @@ -680,6 +664,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)." @@ -690,12 +679,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 "" @@ -704,10 +688,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 "" @@ -803,7 +783,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 "" @@ -1069,10 +1049,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" @@ -1118,7 +1094,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 "" @@ -1230,10 +1206,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" @@ -1274,7 +1246,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 +1256,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 "" @@ -1508,8 +1480,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: @@ -1800,26 +1772,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 @@ -1867,23 +1822,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 "" @@ -1957,7 +1896,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 "" @@ -2006,11 +1950,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" @@ -2136,10 +2075,6 @@ msgid "Kazakhstan" msgstr "" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2855,7 +2790,7 @@ msgid "No Code" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3078,14 +3013,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." @@ -3186,8 +3113,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 "" @@ -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 "" @@ -3999,10 +3926,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'" @@ -4262,88 +4185,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 #, 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 "" - -#: ../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" @@ -4352,10 +4259,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 "" @@ -4368,68 +4273,62 @@ 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." Modified: trunk/libzypp/po/wa.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/wa.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/wa.po (original) +++ trunk/libzypp/po/wa.po Mon Apr 28 15:25:19 2008 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lcn 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: 2004-04-05 17:37+0200\n" "Last-Translator: Jean Cayron \n" "Language-Team: Walloon \n" @@ -16,7 +16,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: " @@ -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 #, fuzzy, c-format msgid "%s conflicts with %s provided by %s" msgstr "afrontmint avou..." #. %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 #, fuzzy, c-format msgid "%s is not installable" msgstr "N' nén astaler" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, fuzzy, c-format msgid "%s obsoletes %s provided by %s" msgstr "trop vî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 "" - -#. 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 "" @@ -106,12 +94,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 "Informåcion e pus" @@ -327,7 +315,7 @@ msgid "Austronesian (Other)" msgstr "Ostronezyin (ôtes)" -#: ../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 "" @@ -597,7 +585,7 @@ msgid "Buginese" msgstr "Balinès" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -647,7 +635,7 @@ msgid "Cameroon" msgstr "Camrone" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "" @@ -655,10 +643,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)." @@ -688,6 +672,13 @@ msgid "Can't initialize recursive mutex" msgstr "" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "" +"Dji n' pout nén drovi l' fitchî d' son:\n" +"%1" + #: ../zypp/ExternalProgram.cc:174 #, c-format msgid "Can't open pipe (%s)." @@ -698,14 +689,7 @@ msgid "Can't open pty (%s)." msgstr "" -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "" -"Dji n' pout nén drovi l' fitchî d' son:\n" -"%1" - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "" @@ -714,10 +698,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 "" @@ -815,7 +795,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 "Racourti d' l' apontiaedje di lingaedje" @@ -1082,11 +1062,6 @@ msgid "Djibouti" msgstr "Djibouti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -#, fuzzy -msgid "Do not install or delete the resolvables concerned" -msgstr "Coridjaedjes di radjoutés" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1132,7 +1107,7 @@ msgstr "Douwala" #. 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 "" @@ -1246,10 +1221,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" @@ -1290,7 +1261,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 "" @@ -1300,7 +1271,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 "" @@ -1527,8 +1498,8 @@ msgid "Geez" msgstr "Gehez" -#: ../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: @@ -1821,26 +1792,9 @@ msgstr "Igbo" #. 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 @@ -1891,24 +1845,7 @@ msgid "Ingush" msgstr "Ingouche" -#. 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 "Afrontmint etur les coridjaedjes" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "" @@ -1982,7 +1919,12 @@ msgid "Invalid port component '%s'" msgstr "Li valixhance ni clope nén pol tchuze '%1': %2" -#: ../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 "L' operåcion d' siervice ni covént nén." @@ -2034,13 +1976,6 @@ msgid "Israel" msgstr "Israyel" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "" -"Dji n' pout nén drovi l' fitchî d' son:\n" -"%1" - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2171,11 +2106,6 @@ msgid "Kazakhstan" msgstr "Kazaxhtan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -#, fuzzy -msgid "Keep resolvables" -msgstr "Coridjaedjes ki dj' vos propôze" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2910,7 +2840,7 @@ msgid "No Code" msgstr "" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "" @@ -3138,14 +3068,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." @@ -3247,8 +3169,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 "" @@ -3276,16 +3198,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 "" @@ -3591,6 +3508,11 @@ msgid "Solomon Islands" msgstr "Iyes Solomon" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "afrontmint avou..." + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3830,7 +3752,7 @@ msgid "Thailand" msgstr "Taylande" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." msgstr "" @@ -4075,11 +3997,6 @@ msgid "Unknown language: " msgstr "Lingaedje nén cnoxhou" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -#, fuzzy -msgid "Unlock these resolvables" -msgstr "Coridjaedjes d' amidrés" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4341,88 +4258,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 "N' nén astaler" -#: ../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 "Astalaedje" -#. 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 "Dis&facer" - -#: ../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 "Coridjaedjes di radjoutés" -#: ../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 "N' nén astaler" -#. 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 "N' nén astaler" -#: ../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 "N' nén astaler" -#: ../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" @@ -4431,10 +4332,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 "" @@ -4447,72 +4346,91 @@ 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 "comande po disastaler les pacaedjes" -#: ../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 "" +#, fuzzy +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "Coridjaedjes di radjoutés" + +#, fuzzy +#~ msgid "Install missing resolvables" +#~ msgstr "Afrontmint etur les coridjaedjes" + +#, fuzzy +#~ msgid "Keep resolvables" +#~ msgstr "Coridjaedjes ki dj' vos propôze" + +#, fuzzy +#~ msgid "Unlock these resolvables" +#~ msgstr "Coridjaedjes d' amidrés" + +#, fuzzy +#~ msgid "delete %s" +#~ msgstr "Dis&facer" + +#, fuzzy +#~ msgid "unlock all resolvables" +#~ msgstr "Afrontmint etur les coridjaedjes" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 #, fuzzy -msgid "unlock all resolvables" -msgstr "Afrontmint etur les coridjaedjes" +#~ msgid "Can't open solv-file: " +#~ msgstr "" +#~ "Dji n' pout nén drovi l' fitchî d' son:\n" +#~ "%1" #, fuzzy #~ msgid "Software management is already running." Modified: trunk/libzypp/po/xh.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/xh.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/xh.po (original) +++ trunk/libzypp/po/xh.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 \n" "Language-Team: Novell Language \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 iimpixano ne %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 ukuhlohla kusilele" #. %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 ukuhlohla kulungile" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, fuzzy, c-format msgid "%s is not installable" msgstr "ayihlohlwanga" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, fuzzy, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s ziphelelwe lixehsa %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 ibonelela esi sixhomekeki kodwa kuza kutshintsha inzululwazi yokwakha into ehlohliweyo" - -#. 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 ibonelela esi sixhomekeki kodwa kuza kutshintsha inzululwazi yokwakha into ehlohliweyo" - #. %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 ukushenxisa kusilele" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" msgstr "%s ukushenxisa kulungile" -#: ../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 "isi-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 "Isivelisi se-rpm Esongezelelweyo:" @@ -322,7 +310,7 @@ msgid "Austronesian (Other)" msgstr "isi-Austronesian (Esinye)" -#: ../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 "isi-Buginese" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -636,7 +624,7 @@ msgid "Cameroon" msgstr "i-Cameroon" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 #, fuzzy msgid "Can not create sat-pool." msgstr "Ayikwazi kudaleka ifayili." @@ -645,10 +633,6 @@ msgid "Can't acquire the mutex lock" msgstr "Ayikwazi kufumana isitshixo se-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)." @@ -678,6 +662,11 @@ msgid "Can't initialize recursive mutex" msgstr "Ayikwazi kundulula i-mutex yokugoba" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Ayikwazi kuvuleka ifayili %1." + #: ../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 "Ayikwazi kuvuleka ifayili %1." - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, fuzzy, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Ayikwazi kubonelela%s ukusuka ku%s" @@ -702,10 +686,6 @@ msgid "Can't release the mutex lock" msgstr "Ayikwazi kukhulula isitshixo se-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 "Ayikwazi kumisela ulwabelo lokugoba i-mutex " @@ -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 "Iifayili zobumbeko ezitshintshileyo zika%s:" @@ -1067,11 +1047,6 @@ msgid "Djibouti" msgstr "i-Djibouti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -#, fuzzy -msgid "Do not install or delete the resolvables concerned" -msgstr "Ungahlohli okanye cima izicombululi ezinxulumeneyo" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1117,7 +1092,7 @@ msgstr "isi-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 "Icandelo lokufunda imposiso %u." - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1275,7 +1245,7 @@ msgid "Failed to delete key." msgstr "Isilele ukuqalisa i-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 "" @@ -1285,7 +1255,7 @@ msgid "Failed to mount %s on %s" msgstr "Ayikwazanga kuvuleka i-%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 "Akukwazeki ukufumana iqhosha likawonkewonke." @@ -1524,9 +1494,9 @@ msgid "Geez" msgstr "isi-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 "Suhoya le mfuneko apha nje" #. :GRD:308: @@ -1817,27 +1787,10 @@ msgstr "isi-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 "Suhoya ukuba%s sele imiselwe ukuhlohla" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "Suhoya ukuphelelwa%s lixesha kwi%s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 -#, c-format -msgid "Ignore this conflict of %s" -msgstr "Suhoya le mpixano ka%s " - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Suhoya le mfuneko apha nje" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 +#, fuzzy, c-format +msgid "Ignore some dependencies of %s" +msgstr "ayikwazi kusombulula izixhomekeki" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1884,23 +1837,7 @@ msgid "Ingush" msgstr "isi-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 "Hlohla%s nangona kuza kutshintsha inzululwazi yokwakha" - -#. 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 "Hlohla%s nangona kuza kutshintsha inzululwazi yokwakha" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Hlohla izicombululi ezilahlekileyo" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "Ukuhlohla kuye kwalahlwa njengoko bekuyalelwe." @@ -1974,7 +1911,12 @@ msgid "Invalid port component '%s'" msgstr "Ayisebenziseki inxalenye yesiqhagamshelanisi se-'%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 "Guqula igama lokugqithisa lakho" @@ -2024,11 +1966,6 @@ msgid "Israel" msgstr "i-Israel" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Ayikwazi kuvuleka ifayili %1." - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2154,10 +2091,6 @@ msgid "Kazakhstan" msgstr "i-Kazakhstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Gcina iziconjululwa" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2873,7 +2806,7 @@ msgid "No Code" msgstr "Akukho Khowudi" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 #, fuzzy msgid "No url in repository." msgstr "Ifayili %1 ayifunyenwanga elugcinweni." @@ -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 "Ukwahlula umda wenkcazelo yendlela yothungelwano awuxhaswa malunga nale-URL" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "Ukwahlula umda wenkcazelo yendlela yothungelwano awuxhaswa malunga ne-URL" - #: ../zypp/media/MediaException.cc:200 #, fuzzy, c-format msgid "Permission to access '%s' denied." @@ -3205,8 +3130,8 @@ msgstr "Ukwahlulwa komtya wokubuzisa awuxhaswa malunga nale-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 "isilele" @@ -3235,16 +3160,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Indlela yothungelwano ethelekisekayo ayivunyelwa xa lukhona ugunyaziso" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "Ibuyisela oovimba" -#: ../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 "i-Solomon Islands" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, fuzzy, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "%s iimpixano ne %s" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3779,7 +3704,7 @@ msgid "Thailand" msgstr "i-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 "Ulwimi Olungaziwayo:" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "Vula ezi zicombululi" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4285,90 +4206,74 @@ msgid "applydeltarpm failed." msgstr "kusilele ukusetyenziswa kwe-deltarpm." -#: ../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 "Ayikwazi kuhlohla%s " -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 #, fuzzy msgid "conflicting requests" msgstr "Uqhagamshelo lucela uku:" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" msgstr "idale ugcino olukhuselekileyo %s " -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "Ukuhlohla" -#. 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 "Cima %s" - -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 #, fuzzy msgid "deleted providers: " msgstr "Akukho nanye ebonelela ngo%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 "Ungahlohli okanye cima izicombululi ezinxulumeneyo" -#: ../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 "Akukho baboneleli bahlohliweyo baka%s" -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, fuzzy, c-format msgid "do not forbid installation of %s" msgstr "ungahlohli %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 "ungahlohli %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 "ayihlohlwanga" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, fuzzy, c-format msgid "downgrade of %s to %s" msgstr "Ikhuphele%s ukusuka ku%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 "hlohla%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 "Gcina%s" @@ -4393,34 +4296,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "i-libhal_imisela_uqhagamshelo_lwe-dbus: Ayikwazi kumesela uqhagamshelo lwe-dbus " -#: ../zypp/sat/SATResolver.cc:699 +#: ../zypp/solver/detail/SATResolver.cc:870 #, fuzzy, c-format msgid "nothing provides %s needed by %s" msgstr "%s ifunwa ngu %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, fuzzy, c-format msgid "nothing provides requested %s" msgstr "Akukho nanye ebonelela ngo%s " -#: ../zypp/sat/SATResolver.cc:685 +#: ../zypp/solver/detail/SATResolver.cc:856 #, fuzzy, c-format msgid "problem with installed package %s" msgstr "umyalelo wokuyeka ukuhlohla imibekelelo" -#: ../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 "i-rpm idalwe %s njenge %s kodwa kwakungenzeki ukumisela umahluko" #. %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 @@ "i-rpm idalwe %s njenge %s.\n" "Nantsi imigca eyi-25 yokuqala yomahluko:\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 "isivelisi se-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 "i-rpm igcine %s njenge %s kodwa kwakungenzeki ukumisela umahluko" #. %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 @@ "i-rpm igcinwe %s njenge %s.\n" "Nantsi imigca eyi-25 yokuqala yomahluko:\n" -#: ../zypp/sat/SATResolver.cc:759 +#: ../zypp/solver/detail/SATResolver.cc:935 #, fuzzy msgid "uninstallable providers: " msgstr "Akukho baboneleli bahlohliweyo baka%s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "vula%s" +#, fuzzy +#~ msgid "%s provides this dependency, but would change the architecture of the installed item" +#~ msgstr "%s ibonelela esi sixhomekeki kodwa kuza kutshintsha inzululwazi yokwakha into ehlohliweyo" + +#, fuzzy +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s ibonelela esi sixhomekeki kodwa kuza kutshintsha inzululwazi yokwakha into ehlohliweyo" + +#, fuzzy +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "Ungahlohli okanye cima izicombululi ezinxulumeneyo" + +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Suhoya ukuba%s sele imiselwe ukuhlohla" + +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "Suhoya ukuphelelwa%s lixesha kwi%s" + +#~ msgid "Ignore this conflict of %s" +#~ msgstr "Suhoya le mpixano ka%s " + +#~ msgid "Ignore this requirement just here" +#~ msgstr "Suhoya le mfuneko apha nje" + +#~ msgid "Install %s although it would change the architecture" +#~ msgstr "Hlohla%s nangona kuza kutshintsha inzululwazi yokwakha" + +#, fuzzy +#~ msgid "Install %s although it would change the vendor" +#~ msgstr "Hlohla%s nangona kuza kutshintsha inzululwazi yokwakha" + +#~ msgid "Install missing resolvables" +#~ msgstr "Hlohla izicombululi ezilahlekileyo" + +#~ msgid "Keep resolvables" +#~ msgstr "Gcina iziconjululwa" + +#~ msgid "Unlock these resolvables" +#~ msgstr "Vula ezi zicombululi" + +#~ msgid "delete %s" +#~ msgstr "Cima %s" + +#~ msgid "install %s" +#~ msgstr "hlohla%s" + +#~ msgid "unlock %s" +#~ msgstr "vula%s" + +#~ msgid "unlock all resolvables" +#~ msgstr "vula zonke izicombululi" + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Ayikwazi kuvuleka ifayili %1." + +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "Icandelo lokufunda imposiso %u." + +#~ msgid "Path Parameter parsing not supported for this URL" +#~ msgstr "Ukwahlula umda wenkcazelo yendlela yothungelwano awuxhaswa malunga nale-URL" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "vula zonke izicombululi" +#~ msgid "Path parameter parsing not supported for this URL" +#~ msgstr "Ukwahlula umda wenkcazelo yendlela yothungelwano awuxhaswa malunga ne-URL" #~ msgid "Software management is already running." #~ msgstr "Ukulawulwa kwe-software sele kuqhuba." Modified: trunk/libzypp/po/zh_CN.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zh_CN.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/zh_CN.po (original) +++ trunk/libzypp/po/zh_CN.po Mon Apr 28 15:25:19 2008 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-31 15:30+0200\n" -"PO-Revision-Date: 2008-03-22 18:23+1000\n" +"POT-Creation-Date: 2008-04-21 18:58+0200\n" +"PO-Revision-Date: 2008-04-23 19:40+0800\n" "Last-Translator: Eric Shan \n" "Language-Team: Simplified Chinese\n" "MIME-Version: 1.0\n" @@ -16,76 +16,65 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../zypp/sat/SATResolver.cc:757 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " -msgstr "没有提供可安装的 %s" +msgstr "" +"\n" +"不可安装的提供者：" #: ../zypp/media/MediaException.cc:214 #, c-format msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." -msgstr "" +msgstr " SSL 认证问题，请确认“%s”的 CA 认证是队的。" -#: ../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 冲突 %s" +msgstr "%1$s 与 %3$s 提供的 %2$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 #, c-format msgid "%s is not installable" msgstr "%s 不能安装" -#: ../zypp/sat/SATResolver.cc:714 -#, 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 +#: ../zypp/solver/detail/SATResolver.cc:885 #, 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 -#, c-format -msgid "%s provides this dependency, but would change the vendor of the installed item" -msgstr "%s 满足了此依赖性，但是会改变已安装项目的提供者" +msgid "%s obsoletes %s provided by %s" +msgstr "%1$s 淘汰 %3$s 提供的 %2$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 "" +msgstr "%s 需要 %s，但是不能提供这个需求" #. language code: abk ab #: ../zypp/LanguageCode.cc:240 @@ -107,12 +96,12 @@ msgid "Adangme" msgstr "阿当梅语" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, 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 输出：" @@ -325,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 "'%s' 需要身份验证" @@ -363,11 +352,11 @@ #: ../zypp/media/MediaException.cc:47 #, c-format msgid "Bad file name: %s" -msgstr "" +msgstr "文件么错误：%s" #: ../zypp/media/MediaException.cc:77 msgid "Bad media attach point" -msgstr "" +msgstr "媒体附加点错误" #. :BRA:076: #: ../zypp/CountryCode.cc:254 @@ -589,7 +578,7 @@ msgid "Buginese" msgstr "布吉语" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "正在构建 '%s' 安装源缓存" @@ -639,39 +628,34 @@ msgid "Cameroon" msgstr "喀麦隆" -#: ../zypp/sat/detail/PoolImpl.cc:100 -#, fuzzy +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." -msgstr "无法创建文件。" +msgstr "无法创建 sat-pool。" #: ../zypp/thread/Mutex.cc:77 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)." -msgstr "" +msgstr "chroot (%s) 不能切换目录到 '/'" #: ../zypp/ExternalProgram.cc:238 #, c-format msgid "Can't chroot to '%s' (%s)." -msgstr "" +msgstr "不能 chroot 到 '%s' (%s)" #. don't want to get here #: ../zypp/ExternalProgram.cc:259 #, c-format msgid "Can't exec '%s' (%s)." -msgstr "" +msgstr "不能执行 '%s' (%s)" #: ../zypp/ExternalProgram.cc:267 -#, fuzzy, c-format +#, c-format msgid "Can't fork (%s)." -msgstr "找不到 %s。" +msgstr "不能够派生 (%s)。" #: ../zypp/thread/Mutex.cc:33 msgid "Can't initialize mutex attributes" @@ -681,6 +665,11 @@ msgid "Can't initialize recursive mutex" msgstr "无法初始化递归的 mutex" +#: ../zypp/base/InterProcessMutex.cc:79 +#, c-format +msgid "Can't open lock file: %s" +msgstr "无法打开锁定文件：%s。" + #: ../zypp/ExternalProgram.cc:174 #, c-format msgid "Can't open pipe (%s)." @@ -691,24 +680,15 @@ msgid "Can't open pty (%s)." msgstr "无法打开 pty (%s)." -#: ../zypp/Repository.cc:136 -#, fuzzy -msgid "Can't open solv-file: " -msgstr "无法打开文件 %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 "无法提供 %s 由安装源 %s " +msgstr "安装源 %2$s 无法提供文件 %1$s " #: ../zypp/thread/Mutex.cc:87 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 特性" @@ -721,7 +701,7 @@ #: ../zypp/KeyRing.cc:276 #, c-format msgid "Cannot create public key %s from %s keyring to file %s" -msgstr "" +msgstr "不能从密钥环 %2$s 创建密钥 %1$s 到文件 %3$s" #: ../zypp/media/MediaException.cc:182 msgid "Cannot eject any media" @@ -804,7 +784,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 的已更改配置文件：" @@ -902,7 +882,7 @@ #: ../zypp/ExternalProgram.cc:346 #, c-format msgid "Command exited with status %d." -msgstr "" +msgstr "命令退出状态 %d。" #: ../zypp/ExternalProgram.cc:371 msgid "Command exited with unknown error." @@ -911,7 +891,7 @@ #: ../zypp/ExternalProgram.cc:366 #, c-format msgid "Command was killed by signal %d (%s)." -msgstr "" +msgstr "命令被信号 %d (%s) 杀死。" #. :KIR:296: #: ../zypp/CountryCode.cc:339 @@ -1069,10 +1049,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" @@ -1100,6 +1076,9 @@ "Error code: %s\n" "Error message: %s\n" msgstr "" +"对于“%s”的下载(curl)错误：\n" +"错误代码：%s\n" +"错误信息：%s\n" #. TranslatorExplanation: curl is the name of a library, don't translate #: ../zypp/media/MediaException.cc:84 @@ -1118,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 "" @@ -1185,11 +1164,11 @@ #: ../zypp/media/MediaException.cc:135 msgid "Empty destination in URI" -msgstr "" +msgstr "URL 目标为空" #: ../zypp/media/MediaException.cc:130 msgid "Empty filesystem in URI" -msgstr "" +msgstr "URI 文件系统为空" #: ../zypp/media/MediaException.cc:125 msgid "Empty host name in URI" @@ -1228,12 +1207,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 "读取扇区 %u 时出错。" +msgstr "为“%s”设置下载(curl)选项时出错：" #. language code: myv #: ../zypp/LanguageCode.cc:850 @@ -1271,21 +1245,20 @@ msgstr "埃翁多语" #: ../zypp/KeyRing.cc:558 -#, fuzzy msgid "Failed to delete key." -msgstr "未能删除密钥。" +msgstr "无法删除密钥。" -#: ../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 "从文件 %s 中导入公钥失败：%s" #: ../zypp/media/MediaException.cc:31 #, c-format msgid "Failed to mount %s on %s" msgstr "未能把 %s 挂载到 %s" -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "未能删除公共密钥 %s: %s" @@ -1420,7 +1393,6 @@ msgstr "芬兰-乌戈尔诸语言（其它）" #: ../zypp/solver/detail/ProblemSolutionCombi.cc:73 -#, fuzzy msgid "Following actions will be done:" msgstr "将执行以下动作：" @@ -1524,9 +1496,9 @@ msgid "Geez" msgstr "吉兹语" -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:65 -msgid "Generally ignore this requirement" -msgstr "通常忽略此需求" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:61 +msgid "Generally ignore of some dependecies" +msgstr "通常忽略一些依赖关系" #. :GRD:308: #: ../zypp/CountryCode.cc:302 @@ -1816,27 +1788,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 +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 #, 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 "仅在此忽略此需求" +msgid "Ignore some dependencies of %s" +msgstr "忽略 %s 的一些依赖关系" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1883,23 +1838,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 -#, 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 "安装已经按照指示被中止。" @@ -1973,7 +1912,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 "无效的正则表达式“%s”：regcomp 返回 %d" + +#: ../zypp/media/MediaCurl.cc:758 ../zypp/media/MediaCurl.cc:826 msgid "Invalid user name or password." msgstr "无效用户名或密码。" @@ -2022,11 +1966,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 +2091,6 @@ msgid "Kazakhstan" msgstr "哈萨克斯坦" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "保留可解析项" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2508,7 +2443,7 @@ #: ../zypp/media/MediaException.cc:115 msgid "Malformed URI" -msgstr "" +msgstr "错误的 URI" #. :MKD:807: #: ../zypp/CountryCode.cc:363 @@ -2618,21 +2553,21 @@ #: ../zypp/media/MediaException.cc:169 #, c-format msgid "Media source '%s' does not contain the desired medium" -msgstr "" +msgstr "媒体源“%s”不包含需要的媒体" #: ../zypp/media/MediaException.cc:175 #, c-format msgid "Medium '%s' is in use by another instance" -msgstr "" +msgstr "媒体“%s”被另外一个实例使用着" #: ../zypp/media/MediaException.cc:72 msgid "Medium not attached" -msgstr "" +msgstr "媒体没有附上" #: ../zypp/media/MediaException.cc:53 #, c-format msgid "Medium not opened when trying to perform action '%s'." -msgstr "" +msgstr "当试图执行动作“%s”时，媒体没有打开。" #. language code: men #: ../zypp/LanguageCode.cc:808 @@ -2871,7 +2806,7 @@ msgid "No Code" msgstr "无代码" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "安装源中没有 url。" @@ -2980,9 +2915,8 @@ msgstr "阿曼" #: ../zypp/media/MediaException.cc:145 -#, fuzzy msgid "Operation not supported by medium" -msgstr "配置文件版本不受 Apparmor 模块支持\n" +msgstr "媒体不支持此操作" #. language code: ori or #: ../zypp/LanguageCode.cc:910 @@ -3086,27 +3020,19 @@ msgstr "巴拉圭" #: ../zypp/media/MediaException.cc:106 -#, fuzzy, c-format +#, c-format msgid "Path '%s' on medium '%s' is not a directory." -msgstr "%1 不是目录。" +msgstr "媒体“%2$s”上的路径“%1$s”不是一个目录。" #: ../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 "不支持对此 URL 的路径参数进行语法分析" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "不支持对此 URL 的路径参数进行语法分析" +msgstr "媒体“%2$s”上的路径“%1$s”不是一个文件。" #: ../zypp/media/MediaException.cc:200 -#, fuzzy, c-format +#, c-format msgid "Permission to access '%s' denied." -msgstr "拒绝许可权限" +msgstr "访问“%s”的权限被拒绝。" #. language code: per fas fa #: ../zypp/LanguageCode.cc:938 ../zypp/LanguageCode.cc:940 @@ -3203,8 +3129,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 msgid "RPM failed: " msgstr "RPM 失败：" @@ -3232,16 +3158,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 "正在移除安装源 '%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 "找不到所需文件：" @@ -3541,6 +3462,11 @@ msgid "Solomon Islands" msgstr "所罗门群岛" +#: ../zypp/solver/detail/SATResolver.cc:889 +#, c-format +msgid "Solvable %s conflicts with %s provided by itself" +msgstr "课解析项 %s 与自身提供的 %s 冲突" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3699,7 +3625,7 @@ #: ../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 "系统管理被 pid 为 %d 的程序锁定。请关闭这个程序再重试。" #. language code: tgl tl #: ../zypp/LanguageCode.cc:1108 @@ -3776,9 +3702,9 @@ msgid "Thailand" msgstr "泰国" -#: ../zypp/base/InterProcessMutex.cc:130 +#: ../zypp/base/InterProcessMutex.cc:139 msgid "This action is being run by another program already." -msgstr "" +msgstr "这个动作正在被另外一个程序运行着。" #. language code: tib bod bo #: ../zypp/LanguageCode.cc:1112 ../zypp/LanguageCode.cc:1114 @@ -3798,7 +3724,7 @@ #: ../zypp/media/MediaException.cc:207 #, c-format msgid "Timeout exceed when access '%s'." -msgstr "" +msgstr "访问“%s”超时。" #. language code: tem #: ../zypp/LanguageCode.cc:1100 @@ -3849,7 +3775,7 @@ #: ../zypp/KeyRing.cc:507 #, c-format msgid "Tried to import not existant key %s into keyring %s" -msgstr "" +msgstr "尝试导入并不存在的密钥 %s 到钥匙环 %s" #. :TUR:792: #: ../zypp/CountryCode.cc:441 @@ -4016,19 +3942,15 @@ 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'" msgstr "不支持 HTTP 认证方法 '%s'" #: ../zypp/media/MediaException.cc:140 -#, fuzzy, c-format +#, c-format msgid "Unsupported URI scheme in '%s'." -msgstr "URL 模式“%1”无效。" +msgstr "不支持“%s”中的 URI 方案。" #: ../devel/devel.mvidner/installation_sources.cc:75 #, c-format @@ -4282,89 +4204,72 @@ 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 "" +msgstr "框架从 %s 更改到 %s" -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, c-format msgid "cannot install both %s and %s" msgstr "无法安装 %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 "已创建备份 %s" -#: ../zypp/sat/SATResolver.cc:978 -#, fuzzy, c-format -msgid "deinstallation of %s" -msgstr "安装 %s 失败：" - -#. 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" +msgid "deinstallation of %s" +msgstr "去除 %s 的安装" -#: ../zypp/sat/SATResolver.cc:747 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:923 msgid "deleted providers: " -msgstr "均不提供 %s" +msgstr "删除的提供者：" -#: ../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 "不安装或删除相关的可解析项" +msgstr "不询问删除所有提供 %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 "没有提供可安装的 %s" +msgstr "不询问安装一个提供 %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 "不安装 %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 "" +msgstr "不安装最最新版本的 %s" -#: ../zypp/sat/SATResolver.cc:811 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:989 +#, c-format msgid "do not keep %s installed" -msgstr "未安装" +msgstr "不保持 %s 被安装" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, 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" @@ -4372,11 +4277,13 @@ "-->\n" " %s" msgstr "" +"安装 %s (包括供应商的更改)" +" %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" @@ -4389,34 +4296,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "libhal_set_dbus_connection：无法设置 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 对于以下对象是必需的： %s" +msgstr "没有什么能提供 %2$s 需要的 %1$s" -#: ../zypp/sat/SATResolver.cc:691 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:862 +#, c-format msgid "nothing provides requested %s" -msgstr "均不提供 %s" +msgstr "没有什么能提供需要的 %s" -#: ../zypp/sat/SATResolver.cc:685 -#, fuzzy, c-format +#: ../zypp/solver/detail/SATResolver.cc:856 +#, c-format msgid "problem with installed package %s" -msgstr "正在读取已安装的包" +msgstr "已经安装的软件包 %s 有问题" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" -msgstr "" +msgstr "用 %2$s 取代 %1$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 已将 %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" @@ -4425,18 +4332,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 #, 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" @@ -4445,399 +4352,6 @@ "rpm 已将 %s 另存为 %s。\n" "以下是前 25 行差异：\n" -#: ../zypp/sat/SATResolver.cc:759 -#, fuzzy +#: ../zypp/solver/detail/SATResolver.cc:935 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 锁定" - -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "解锁所有可解析项" - -#~ msgid "Reading '%s' repository cache" -#~ msgstr "正在读取 '%s' 安装源缓存" - -#~ msgid "Reading patch and delta rpms from '%s' repository cache" -#~ msgstr "正在从 '%s' 安装源缓存读取补丁和增量包" - -#~ msgid "Cleaning repository '%s' cache" -#~ msgstr "正在清除 '%s' 安装源缓存" - -#~ msgid "Reading repository '%s' cache" -#~ msgstr "正在读取 '%s' 安装源缓存" - -#~ msgid "Software management is already running." -#~ msgstr "软件管理已处于运行状态。" - -#~ msgid "%s is replaced by %s" -#~ msgstr "%s 替换为 %s" - -#~ msgid "%s replaced by %s" -#~ msgstr "%s 替换为 %s" - -#~ msgid "%s will be deleted by the user.\n" -#~ msgstr "%s 将被用户删除。\n" - -#~ msgid "%s will be deleted by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "%s 将被另一个程序删除。(ApplLow/ApplHigh)\n" - -#~ msgid "%s will be installed by the user.\n" -#~ msgstr "%s 将被用户安装。\n" - -#~ msgid "%s will be installed by another application. (ApplLow/ApplHigh)\n" -#~ msgstr "%s 将被另一个程序安装。(ApplLow/ApplHigh)\n" - -#~ msgid "No valid solution found within %d seconds" -#~ msgstr " %d 秒内未得到有效方案。" - -#~ msgid "The solver has reached a defined timout" -#~ msgstr "解析生成试例超过规定时间" - -#~ msgid "No valid solution found with just resolvables of best architecture." -#~ msgstr "仅使用最佳架构解析项未得到有效方案。" - -#~ msgid "With this run only resolvables with the best architecture have been regarded.\n" -#~ msgstr "此试例中仅使用最佳架构的可解析项。\n" - -#~ msgid "Regarding all possible resolvables takes time, but can come to a valid result." -#~ msgstr "使用所有可能的可解析项，费时但有效。" - -#~ msgid "Invalid information" -#~ msgstr "无效信息" - -#~ msgid "%s is needed by other resolvables" -#~ msgstr "%s 对于其它可解析项是必需的" - -#~ msgid "" -#~ "%s is needed by:\n" -#~ "%s" -#~ msgstr "" -#~ "%s 对于以下对象是必需的：\n" -#~ "%s" - -#~ msgid "%s conflicts with other resolvables" -#~ msgstr "%s 与其它可解析项冲突" - -#~ msgid "" -#~ "%s conflicts with:\n" -#~ "%s" -#~ msgstr "" -#~ "%s 与以下对象冲突：\n" -#~ "%s" - -#~ msgid "%s obsoletes other resolvables" -#~ msgstr "%s 将废弃其它可解析项" - -#~ msgid "%s obsoletes:%s" -#~ msgstr "%s 废弃：%s" - -#~ msgid "" -#~ "\n" -#~ "These resolvables will be deleted from the system." -#~ msgstr "" -#~ "\n" -#~ "将从系统删除这些可解析项。" - -#~ msgid "%s depends on other resolvables" -#~ msgstr "%s 取决于其它可解析项" - -#~ msgid "%s depends on %s" -#~ msgstr "%s 依赖于 %s" - -#~ msgid "%s depends on:%s" -#~ msgstr "%s 依赖于：%s" - -#~ msgid "Child of" -#~ msgstr "子集" - -#~ msgid "" -#~ "\n" -#~ "There is no resource available which supports this requirement." -#~ msgstr "" -#~ "\n" -#~ "没有支持此需求的资源可用。" - -#~ msgid "Due to the problems described above/below, this resolution will not solve all dependencies" -#~ msgstr "由于上／下所述的问题，此解析将不解决所有依赖性问题。" - -#~ msgid "Cannot install %s, because it is conflicting with %s" -#~ msgstr "无法安装 %s，因为它与 %s 冲突" - -#~ msgid "%s is not installed and has been marked as uninstallable" -#~ msgstr "%s 未安装，且已被标记为不可安装" - -#~ msgid "Cannot install %s due to dependency problems" -#~ msgstr "由于依赖性问题，所以无法安装 %s" - -#~ msgid "%s has unfulfilled requirements" -#~ msgstr "%s 具有未满足的需求" - -#~ msgid "%s has missing dependencies" -#~ msgstr "%s 缺少依赖性" - -#~ msgid "%s cannot be installed due to missing dependencies" -#~ msgstr "由于缺少依赖性，所以无法安装 %s" - -#~ msgid "%s fulfills dependencies of %s but will be uninstalled" -#~ msgstr "%s 将满足 %s 的依赖性需求，但是将会被卸载" - -#~ msgid "%s fulfills dependencies of %s but will be kept on your system" -#~ msgstr "%s 将满足 %s 的依赖性需求，但是将会被保留在系统上" - -#~ msgid "No need to install %s" -#~ msgstr "无需安装 %s" - -#~ msgid "Cannot install %s to fulfill the dependencies of %s" -#~ msgstr "无法安装 %s 以满足 %s 的依赖性需求" - -#~ msgid "Cannot install %s to fulfil the dependencies of %s" -#~ msgstr "无法安装 %s 以实现 %s 的依赖性" - -#~ msgid "%s will not be uninstalled, because it is still required" -#~ msgstr "将不卸载 %s ，仍然需要此内容" - -#~ msgid "%s obsoletes %s. But %s cannot be deleted, because it is locked." -#~ msgstr "%s 废弃 %s。但无法删除 %s，因为它被锁定。" - -#~ msgid "Cannot install %s, because it is conflicting" -#~ msgstr "无法安装 %s，因为冲突" - -#~ msgid "%s is uninstallable due to conflicts with %s" -#~ msgstr "%s 由于与以下对象冲突所以不可卸装： %s" - -#~ msgid "Requirememt %s cannot be fulfilled." -#~ msgstr "无法满足需求 %s 。" - -#~ msgid "for requiring %s for %s when upgrading %s" -#~ msgstr "因为需要 %s（对于 %s）－ 在升级 %s 时" - -#~ msgid "%s is lacking the requirement %s" -#~ msgstr "%s 缺少所需的 %s" - -#~ msgid ", Action: " -#~ msgstr "，操作：" - -#~ msgid ", Trigger: " -#~ msgstr "，触发：" - -#~ msgid "package" -#~ msgstr "包" - -#~ msgid "selection" -#~ msgstr "选择" - -#~ msgid "pattern" -#~ msgstr "模式" - -#~ msgid "product" -#~ msgstr "产品" - -#~ msgid "patch" -#~ msgstr "增补" - -#~ msgid "script" -#~ msgstr "脚本" - -#~ msgid "message" -#~ msgstr "讯息" - -#~ msgid "atom" -#~ msgstr "原子" - -#~ msgid "system" -#~ msgstr "系统" - -#~ msgid "Resolvable" -#~ msgstr "可解析项" - -#~ msgid "Marking this resolution attempt as invalid." -#~ msgstr "将此解析尝试标记为无效。" - -#~ msgid "Marking resolvable %s as uninstallable" -#~ msgstr "将可解析的 %s 标记为可卸载" - -#~ msgid "%s is scheduled to be installed, but this is impossible due to dependency problems." -#~ msgstr "已计划安装 %s，但是由于依赖性问题而无法实现。" - -#~ msgid "Can't install %s since it is already marked as needed to be uninstalled" -#~ msgstr "无法安装 %s，这是由于它已被标记为需要卸载" - -#~ msgid "Can't install %s, because it does not apply to this system." -#~ msgstr "无法安装 %s，因为它不适用于此系统。" - -#~ msgid "Can't install %s, because %s is already marked as needed to for installation" -#~ msgstr "无法安装 %s，因为 %s 已被标记为需要安装" - -#~ msgid "This would invalidate %s." -#~ msgstr "这会使 %s 无效。" - -#~ msgid "Establishing %s" -#~ msgstr "正在建立 %s" - -#~ msgid "Installing %s" -#~ msgstr "正在安装 %s" - -#~ msgid "Skipping %s: already installed" -#~ msgstr "正在跳过 %s：已经安装" - -#~ msgid "There are no alternative providers of %s installed" -#~ msgstr "没有其它内容可提供需要的 %s" - -#~ msgid "for %s" -#~ msgstr "对于 %s" - -#~ msgid "Upgrading to %s to avoid removing %s is not possible." -#~ msgstr "通过升级到 %s 以避免移除 %s 是不可能的。" - -#~ msgid "%s provides %s, but is scheduled to be uninstalled." -#~ msgstr "%s 提供了 %s，但是已安排将其卸载。" - -#~ msgid "%s provides %s, but another version of that %s is already installed." -#~ msgstr "%s 提供了 %s，但是已经安装了该 %s 的另一个版本。" - -#~ msgid "%s provides %s, but it is uninstallable. Try installing it on its own for more details." -#~ msgstr "%s 提供了 %s，但是它是可卸载的。欲获取更多详细信息，请尝试自动安装它。" - -#~ msgid "%s provides %s, but it is locked." -#~ msgstr "%s 提供了 %s，但是它已被锁定。" - -#~ msgid "%s provides %s, but is scheduled to be kept." -#~ msgstr "%s 提供了 %s，但是已安排将其保留。" - -#~ msgid "%s provides %s, but has another architecture." -#~ msgstr "%s 提供了 %s，但它具有另一种架构。" - -#~ msgid "%s provides %s, but has another vendor (%s)." -#~ msgstr "%s 提供了 %s，但它具有另一个供应者 (%s)。" - -#~ msgid "Can't satisfy requirement %s for %s" -#~ msgstr "无法满足需求\"%s\"（对于 %s）" - -#~ msgid "%s is required by another resolvable selected for installation, so it won't be unlinked." -#~ msgstr "%s 是选定被安装的可解析项所需要的，因此不会将其取消链接。" - -#~ msgid "%s is required by another installed resolvable, so it won't be unlinked." -#~ msgstr "%s 是其他已安装的可解析项所需要的，因此不会将其取消链接。" - -#~ msgid "%s is locked and cannot be uninstalled." -#~ msgstr "%s 已锁定，因此无法将其卸装。" - -#~ msgid "A conflict over %s (%s) requires the removal of %s which is scheduled for installation" -#~ msgstr "%s (%s) 上发生冲突，需要去除将安装的 %s" - -#~ msgid "Marking %s as uninstallable due to conflicts over %s" -#~ msgstr "将 %s 标记为可卸载，这是由于 %s 上存在冲突" - -#~ msgid "from %s" -#~ msgstr "发件人 %s" - -#~ msgid " Error!" -#~ msgstr "错误！" - -#~ msgid " Important!" -#~ msgstr "重要信息！" - -#~ msgid "Make a solver run with ALL possibilities." -#~ msgstr "为所有可能生成解决试例。" - -#~ msgid "Regarding all resolvables with a compatible architecture." -#~ msgstr "使用所有兼容架构的可解析项。" - -#~ msgid "Make a solver run with best architecture only." -#~ msgstr "生成仅使用最佳架构的解决试例。" - -#~ msgid "Regarding resolvables with best architecture only." -#~ msgstr "仅使用最佳架构的可解析项。" - -#~ msgid "%s depended on %s" -#~ msgstr "%s 依赖于 %s" - -#~ msgid "%s is recommended by %s" -#~ msgstr "%s 被以下对象推荐： %s" - -#~ msgid "%s is suggested by %s" -#~ msgstr "%s 被以下对象建议： %s" - -#~ msgid "%s will be evaluated for installation (freshened) by %s" -#~ msgstr "将评估替换 %s 的 %s 安装（刷新）" - -#~ msgid "%s is enhanced by %s" -#~ msgstr "%s 被以下对象优化 %s" - -#~ msgid "%s is supplemented by %s" -#~ msgstr "%s 被以下对象补充： %s" - -#~ msgid "%s part of %s" -#~ msgstr "%s 一部分 %s" - -#~ msgid "Double timeout" -#~ msgstr "超时加倍" - -#~ msgid "Start the next solver run with doubled timeout." -#~ msgstr "用双倍超时开始下一次解析。" - -#~ msgid "%s is freshened by %s" -#~ msgstr "%s 被以下对象刷新： %s" - -#~ msgid "Unable to parse Url authority" -#~ msgstr "无法对 URL 授权进行语法分析" - -#~ msgid "Ignore this requirement generally" -#~ msgstr "通常忽略此需求" - -#~ msgid "%s is required by other to-be-installed resolvable, so it won't be unlinked." -#~ msgstr "%s 是其他将安装的可解析项所需要的，因此不会将其取消链接。" - -#~ msgid "Cannot create a file needed to perform update installation." -#~ msgstr "无法创建执行更新安装所需要的文件。" - -#~ msgid "Unable to restore all sources." -#~ msgstr "无法恢复所有源" - -#~ msgid "At least one source already registered, stored sources cannot be restored." -#~ msgstr "至少已注册了一个源，保存的源无法恢复。" - -#~ msgid "Cannot be install %s to fulfil the dependencies of %s" -#~ msgstr "无法安装 %s 以实现 %s 的依赖性" - -#~ msgid "%s dependend on %s" -#~ msgstr "%s 依赖于 %s" - -#~ msgid "Reading index files" -#~ msgstr "正在读取索引文件" - -#~ msgid "The signed repomd.xml file failed the signature check." -#~ msgstr "已签名的 repomd.xml 文件未能通过签名检查。" - -#~ msgid "Reading product from %s" -#~ msgstr "正在从 %s 读取产品" - -#~ msgid "Reading filelist from %s" -#~ msgstr "正在从 %s 读取文件列表" - -#~ msgid "Reading packages from %s" -#~ msgstr "正在从 %s 读取包" - -#~ msgid "Reading selection from %s" -#~ msgstr "正在从 %s 读取选择" - -#~ msgid "Reading pattern from %s" -#~ msgstr "正在从 %s 读取模式" - -#~ msgid "Reading patches index %s" -#~ msgstr "正在读取增补程序索引 %s" - -#~ msgid "Reading patch %s" -#~ msgstr "正在读取增补程序 %s" - -#~ msgid "The script file failed the checksum test." -#~ msgstr "脚本文件未能通过校验和测试。" - -#~ msgid "Reading packages file" -#~ msgstr "正在读取包文件" +msgstr "不可安装的提供者：" Modified: trunk/libzypp/po/zh_TW.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zh_TW.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/zh_TW.po (original) +++ trunk/libzypp/po/zh_TW.po Mon Apr 28 15:25:19 2008 @@ -9,7 +9,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: 2008-04-05 01:03+0800\n" "Last-Translator: swyear \n" "Language-Team: Chinese Traditional \n" @@ -19,7 +19,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: KBabel 1.11.4\n" -#: ../zypp/sat/SATResolver.cc:757 +#: ../zypp/solver/detail/SATResolver.cc:933 msgid "" "\n" "uninstallable providers: " @@ -32,61 +32,49 @@ msgid " SSL certificate problem, verify that the CA cert is OK for '%s'." msgstr " SSL 驗證問題，確認 '%s' 的 CA 憑證是正確的。" -#: ../zypp/sat/SATResolver.cc:709 +#: ../zypp/solver/detail/SATResolver.cc:880 #, c-format msgid "%s conflicts with %s provided by %s" msgstr "%s 與 %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 #, c-format msgid "%s is not installable" msgstr "%s 無法安裝" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s 汰換 %s (由 %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 可提供這項相依性，但是它會變更已安裝項目的架構" - -#. 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 可提供這項相依性，但是它會變更已安裝項目的廠商" - #. %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 "%s 需要 %s，但無法提供此需求" @@ -111,12 +99,12 @@ msgid "Adangme" msgstr "阿當梅語" -#: ../zypp/RepoManager.cc:1005 +#: ../zypp/RepoManager.cc:1007 #, 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 輸出：" @@ -329,7 +317,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 "要求 '%s' 的驗證" @@ -593,7 +581,7 @@ msgid "Buginese" msgstr "布吉斯語" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "正在建立套件庫 '%s' 的快取" @@ -643,7 +631,7 @@ msgid "Cameroon" msgstr "喀麥隆" -#: ../zypp/sat/detail/PoolImpl.cc:100 +#: ../zypp/sat/detail/PoolImpl.cc:147 msgid "Can not create sat-pool." msgstr "無法建立 sat-pool。" @@ -651,10 +639,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)." @@ -684,6 +668,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 "%d，無法開啟鎖定檔案： %s" + #: ../zypp/ExternalProgram.cc:174 #, c-format msgid "Can't open pipe (%s)." @@ -694,11 +683,7 @@ msgid "Can't open pty (%s)." msgstr "無法開啟 pty (%s)。" -#: ../zypp/Repository.cc:136 -msgid "Can't open solv-file: " -msgstr "無法開啟 solv-file： " - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "檔案 '%s' 無法由套件庫 '%s' 提供" @@ -707,10 +692,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 +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 "%s 的已變更組態檔：" @@ -1071,10 +1052,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" @@ -1123,7 +1100,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 "可疑的類型 '%s'：%u 位元 checksum '%s'" @@ -1235,10 +1212,6 @@ msgid "Error occurred while setting download (curl) options for '%s':" msgstr "為 '%s' 設定下載(curl)參數時發生錯誤：" -#: ../zypp/Repository.cc:141 -msgid "Error reading solv-file: " -msgstr "讀取 sol-file 發生錯誤： " - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1278,7 +1251,7 @@ msgid "Failed to delete key." msgstr "刪除金鑰失敗。" -#: ../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 "從檔案 %s 匯入公開金鑰失敗： %s" @@ -1288,7 +1261,7 @@ msgid "Failed to mount %s on %s" msgstr "載掛 %s 在 %s 失敗" -#: ../zypp/target/rpm/RpmDb.cc:1124 +#: ../zypp/target/rpm/RpmDb.cc:1122 #, c-format msgid "Failed to remove public key %s: %s" msgstr "移除公開金鑰 %s 失敗： %s" @@ -1527,8 +1500,9 @@ msgid "Geez" msgstr "吉茲語" -#: ../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 "完全忽略此需求" #. :GRD:308: @@ -1819,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 @@ -1886,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 -#, 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 "安裝已如指示中止。" @@ -1976,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 msgid "Invalid user name or password." msgstr "無效的使用者名稱和密碼。" @@ -2025,11 +1971,6 @@ msgid "Israel" msgstr "以色列" -#: ../zypp/base/InterProcessMutex.cc:68 -#, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "%d，無法開啟鎖定檔案： %s" - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2155,10 +2096,6 @@ msgid "Kazakhstan" msgstr "哈薩克" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "保留解決方案" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2874,7 +2811,7 @@ msgid "No Code" msgstr "沒有程式碼" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 msgid "No url in repository." msgstr "套件庫中沒有 url。" @@ -3097,14 +3034,6 @@ msgid "Path '%s' on medium '%s' is not a file." msgstr "路徑 '%s' 在媒體 '%s' 不是一個檔案。" -#: ../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 #, c-format msgid "Permission to access '%s' denied." @@ -3205,8 +3134,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 msgid "RPM failed: " msgstr "RPM 失敗： " @@ -3234,16 +3163,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 "正在移除套件庫 '%s'" -#: ../zypp/Repository.cc:104 -#, c-format -msgid "RepoInfo alias (%s) does not match repository name (%s)" -msgstr "套件庫資訊別名 (%s) 不符合套件庫名稱 (%s)" - #: ../zypp/parser/susetags/RepoParser.cc:232 msgid "Required file is missing: " msgstr "缺少需要的檔案：" @@ -3543,6 +3467,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 衝突(由 %s 提供)" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3778,7 +3707,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 "此行動已被其他程式執行。" @@ -4018,10 +3947,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'" @@ -4284,88 +4209,72 @@ 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 "架構由 %s 變更為 %s" -#: ../zypp/sat/SATResolver.cc:704 +#: ../zypp/solver/detail/SATResolver.cc:875 #, c-format msgid "cannot install both %s and %s" msgstr "無法同時安裝 %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 "已建立備份 %s" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, c-format msgid "deinstallation of %s" msgstr "反安裝 %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 "刪除 %s" - -#: ../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 "請勿要求刪除所有提供 %s 的解決方案" -#: ../zypp/sat/SATResolver.cc:884 +#: ../zypp/solver/detail/SATResolver.cc:1062 #, 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 #, 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 "請勿安裝最新版本的 %s" -#: ../zypp/sat/SATResolver.cc:811 +#: ../zypp/solver/detail/SATResolver.cc:989 #, c-format msgid "do not keep %s installed" msgstr "請勿保有 %s 被安裝" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, 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" @@ -4378,10 +4287,8 @@ "-->\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" @@ -4394,34 +4301,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 #, c-format msgid "nothing provides %s needed by %s" msgstr "無法提供 %s 這是被 %s 所需要的" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, 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 "已安裝的套件 %s 發生問題" -#: ../zypp/sat/SATResolver.cc:966 +#: ../zypp/solver/detail/SATResolver.cc:1144 #, c-format msgid "replacement of %s with %s" msgstr "取代 %s 以 %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 已將 %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" @@ -4430,18 +4337,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 #, 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" @@ -4450,17 +4357,75 @@ "rpm 已將 %s 儲存為 %s。\n" "這是前 25 行差異：\n" -#: ../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 "取消鎖定 %s" +#~ msgid "%s provides this dependency, but would change the architecture of the installed item" +#~ msgstr "%s 可提供這項相依性，但是它會變更已安裝項目的架構" + +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s 可提供這項相依性，但是它會變更已安裝項目的廠商" + +#~ 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，即使它會變更架構" + +#~ 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 "解除鎖定所有解決方案" + +#~ msgid "Can't add solvables to norepo." +#~ msgstr "無法附加解決方案到虛無的套件庫。" + +#~ msgid "Can't open solv-file: " +#~ msgstr "無法開啟 solv-file： " + +#~ msgid "Can't set RepoInfo for norepo." +#~ msgstr "無法對虛無的套件庫設定套件庫資訊。" + +#~ msgid "Error reading solv-file: " +#~ msgstr "讀取 sol-file 發生錯誤： " + +#~ 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 "RepoInfo alias (%s) does not match repository name (%s)" +#~ msgstr "套件庫資訊別名 (%s) 不符合套件庫名稱 (%s)" Modified: trunk/libzypp/po/zu.po URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/po/zu.po?rev=9860&r1=9859&r2=9860&view=diff ============================================================================== --- trunk/libzypp/po/zu.po (original) +++ trunk/libzypp/po/zu.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 \n" "Language-Team: Novell Language \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 ixabana ne- %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 "ukufakwa kwe-%s akuphumelelanga" #. %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 efakiwe ilungile" -#: ../zypp/sat/SATResolver.cc:695 +#: ../zypp/solver/detail/SATResolver.cc:866 #, fuzzy, c-format msgid "%s is not installable" msgstr "alufakiwe" -#: ../zypp/sat/SATResolver.cc:714 +#: ../zypp/solver/detail/SATResolver.cc:885 #, fuzzy, c-format msgid "%s obsoletes %s provided by %s" msgstr "%s yenza zingasebenzi %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 ihlinzeka ngalolu hlelo okuncikwe kulo kodwa ingabushintsha ubuciko bomklamo bento efakiwe" - -#. 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 ihlinzeka ngalolu hlelo okuncikwe kulo kodwa ingabushintsha ubuciko bomklamo bento efakiwe" - #. %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 "Ukususa i-%s akuphumelelanga" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2184 +#: ../zypp/target/rpm/RpmDb.cc:2182 #, c-format msgid "%s remove ok" msgstr "ukususa i-%s kuphumelele" -#: ../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 "Isi-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 "Okunye okukhishiwe kwe-rpm:" @@ -322,7 +310,7 @@ msgid "Austronesian (Other)" msgstr "Isi-Austronesia (Esinye)" -#: ../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 "IsiBuginese" -#: ../zypp/RepoManager.cc:718 +#: ../zypp/RepoManager.cc:719 #, c-format msgid "Building repository '%s' cache" msgstr "" @@ -636,7 +624,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 "Ayikwazi ukwakha ifayela." @@ -645,10 +633,6 @@ msgid "Can't acquire the mutex lock" msgstr "Ayikwazi ukuthola isihluthulelo se-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)." @@ -678,6 +662,11 @@ msgid "Can't initialize recursive mutex" msgstr "Ayikwazi ukulungiselela ukuqalisa i-recursive mutex" +#: ../zypp/base/InterProcessMutex.cc:79 +#, fuzzy, c-format +msgid "Can't open lock file: %s" +msgstr "Ayikwazi ukuvula ifayela %1." + #: ../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 "Ayikwazi ukuvula ifayela %1." - -#: ../zypp/repo/RepoProvideFile.cc:207 +#: ../zypp/repo/RepoProvideFile.cc:216 #, fuzzy, c-format msgid "Can't provide file '%s' from repository '%s'" msgstr "Ayikwazi ukuhlinzeka nge-%s kwi-%s" @@ -702,10 +686,6 @@ msgid "Can't release the mutex lock" msgstr "Ayikwazi ukukhulula isihluthulelo se-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 "Ayikwazi ukusetha ama-attribute e-mutex" @@ -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 "Amafayela okuhlela ashintshile e-%s:" @@ -1067,11 +1047,6 @@ msgid "Djibouti" msgstr "Djibouti" -#: ../zypp/solver/detail/ProblemSolutionUninstall.cc:81 -#, fuzzy -msgid "Do not install or delete the resolvables concerned" -msgstr "Ungafaki noma ususe maqondana nezixazululi" - #. language code: doi #: ../zypp/LanguageCode.cc:468 msgid "Dogri" @@ -1117,7 +1092,7 @@ msgstr "IsiDuala" #. 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 "Kwenzeke iphutha ifunda i-sector %u." - #. language code: myv #: ../zypp/LanguageCode.cc:850 msgid "Erzya" @@ -1275,7 +1245,7 @@ msgid "Failed to delete key." msgstr "Ayikwazanga ukuqala i-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 "" @@ -1285,7 +1255,7 @@ msgid "Failed to mount %s on %s" msgstr "Ayikwazi ukuvula %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 "Ayikwazi ukuthola isikhiye sikawonk’ uwonke." @@ -1524,9 +1494,9 @@ msgid "Geez" msgstr "IsiGeez" -#: ../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 "Sishaye indiva lesi sidingo lapha nje kuphela" #. :GRD:308: @@ -1818,27 +1788,10 @@ msgstr "Isi-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 "Kushaye indiva ukuthi i-%s isisethelwe ukufakwa kakade" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:132 -#, c-format -msgid "Ignore the obsolete %s in %s" -msgstr "Ishaye indiva into engasebenzi i-%s e-%s" - -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:105 -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:117 -#, c-format -msgid "Ignore this conflict of %s" -msgstr "Kushaye indiva lokhu kuxabana kwe-%s" - -#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:56 -msgid "Ignore this requirement just here" -msgstr "Sishaye indiva lesi sidingo lapha nje kuphela" +#: ../zypp/solver/detail/ProblemSolutionIgnore.cc:52 +#, fuzzy, c-format +msgid "Ignore some dependencies of %s" +msgstr "ayikwazanga ukuxazulula izinhlelo ezincike kwezinye" #. language code: ijo #: ../zypp/LanguageCode.cc:630 @@ -1885,23 +1838,7 @@ msgid "Ingush" msgstr "Isi-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 "Faka %s nakuba izoshintsha ubuciko bomklamo" - -#. 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 "Faka %s nakuba izoshintsha ubuciko bomklamo" - -#: ../zypp/solver/detail/ProblemSolutionInstall.cc:66 -msgid "Install missing resolvables" -msgstr "Faka izixazululi ezilahlekile" - -#: ../zypp/target/TargetImpl.cc:678 +#: ../zypp/target/TargetImpl.cc:762 msgid "Installation has been aborted as directed." msgstr "Ukufaka kuyekiwe njengoba kunikezwe isiqondiso." @@ -1975,7 +1912,12 @@ msgid "Invalid port component '%s'" msgstr "Ingxenyana engekho emthethweni '%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 "Iphasiwedi ye-CA engekho emthethweni." @@ -2025,11 +1967,6 @@ msgid "Israel" msgstr "Israel" -#: ../zypp/base/InterProcessMutex.cc:68 -#, fuzzy, c-format -msgid "It %d, Can't open lock file: %s" -msgstr "Ayikwazi ukuvula ifayela %1." - #. language code: ita it #: ../zypp/LanguageCode.cc:654 msgid "Italian" @@ -2155,10 +2092,6 @@ msgid "Kazakhstan" msgstr "Kazakhstan" -#: ../zypp/solver/detail/ProblemSolutionKeep.cc:65 -msgid "Keep resolvables" -msgstr "Gcina Izixazululi" - #. :JPN:392: #: ../zypp/CountryCode.cc:335 msgid "Kenya" @@ -2874,7 +2807,7 @@ msgid "No Code" msgstr "Ayikho Ikhodi" -#: ../zypp/repo/RepoProvideFile.cc:213 +#: ../zypp/repo/RepoProvideFile.cc:222 #, fuzzy msgid "No url in repository." msgstr "Ifayela %1 ayitholakali enqolobaneni yamafayela." @@ -3098,14 +3031,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 "Ukucazwa kwepharamitha yomgudu akusekelwa kule-URL" - -#: ../zypp/url/UrlBase.cc:727 -msgid "Path parameter parsing not supported for this URL" -msgstr "Ukucazwa kwepharamitha yomgudu akusekelwa kule-URL" - #: ../zypp/media/MediaException.cc:200 #, fuzzy, c-format msgid "Permission to access '%s' denied." @@ -3206,8 +3131,8 @@ msgstr "Ukucazwa kohlu lwemibuzo akusekelwa kule-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 "ayiphumelelanga" @@ -3236,16 +3161,11 @@ msgid "Relative path not allowed if authority exists" msgstr "Umgudu ongaphelele awuvunyelwe uma kunegunya" -#: ../zypp/RepoManager.cc:1112 +#: ../zypp/RepoManager.cc:1114 #, fuzzy, c-format msgid "Removing repository '%s'" msgstr "Ukubuyisela imithombo yokwaziswa" -#: ../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 "" @@ -3545,6 +3465,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 ixabana ne- %s" + #. language code: som so #: ../zypp/LanguageCode.cc:1060 msgid "Somali" @@ -3780,7 +3705,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 "" @@ -4020,10 +3945,6 @@ msgid "Unknown language: " msgstr "Ulimi olungaziwa:" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:91 -msgid "Unlock these resolvables" -msgstr "Vula izihluthulelo zalezi zixazululi" - #: ../zypp/media/MediaUserAuth.cc:97 #, c-format msgid "Unsupported HTTP authentication method '%s'" @@ -4286,90 +4207,74 @@ msgid "applydeltarpm failed." msgstr "i-applydeltarpm ihlulekile." -#: ../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 "Ayikwazi ukufaka %s" -#: ../zypp/sat/SATResolver.cc:688 +#: ../zypp/solver/detail/SATResolver.cc:859 #, fuzzy msgid "conflicting requests" msgstr "Isicelo Sokuxhuma kwi-:" #. timestamp -#: ../zypp/target/rpm/RpmDb.cc:2329 +#: ../zypp/target/rpm/RpmDb.cc:2327 #, c-format msgid "created backup %s" msgstr "yakhe i-backup %s" -#: ../zypp/sat/SATResolver.cc:978 +#: ../zypp/solver/detail/SATResolver.cc:1156 #, fuzzy, c-format msgid "deinstallation of %s" msgstr "Ukufaka uhlelo" -#. 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 "Susa %s" - -#: ../zypp/sat/SATResolver.cc:747 +#: ../zypp/solver/detail/SATResolver.cc:923 #, fuzzy msgid "deleted providers: " msgstr "Akukho okunikeza %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 "Ungafaki noma ususe maqondana nezixazululi" -#: ../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 "Abekho abanye abaphakeli abafakiwe be-%s" -#: ../zypp/sat/SATResolver.cc:837 +#: ../zypp/solver/detail/SATResolver.cc:1015 #, fuzzy, c-format msgid "do not forbid installation of %s" msgstr "ungafaki %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 "ungafaki %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 "alufakiwe" -#: ../zypp/sat/SATResolver.cc:944 +#: ../zypp/solver/detail/SATResolver.cc:1122 #, fuzzy, c-format msgid "downgrade of %s to %s" msgstr "Ilande %s kwi-%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 "faka %s" - -#: ../zypp/sat/SATResolver.cc:958 +#: ../zypp/solver/detail/SATResolver.cc:1136 #, c-format msgid "" "install %s (with vendor change)\n" @@ -4378,10 +4283,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 "Gcina %s" @@ -4394,34 +4297,34 @@ msgid "libhal_set_dbus_connection: Can't set dbus connection" msgstr "I-libhal_set_dbus_connection: Ayikwazi ukwakha ukuxhumana kwe-dbus" -#: ../zypp/sat/SATResolver.cc:699 +#: ../zypp/solver/detail/SATResolver.cc:870 #, fuzzy, c-format msgid "nothing provides %s needed by %s" msgstr "%s idingwa yi- %s" -#: ../zypp/sat/SATResolver.cc:691 +#: ../zypp/solver/detail/SATResolver.cc:862 #, fuzzy, c-format msgid "nothing provides requested %s" msgstr "Akukho okunikeza %s" -#: ../zypp/sat/SATResolver.cc:685 +#: ../zypp/solver/detail/SATResolver.cc:856 #, fuzzy, c-format msgid "problem with installed package %s" msgstr "ikhomandi yokukhipha amaphakheji" -#: ../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 "I-rpm yakhe %s njenge-%s kodwa bekungenakwenzeka ukubona umehluko" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2050 +#: ../zypp/target/rpm/RpmDb.cc:2048 #, c-format msgid "" "rpm created %s as %s.\n" @@ -4430,18 +4333,18 @@ "I-rpm yakhe i-%s njenge-%s.\n" "Nansi imigqa yokuqala engu-25 yomehluko:\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 "okukhishiwe kwe-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 "I-rpm igcine %s njenge-%s kodwa bekungenakwenzeka ukubona umehluko" #. %s = filenames -#: ../zypp/target/rpm/RpmDb.cc:2045 +#: ../zypp/target/rpm/RpmDb.cc:2043 #, c-format msgid "" "rpm saved %s as %s.\n" @@ -4450,20 +4353,76 @@ "I-rpm igcine i-%s njenge-%s.\n" "Nansi imigqa yokuqala engu-25 yomehluko:\n" -#: ../zypp/sat/SATResolver.cc:759 +#: ../zypp/solver/detail/SATResolver.cc:935 #, fuzzy msgid "uninstallable providers: " msgstr "Abekho abanye abaphakeli abafakiwe be-%s" -#. TranslatorExplanation %s = name of package, patch, selection ... -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:82 -#, c-format -msgid "unlock %s" -msgstr "vula isihluthulelo se-%s" +#, fuzzy +#~ msgid "%s provides this dependency, but would change the architecture of the installed item" +#~ msgstr "%s ihlinzeka ngalolu hlelo okuncikwe kulo kodwa ingabushintsha ubuciko bomklamo bento efakiwe" + +#, fuzzy +#~ msgid "%s provides this dependency, but would change the vendor of the installed item" +#~ msgstr "%s ihlinzeka ngalolu hlelo okuncikwe kulo kodwa ingabushintsha ubuciko bomklamo bento efakiwe" + +#, fuzzy +#~ msgid "Do not install or delete the resolvables concerned" +#~ msgstr "Ungafaki noma ususe maqondana nezixazululi" + +#~ msgid "Ignore that %s is already set to install" +#~ msgstr "Kushaye indiva ukuthi i-%s isisethelwe ukufakwa kakade" + +#~ msgid "Ignore the obsolete %s in %s" +#~ msgstr "Ishaye indiva into engasebenzi i-%s e-%s" + +#~ msgid "Ignore this conflict of %s" +#~ msgstr "Kushaye indiva lokhu kuxabana kwe-%s" + +#~ msgid "Ignore this requirement just here" +#~ msgstr "Sishaye indiva lesi sidingo lapha nje kuphela" + +#~ msgid "Install %s although it would change the architecture" +#~ msgstr "Faka %s nakuba izoshintsha ubuciko bomklamo" + +#, fuzzy +#~ msgid "Install %s although it would change the vendor" +#~ msgstr "Faka %s nakuba izoshintsha ubuciko bomklamo" + +#~ msgid "Install missing resolvables" +#~ msgstr "Faka izixazululi ezilahlekile" + +#~ msgid "Keep resolvables" +#~ msgstr "Gcina Izixazululi" + +#~ msgid "Unlock these resolvables" +#~ msgstr "Vula izihluthulelo zalezi zixazululi" + +#~ msgid "delete %s" +#~ msgstr "Susa %s" + +#~ msgid "install %s" +#~ msgstr "faka %s" + +#~ msgid "unlock %s" +#~ msgstr "vula isihluthulelo se-%s" + +#~ msgid "unlock all resolvables" +#~ msgstr "Vula izihluthulelo zezixazululi" + +#, fuzzy +#~ msgid "Can't open solv-file: " +#~ msgstr "Ayikwazi ukuvula ifayela %1." + +#, fuzzy +#~ msgid "Error reading solv-file: " +#~ msgstr "Kwenzeke iphutha ifunda i-sector %u." + +#~ msgid "Path Parameter parsing not supported for this URL" +#~ msgstr "Ukucazwa kwepharamitha yomgudu akusekelwa kule-URL" -#: ../zypp/solver/detail/ProblemSolutionUnlock.cc:69 -msgid "unlock all resolvables" -msgstr "Vula izihluthulelo zezixazululi" +#~ msgid "Path parameter parsing not supported for this URL" +#~ msgstr "Ukucazwa kwepharamitha yomgudu akusekelwa kule-URL" #~ msgid "Software management is already running." #~ msgstr "Ukulawulwa kwe-software sekuyasebenza kakade." -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org