From 8746e02d8738777a94ed22abb2f55ca7a8b62776 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Fri, 27 Nov 2020 15:44:58 +0900 Subject: [PATCH] Imported Upstream version 17.18.0 --- VERSION.cmake | 4 +- package/libzypp.changes | 8 + po/af.po | 112 +++++++----- po/ar.po | 112 +++++++----- po/be.po | 112 +++++++----- po/bg.po | 112 +++++++----- po/bn.po | 112 +++++++----- po/bs.po | 112 +++++++----- po/ca.po | 112 +++++++----- po/cs.po | 112 +++++++----- po/cy.po | 112 +++++++----- po/da.po | 112 +++++++----- po/de.po | 112 +++++++----- po/el.po | 112 +++++++----- po/en_GB.po | 112 +++++++----- po/es.po | 112 +++++++----- po/et.po | 357 ++++++++++++++++++++++++-------------- po/fa.po | 112 +++++++----- po/fi.po | 112 +++++++----- po/fr.po | 112 +++++++----- po/gl.po | 112 +++++++----- po/gu.po | 112 +++++++----- po/he.po | 112 +++++++----- po/hi.po | 112 +++++++----- po/hr.po | 112 +++++++----- po/hu.po | 112 +++++++----- po/id.po | 112 +++++++----- po/it.po | 112 +++++++----- po/ja.po | 112 +++++++----- po/ka.po | 112 +++++++----- po/km.po | 112 +++++++----- po/ko.po | 112 +++++++----- po/ku.po | 112 +++++++----- po/lt.po | 112 +++++++----- po/mk.po | 112 +++++++----- po/mr.po | 112 +++++++----- po/nb.po | 112 +++++++----- po/nl.po | 112 +++++++----- po/nn.po | 112 +++++++----- po/pa.po | 112 +++++++----- po/pl.po | 112 +++++++----- po/pt.po | 112 +++++++----- po/pt_BR.po | 112 +++++++----- po/ro.po | 112 +++++++----- po/ru.po | 112 +++++++----- po/si.po | 112 +++++++----- po/sk.po | 112 +++++++----- po/sl.po | 112 +++++++----- po/sr.po | 112 +++++++----- po/sv.po | 112 +++++++----- po/ta.po | 112 +++++++----- po/th.po | 112 +++++++----- po/tr.po | 112 +++++++----- po/uk.po | 112 +++++++----- po/vi.po | 112 +++++++----- po/wa.po | 112 +++++++----- po/xh.po | 112 +++++++----- po/zh_CN.po | 112 +++++++----- po/zh_TW.po | 112 +++++++----- po/zu.po | 112 +++++++----- po/zypp.pot | 112 +++++++----- tests/zypp/Vendor_test.cc | 12 ++ zypp/Capabilities.h | 11 ++ zypp/sat/Solvable.cc | 15 ++ zypp/sat/Solvable.h | 15 +- zypp/sat/SolvableType.h | 2 + zypp/solver/detail/SATResolver.cc | 35 +++- 67 files changed, 4085 insertions(+), 2870 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index e5e73d8..ff11631 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "17") SET(LIBZYPP_COMPATMINOR "12") -SET(LIBZYPP_MINOR "17") +SET(LIBZYPP_MINOR "18") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 17.17.0 (12) +# LAST RELEASED: 17.18.0 (12) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 6aecacd..e92400c 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Dec 5 14:23:52 CET 2019 - ma@suse.de + +- Resolver: add solution actions for SOLVER_SOLUTION_BLACK + (retracted/PTF) +- Solvable: add isRetracted and isPtf attributes. +- version 17.18.0 (12) + +------------------------------------------------------------------- Thu Nov 28 18:20:04 CET 2019 - ma@suse.de - Introduce PurgeKernels class (bsc#1155198) diff --git a/po/af.po b/po/af.po index 6008a54..7713f94 100644 --- a/po/af.po +++ b/po/af.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2006-11-03 12:03\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -4372,216 +4372,234 @@ msgstr "Ignoreer dié vereiste net hier" msgid "generally ignore of some dependencies" msgstr "Ignoreer dié vereiste net hier" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s voorsien %s, maar dit het ’n ander argitektuur." -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "opdrag om pakkette te oninstalleer" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 #, fuzzy msgid "conflicting requests" msgstr "Verbindingsversoek aan:" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "Kan %s nie installeer nie vanweë afhanklikheidsprobleme" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, fuzzy, c-format, boost-format msgid "nothing provides requested %s" msgstr "Geen voorsiening %s nie" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "Die skyf bestaan nie." -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s is gesluit en kan nie ongeïnstalleer word nie." -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "nie geïnstalleer nie" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, fuzzy, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "%s word benodig deur %s" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "Kan %s nie installeer nie" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s verkeer in konflik met %s" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, fuzzy, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s uitgediendes %s" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s uitgediendes %s" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%s verkeer in konflik met %s" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 #, fuzzy msgid "deleted providers: " msgstr "Geen voorsiening %s nie" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 #, fuzzy msgid "" "\n" "not installable providers: " msgstr "Daar is geen installeerbare verskaffers van %s nie" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "Daar is geen installeerbare verskaffers van %s nie" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "moenie %s installeer nie" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "hou %s" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "moenie %s installeer nie" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "Die navraag bestaan reeds." -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, fuzzy, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "Daar is geen installeerbare verskaffers van %s nie" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "Moenie waar oplossings ter sprake is, installeer of skrap nie" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, fuzzy, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "%s voorsien %s, maar dit het ’n ander argitektuur." -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, fuzzy, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "Installeer %s, hoewel dit die argitektuur kan verander" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "%s uitgediendes %s" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, fuzzy, c-format, boost-format msgid "downgrade of %s to %s" msgstr "%s afgelaai vanaf %s" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Installasie" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/ar.po b/po/ar.po index 26fdeb9..0b9db9f 100644 --- a/po/ar.po +++ b/po/ar.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-23 20:19+0000\n" "Last-Translator: Iman Abd Elaziz \n" "Language-Team: Arabic %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "استبدال %s بـ %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "إلغاء تثبيت %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "جارٍ تنفيذ برنامج %%posttrans النصي '%1%'" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "جارٍ تنفيذ برامج %posttrans النصية" diff --git a/po/be.po b/po/be.po index db90112..877acde 100644 --- a/po/be.po +++ b/po/be.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2006-01-04 08:58+0100\n" "Last-Translator: Alexander Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -4455,211 +4455,229 @@ msgstr "" msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 #, fuzzy msgid "Have you enabled all requested repositories?" msgstr "Выдаліць непатрэбныя сховішчы" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, c-format, boost-format msgid "package %s does not exist" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "Захаваць налады ўсталёўкі" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Захаваць налады ўсталёўкі" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/bg.po b/po/bg.po index 28c1cfc..5804fda 100644 --- a/po/bg.po +++ b/po/bg.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2017-10-23 11:43+0000\n" "Last-Translator: Dimitar Zahariev \n" "Language-Team: Bulgarian %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Инсталиране" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/bn.po b/po/bn.po index 0cdcbca..7988c45 100644 --- a/po/bn.po +++ b/po/bn.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: Priyavert Sharma\n" "Language-Team: AgreeYa Solutions \n" @@ -4372,216 +4372,234 @@ msgstr "কিছু অমীমাংসিত আবশ্যকতা আছ msgid "generally ignore of some dependencies" msgstr "কিছু অমীমাংসিত আবশ্যকতা আছে..." -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s %s প্রদান করে, কিন্তু এটার অন্য একটা আর্কিটেকচার আছে।" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "প্যাকেজ আনইনস্টল করার আদেশ" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 #, fuzzy msgid "conflicting requests" msgstr "এর সাথে সংযোগের অনুরোধ: " -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "নির্ভরতা সমস্যাগুলির কারণে %s স্থাপন করতে পারে না" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, fuzzy, c-format, boost-format msgid "nothing provides requested %s" msgstr "কোনওটাই %s প্রদান করে না" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "সার্টিফিকেট %1 অনুপস্থিত" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s লক করা আছে এবং আনইন্সটল করা যাবে না ।" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "ইনস্টল করা হয় নি" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, fuzzy, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "%s এর %s দরকার" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "in/ssTklইনস্টল করা যাবে না" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s-এর সঙ্গে %s-এর দ্বন্দ্ব" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, fuzzy, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s %sকে প্রাচীন করে দিয়েছে" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s %sকে প্রাচীন করে দিয়েছে" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%s-এর সঙ্গে %s-এর দ্বন্দ্ব" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 #, fuzzy msgid "deleted providers: " msgstr "কোনওটাই %s প্রদান করে না" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 #, fuzzy msgid "" "\n" "not installable providers: " msgstr "%s এর কোনও বিকল্প স্থাপনযোগ্য প্রদানকারী নেই" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "%s এর কোনও বিকল্প স্থাপনযোগ্য প্রদানকারী নেই" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "%s ইন্সটল করে না" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "%s রাখুন" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "%s ইন্সটল করে না" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "ইতিমধ্যে এই অনুরোধ করা হয়ে গিয়েছে" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, fuzzy, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "%s এর কোনও বিকল্প স্থাপনযোগ্য প্রদানকারী নেই" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "%1 এর দ্বন্দ্ব %2 এর সাথে" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, fuzzy, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "%s %s প্রদান করে, কিন্তু এটার অন্য একটা আর্কিটেকচার আছে।" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, fuzzy, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "%s স্থাপন করুন যদিও এটা আর্কিটেকচার পালটে দেবে" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "%s %sকে প্রাচীন করে দিয়েছে" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, fuzzy, c-format, boost-format msgid "downgrade of %s to %s" msgstr "%s থেকে %s ডাউনলোড করেছে" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "স্থাপন" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/bs.po b/po/bs.po index 6d12834..f911880 100644 --- a/po/bs.po +++ b/po/bs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2002-07-23 18:27+0200\n" "Last-Translator: Damir Bjelobradic \n" "Language-Team: Bosnian \n" @@ -4868,211 +4868,229 @@ msgstr "" msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, c-format, boost-format msgid "package %s does not exist" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "Nova instalacija" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "Instaliram driver..." -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "&Nemoj instalirati" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, fuzzy, c-format, boost-format msgid "do not install %s" msgstr "Instaliram driver..." -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "Instaliram driver..." -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "Instaliram driver..." -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "Izbrii" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Instaliram driver..." #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/ca.po b/po/ca.po index febbd60..bae3931 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-14 18:32+0000\n" "Last-Translator: David Medina \n" "Language-Team: Catalan %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "substitució de %s per %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "desinstal·lació de %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Executant l'script %%posttrans \"%1%\"" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Executant scripts %posttrans" diff --git a/po/cs.po b/po/cs.po index 66e3316..e9fd681 100644 --- a/po/cs.po +++ b/po/cs.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-14 18:32+0000\n" "Last-Translator: Aleš Kastner \n" "Language-Team: Czech %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "nahrazení %s položkou %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "odinstalace %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Běží skript %%posttrans '%1%'" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Běží skripty %posttrans" diff --git a/po/cy.po b/po/cy.po index 4c8ec5d..54f5846 100644 --- a/po/cy.po +++ b/po/cy.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2003-09-23 10:33+0200\n" "Last-Translator: Kevin Donnelly \n" "Language-Team: Welsh \n" @@ -4671,211 +4671,229 @@ msgstr "" msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "Saerniaeth:" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "Bydd pecyn %1 yn cael ei arsefydlu" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "Rhaid arsefydlu'r pecynnau yma:" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "Methodd yr arsefydliad." #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "Arsefydlu %s: \"%s\"" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "Arsefydlu" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, fuzzy, c-format, boost-format msgid "do not install %s" msgstr "Arsefydlu %s: \"%s\"" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "Arsefydlu %s: \"%s\"" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "Gosod gyrrydd..." -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "&Dileu" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Arsefydlu %s: \"%s\"" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/da.po b/po/da.po index 4c17440..764f774 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: libzypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-23 20:19+0000\n" "Last-Translator: scootergrisen \n" "Language-Team: Danish %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "udskiftning af %s med %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "afinstallation af %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Udfører %%posttrans-scriptet '%1%'" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Udfører %posttrans-scripts" diff --git a/po/de.po b/po/de.po index b156b89..2113cb2 100644 --- a/po/de.po +++ b/po/de.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-18 10:04+0000\n" "Last-Translator: Sarah Kriesch \n" "Language-Team: German %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "Ersatz von %s durch %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "Deinstallation von %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "%%posttrans script '%1%' wird ausgeführt" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "%posttrans scripts werden ausgeführt" diff --git a/po/el.po b/po/el.po index 43f3d8e..970a75c 100644 --- a/po/el.po +++ b/po/el.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Greek (libzypp)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2018-04-29 12:02+0000\n" "Last-Translator: Konstantina Tsolakoglou \n" "Language-Team: Greek %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "αντικατάσταση του %s με το %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "απεγκατάσταση του %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Εκτέλεση %%posttrans script '%1%'" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Εκτέλεση %posttrans scripts" diff --git a/po/en_GB.po b/po/en_GB.po index b07862d..d3569af 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2007-08-19 16:20+0100\n" "Last-Translator: Benjamin Weber \n" "Language-Team: \n" @@ -4384,217 +4384,235 @@ msgstr "Generally ignore this requirement" msgid "generally ignore of some dependencies" msgstr "Generally ignore this requirement" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s provides %s, but has another architecture." -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "Problem installing source package %s-%s:" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 #, fuzzy msgid "conflicting requests" msgstr "Connection request to: " -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "Cannot install %s due to dependency problems" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, fuzzy, c-format, boost-format msgid "nothing provides requested %s" msgstr "None provides %s" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "backup does not exists" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 #, fuzzy msgid "unsupported request" msgstr " - not supported" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s is locked and cannot be uninstalled." -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "not installed" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, fuzzy, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "%s is needed by %s" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "Cannot install %s" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s conflicts with %s" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, fuzzy, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s obsoletes %s" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s obsoletes %s" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%s conflicts with %s" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 #, fuzzy msgid "deleted providers: " msgstr "None provides %s" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 #, fuzzy msgid "" "\n" "not installable providers: " msgstr "There are no installable providers of %s" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "There are no installable providers of %s" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "do not install %s" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "keep %s" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "do not install %s" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "The request already exists." -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, fuzzy, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "There are no installable providers of %s" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "Do not install or delete the resolvables concerned" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, fuzzy, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "%s provides %s, but has another architecture." -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, fuzzy, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "Install %s although it would change the architecture" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "%s obsoletes %s" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, fuzzy, c-format, boost-format msgid "downgrade of %s to %s" msgstr "Updating %s to %s" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Installation of %s failed:" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/es.po b/po/es.po index bbbe4d4..6a2a3ab 100644 --- a/po/es.po +++ b/po/es.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-23 20:19+0000\n" "Last-Translator: Juan Sarria \n" "Language-Team: Spanish %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "reemplazo de %s con %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "desinstalación de %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Ejecutando el guion %%posttrans %1%" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Ejecutando guiones %posttrans" diff --git a/po/et.po b/po/et.po index 3978cea..7540a37 100644 --- a/po/et.po +++ b/po/et.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: zypp.et\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" -"PO-Revision-Date: 2019-10-25 09:53+0000\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" +"PO-Revision-Date: 2019-12-03 17:54+0000\n" "Last-Translator: Jaanus Ojangu \n" "Language-Team: Estonian \n" @@ -24,7 +24,7 @@ msgstr "" #: zypp/CheckSum.cc:136 #, c-format, boost-format msgid "Dubious type '%s' for %u byte checksum '%s'" -msgstr "" +msgstr "Kahtlane tüüp '%s' %u baitide kontrollsummale '%s'" #: zypp/CountryCode.cc:50 msgid "Unknown country: " @@ -544,7 +544,7 @@ msgstr "Iisrael" #. :ISR:376: #: zypp/CountryCode.cc:260 msgid "Isle of Man" -msgstr "" +msgstr "Manni saar 'Isle of Man'" #: zypp/CountryCode.cc:261 msgid "India" @@ -577,8 +577,9 @@ msgstr "Itaalia" #. :ITA:380: #: zypp/CountryCode.cc:267 +#, fuzzy msgid "Jersey" -msgstr "" +msgstr "Jersey" #: zypp/CountryCode.cc:268 msgid "Jamaica" @@ -1317,7 +1318,7 @@ msgstr "Ei saa chroot läbi viia '%s' (%s)." #: zypp/ExternalProgram.cc:372 #, c-format, boost-format msgid "Can't chdir to '%s' inside chroot '%s' (%s)." -msgstr "" +msgstr "Ei õnnestunud 'chdir' '%s' 'chroot' sees '%s' (%s)." #: zypp/ExternalProgram.cc:373 #, fuzzy, c-format, boost-format @@ -1333,7 +1334,7 @@ msgstr "Ei saa käivitada '%s' (%s)." #: zypp/ExternalProgram.cc:393 #, c-format, boost-format msgid "Can't fork (%s)." -msgstr "" +msgstr "'fork' ei õnnestu (%s)." #: zypp/ExternalProgram.cc:522 #, c-format, boost-format @@ -2894,7 +2895,7 @@ msgstr "Niasi" #. language code: nic #: zypp/LanguageCode.cc:799 msgid "Niger-Kordofanian (Other)" -msgstr "" +msgstr "Niger-kordofaani (Muud)" #. language code: niu #: zypp/LanguageCode.cc:801 @@ -3256,7 +3257,7 @@ msgstr "Siuu keeled" #. language code: sit #: zypp/LanguageCode.cc:951 msgid "Sino-Tibetan (Other)" -msgstr "" +msgstr "Hiina-Tiibeti keel (Muud)" #. language code: sla #: zypp/LanguageCode.cc:953 @@ -3511,7 +3512,7 @@ msgstr "Uusmelaneesia" #. language code: tsi #: zypp/LanguageCode.cc:1059 msgid "Tsimshian" -msgstr "" +msgstr "Tsimshian" #. language code: tsn tn #: zypp/LanguageCode.cc:1061 @@ -3765,40 +3766,40 @@ msgstr "(AEGUNUD)" #. translators: an annotation to a gpg keys expiry date #: zypp/PublicKey.cc:95 msgid "(expires within 24h)" -msgstr "" +msgstr "(aegub 24h jooksul)" #. translators: an annotation to a gpg keys expiry date #: zypp/PublicKey.cc:99 #, c-format, boost-format msgid "(expires in %d day)" msgid_plural "(expires in %d days)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "(aegub %d päevaga)" +msgstr[1] "(aegub %d päevaga)" #. translator: %1% is a gpg key ID like 3DBDC284 #. %2% is a cache directories path #: zypp/RepoInfo.cc:517 #, boost-format msgid "Looking for gpg key ID %1% in cache %2%." -msgstr "" +msgstr "Otsitakse gpg võtme ID-d %1% vahemälus %2%." #. translator: %1% is a gpg key ID like 3DBDC284 #. %2% is a repositories name #: zypp/RepoInfo.cc:545 #, boost-format msgid "Looking for gpg key ID %1% in repository %2%." -msgstr "" +msgstr "Otsitakse gpg võtme ID-d %1% repositooriumis %2%." #. translator: %1% is a repositories name #: zypp/RepoInfo.cc:569 #, boost-format msgid "Repository %1% does not define additional 'gpgkey=' URLs." -msgstr "" +msgstr "Repositoorium %1% ei defineeri täiendavat 'gpgkey=' URLi." #: zypp/RepoManager.cc:312 #, boost-format msgid "Cannot read repo directory '%1%': Permission denied" -msgstr "" +msgstr "Ei saa lugeda repo kataloogi '%1%': Juurdepääs on keelatud" #. TranslatorExplanation '%s' is a pathname #: zypp/RepoManager.cc:320 zypp/RepoManager.cc:783 zypp/RepoManager.cc:1536 @@ -3810,7 +3811,7 @@ msgstr "Kataloogi '%s' lugemine nurjus." #: zypp/RepoManager.cc:330 #, boost-format msgid "Cannot read repo file '%1%': Permission denied" -msgstr "" +msgstr "Ei saa lugeda repo faili '%1%': Juurdepääs on keelatud" #: zypp/RepoManager.cc:353 #, fuzzy @@ -3819,7 +3820,7 @@ msgstr "Hoidlat %s ei leitud." #: zypp/RepoManager.cc:364 msgid "Service alias cannot start with dot." -msgstr "" +msgstr "Teenuse alias ei saa alata täpiga." #. TranslatorExplanation '%s' is a filename #: zypp/RepoManager.cc:738 zypp/RepoManager.cc:1654 zypp/RepoManager.cc:1720 @@ -3834,14 +3835,14 @@ msgstr "Faili '%s' avamine kirjutamiseks nurjus." #: zypp/RepoManager.cc:865 #, boost-format msgid "Unknown service '%1%': Removing orphaned service repository '%2%'" -msgstr "" +msgstr "Tundmatu teenus '%1%': Orvustunud teenuse repost '%2%' eemaldamine" #. we will throw this later if no URL checks out fine #: zypp/RepoManager.cc:1092 msgid "Valid metadata not found at specified URL" msgid_plural "Valid metadata not found at specified URLs" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Valitud metaandmeid ei leitud määratud URL-ilt" +msgstr[1] "Valitud metaandmeid ei leitud määratud URL-delt" #: zypp/RepoManager.cc:1140 zypp/RepoManager.cc:1252 zypp/RepoManager.cc:1308 #, fuzzy, c-format, boost-format @@ -3856,12 +3857,12 @@ msgstr "Ei saa luua katalooogi %1: %2" #: zypp/RepoManager.cc:1294 #, c-format, boost-format msgid "Building repository '%s' cache" -msgstr "" +msgstr "Loodava repositooriumi '%s' vahemälu" #: zypp/RepoManager.cc:1314 #, c-format, boost-format msgid "Can't create cache at %s - no writing permissions." -msgstr "" +msgstr "Ei saa luua vahemälu kohas %s - puuduvad kirjutamise õigused." #: zypp/RepoManager.cc:1379 #, c-format, boost-format @@ -3870,7 +3871,7 @@ msgstr "Hoidla puhverdamine nurjus (%d)." #: zypp/RepoManager.cc:1390 msgid "Unhandled repository type" -msgstr "" +msgstr "Käsitlemata tarkvarahoidla tüüp" #. prepare exception to be thrown if the type could not be determined #. due to a media exception. We can't throw right away, because of some @@ -3892,7 +3893,7 @@ msgstr "Tundmatu käsk '%s'" #: zypp/RepoManager.cc:1618 #, c-format, boost-format msgid "Adding repository '%s'" -msgstr "" +msgstr "Lisatakse repositoorium '%s'" #. TranslatorExplanation '%s' is an URL #: zypp/RepoManager.cc:1706 @@ -3921,12 +3922,12 @@ msgstr "Ei suuda tuvastada, kus teenus asub." #: zypp/Url.cc:114 msgid "Invalid LDAP URL query string" -msgstr "" +msgstr "Vigane LDAP URL-i päringu kirje" #: zypp/Url.cc:153 #, c-format, boost-format msgid "Invalid LDAP URL query parameter '%s'" -msgstr "" +msgstr "Vigane LDAP URL-i päringu parameeter '%s'" #: zypp/Url.cc:301 #, fuzzy @@ -3949,7 +3950,7 @@ msgstr "tundmatu" #: zypp/VendorSupportOptions.cc:17 msgid "unsupported" -msgstr "" +msgstr "toetamata" #: zypp/VendorSupportOptions.cc:20 msgid "Level 1" @@ -3965,7 +3966,7 @@ msgstr "Tase 3" #: zypp/VendorSupportOptions.cc:29 msgid "Additional Customer Contract Necessary" -msgstr "" +msgstr "Vajalik on täiendav kliendileping" #: zypp/VendorSupportOptions.cc:31 msgid "invalid" @@ -3973,11 +3974,11 @@ msgstr "vigane" #: zypp/VendorSupportOptions.cc:39 msgid "The level of support is unspecified" -msgstr "" +msgstr "Kasutajatoe tase pole määramata" #: zypp/VendorSupportOptions.cc:42 msgid "The vendor does not provide support." -msgstr "" +msgstr "Müüja ei paku tuge." #: zypp/VendorSupportOptions.cc:45 msgid "" @@ -3986,6 +3987,10 @@ msgid "" "maintenance and basic troubleshooting. Level 1 Support is not intended to " "correct product defect errors." msgstr "" +"Probleemi tuvastamine, mis tähendab tehnilist abi, et pakkuda ühilduvuse " +"teavet, paigaldusabi, kasutustuge, töösoleva hoolduse ja põhiliste " +"tõrkeotsingute jaoks. Tase 1 tugi pole mõeldud toote defektide vigade " +"parandamiseks." #: zypp/VendorSupportOptions.cc:48 msgid "" @@ -3993,6 +3998,9 @@ msgid "" "customer problems, isolate problem area and provide resolution for problems " "not resolved by Level 1 Support." msgstr "" +"Probleemide eraldamine, mis tähendab tehnilist tuge, mis on loodud klientide " +"probleemide dubleerimiseks, probleemipiirkonna isoleerimiseks ja probleemide " +"lahendamiseks ei sisaldu tase 1 toes." #: zypp/VendorSupportOptions.cc:51 msgid "" @@ -4000,14 +4008,17 @@ msgid "" "complex problems by engaging engineering in resolution of product defects " "which have been identified by Level 2 Support." msgstr "" +"Probleemi lahendamine, mis tähendab tehnilist tuge, mis on loodud keerukate " +"probleemide lahendamiseks, rakendades tehnilisi lahendusi tuvastatud " +"tootevigade kõrvaldamiseks, mis on kindlaks tehtud 2. taseme toe abil." #: zypp/VendorSupportOptions.cc:54 msgid "An additional customer contract is necessary for getting support." -msgstr "" +msgstr "Kasutajatoe saamiseks on vajalik täiendav kliendileping." #: zypp/VendorSupportOptions.cc:56 msgid "Unknown support option. Description not available" -msgstr "" +msgstr "Tundmatu toe valik. Kirjeldus pole saadaval" #: zypp/ZYppFactory.cc:399 #, c-format, boost-format @@ -4015,6 +4026,8 @@ msgid "" "System management is locked by the application with pid %d (%s).\n" "Close this application before trying again." msgstr "" +"Süsteemihaldus on lukustatud rakendusega pid %d (%s).\n" +"Enne uuesti proovimist sulgege see rakendus." #. TranslatorExplanation followed by the list of error messages that lead to this exception #: zypp/base/Exception.cc:134 @@ -4029,7 +4042,7 @@ msgstr "Tundmatu käsk '%s'" #: zypp/base/StrMatcher.cc:153 #, c-format, boost-format msgid "Unknown match mode '%s' for pattern '%s'" -msgstr "" +msgstr "Tundmatu 'match mode' '%s' struktuurile '%s'" #: zypp/base/StrMatcher.cc:157 #, fuzzy, c-format, boost-format @@ -4045,19 +4058,23 @@ msgstr " pole korrektne regulaaravaldis: \"" #: zypp/media/MediaCIFS.cc:427 zypp/media/MediaCurl.cc:1738 #, c-format, boost-format msgid "Authentication required for '%s'" -msgstr "" +msgstr "Autoriseerimine on nõutav '%s' jaoks" #: zypp/media/MediaCurl.cc:1111 msgid "" "Visit the SUSE Customer Center to check whether your registration is valid " "and has not expired." msgstr "" +"Külastage SUSE kliendikeskust, et kontrollida, kas teie registreering on " +"kehtiv ega ole aegunud." #: zypp/media/MediaCurl.cc:1113 msgid "" "Visit the Novell Customer Center to check whether your registration is valid " "and has not expired." msgstr "" +"Külastage kliendikeskust, et kontrollida, kas teie registreerimine on kehtiv " +"ja kas see pole aegunud." #: zypp/media/MediaException.cc:33 #, fuzzy, c-format, boost-format @@ -4072,12 +4089,12 @@ msgstr "Mooduli \"%s\" laadimine ebaõnnestus." #: zypp/media/MediaException.cc:48 #, c-format, boost-format msgid "Bad file name: %s" -msgstr "" +msgstr "Vigane faili nimi: %s" #: zypp/media/MediaException.cc:53 #, c-format, boost-format msgid "Medium not opened when trying to perform action '%s'." -msgstr "" +msgstr "Toimingu '%s' sooritamisel meedium ei avanenud." #: zypp/media/MediaException.cc:58 #, fuzzy, c-format, boost-format @@ -4091,27 +4108,27 @@ msgstr "Faili '%s' ei saa kirjutada." #: zypp/media/MediaException.cc:68 msgid "Medium not attached" -msgstr "" +msgstr "Meedium ei ole lisatud" #: zypp/media/MediaException.cc:73 msgid "Bad media attach point" -msgstr "" +msgstr "Vigane meedia lisamispunkt" #. TranslatorExplanation: curl is the name of a library, don't translate #: zypp/media/MediaException.cc:79 #, c-format, boost-format msgid "Download (curl) initialization failed for '%s'" -msgstr "" +msgstr "'%s' allalaadimise (curl) initaliseerimine nurjus" #: zypp/media/MediaException.cc:84 #, c-format, boost-format msgid "System exception '%s' on medium '%s'." -msgstr "" +msgstr "Süsteemi erand „%s” andmekandjal „%s”." #: zypp/media/MediaException.cc:89 #, c-format, boost-format msgid "Path '%s' on medium '%s' is not a file." -msgstr "" +msgstr "Tee sihtkohas '%s' andmekandjal '%s' ei ole fail." #: zypp/media/MediaException.cc:94 #, fuzzy, c-format, boost-format @@ -4120,7 +4137,7 @@ msgstr "%1 pole kataloog." #: zypp/media/MediaException.cc:101 msgid "Malformed URI" -msgstr "" +msgstr "Vigane URI" #: zypp/media/MediaException.cc:111 msgid "Empty host name in URI" @@ -4128,16 +4145,16 @@ msgstr "Tühi masina nimi URI-s" #: zypp/media/MediaException.cc:116 msgid "Empty filesystem in URI" -msgstr "" +msgstr "Tühi failisüsteem on URl-l" #: zypp/media/MediaException.cc:121 msgid "Empty destination in URI" -msgstr "" +msgstr "Tühi sihtkoht URl-s" #: zypp/media/MediaException.cc:126 #, c-format, boost-format msgid "Unsupported URI scheme in '%s'." -msgstr "" +msgstr "Mittetoetatud URl skeem '%s'." #: zypp/media/MediaException.cc:131 #, fuzzy @@ -4151,26 +4168,29 @@ msgid "" "Error code: %s\n" "Error message: %s\n" msgstr "" +"'%s' allalaadimise (curl) viga:\n" +"Vea kood: %s\n" +"Veateade: %s\n" #. TranslatorExplanation: curl is the name of a library, don't translate #: zypp/media/MediaException.cc:146 #, c-format, boost-format msgid "Error occurred while setting download (curl) options for '%s':" -msgstr "" +msgstr "'%s' allalaadimise valikute määramisel ilmnes viga:" #: zypp/media/MediaException.cc:153 #, c-format, boost-format msgid "Media source '%s' does not contain the desired medium" -msgstr "" +msgstr "Meediumi allikas '%s' ei sisalda soovitud andmekandjat" #: zypp/media/MediaException.cc:158 #, c-format, boost-format msgid "Medium '%s' is in use by another instance" -msgstr "" +msgstr "Meedium '%s' on kasutuses teise kasutaja poolt" #: zypp/media/MediaException.cc:164 msgid "Cannot eject any media" -msgstr "" +msgstr "Ühtegi andmekandjat ei saa väljutada" #: zypp/media/MediaException.cc:166 #, fuzzy, c-format, boost-format @@ -4185,17 +4205,17 @@ msgstr "Ligipääs on keelatud" #: zypp/media/MediaException.cc:189 #, c-format, boost-format msgid "Timeout exceeded when accessing '%s'." -msgstr "" +msgstr "'%s juurdepääsu ajalimiit on ületatud." #: zypp/media/MediaException.cc:197 #, c-format, boost-format msgid "Downloaded data exceeded the expected filesize '%s' of '%s'." -msgstr "" +msgstr "Allalaaditud andmed ületasid faili suurust '%s' '%s' -st." #: zypp/media/MediaException.cc:205 #, c-format, boost-format msgid "Location '%s' is temporarily unaccessible." -msgstr "" +msgstr "Asukoht '%s' on ajutiselt kättesaamatu." #: zypp/media/MediaException.cc:213 #, c-format, boost-format @@ -4209,25 +4229,26 @@ msgid "" "Create attach point: Can't find a writable directory to create an attach " "point" msgstr "" +"Lisamispunkti loomine: lisamispunkti loomiseks ei leia kirjutatavat kataloogi" #: zypp/media/MediaUserAuth.cc:136 #, c-format, boost-format msgid "Unsupported HTTP authentication method '%s'" -msgstr "" +msgstr "Mittetoetatud HTTP autoriseerimise meetod '%s'" #: zypp/misc/CheckAccessDeleted.cc:444 msgid "Please install package 'lsof' first." -msgstr "" +msgstr "Palun esmalt paigaldage 'Isof' pakett." #: zypp/parser/RepoindexFileReader.cc:197 #, c-format, boost-format msgid "Required attribute '%s' is missing." -msgstr "" +msgstr "Puudub nõutav argument '%s'." #: zypp/parser/RepoindexFileReader.cc:209 #, c-format, boost-format msgid "One or both of '%s' or '%s' attributes is required." -msgstr "" +msgstr "Üks või mõlemad '%s' või '%s' atribuudid on nõutavad." #: zypp/repo/PackageProvider.cc:331 #, fuzzy @@ -4241,29 +4262,31 @@ msgid "" "Package %s seems to be corrupted during transfer. Do you want to retry " "retrieval?" msgstr "" +"Pakatt %s tundub olevat transpordi ajal rikutud. Kas te soovit proovida " +"uuesti vastu võtta?" #. TranslatorExplanation %s = name of the package being processed. #: zypp/repo/PackageProvider.cc:486 #, c-format, boost-format msgid "Failed to provide Package %s. Do you want to retry retrieval?" -msgstr "" +msgstr "Paketi %s saatmine nurjus. Kas proovida uuesti saata?" #: zypp/repo/PackageProvider.cc:609 msgid "applydeltarpm check failed." -msgstr "" +msgstr "applydeltarpm kontrollimine nurjus." #: zypp/repo/PackageProvider.cc:620 msgid "applydeltarpm failed." -msgstr "" +msgstr "applydeltarpm nurjus." #: zypp/repo/RepoException.cc:129 msgid "Service plugin does not support changing an attribute." -msgstr "" +msgstr "Teenuse lisaprogramm ei toeta atribuudi muutmist." #: zypp/repo/RepoProvideFile.cc:261 #, c-format, boost-format msgid "Can't provide file '%s' from repository '%s'" -msgstr "" +msgstr "Ei saa faili '%s' tarkvarahoidlast '%s' hankida" #: zypp/repo/RepoProvideFile.cc:267 #, fuzzy @@ -4281,6 +4304,11 @@ msgid "" " conflicts with file from package\n" " %3%" msgstr "" +"Faili %1%\n" +" paketist\n" +" %2%\n" +" on konfliktis failiga paketist\n" +" %3%" #. TranslatorExplanation %1%(filename) %2%(package1) %3%(package2) #: zypp/sat/FileConflicts.cc:40 @@ -4292,6 +4320,11 @@ msgid "" " conflicts with file from install of\n" " %3%" msgstr "" +"Fail %1%\n" +" paketist\n" +" %2%\n" +" on vastuolus failiga paigaldusest\n" +" %3%" #. TranslatorExplanation %1%(filename) %2%(package1) %3%(package2) #: zypp/sat/FileConflicts.cc:47 @@ -4303,6 +4336,11 @@ msgid "" " conflicts with file from package\n" " %3%" msgstr "" +"Fail %1%\n" +" paigaldusest\n" +" %2%\n" +" on konfliktis failiga paketist\n" +" %3%" #. TranslatorExplanation %1%(filename) %2%(package1) %3%(package2) #: zypp/sat/FileConflicts.cc:53 @@ -4314,6 +4352,11 @@ msgid "" " conflicts with file from install of\n" " %3%" msgstr "" +"Fail %1%\n" +" paigaldusest\n" +" %2%\n" +" on vastuolus failiga paigaldusest\n" +" %3%" #. [lhs][rhs] 0 = installed; 1 = to be installed #. TranslatorExplanation %1%(filename1) %2%(package1) %%3%(filename2) 4%(package2) @@ -4328,6 +4371,13 @@ msgid "" " from package\n" " %4%" msgstr "" +"Fail %1%\n" +" paketist\n" +" %2%\n" +" on vastuolus failiga\n" +" %3%\n" +" paketist\n" +" %4%" #. TranslatorExplanation %1%(filename1) %2%(package1) %3%(filename2) %4%(package2) #: zypp/sat/FileConflicts.cc:76 @@ -4341,6 +4391,13 @@ msgid "" " from install of\n" " %4%" msgstr "" +"Fail %1%\n" +" paketist\n" +" %2%\n" +" on vastuolus failiga\n" +" %3%\n" +" paigaldusest\n" +" %4%" #. TranslatorExplanation %1%(filename1) %2%(package1) %3%(filename2) %4%(package2) #: zypp/sat/FileConflicts.cc:85 @@ -4354,6 +4411,13 @@ msgid "" " from package\n" " %4%" msgstr "" +"Fail %1%\n" +" paigaldusest\n" +" %2%\n" +" on konfliktis failiga\n" +" %3%\n" +" paketist\n" +" %4%" #. TranslatorExplanation %1%(filename1) %2%(package1) %3%(filename2) %4%(package2) #: zypp/sat/FileConflicts.cc:93 @@ -4367,6 +4431,13 @@ msgid "" " from install of\n" " %4%" msgstr "" +"Fail %1%\n" +" paigaldusest\n" +" %2%\n" +" on vastuolus failiga\n" +" %3%\n" +" paigaldusest\n" +" %4%" #: zypp/sat/detail/PoolImpl.cc:193 #, fuzzy @@ -4384,99 +4455,99 @@ msgstr "Sõltuvuste kontrollimine" msgid "generally ignore of some dependencies" msgstr "Sõltuvuste kontrollimine" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" -msgstr "" +msgstr "%s ei kuulu distupgrade tarkvarahoidlasse" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" -msgstr "" +msgstr "%s on halvema arhitektuuriga" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "Paigaldatud pakettide lugemine" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "vastuolulised päringud" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "mingi sõltuvuse probleem" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" -msgstr "" +msgstr "kuskil ei pakuta nõutud %s" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" -msgstr "" +msgstr "Kas olete lubanud kõik taotletud hoidlad?" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "varukoopiat pole olemas" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" -msgstr "" +msgstr "mittetoetaud taotlus" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" -msgstr "" +msgstr "%s on süsteemi poolt seatud ja ei ole eemaldatav" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "%s pole paigaldatav" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" -msgstr "" +msgstr "miski ei paku %s vajalikku %s -le" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" -msgstr "" +msgstr "Ei saa paigaldada mõlemat %s ja %s" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" -msgstr "" +msgstr "%s on konfliktis %s -ga hangituna %s poolt" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" -msgstr "" +msgstr "%s aegub %s, mida pakub %s" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" -msgstr "" +msgstr "paigaldatud %s aegub %s pakkujalt %s" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" -msgstr "" +msgstr "lahendatav %s on vastuolus enda poolt pakutuga %s" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" -msgstr "" +msgstr "%s nõuab %s, kuid seda nõuet ei saa täita" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " -msgstr "" +msgstr "kustutatud pakkujad: " -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " @@ -4484,113 +4555,133 @@ msgstr "" "\n" "kättesaamatud varustajad: " -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "kättesaamatud varustajad: " -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" -msgstr "" +msgstr "eemalda lukk, et lubada %s eemaldamist" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" -msgstr "" +msgstr "ära paigalda %s" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" -msgstr "" +msgstr "jäta alles %s" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "Käivita paigaldus või süsteem" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "Päring on juba olemas." -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" -msgstr "" +msgstr "ignoreerige katkise süsteemi hoiatust" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" -msgstr "" +msgstr "ära paigalda %s uusimat versiooni" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" -msgstr "" +msgstr "jäta alles %s hoolimata halvemast arhitektuurist" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" -msgstr "" +msgstr "paigaldage %s vaatamata madalamale arhitektuurile" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "Muudab aegunuks" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" +msgstr "paigaldage %s välistatud hoidlast" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" -msgstr "" +msgstr "tagasiviimine %s tasemele %s" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" -msgstr "" +msgstr "arhitektuuri muutus %s teisele %s" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" +"paigalda %s (koos tarnija vahetusega)\n" +" %s --> %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" -msgstr "" +msgstr "%s vahetamine %s vastu" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Paigaldamine" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/fa.po b/po/fa.po index 604ce01..d9a4bed 100644 --- a/po/fa.po +++ b/po/fa.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: opensuse-i 18n\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-05-21 15:55+0000\n" "Last-Translator: Mohammad Rezaei Seresht \n" "Language-Team: Persian %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "جایگزینی %s با %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "از نصب خارج کردن %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/fi.po b/po/fi.po index e61cb93..13b6447 100644 --- a/po/fi.po +++ b/po/fi.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.fi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-04-09 16:45+0000\n" "Last-Translator: Tommi Nieminen \n" "Language-Team: Finnish %s" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "arkkitehtuurin vaihto %s -> %s" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" @@ -4827,24 +4845,24 @@ msgstr "" "asenna %s (vaihtaa tarjoajaa)\n" " %s --> %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "Korvataan %s -> %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "poista %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Suoritetaan %%posttrans-skriptiä ”%1%”" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Suoritetaan %posttrans-skriptejä" diff --git a/po/fr.po b/po/fr.po index aea6703..8c21cda 100644 --- a/po/fr.po +++ b/po/fr.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-23 20:19+0000\n" "Last-Translator: Christine Gabriel \n" "Language-Team: French %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "remplacement de %s par %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "désinstallation de %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Exécution du script %%posttrans « %1% »" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Exécution des scripts %posttrans" diff --git a/po/gl.po b/po/gl.po index 838930e..ca4b63f 100644 --- a/po/gl.po +++ b/po/gl.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-08-26 11:51+0000\n" "Last-Translator: Manuel Vazquez \n" "Language-Team: Galician %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "substitución de %s con %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "desinstalación de %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Executando o script %%posttrans '%1%'" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Executando scripts de %posttrans" diff --git a/po/gu.po b/po/gu.po index 3cdbaba..6f1c557 100644 --- a/po/gu.po +++ b/po/gu.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: nis\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2006-11-11 18:41+0530\n" "Last-Translator: Priyavert Sharma\n" "Language-Team: AgreeYa Solutions\n" @@ -4375,216 +4375,234 @@ msgstr "આ જરૂરિયાત અહીં માત્ર અવગણ msgid "generally ignore of some dependencies" msgstr "આ જરૂરિયાત અહીં માત્ર અવગણો" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s, %s પૂરું પાડે છે, પરંતુ તેની પાસે બીજી સંરચના છે." -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "પેકેજીસનું સ્થાપન દૂર કરવાનો આદેશ" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 #, fuzzy msgid "conflicting requests" msgstr "ને જોડાણ માટે વિનંતી કરો:" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "પરાધિનતા મૂશ્કેલીઓને કારણે %s સ્થાપિ શકાયું નથી" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, fuzzy, c-format, boost-format msgid "nothing provides requested %s" msgstr "%s કોઇ આપતું નથી" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "ડિસ્ક અસ્તિત્વ ધરાવતી નથી." -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s લોક છે અને અસ્થાપિત થઇ શકશે નહીં" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "સ્થાપેલ નથી" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, fuzzy, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "%s દ્વારા %s જરૂરી હતું" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "%s સ્થાપિ શકાશે નહીં" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s, %s સાથે વિસંગત છે" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, fuzzy, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s અલગ પાડવું %s" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s અલગ પાડવું %s" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%s, %s સાથે વિસંગત છે" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 #, fuzzy msgid "deleted providers: " msgstr "%s કોઇ આપતું નથી" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 #, fuzzy msgid "" "\n" "not installable providers: " msgstr "%s ના કોઇ સ્થાપવાનું પૂરું પાડનાર નથી" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "%s ના કોઇ સ્થાપવાનું પૂરું પાડનાર નથી" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "%s સ્થાપશો નહીં" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "%s રાખો" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "%s સ્થાપશો નહીં" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "રિક્વેસ્ટ અસ્તિત્વમાં છે જ." -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, fuzzy, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "%s ના કોઇ સ્થાપવાનું પૂરું પાડનાર નથી" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "સંબંધિત રિઝોલ્વેબલ્સ સ્થાપો કે કાઢો નહીં" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, fuzzy, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "%s, %s પૂરું પાડે છે, પરંતુ તેની પાસે બીજી સંરચના છે." -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, fuzzy, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "%s સ્થાપો જો કે તે સંરચના બદલી શકે" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "%s અલગ પાડવું %s" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, fuzzy, c-format, boost-format msgid "downgrade of %s to %s" msgstr "%s માંથી %s ડાઉનલોડ થયું" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "સ્થાપન" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/he.po b/po/he.po index 753dddf..f023cdc 100644 --- a/po/he.po +++ b/po/he.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2004-08-09 10:24+0200\n" "Last-Translator: xxx \n" "Language-Team: Hebrew \n" @@ -4854,217 +4854,235 @@ msgstr "" msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "ארכיטקטורה:" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, c-format, boost-format msgid "package %s does not exist" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "התקנה נכשלה" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "מתקין על:" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" # IT -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "התקן" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, fuzzy, c-format, boost-format msgid "do not install %s" msgstr "מתקין על:" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "מתקין על:" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "מתקין דריבר..." -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" # main dialog: Button Delete partition -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "&מחק" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "מתקין על:" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/hi.po b/po/hi.po index 45f0add..7f1bc04 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.hi\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2007-08-24 22:33+0530\n" "Last-Translator: Sangeeta Kumari \n" "Language-Team: Hindi \n" @@ -4374,216 +4374,234 @@ msgstr "सिर्फ यहां पर इस आवश्यकता क msgid "generally ignore of some dependencies" msgstr "सिर्फ यहां पर इस आवश्यकता की अनदेखी कर दें" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s ही %s प्रदान करता है, लेकिन इसके पास कोई और स्थापत्य है।" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "पैकेजों को असंस्थापित करने का कमांड" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 #, fuzzy msgid "conflicting requests" msgstr "के लिए कनेक्शन आवेदन : " -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "निर्भरता समस्याओं के कारण %s का संस्थापन नहीं कर सकता" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, fuzzy, c-format, boost-format msgid "nothing provides requested %s" msgstr "कोई नहीं %s प्रदान करता" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "प्रमाण पत्र %1 मौजूद नहीं है।" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s लॉक हो गया है और इसे असंस्थापित नहीं किया जा सकता।" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "इंस्टाल नहीं हुआ" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, fuzzy, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "%s को %s की आवश्यकता है" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "%s का संस्थापन नहीं कर सकता" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s का %s से टकराव है " -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, fuzzy, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s को %s पुराना कर देता है" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s को %s पुराना कर देता है" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%s का %s से टकराव है " -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 #, fuzzy msgid "deleted providers: " msgstr "कोई नहीं %s प्रदान करता" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 #, fuzzy msgid "" "\n" "not installable providers: " msgstr "%s का कोई संस्थापनयोग्य प्रदाता नहीं है" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "%s का कोई संस्थापनयोग्य प्रदाता नहीं है" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "%s संस्थापित न करें" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "%s रखें" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "%s संस्थापित न करें" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "अनुरोध पहले से ही मौजूद है।" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, fuzzy, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "%s का कोई संस्थापनयोग्य प्रदाता नहीं है" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "संबंधित रिजॉल्वेबल को संस्थापित या मिटाएं नहीं" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, fuzzy, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "%s ही %s प्रदान करता है, लेकिन इसके पास कोई और स्थापत्य है।" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, fuzzy, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "%s को संस्थापित करें यद्यपि यह स्थापत्य को बदल देगा" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "%s को %s पुराना कर देता है" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, fuzzy, c-format, boost-format msgid "downgrade of %s to %s" msgstr "%s से %s तक अपडेट कर रहा है" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "अधिष्ठापन" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/hr.po b/po/hr.po index 1f3fa69..06e78c0 100644 --- a/po/hr.po +++ b/po/hr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.hr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2011-04-03 12:05+0200\n" "Last-Translator: Krešimir Jozić \n" "Language-Team: Croatian \n" @@ -4510,211 +4510,229 @@ msgstr "" msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "problem s instaliranim paketom %s" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "Disk ne postoji." -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 #, fuzzy msgid "unsupported request" msgstr "nije podržano" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "nemoj instalirati %s" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "zadrži %s" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "deinstalacija %s" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "deinstalacija %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/hu.po b/po/hu.po index 5adc183..1c3ab0c 100644 --- a/po/hu.po +++ b/po/hu.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-23 20:19+0000\n" "Last-Translator: Robert Taisz \n" "Language-Team: Hungarian %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "%s cseréje erre: %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "%s eltávolítása" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "'%1%' %%posttrans parancsfájl végrehajtása" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "%posttrans parancsfájlok végrehajtása" diff --git a/po/id.po b/po/id.po index b5352fc..a296a1a 100644 --- a/po/id.po +++ b/po/id.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-04-18 16:03+0000\n" "Last-Translator: Kukuh Syafaat \n" "Language-Team: Indonesian %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "penggantian %s dengan %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "penghapusan dari %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Menjalankan skrip '%1%' %%posttrans" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Menjalankan skrip %posttrans" diff --git a/po/it.po b/po/it.po index b26544b..a7844db 100644 --- a/po/it.po +++ b/po/it.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-23 20:19+0000\n" "Last-Translator: Davide Aiello \n" "Language-Team: Italian %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "sostituzione di %s con %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "disinstallazione di %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Esecuzione dello script %%posttrans '%1%'" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Esecuzione degli script %posttrans" diff --git a/po/ja.po b/po/ja.po index f933a42..6a55776 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-09-26 04:52+0000\n" "Last-Translator: Yasuhiko Kamata \n" "Language-Team: Japanese %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "%s を %s で置き換える" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "%s のアンインストール" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "%%posttrans スクリプト '%1%' を実行しています" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "%postrans スクリプトを実行しています" diff --git a/po/ka.po b/po/ka.po index 29f7f8b..da95e10 100644 --- a/po/ka.po +++ b/po/ka.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2009-03-06 01:28+0400\n" "Last-Translator: George Machitidze \n" "Language-Team: Georgian <>\n" @@ -4358,210 +4358,228 @@ msgstr "" msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, c-format, boost-format msgid "package %s does not exist" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/km.po b/po/km.po index d4f40c3..999d810 100644 --- a/po/km.po +++ b/po/km.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2010-06-03 08:04+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -4379,100 +4379,100 @@ msgstr "បំបែក %s ដោយ​មិនអើពើ​ភាព​អ msgid "generally ignore of some dependencies" msgstr "ជា​ទូទៅ​មិនអើពើ​នឹង​ភាព​អាស្រ័យ​មួយ​ចំនួន" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "%s មិនមែនជា​របស់​ឃ្លាំង distupgrade នោះ​ទេ" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s មាន​​​ស្ថាបត្យកម្ម​ទាប​ជាង" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "បញ្ហា​ជាមួយ​កញ្ចប់​ដែល​បាន​ដំឡើង %s" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "សំណើ​ការ​ប៉ះទង្គិច" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "បញ្ហា​ភាព​អាស្រ័យ​មួយ​ចំនួន" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "គ្មាន​អ្វី​ផ្ដល់ %s ដែលបាន​ស្នើ​ទេ" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "តើ​អ្នក​បាន​បើក​ឃ្លាំង​ដែល​បាន​ស្នើ​ទាំងអស់​ហើយឬនៅ ?" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "មិនមាន​ព័ត៌មាន​បម្រុង​ទុក​ទេ" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 #, fuzzy msgid "unsupported request" msgstr "មិន​បានគាំទ្រ" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s ជាប់សោ និង​មិន​អាច​លុប​បាន​ឡើយ ។" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "%s មិនអាច​ដំឡើងបាន" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "គ្មាន​អ្វី​ផ្ដល់ %s ដែល​ត្រូវការ​ដោយ %s ទេ" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "មិនអាច​ដំឡើង​ទាំង %s និង %s" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s ប៉ះទង្គិច​ជាមួយ %s ដែល​បាន​ផ្ដល់​ដោយ %s" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s លែងប្រើ %s ដែល​ផ្ដល់ដោយ %s" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s ដែល​បាន​ដំឡើង​លែង​ប្រើ %s ដែល​ផ្ដល់​ដោយ %s ហើយ" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "ការ​ប៉ះទង្គិច %s ដែល​អាច​ដោះស្រាយ​បាន​ជា​មួយ %s ដែល​បាន​ផ្ដល់​ដោយ​ខ្លួន​វា​ផ្ទាល់" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "%s ត្រូវការ %s ប៉ុន្តែ​តម្រូវការ​នេះ​មិនអាច​ផ្ដល់​បានទេ" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "ក្រុមហ៊ុន​ផ្ដល់​ដែល​បាន​លុប ៖ " -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " @@ -4480,88 +4480,106 @@ msgstr "" "\n" "លុបក្រុមហ៊ុនផ្ដល់ ៖ " -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "ក្រុមហ៊ុន​លក់​ដែល​អាច​លុបបាន ៖ " -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "កុំ​ដំឡើង %s" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "រក្សា %s" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "កុំ​ហាម​ការ​ដំឡើង​នៃ %s" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "សំណើ​នេះ​នឹង​ធ្វើ​ឲ្យ​ប្រព័ន្ធ​របស់​អ្នក​ខូច !" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "មិនអើពើ​នឹង​ការ​ព្រមាន​របស់​ប្រព័ន្ធ​ដែល​ខូច" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "កុំ​ស្នើ​ឲ្យ​ដំឡើង​កញ្ចប់​ដោះស្រាយ​ដោយ​ផ្ដល់ %s" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "កុំ​ស្នើ​ឲ្យ​លុប​កញ្ចប់​ដោះស្រាយ​ទាំងអស់​ដោយ​ផ្ដល់ %s" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "កុំ​ដំឡើង​កំណែ​ថ្មីរបស់ %s" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "ទុក %s ទោះ​បី​ជា​ស្ថាបត្យកម្ម​ទាប​ក៏​ដោយ" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "ដំឡើង %s ទោះ​បីជា​ស្ថាបត្យកម្ម​ទាប​ក៏​ដោយ" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" msgstr "លែង​ប្រើ %s" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "ដំឡើង %s ពី​ឃ្លាំង​ដែល​បាន​ដក​ចេញ" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "បន្ទាប %s ទៅ %s" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "ការ​ផ្លាស់ប្ដូរ​ស្ថាបត្យកម្ម​នៃ %s ទៅ %s" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" @@ -4570,24 +4588,24 @@ msgstr "" "ដំឡើង %s (ដោយ​មានការ​ផ្លាស់ប្ដូរ​របស់​អ្នក​លក់)\n" " %s --> %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "ការ​ជំនួស %s ជាមួយ %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "ការ​លុប​នៃ %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/ko.po b/po/ko.po index 99dbbf7..fa37485 100644 --- a/po/ko.po +++ b/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.ko\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-23 20:19+0000\n" "Last-Translator: Hwajin Kim \n" "Language-Team: Korean %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "%s을(를) %s(으)로 대체" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "%s 설치 제거" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "%%posttrans 스크립트 '%1%' 실행 중" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "%posttrans 스크립트 실행 중" diff --git a/po/ku.po b/po/ku.po index e0d023a..b792fc3 100644 --- a/po/ku.po +++ b/po/ku.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: memory.ku.po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2005-09-23 00:15+0200\n" "Last-Translator: Kurdish Team \n" "Language-Team: Kurdish Team \n" @@ -4447,212 +4447,230 @@ msgstr "" msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "Sazkirina pakêtên hewce pêk nehat." -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 #, fuzzy msgid "conflicting requests" msgstr "Pakêtên nakokiyên wan hene" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "Pela %1 tune ye. " -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 #, fuzzy msgid "unsupported request" msgstr "Piştgirî" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "Saz neke" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, fuzzy, c-format, boost-format msgid "do not install %s" msgstr "Saz neke" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "Sazkirina nivîsbariyê" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, fuzzy, c-format, boost-format msgid "do not install most recent version of %s" msgstr "Ji bo nû ve sazkirina guhertoya cuda" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, fuzzy, c-format, boost-format msgid "downgrade of %s to %s" msgstr "kêmkirin" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Moda Sazkirinê" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/lt.po b/po/lt.po index 7f321b2..36fa489 100644 --- a/po/lt.po +++ b/po/lt.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2017-06-02 18:02+0000\n" "Last-Translator: Mindaugas Baranauskas \n" "Language-Team: Lithuanian %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "%s pakeisti į %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "pašalinti %s " #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/mk.po b/po/mk.po index f64bba1..06d3785 100644 --- a/po/mk.po +++ b/po/mk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2001-07-17 16:12+0200\n" "Last-Translator: Зоран Димовски \n" "Language-Team: Macedonian \n" @@ -4728,210 +4728,228 @@ msgstr "" msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, c-format, boost-format msgid "package %s does not exist" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/mr.po b/po/mr.po index 3043cde..090c667 100644 --- a/po/mr.po +++ b/po/mr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Check hardware-2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2006-11-13 12:55+0530\n" "Last-Translator: Priyavert Sharma \n" "Language-Team: AgreeYa Solutions \n" @@ -4373,216 +4373,234 @@ msgstr "या गरजेकडे येथेच दुर्लक्ष msgid "generally ignore of some dependencies" msgstr "या गरजेकडे येथेच दुर्लक्ष करा" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s %s पुरवते, परंतु त्याचे दुसरे स्थापत्य आहे." -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "पॅकेजेस अस्थापित करण्याचा आदेश" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 #, fuzzy msgid "conflicting requests" msgstr "यांच्याशी कनेक्शनची रिक्वेस्ट :" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "अवलंबून असण्याच्या (डिपेन्डन्सी) समस्येमुळे %s स्थापित करु शकत नाही" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, fuzzy, c-format, boost-format msgid "nothing provides requested %s" msgstr "कोणतीही गोष्ट %s पुरवत नाही" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "डिस्क अस्तित्वात नाही" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s ला कुलुप आहे व अस्थापित होऊ शकत नाही" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "स्थापित नसलेली" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, fuzzy, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "%s ला %s ची गरज आहे" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "%s स्थापित करु शकत नाही" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s चे %s शी पटत नाही" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, fuzzy, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s %s ला बाजूला टाकते" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s %s ला बाजूला टाकते" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%s चे %s शी पटत नाही" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 #, fuzzy msgid "deleted providers: " msgstr "कोणतीही गोष्ट %s पुरवत नाही" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 #, fuzzy msgid "" "\n" "not installable providers: " msgstr "%s चे स्थापित करता येण्याजोगे प्रदाता नाहीत" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "%s चे स्थापित करता येण्याजोगे प्रदाता नाहीत" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "%s स्थापित करु नका" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "%s ठेवा" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "%s स्थापित करु नका" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "विनंती आधीपासूनच आहे." -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, fuzzy, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "%s चे स्थापित करता येण्याजोगे प्रदाता नाहीत" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "संबंधित रिझॉल्व्हेबल्स स्थापित किंवा पुसून टाकू नका" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, fuzzy, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "%s %s पुरवते, परंतु त्याचे दुसरे स्थापत्य आहे." -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, fuzzy, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "%s स्थापित करा, जरी ते स्थापत्य बदलत असेल" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "%s %s ला बाजूला टाकते" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, fuzzy, c-format, boost-format msgid "downgrade of %s to %s" msgstr "% वरून % डाऊनलोड करत आहे" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "स्थापना (इन्स्टॉलेशन)" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/nb.po b/po/nb.po index 5afc2c4..02b7bf6 100644 --- a/po/nb.po +++ b/po/nb.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2013-10-04 20:05+0200\n" "Last-Translator: Olav Pettershagen \n" "Language-Team: Norwegian Bokmål \n" @@ -4519,99 +4519,99 @@ msgstr "ignorer noen avhengigheter selv om %s ikke vil fungere" msgid "generally ignore of some dependencies" msgstr "ignorer generelt noen avhengigheter" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "%s tilhører ikke en pakkebrønn for distribusjonsoppgradering" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s har foreldet arkitektur" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "problem med den installerte pakken %s" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "kommandokonflikter" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "en konflikt" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "ingenting inneholder den nødvendige %s" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "Har du aktivert alle nødvendige pakkebrønner?" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, c-format, boost-format msgid "package %s does not exist" msgstr "pakken %s finnes ikke" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "forespørselen støttes ikke" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s er beskyttet av systemet, og kan ikke slettes." -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "%s kan ikke installeres" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "ingenting inneholder %s som kreves av %s" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "kan ikke installere både %s og %s" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s er i konflikt med %s fra %s" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s foreldede pakker %s fra %s" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "installert %s foreldede %s fra %s" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "løsningen %s er i konflikt med %s som den selv inneholder" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "%s krever %s, men denne nødvendige filen finnes ikke" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "slettede leverandører: " -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " @@ -4619,88 +4619,106 @@ msgstr "" "\n" "uinstallerbare nødvendige pakker: " -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "uinstallerbare nødvendige pakker: " -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "Ikke installer %s" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "behold %s" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "ikke forby installasjon av %s" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "Denne kommandoen vil skade systemet!" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "ignorer advarsel om skadet system" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "ikke be om å installere en nødvendig pakke som gir %s" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "ikke be om å slette alle nødvendige pakker som gir %s" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "ikke installer nyeste versjon av %s" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "behold %s selv om arkitekturen er feil" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "installer %s selv om arkitekturen ikke er riktig" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" msgstr "behold den foreldede pakken %s" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "installer %s fra deaktivert pakkebrønn" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "nedgradering av %s til %s" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "Arkitekturendring fra %s til %s" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" @@ -4709,24 +4727,24 @@ msgstr "" "installer %s (med produsentendring)\n" " %s --> %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "%s erstattes av %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "avinstallasjon av %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/nl.po b/po/nl.po index 3507d49..a1ca9d9 100644 --- a/po/nl.po +++ b/po/nl.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-14 18:32+0000\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "vervanging van %s door %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "verwijderen van %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "%%posttrans script '%1%' wordt uitgevoerd" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "%posttrans scripts zijn uitgevoerd" diff --git a/po/nn.po b/po/nn.po index fa9ed49..aad78fc 100644 --- a/po/nn.po +++ b/po/nn.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2018-03-09 22:04+0000\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/pa.po b/po/pa.po index 178332c..09e7de9 100644 --- a/po/pa.po +++ b/po/pa.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.pa\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2007-08-23 19:28+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Panjabi \n" @@ -4378,216 +4378,234 @@ msgstr "ਆਮ ਤੌਰ ਉੱਤੇ ਇਹ ਲੋੜ ਅਣਡਿੱਠੀ ਕ msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s %s ਦਿੰਦਾ ਹੈ, ਪਰ ਆਰਕੀਟੈਕਚਰ ਹੋਰ ਹੈ।" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "ਸੋਰਸ ਪੈਕੇਜ %s-%s ਇੰਸਟਾਲ ਕਰਨ ਦੌਰਾਨ ਸਮੱਸਿਆ:" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 #, fuzzy msgid "conflicting requests" msgstr "ਕੁਨੈਕਸ਼ਨ ਮੰਗ:" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "ਨਿਰਭਰਤਾ ਸਮੱਸਿਆਵਾਂ ਕਰਕੇ %s ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, fuzzy, c-format, boost-format msgid "nothing provides requested %s" msgstr "%s ਕੋਈ ਨਹੀਂ ਦਿੰਦਾ ਹੈ" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, c-format, boost-format msgid "package %s does not exist" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, fuzzy, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "%s %s ਰਾਹੀਂ ਚਾਹੀਦਾ ਹੈ" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "%s ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s ਦਾ %s ਨਾਲ ਅਪਵਾਦ ਹੈ" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, fuzzy, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s %s ਰਾਹੀਂ ਚਾਹੀਦਾ ਹੈ" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s %s ਰਾਹੀਂ ਚਾਹੀਦਾ ਹੈ" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%s ਦਾ %s ਨਾਲ ਅਪਵਾਦ ਹੈ" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 #, fuzzy msgid "deleted providers: " msgstr "%s ਕੋਈ ਨਹੀਂ ਦਿੰਦਾ ਹੈ" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "ਉਪਲੱਬਧ ਪਰੋਫਾਇਲ" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "%s ਨੂੰ ਨਾ ਹਟਾਓ" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "%s ਰੱਖੋ" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "ਮੰਗ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, fuzzy, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "%s %s ਦਿੰਦਾ ਹੈ, ਪਰ ਆਰਕੀਟੈਕਚਰ ਹੋਰ ਹੈ।" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "%s ਹਟਾਓ" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, fuzzy, c-format, boost-format msgid "downgrade of %s to %s" msgstr "%s ਨੂੰ %s ਲਈ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" # %s is either BOOTP or DHCP -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "%s ਦੀ ਇੰਸਟਾਲੇਸ਼ਨ ਫੇਲ੍ਹ ਹੋਈ:" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/pl.po b/po/pl.po index facc0ce..8094fef 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-14 18:32+0000\n" "Last-Translator: Ewelina Michalowska \n" "Language-Team: Polish %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "zamiana %s na %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "usunięcie %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Wykonywanie skryptu %%posttrans '%1%'" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Wykonywanie skryptów %posttrans" diff --git a/po/pt.po b/po/pt.po index fbfd097..14a4651 100644 --- a/po/pt.po +++ b/po/pt.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.pt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2008-06-10 16:04+0100\n" "Last-Translator: Antonio Cardoso Martins \n" "Language-Team: Portuguese \n" @@ -4605,100 +4605,100 @@ msgstr "Ignorar de uma forma geral algumas dependências" msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s fornece %s, mas tem outra arquitectura." -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "problema com o pacote %s instalado" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "pedidos em conflito" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "Não foi possível instalar %s devido a problemas de dependências" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "nada fornece %s solicitado" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, c-format, boost-format msgid "package %s does not exist" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "%s não é instalável" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "nada fornece %s necessário por %s" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "não é possível instalar tanto %s como %s" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s conflitua com %s fornecido por %s" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s torna obsoleto %s fornecido por %s" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s torna obsoleto %s fornecido por %s" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "Resolúvel %s conflitua com %s fornecido por ele próprio" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "%s requer %s, mas este requisito não pode ser fornecido" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "fornecedores apagados: " -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " @@ -4706,88 +4706,106 @@ msgstr "" "\n" "fornecedores não instaláveis: " -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "fornecedores não instaláveis: " -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "não instalar %s" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "manter %s" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "não perguntar para instalar um resolúvel que fornece %s" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "não perguntar para apagar todos os resolúveis que fornecem %s" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "não instalar a versão mais recente de %s" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, fuzzy, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "%s fornece %s, mas tem outra arquitectura." -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, fuzzy, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "instalar %s apesar de alterar a arquitectura" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "%s obsoleto %s" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, fuzzy, c-format, boost-format msgid "install %s from excluded repository" msgstr "Repositório activado" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "desactualização de %s para %s" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "alteração de arquitectura de %s para %s" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, fuzzy, c-format, boost-format msgid "" "install %s (with vendor change)\n" @@ -4798,24 +4816,24 @@ msgstr "" "-->\n" " %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "substituição de %s por %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "desinstalação de %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4a45612..77aefcd 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-14 18:32+0000\n" "Last-Translator: Rodrigo Macedo \n" "Language-Team: Portuguese (Brazil) %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "substituição de %s por %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "desinstalação de %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Executando o script %%posttrans '%1%'" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Executando scripts %posttrans" diff --git a/po/ro.po b/po/ro.po index 41d51cb..e8d8569 100644 --- a/po/ro.po +++ b/po/ro.po @@ -24,7 +24,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenSUSE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2012-11-19 14:59+0200\n" "Last-Translator: Lucian Oprea \n" "Language-Team: Romanian \n" @@ -4412,100 +4412,100 @@ msgstr "întrerupe pachetul %s ignorând o parte din dependențele lui" msgid "generally ignore of some dependencies" msgstr "în general se ignoră unele dependințe" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "%s nu aparține de o sursă de instalare de actualizare distribuție" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s are arhitectură inferioară" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "problemă cu pachetul instalat %s" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "cereri ce intră în conflict" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "o problemă de dependențe" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "nimic nu oferă %s necesar" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "Ați activat toate sursele cerute?" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "nu există backup" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 #, fuzzy msgid "unsupported request" msgstr "nesuportat" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s este blocat şi nu poate fi deinstalat." -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "%s nu este instalabil" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "Nimic nu oferă %s necesar pentru %s" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "nu pot instala %s și %s împreună" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s intră în conflict cu %s pus la dispoziție de %s" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s înlocuiește %s oferit de %s" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "versiuni vechi %s instalate %s furnizate de %s" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "dependența %s intră în conflict cu %s furnizat de ea însăși" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "%s necesită %s, dar această cerință nu este îndeplinită" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "pachete șterse: " -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " @@ -4513,88 +4513,106 @@ msgstr "" "\n" "pachete care pot fi dezinstalate: " -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "furnizori dezinstalabili: " -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "nu instala %s" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "păstrează %s" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "nu interzice instalarea %s" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "Această cerere vă va afecta sistemul!" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "ignoră avertismentul privitor la stricarea sistemului" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "nu cere instalarea unui pachet ce oferă %s" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "nu cere stergerea tuturor pachetelor ce oferă %s" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "nu instala cea mai recentă versiune a %s" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "păstrează %s chiar dacă arhitectura este inferioară" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "instalează %s chiar dacă arhitectura este inferioară" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" msgstr "păstrează pachetul vechi %s" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "instalează %s de la o sursă de instalare exclusă" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "downgrade %s la %s" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "modificare de arhitectură a %s în %s" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" @@ -4605,24 +4623,24 @@ msgstr "" "-->\n" " %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "înlocuirea %s cu %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "deinstalarea %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/ru.po b/po/ru.po index e084ec4..f504048 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-23 20:19+0000\n" "Last-Translator: Nikita Maynagashev \n" "Language-Team: Russian %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "замена %s на %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "удаление %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Выполнение скрипта %%posttrans \"%1%\"" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Выполнение скриптов %posttrans" diff --git a/po/si.po b/po/si.po index a6a6782..d769af3 100644 --- a/po/si.po +++ b/po/si.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2005-07-29 15:37+0530\n" "Last-Translator: i18n@suse.de\n" "Language-Team: Sinhala \n" @@ -4387,210 +4387,228 @@ msgstr "" msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, c-format, boost-format msgid "package %s does not exist" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/sk.po b/po/sk.po index b4f05da..d58c653 100644 --- a/po/sk.po +++ b/po/sk.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: libzypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-14 18:32+0000\n" "Last-Translator: Ferdinand Galko \n" "Language-Team: Slovak %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "%s nahradiť %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "odinštalovanie %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Vykonávanie %%posttrans skriptu '%1%'" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Vykonávanie %p osttrans skriptov" diff --git a/po/sl.po b/po/sl.po index 27e7921..64ba2fc 100644 --- a/po/sl.po +++ b/po/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2001-10-18 11:02+0200\n" "Last-Translator: Janez Krek \n" "Language-Team: Slovenian\n" @@ -4841,212 +4841,230 @@ msgstr "ima nerešene zahteve..." msgid "generally ignore of some dependencies" msgstr "ima nerešene zahteve..." -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "Zagonska arhitektura" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "Nezadoščene odvisnosti:" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "Paketi za obnovitev" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "Ta paket ni nameščen in ne bo nameščen." -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "Namestitev ni uspela." #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "Nameščam na:" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%1 je v sporu s/z %2" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%1 je v sporu s/z %2" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%1 je v sporu s/z %2" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "Samodejna namestitev" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, fuzzy, c-format, boost-format msgid "do not install %s" msgstr "Nameščam na:" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "Nameščam na:" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "%1 je v sporu s/z %2" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "Zbriši %1" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Namestitev" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/sr.po b/po/sr.po index 9385212..6d8698c 100644 --- a/po/sr.po +++ b/po/sr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST2 (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2004-03-31 11:34+0200\n" "Last-Translator: Bojan Jovanovic \n" "Language-Team: Serbian \n" @@ -4484,218 +4484,236 @@ msgstr "ima neispunjene zahteve..." msgid "generally ignore of some dependencies" msgstr "ima neispunjene zahteve..." -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" # tree node string -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "Boot arhitektura" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "Proveravam međuzavisnost..." -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" # summary text heading -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "Paketi za obnavljanje" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 #, fuzzy msgid "unsupported request" msgstr " - није подржано" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "Ovaj paket nije i neće biti instaliran." -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "Instalacioni proces nije uspešno završen." #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "Instaliram na:" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%1 je u konfliktu sa %2" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%1 je u konfliktu sa %2" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%1 je u konfliktu sa %2" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "Automatska Instalacija" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, fuzzy, c-format, boost-format msgid "do not install %s" msgstr "Instaliram na:" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" # Frame title for installation target hard disk / partition(s) -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "Instaliram na:" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "%1 je u konfliktu sa %2" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "Obriši %1" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Инсталација" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/sv.po b/po/sv.po index 596cf6a..7362827 100644 --- a/po/sv.po +++ b/po/sv.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-23 20:19+0000\n" "Last-Translator: Sven Åhr \n" "Language-Team: Swedish %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "ersätt %s med %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "avinstallation av %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Kör %%posttrans-skriptet '%1%'" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Kör %p 1osttrans-skript" diff --git a/po/ta.po b/po/ta.po index 44e8188..54f0ab9 100644 --- a/po/ta.po +++ b/po/ta.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: NetworkManager-vpnc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2005-06-26 01:20+0200\n" "Last-Translator: Priyavert Sharma \n" "Language-Team: AgreeYa Solutions \n" @@ -4371,216 +4371,234 @@ msgstr "இத்தேவையை இங்கேயே புறக்கண msgid "generally ignore of some dependencies" msgstr "இத்தேவையை இங்கேயே புறக்கணிக்கவும்" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s, %sஐ அளிக்கிறது, ஆனால் அதற்கு வேறொரு கட்டமைப்பு உள்ளது." -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "பேக்கேஜ்களின் நிறுவுதலை நீக்குவதற்கான ஆணை" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 #, fuzzy msgid "conflicting requests" msgstr "இந்த இணைப்புக்கான கோரிக்கை: " -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "சார்புத்தன்மை பிரச்னைகள் காரணமாக %s ஐ நிறுவ இயலவில்லை" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, fuzzy, c-format, boost-format msgid "nothing provides requested %s" msgstr "%s யாரும் அளிப்பதில்லை" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "சான்றிதழ் %1 இல்லை." -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s பூட்டப்பட்டுள்ளது மற்றும் அதன் நிறுவுதலை நீக்க இயலாது." -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "நிறுவப்படவில்லை" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, fuzzy, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "%s, %sக்கு தேவைப்படுகிறது" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "%sஐ நிறுவ முடியவில்லை" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s %sஉடன் முரண்படுகிறது" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, fuzzy, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s %sஐ வழக்கற்றதாக்குகிறது" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s %sஐ வழக்கற்றதாக்குகிறது" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%s %sஉடன் முரண்படுகிறது" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 #, fuzzy msgid "deleted providers: " msgstr "%s யாரும் அளிப்பதில்லை" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 #, fuzzy msgid "" "\n" "not installable providers: " msgstr "%sக்கு நிறுவக்கூடிய அளிப்பவர்கள் இல்லை" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "%sக்கு நிறுவக்கூடிய அளிப்பவர்கள் இல்லை" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "%sஐ நிறுவ வேண்டாம்" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "%sஐ வைத்துக் கொள்ளவும்" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "%sஐ நிறுவ வேண்டாம்" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "கோரிக்கை ஏற்கனவே உள்ளது." -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, fuzzy, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "%sக்கு நிறுவக்கூடிய அளிப்பவர்கள் இல்லை" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "தொடர்புள்ள தீர்வுகளை நிறுவவோ அல்லது நீக்கவோ வேண்டாம்" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, fuzzy, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "%s, %sஐ அளிக்கிறது, ஆனால் அதற்கு வேறொரு கட்டமைப்பு உள்ளது." -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, fuzzy, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "அது கட்டமைப்பை மாற்றக்கூடுமென்றாலும் %sஐ நிறுவவும்" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "%s %sஐ வழக்கற்றதாக்குகிறது" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, fuzzy, c-format, boost-format msgid "downgrade of %s to %s" msgstr "%sலிருந்து %s தகவலிறக்கம் செய்யப்பட்டது" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "நிறுவுதல்" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/th.po b/po/th.po index 800a2fb..9f78b8f 100644 --- a/po/th.po +++ b/po/th.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2008-01-04 08:58+0100\n" "Last-Translator: i18n@suse.de\n" "Language-Team: Thai \n" @@ -4489,216 +4489,234 @@ msgstr "การตรวจสอบการขึ้นอยู่แก่ msgid "generally ignore of some dependencies" msgstr "การตรวจสอบการขึ้นอยู่แก่กันของระบบ ไม่พบปัญหา" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, fuzzy, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "กำลังเรียกใช้คลังแพกเกจสำหรับปรับรุ่นให้ทันสมัย..." -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "สถาปัตยกรรมพื้นฐาน" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "ผิดพลาด: ไม่สามารถติดตั้งแพกเกจได้" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "การตรวจสอบการขึ้นอยู่แก่กันของระบบ ไม่พบปัญหา" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 #, fuzzy msgid "Have you enabled all requested repositories?" msgstr "เพิ่มคลังแพกเกจแบบออนไลน์ที่เลือกไว้ทั้งหมด" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "ยังไม่มีบริการ %1 อยู่" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "ไฟร์วอลล์ยังไม่ถูกติดตั้ง" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "ไม่ต้องติดตั้งตัวจัดการการบูตระบบใด ๆ" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 #, fuzzy msgid "deleted providers: " msgstr "อ่านค่าของผู้ให้บริการ" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 #, fuzzy msgid "" "\n" "not installable providers: " msgstr "เขียนค่าของผู้ให้บริการ" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "เขียนค่าของผู้ให้บริการ" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, fuzzy, c-format, boost-format msgid "do not install %s" msgstr "ไม่ต้องติดตั้ง" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "บันทึกการตั้งค่าการติดตั้ง" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "รุ่นนี้ถูกติดตั้งไว้บนระบบของคุณ" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "ลบอัตโนมัติ" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "บันทึกการตั้งค่าการติดตั้ง" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/tr.po b/po/tr.po index 937fdca..8520713 100644 --- a/po/tr.po +++ b/po/tr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2018-01-29 14:07+0000\n" "Last-Translator: Özgür Ateş Fırat \n" "Language-Team: Turkish %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Kurulum" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/uk.po b/po/uk.po index ca10d8b..6d2ef3a 100644 --- a/po/uk.po +++ b/po/uk.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp.uk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2018-04-14 04:38+0000\n" "Last-Translator: Andriy Bandura \n" "Language-Team: Ukrainian %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "заміна %s на %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "вилучення %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "Виконання сценарію %%posttrans '%1%'" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "Виконання сценаріїв %posttrans" diff --git a/po/vi.po b/po/vi.po index a595cf4..2b23fa3 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2016-08-25 08:06+0000\n" "Last-Translator: Hoàng Phạm \n" "Language-Team: Vietnamese %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/wa.po b/po/wa.po index 4dc5854..2566bd6 100644 --- a/po/wa.po +++ b/po/wa.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: lcn memory\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2012-08-24 14:42+0200\n" "Last-Translator: Jean Cayron \n" "Language-Team: Walloon \n" @@ -4399,101 +4399,101 @@ msgstr "sketer %s e passant houte sacwantes di ses aloyances" msgid "generally ignore of some dependencies" msgstr "sketer %s e passant houte sacwantes di ses aloyances" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" "%s ni fwait nén pårteye d' on depot d' metaedje a djoû del distribucion" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s a ene årtchitecteure pus basse" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "problinme avou l' pacaedje d' astalé %s" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "dimandes d' afrontmints" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "gn des des problinmes d' aloyances" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "rén n' dene li %s dimandé" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "Avoz metou en alaedje tos les depots dmandés ?" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, c-format, boost-format msgid "package %s does not exist" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 #, fuzzy msgid "unsupported request" msgstr "nén sopoirté" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "Çou paket n' est nén astalé et n' serè nén astalé." -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "%s n' est nén astalåve" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "rén n' dene %s k' a dandjî %s" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "Dji n' sai nén astaler ambedeus %s eyet %s" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s s' afronte avou %s ahessî pa %s" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s rind trop vîs %s ahessî pa %s" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "astalé %s trop vîs %s dinés pa %s" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%s afrontmints rezoudåves avou %s ahessî pa lyi minme" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "%s a dandjî d' %s mins cisse dimande ni sait nén esse ahesseye" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "ahesseus disfacé : " -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " @@ -4501,88 +4501,106 @@ msgstr "" "\n" "ahesseus nén astalåves : " -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "ahesseus nén astalåves : " -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "èn nén astaler %s" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "wårder %s" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "èn nén espaitchî l' astalaedje di %s" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "Cisse dimande ci va scheter vosse sistinme !" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "passer houte l' adviertixhmint d' on sketé sistinme" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "èn nén dmander d' astaler on rezoudaedje dinant %s" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "èn nén dmander d' disfacer tos les rezoudaedjes dinant %s" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "èn nén astaler l' pus nouve modêye di %s" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "wårder %s mågré k' il est d' ene pus basse årtchitecteure" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "astaler %s mågré k' il est d' ene pus basse årtchitecteure" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" msgstr "wårder l' forpassé %s" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "astaler %s a pårti do depot schovté evoye" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "dismete a djoû di %s a %s" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "candjmint d' årtchitecteure di %s a %s" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" @@ -4591,24 +4609,24 @@ msgstr "" "astaler %s (avou candjmint d' vindeu)\n" " %s --> %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "replaeçmint di %s avou %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "disastalaedje di %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/xh.po b/po/xh.po index 8001b3c..25891f3 100644 --- a/po/xh.po +++ b/po/xh.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2006-11-03 12:03\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -4376,216 +4376,234 @@ msgstr "Suhoya le mfuneko apha nje" msgid "generally ignore of some dependencies" msgstr "Suhoya le mfuneko apha nje" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s ibonelela%s, kodwa inenye inzululwazi ngokwakha." -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "umyalelo wokuyeka ukuhlohla imibekelelo" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 #, fuzzy msgid "conflicting requests" msgstr "Uqhagamshelo lucela uku:" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "Ayikwazi kuhlohla%s ngenxa yeengxaki zoxhomekeko" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, fuzzy, c-format, boost-format msgid "nothing provides requested %s" msgstr "Akukho nanye ebonelela ngo%s " -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "Idiski ayikho." -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s itshixiwe kwaye ayikwazi kungahlohlwa." -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "ayihlohlwanga" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, fuzzy, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "%s ifunwa ngu %s" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "Ayikwazi kuhlohla%s " -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s iimpixano ne %s" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, fuzzy, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s ziphelelwe lixehsa %s" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s ziphelelwe lixehsa %s" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%s iimpixano ne %s" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 #, fuzzy msgid "deleted providers: " msgstr "Akukho nanye ebonelela ngo%s " -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 #, fuzzy msgid "" "\n" "not installable providers: " msgstr "Akukho baboneleli bahlohliweyo baka%s" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "Akukho baboneleli bahlohliweyo baka%s" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "ungahlohli %s" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "Gcina%s" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "ungahlohli %s" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "Isicelo sesikhona kakade." -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, fuzzy, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "Akukho baboneleli bahlohliweyo baka%s" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "Ungahlohli okanye cima izicombululi ezinxulumeneyo" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, fuzzy, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "%s ibonelela%s, kodwa inenye inzululwazi ngokwakha." -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, fuzzy, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "Hlohla%s nangona kuza kutshintsha inzululwazi yokwakha" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "%s ziphelelwe lixehsa %s" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, fuzzy, c-format, boost-format msgid "downgrade of %s to %s" msgstr "Ikhuphele%s ukusuka ku%s" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Ukuhlohla" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 6cd5f57..00d634b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-03-14 18:32+0000\n" "Last-Translator: Marguerite Su \n" "Language-Team: Chinese (China) %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "将 %s 用 %s 取代" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "卸载 %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "正在执行 %%posttrans 脚本“%1%”" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "正在执行 %p osttrans 脚本" diff --git a/po/zh_TW.po b/po/zh_TW.po index d23248a..86718dc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2019-05-03 09:49+0000\n" "Last-Translator: Ramax Lo \n" "Language-Team: Chinese (Taiwan) %s" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "將 %s 取代為 %s" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "反安裝 %s" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "正在執行 %%posttrans 程序檔「%1%」" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "正在執行 %p osttrans 程序檔" diff --git a/po/zu.po b/po/zu.po index fcc49fb..06f47f2 100644 --- a/po/zu.po +++ b/po/zu.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: 2006-11-03 12:03\n" "Last-Translator: Novell Language \n" "Language-Team: Novell Language \n" @@ -4379,216 +4379,234 @@ msgstr "Sishaye indiva lesi sidingo lapha nje kuphela" msgid "generally ignore of some dependencies" msgstr "Sishaye indiva lesi sidingo lapha nje kuphela" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, fuzzy, c-format, boost-format msgid "%s has inferior architecture" msgstr "%s ihlinzeka nge-%s, kodwa inobunye ubuciko bomklamo." -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, fuzzy, c-format, boost-format msgid "problem with installed package %s" msgstr "ikhomandi yokukhipha amaphakheji" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 #, fuzzy msgid "conflicting requests" msgstr "Isicelo Sokuxhuma kwi-:" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 #, fuzzy msgid "some dependency problem" msgstr "Ayikwazi ukufaka %s ngenxa yezinkinga zohlelo oluncike kwezinye" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, fuzzy, c-format, boost-format msgid "nothing provides requested %s" msgstr "Akukho okunikeza %s" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, fuzzy, c-format, boost-format msgid "package %s does not exist" msgstr "Idiski ayikho." -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, fuzzy, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "%s ihluthulelwe futhi ngeke ikwazi ukukhipheka." -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, fuzzy, c-format, boost-format msgid "%s is not installable" msgstr "alufakiwe" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, fuzzy, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "%s idingwa yi- %s" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, fuzzy, c-format, boost-format msgid "cannot install both %s and %s" msgstr "Ayikwazi ukufaka %s" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, fuzzy, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "%s ixabana ne- %s" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, fuzzy, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "%s yenza zingasebenzi %s" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, fuzzy, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "%s yenza zingasebenzi %s" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, fuzzy, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "%s ixabana ne- %s" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 #, fuzzy msgid "deleted providers: " msgstr "Akukho okunikeza %s" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 #, fuzzy msgid "" "\n" "not installable providers: " msgstr "Abekho abanye abaphakeli abafakiwe be-%s" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 #, fuzzy msgid "not installable providers: " msgstr "Abekho abanye abaphakeli abafakiwe be-%s" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "ungafaki %s" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "Gcina %s" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, fuzzy, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "ungafaki %s" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 #, fuzzy msgid "This request will break your system!" msgstr "Isicelo sesikhona kakade." -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, fuzzy, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "Abekho abanye abaphakeli abafakiwe be-%s" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, fuzzy, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "Ungafaki noma ususe maqondana nezixazululi" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, fuzzy, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "%s ihlinzeka nge-%s, kodwa inobunye ubuciko bomklamo." -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, fuzzy, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "Faka %s nakuba izoshintsha ubuciko bomklamo" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, fuzzy, c-format, boost-format msgid "keep obsolete %s" msgstr "%s yenza zingasebenzi %s" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, fuzzy, c-format, boost-format msgid "downgrade of %s to %s" msgstr "Ilande %s kwi-%s" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, fuzzy, c-format, boost-format msgid "deinstallation of %s" msgstr "Ukufaka uhlelo" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/po/zypp.pot b/po/zypp.pot index adb77bf..e94c588 100644 --- a/po/zypp.pot +++ b/po/zypp.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-11 09:20+0200\n" +"POT-Creation-Date: 2019-12-05 14:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4338,210 +4338,228 @@ msgstr "" msgid "generally ignore of some dependencies" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1052 +#: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format msgid "%s does not belong to a distupgrade repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1055 +#: zypp/solver/detail/SATResolver.cc:1063 #, c-format, boost-format msgid "%s has inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1058 +#: zypp/solver/detail/SATResolver.cc:1066 #, c-format, boost-format msgid "problem with installed package %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1061 +#: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1064 +#: zypp/solver/detail/SATResolver.cc:1072 msgid "some dependency problem" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1067 +#: zypp/solver/detail/SATResolver.cc:1075 #, c-format, boost-format msgid "nothing provides requested %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1068 -#: zypp/solver/detail/SATResolver.cc:1072 +#: zypp/solver/detail/SATResolver.cc:1076 +#: zypp/solver/detail/SATResolver.cc:1080 msgid "Have you enabled all requested repositories?" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1071 +#: zypp/solver/detail/SATResolver.cc:1079 #, c-format, boost-format msgid "package %s does not exist" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1075 +#: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1078 +#: zypp/solver/detail/SATResolver.cc:1086 #, c-format, boost-format msgid "%s is provided by the system and cannot be erased" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1081 +#: zypp/solver/detail/SATResolver.cc:1089 #, c-format, boost-format msgid "%s is not installable" msgstr "" #. for setting weak dependencies -#: zypp/solver/detail/SATResolver.cc:1085 +#: zypp/solver/detail/SATResolver.cc:1093 #, c-format, boost-format msgid "nothing provides %s needed by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1088 +#: zypp/solver/detail/SATResolver.cc:1096 #, c-format, boost-format msgid "cannot install both %s and %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1091 +#: zypp/solver/detail/SATResolver.cc:1099 #, c-format, boost-format msgid "%s conflicts with %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1094 +#: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1097 +#: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format msgid "installed %s obsoletes %s provided by %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1100 +#: zypp/solver/detail/SATResolver.cc:1108 #, c-format, boost-format msgid "solvable %s conflicts with %s provided by itself" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1131 +#: zypp/solver/detail/SATResolver.cc:1139 #, c-format, boost-format msgid "%s requires %s, but this requirement cannot be provided" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1133 +#: zypp/solver/detail/SATResolver.cc:1141 msgid "deleted providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1143 +#: zypp/solver/detail/SATResolver.cc:1151 msgid "" "\n" "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1145 +#: zypp/solver/detail/SATResolver.cc:1153 msgid "not installable providers: " msgstr "" -#: zypp/solver/detail/SATResolver.cc:1207 +#: zypp/solver/detail/SATResolver.cc:1215 #, c-format, boost-format msgid "remove lock to allow removal of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1212 -#: zypp/solver/detail/SATResolver.cc:1248 +#: zypp/solver/detail/SATResolver.cc:1220 +#: zypp/solver/detail/SATResolver.cc:1256 #, c-format, boost-format msgid "do not install %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1227 -#: zypp/solver/detail/SATResolver.cc:1269 +#: zypp/solver/detail/SATResolver.cc:1235 +#: zypp/solver/detail/SATResolver.cc:1277 #, c-format, boost-format msgid "keep %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1232 +#: zypp/solver/detail/SATResolver.cc:1240 #, c-format, boost-format msgid "remove lock to allow installation of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1283 -#: zypp/solver/detail/SATResolver.cc:1304 +#: zypp/solver/detail/SATResolver.cc:1291 +#: zypp/solver/detail/SATResolver.cc:1312 msgid "This request will break your system!" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1284 -#: zypp/solver/detail/SATResolver.cc:1305 +#: zypp/solver/detail/SATResolver.cc:1292 +#: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1289 +#: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1311 +#: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1324 +#: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format msgid "do not install most recent version of %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1345 +#: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1350 +#: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1359 +#: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1364 +#: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1384 +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1386 +#, boost-format +msgid "install %1% although it has been retracted" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1389 +#, boost-format +msgid "allow to install the PTF %1%" +msgstr "" + +#. translator: %1% is a package name +#: zypp/solver/detail/SATResolver.cc:1392 +#, boost-format +msgid "install %1% although it is blacklisted" +msgstr "" + +#: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format msgid "downgrade of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1391 +#: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1400 +#: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format msgid "" "install %s (with vendor change)\n" " %s --> %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1409 +#: zypp/solver/detail/SATResolver.cc:1437 #, c-format, boost-format msgid "replacement of %s with %s" msgstr "" -#: zypp/solver/detail/SATResolver.cc:1420 +#: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" msgstr "" #. strip tmp file suffix -#: zypp/target/RpmPostTransCollector.cc:103 +#: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" msgstr "" #. show a final message -#: zypp/target/RpmPostTransCollector.cc:161 +#: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" msgstr "" diff --git a/tests/zypp/Vendor_test.cc b/tests/zypp/Vendor_test.cc index e41bf4f..1cf6f66 100644 --- a/tests/zypp/Vendor_test.cc +++ b/tests/zypp/Vendor_test.cc @@ -23,6 +23,18 @@ namespace zypp #define DATADIR (Pathname(TESTS_SRC_DIR) + "/zypp/data/Vendor") +BOOST_AUTO_TEST_CASE(vendor_empty) +{ + BOOST_REQUIRE( VendorAttr::instance().equivalent("", "") ); + BOOST_REQUIRE( !VendorAttr::instance().equivalent("a", "") ); + BOOST_REQUIRE( !VendorAttr::instance().equivalent("", "a") ); + + BOOST_REQUIRE( VendorAttr::instance().equivalent( IdString::Null, IdString::Null ) ); + BOOST_REQUIRE( VendorAttr::instance().equivalent( IdString::Empty, IdString::Null ) ); + BOOST_REQUIRE( VendorAttr::instance().equivalent( IdString::Null, IdString::Empty ) ); + BOOST_REQUIRE( VendorAttr::instance().equivalent( IdString::Empty, IdString::Empty ) ); +} + BOOST_AUTO_TEST_CASE(vendor_test1) { reconfigureZConfig( DATADIR / "zypp1.conf" ); diff --git a/zypp/Capabilities.h b/zypp/Capabilities.h index 0e8daf8..98f8bac 100644 --- a/zypp/Capabilities.h +++ b/zypp/Capabilities.h @@ -75,6 +75,9 @@ namespace zypp const_iterator end() const; public: + /** Return whether the set contains \a lhs (the Id)*/ + bool contains( const Capability & lhs ) const; + /** Return whether \a lhs matches at least one capability in set. */ bool matches( const Capability & lhs ) const; @@ -169,6 +172,14 @@ namespace zypp inline Capabilities::const_iterator Capabilities::end() const { return const_iterator( 0 ); } + inline bool Capabilities::contains( const Capability & lhs ) const + { + for ( const Capability & rhs : *this ) + if ( lhs == rhs ) + return true; + return false; + } + inline bool Capabilities::matches( const Capability & lhs ) const { for ( const Capability & rhs : *this ) diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc index e47c9f8..82b460b 100644 --- a/zypp/sat/Solvable.cc +++ b/zypp/sat/Solvable.cc @@ -97,6 +97,9 @@ namespace zypp const Solvable Solvable::noSolvable; + const IdString Solvable::retractedToken { "retracted-patch-package()" }; + const IdString Solvable::ptfToken { "ptf()" }; + ///////////////////////////////////////////////////////////////// detail::CSolvable * Solvable::get() const @@ -393,6 +396,18 @@ namespace zypp return myPool().isNeedreboot( *this ); } + bool Solvable::isRetracted() const + { + NO_SOLVABLE_RETURN( false ); + return provides().contains( Capability( retractedToken.id() ) ); + } + + bool Solvable::isPtf() const + { + NO_SOLVABLE_RETURN( false ); + return provides().contains( Capability( ptfToken.id() ) ); + } + bool Solvable::multiversionInstall() const { NO_SOLVABLE_RETURN( false ); diff --git a/zypp/sat/Solvable.h b/zypp/sat/Solvable.h index 00650ea..d30b995 100644 --- a/zypp/sat/Solvable.h +++ b/zypp/sat/Solvable.h @@ -55,6 +55,9 @@ namespace zypp public: typedef sat::detail::SolvableIdType IdType; + static const IdString retractedToken; ///< Indicator provides `retracted-patch-package()` + static const IdString ptfToken; ///< Indicator provides `ptf()` + public: /** Default ctor creates \ref noSolvable.*/ Solvable() @@ -136,14 +139,20 @@ namespace zypp /** \overload static version */ static bool identIsAutoInstalled( const IdString & ident_r ); - /** Whether this solvable triggers the reboot-needed hint if installed/updated. */ - bool isNeedreboot() const; - /** Whether different versions of this package can be installed at the same time. * Per default \c false. \see also \ref ZConfig::multiversion. */ bool multiversionInstall() const; + /** Whether this solvable triggers the reboot-needed hint if installed/updated. */ + bool isNeedreboot() const; + + /** Whether this solvable is retracted (provides \ref retractedToken). */ + bool isRetracted() const; + + /** Whether this solvable is a PTF (provides \ref ptfToken). */ + bool isPtf() const; + /** The items build time. */ Date buildtime() const; diff --git a/zypp/sat/SolvableType.h b/zypp/sat/SolvableType.h index 55db076..86789a4 100644 --- a/zypp/sat/SolvableType.h +++ b/zypp/sat/SolvableType.h @@ -81,6 +81,8 @@ namespace zypp bool identIsAutoInstalled() const { return satSolvable().identIsAutoInstalled(); } bool multiversionInstall() const { return satSolvable().multiversionInstall(); } bool isNeedreboot() const { return satSolvable().isNeedreboot(); } + bool isRetracted() const { return satSolvable().isRetracted(); } + bool isPtf() const { return satSolvable().isPtf(); } Date buildtime() const { return satSolvable().buildtime(); } Date installtime() const { return satSolvable().installtime(); } diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc index 0fd2b4c..b8ad971 100644 --- a/zypp/solver/detail/SATResolver.cc +++ b/zypp/solver/detail/SATResolver.cc @@ -645,14 +645,12 @@ SATResolver::solverInit(const PoolItemList & weakItems) queue_push( &(_jobQueue), id ); } - // Ad rules for retracted pathces and packages + // Ad rules for retracted patches and packages { - static const IdString retractedToken { "retracted-patch-package()" }; - static const IdString ptfToken { "ptf()" }; queue_push( &(_jobQueue), SOLVER_BLACKLIST|SOLVER_SOLVABLE_PROVIDES ); - queue_push( &(_jobQueue), retractedToken.id() ); + queue_push( &(_jobQueue), sat::Solvable::retractedToken.id() ); queue_push( &(_jobQueue), SOLVER_BLACKLIST|SOLVER_SOLVABLE_PROVIDES ); - queue_push( &(_jobQueue), ptfToken.id() ); + queue_push( &(_jobQueue), sat::Solvable::ptfToken.id() ); } // Ad rules for changed requestedLocales @@ -1375,7 +1373,27 @@ SATResolver::problems () MIL << description << endl; problemSolution->addDescription (description); } - } else { + } else if ( p == SOLVER_SOLUTION_BLACK ) { + // Allow to install a blacklisted package (PTF, retracted,...). + // For not-installed items only + s = mapSolvable (rp); + PoolItem poolItem = _pool.find (s); + + problemSolution->addSingleAction (poolItem, INSTALL); + string description; + if ( s.isRetracted() ) { + // translator: %1% is a package name + description = str::Format(_("install %1% although it has been retracted")) % s.asString(); + } else if ( s.isPtf() ) { + // translator: %1% is a package name + description = str::Format(_("allow to install the PTF %1%")) % s.asString(); + } else { + // translator: %1% is a package name + description = str::Format(_("install %1% although it is blacklisted")) % s.asString(); + } + MIL << description << endl; + problemSolution->addDescription( description ); + } else if ( p > 0 ) { /* policy, replace p with rp */ s = mapSolvable (p); PoolItem itemFrom = _pool.find (s); @@ -1434,6 +1452,11 @@ SATResolver::problems () } } } + else + { + INT << "Unknown solution " << p << endl; + } + } resolverProblem->addSolution (problemSolution, problemSolution->actionCount() > 1 ? true : false); // Solutions with more than 1 action will be shown first. -- 2.7.4