From ceccf43cc5b354cb0893b0eec0180ee990ac2dd5 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Fri, 27 Nov 2020 15:45:12 +0900 Subject: [PATCH] Imported Upstream version 17.18.1 --- VERSION.cmake | 4 +- package/libzypp.changes | 7 + po/ca.po | 12 +- po/cs.po | 14 +- po/da.po | 14 +- po/de.po | 14 +- po/et.po | 305 +++++++++++++++++--------------------- po/ja.po | 22 +-- po/nl.po | 14 +- po/pt_BR.po | 10 +- po/sk.po | 14 +- tests/lib/TestSetup.h | 11 +- zypp/solver/detail/SATResolver.cc | 108 ++++++-------- 13 files changed, 258 insertions(+), 291 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index ff11631..388f2ec 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "17") SET(LIBZYPP_COMPATMINOR "12") SET(LIBZYPP_MINOR "18") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 17.18.0 (12) +# LAST RELEASED: 17.18.1 (12) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index e92400c..056f98a 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Dec 9 10:22:56 CET 2019 - ma@suse.de + +- dup: fix removing orphaned packages dropped by to-be-installed + products (bsc#1155819) +- version 17.18.1 (12) + +------------------------------------------------------------------- Thu Dec 5 14:23:52 CET 2019 - ma@suse.de - Resolver: add solution actions for SOLVER_SOLUTION_BLACK diff --git a/po/ca.po b/po/ca.po index bae3931..48439fe 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-03-14 18:32+0000\n" +"PO-Revision-Date: 2019-12-05 20:54+0000\n" "Last-Translator: David Medina \n" "Language-Team: Catalan \n" @@ -18,13 +18,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" #. dubious: Throw on malformed known types, otherwise log a warning. #: zypp/CheckSum.cc:136 #, c-format, boost-format msgid "Dubious type '%s' for %u byte checksum '%s'" -msgstr "Tipus dubtós \"%s\" per a %u byte checksum \"%s\"" +msgstr "Tipus dubtós \"%s\" per a la suma de comprovació \"%s\" de %u bytes." #: zypp/CountryCode.cc:50 msgid "Unknown country: " @@ -5010,19 +5010,19 @@ msgstr "instal·la %s del repositori exclòs" #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "instal·la %1% tot i que ha estat retret" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "permet instal·lar el PTF %1%" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "instal·la %1% tot i que és a la llista negra" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff --git a/po/cs.po b/po/cs.po index e9fd681..8637979 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,16 +20,16 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-03-14 18:32+0000\n" +"PO-Revision-Date: 2019-12-06 11:54+0000\n" "Last-Translator: Aleš Kastner \n" -"Language-Team: Czech \n" +"Language-Team: Czech " +"\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" #. dubious: Throw on malformed known types, otherwise log a warning. #: zypp/CheckSum.cc:136 @@ -4828,19 +4828,19 @@ msgstr "instalovat %s z vyloučeného repozitáře" #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "instalovat %1%, ačkoli byl odvolán" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "umožnit instalaci PTF %1%" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "instalovat %1%, ačkoli je na indexu" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff --git a/po/da.po b/po/da.po index 764f774..a9cde84 100644 --- a/po/da.po +++ b/po/da.po @@ -7,16 +7,16 @@ msgstr "" "Project-Id-Version: libzypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-03-23 20:19+0000\n" +"PO-Revision-Date: 2019-12-06 11:54+0000\n" "Last-Translator: scootergrisen \n" -"Language-Team: Danish \n" +"Language-Team: Danish " +"\n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" #. dubious: Throw on malformed known types, otherwise log a warning. #: zypp/CheckSum.cc:136 @@ -4603,19 +4603,19 @@ msgstr "installér %s fra ekskluderet softwarekilde" #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "installér %1%, selvom den er blevet tilbagetrukket" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "giv tillade til installation af PTF'en %1%" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "installér %1%, selvom den er sortlistet" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff --git a/po/de.po b/po/de.po index 2113cb2..a4ad8c1 100644 --- a/po/de.po +++ b/po/de.po @@ -18,16 +18,16 @@ msgstr "" "Project-Id-Version: zypp.de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-03-18 10:04+0000\n" +"PO-Revision-Date: 2019-12-05 20:54+0000\n" "Last-Translator: Sarah Kriesch \n" -"Language-Team: German \n" +"Language-Team: German " +"\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" #. dubious: Throw on malformed known types, otherwise log a warning. #: zypp/CheckSum.cc:136 @@ -4633,19 +4633,19 @@ msgstr "%s aus dem ausgeschlossenen Repository installieren" #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "%1 installieren, obwohl es widerrufen wurde" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "Erlauben das PTF %1% zu installieren" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "%1% installieren, obwohl es geblacklistet ist" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff --git a/po/et.po b/po/et.po index 7540a37..855b91c 100644 --- a/po/et.po +++ b/po/et.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: zypp.et\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-12-03 17:54+0000\n" +"PO-Revision-Date: 2019-12-08 11:54+0000\n" "Last-Translator: Jaanus Ojangu \n" "Language-Team: Estonian \n" @@ -88,7 +88,7 @@ msgstr "Antarktika" #. :ATA:010: #: zypp/CountryCode.cc:168 msgid "Argentina" -msgstr "Argentina" +msgstr "Argentiina" #. :ARG:032: #: zypp/CountryCode.cc:169 @@ -193,7 +193,7 @@ msgstr "Bahama" #. :BHS:044: #: zypp/CountryCode.cc:189 msgid "Bhutan" -msgstr "Bhutan" +msgstr "Bhutaan" #. :BTN:064: #: zypp/CountryCode.cc:190 @@ -269,12 +269,12 @@ msgstr "Hiina" #. :CHN:156: #: zypp/CountryCode.cc:205 msgid "Colombia" -msgstr "Colombia" +msgstr "Kolumbia" #. :COL:170: #: zypp/CountryCode.cc:206 msgid "Costa Rica" -msgstr "Costa Rica" +msgstr "Costa-Rica" #. :CRI:188: #: zypp/CountryCode.cc:207 @@ -428,9 +428,8 @@ msgstr "Prantsuse Guajaana" #. :GUF:254: #: zypp/CountryCode.cc:237 -#, fuzzy msgid "Guernsey" -msgstr "Saksamaa" +msgstr "Guernsey" #: zypp/CountryCode.cc:238 msgid "Ghana" @@ -577,7 +576,6 @@ msgstr "Itaalia" #. :ITA:380: #: zypp/CountryCode.cc:267 -#, fuzzy msgid "Jersey" msgstr "Jersey" @@ -598,7 +596,7 @@ msgstr "Jaapan" #. :JPN:392: #: zypp/CountryCode.cc:271 msgid "Kenya" -msgstr "Kenya" +msgstr "Keenia" #. :KEN:404: #: zypp/CountryCode.cc:272 @@ -663,7 +661,7 @@ msgstr "Liibanon" #. :LBN:422: #: zypp/CountryCode.cc:284 msgid "Saint Lucia" -msgstr "Saint Lucia" +msgstr "Saint-Lucia" #. :LCA:662: #: zypp/CountryCode.cc:285 @@ -673,7 +671,7 @@ msgstr "Liechtenstein" #. :LIE:438: #: zypp/CountryCode.cc:286 msgid "Sri Lanka" -msgstr "Sri Lanka" +msgstr "Sri-Lanka" #. :LKA:144: #: zypp/CountryCode.cc:287 @@ -722,14 +720,12 @@ msgstr "Moldova" #. :MDA:498: #: zypp/CountryCode.cc:296 -#, fuzzy msgid "Montenegro" -msgstr "Mongo" +msgstr "Montenegro" #: zypp/CountryCode.cc:297 -#, fuzzy msgid "Saint Martin" -msgstr "San Marino" +msgstr "Saint Martin" #: zypp/CountryCode.cc:298 msgid "Madagascar" @@ -934,7 +930,7 @@ msgstr "Pitcairn" #. :PCN:612: #: zypp/CountryCode.cc:338 msgid "Puerto Rico" -msgstr "Puerto Rico" +msgstr "Puerto-Rico" #. :PRI:630: #: zypp/CountryCode.cc:339 @@ -973,7 +969,6 @@ msgstr "Rumeenia" #. :ROU:642: #: zypp/CountryCode.cc:346 -#, fuzzy msgid "Serbia" msgstr "Serbia" @@ -1019,7 +1014,7 @@ msgstr "Singapur" #. :SGP:702: #: zypp/CountryCode.cc:355 msgid "Saint Helena" -msgstr "Saint Helena" +msgstr "Saint-Helena" #. :SHN:654: #: zypp/CountryCode.cc:356 @@ -1039,12 +1034,12 @@ msgstr "Slovakkia" #. :SVK:703: #: zypp/CountryCode.cc:359 msgid "Sierra Leone" -msgstr "Sierra Leone" +msgstr "Sierra-Leone" #. :SLE:694: #: zypp/CountryCode.cc:360 msgid "San Marino" -msgstr "San Marino" +msgstr "San-Marino" #. :SMR:674: #: zypp/CountryCode.cc:361 @@ -1280,9 +1275,8 @@ msgid "Conflicts" msgstr "On vastuolus" #: zypp/Dep.cc:100 -#, fuzzy msgid "Obsoletes" -msgstr "Muudab aegunuks" +msgstr "Aegub" #: zypp/Dep.cc:101 msgid "Recommends" @@ -1301,14 +1295,14 @@ msgid "Supplements" msgstr "Lisandid" #: zypp/ExternalProgram.cc:268 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Can't open pty (%s)." -msgstr "Ei saanud avada faili: %s." +msgstr "Ei saanud avada preudoterminali 'pty' (%s)." #: zypp/ExternalProgram.cc:279 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Can't open pipe (%s)." -msgstr "Ei saa avada faili %1." +msgstr "Ei saa avada toru 'pipe' (%s)." #: zypp/ExternalProgram.cc:362 #, c-format, boost-format @@ -1321,9 +1315,9 @@ msgid "Can't chdir to '%s' inside chroot '%s' (%s)." msgstr "Ei õnnestunud 'chdir' '%s' 'chroot' sees '%s' (%s)." #: zypp/ExternalProgram.cc:373 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Can't chdir to '%s' (%s)." -msgstr "Ei saa käivitada '%s' (%s)." +msgstr "Ei saa kataloogi vahetada 'chdir '%s' (%s)." #. don't want to get here #: zypp/ExternalProgram.cc:385 @@ -1357,18 +1351,17 @@ msgid "Tried to import not existent key %s into keyring %s" msgstr "Prooviti võtmehoidjasse %s importida olematu võtme %s" #: zypp/KeyRing.cc:596 -#, fuzzy msgid "Failed to import key." -msgstr "Võtme kustutamine nurjus." +msgstr "Võtme import nurjus." #: zypp/KeyRing.cc:603 msgid "Failed to delete key." msgstr "Võtme kustutamine nurjus." #: zypp/KeyRing.cc:609 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Signature file %s not found" -msgstr "Hoidlat %s ei leitud." +msgstr "Allkirjade faili %s ei leitud" #: zypp/LanguageCode.cc:49 msgid "Unknown language: " @@ -1561,9 +1554,8 @@ msgstr "Banda" #. language code: bai #: zypp/LanguageCode.cc:239 -#, fuzzy msgid "Bamileke Languages" -msgstr "Mitu keelt" +msgstr "Bamileke keeled" #. language code: bak ba #: zypp/LanguageCode.cc:241 @@ -1812,9 +1804,8 @@ msgstr "Šaieeni" #. language code: cmc #: zypp/LanguageCode.cc:345 -#, fuzzy msgid "Chamic Languages" -msgstr "Apatši keeled" +msgstr "Chamic keeled" #. language code: cop #: zypp/LanguageCode.cc:347 @@ -1858,9 +1849,8 @@ msgstr "Krimmitatari" #. language code: crp #: zypp/LanguageCode.cc:363 -#, fuzzy msgid "Creoles and Pidgins (Other)" -msgstr "Kesk-Ameerika indiaani (muu)" +msgstr "Kreoolid ja Pidginid (muu)" #. language code: csb #: zypp/LanguageCode.cc:365 @@ -2255,7 +2245,7 @@ msgstr "Hmongi" #. language code: hmo ho #: zypp/LanguageCode.cc:533 msgid "Hiri Motu" -msgstr "Hiri Motu" +msgstr "Hiri-Motu" #. language code: hsb #: zypp/LanguageCode.cc:535 @@ -3004,9 +2994,8 @@ msgstr "Osmanitürgi (1500-1928)" #. language code: oto #: zypp/LanguageCode.cc:843 -#, fuzzy msgid "Otomian Languages" -msgstr "Nuubia keeled" +msgstr "Otomi keeled" #. language code: paa #: zypp/LanguageCode.cc:845 @@ -3170,9 +3159,8 @@ msgstr "Lõuna-Ameerika indiaani (muu)" #. language code: sal #: zypp/LanguageCode.cc:913 -#, fuzzy msgid "Salishan Languages" -msgstr "Siuu keeled" +msgstr "Salishani keeled" #. language code: sam #: zypp/LanguageCode.cc:915 @@ -3626,9 +3614,8 @@ msgstr "Vadja" #. language code: wak #: zypp/LanguageCode.cc:1107 -#, fuzzy msgid "Wakashan Languages" -msgstr "Atapaski keeled" +msgstr "Wakashani keeled" #. language code: wal #: zypp/LanguageCode.cc:1109 @@ -3736,9 +3723,8 @@ msgstr "Sooritatakse järgmised tegevused:" #. translators: an annotation to a gpg keys expiry date #: zypp/PublicKey.cc:63 -#, fuzzy msgid "does not expire" -msgstr "'%1' pole olemas." +msgstr "ei vanane" #. translators: an annotation to a gpg keys expiry date: "expired: 1999-04-12" #: zypp/PublicKey.cc:68 @@ -3754,9 +3740,8 @@ msgstr "aegub: %1%" #. translators: an annotation to a gpg keys expiry date #: zypp/PublicKey.cc:82 -#, fuzzy msgid "(does not expire)" -msgstr "'%1' pole olemas." +msgstr "(ei vanane)" #. translators: an annotation to a gpg keys expiry date #: zypp/PublicKey.cc:91 @@ -3806,7 +3791,7 @@ msgstr "Ei saa lugeda repo kataloogi '%1%': Juurdepääs on keelatud" #: zypp/repo/PluginServices.cc:49 #, c-format, boost-format msgid "Failed to read directory '%s'" -msgstr "Kataloogi '%s' lugemine nurjus." +msgstr "Kataloogi '%s' lugemine nurjus" #: zypp/RepoManager.cc:330 #, boost-format @@ -3814,9 +3799,8 @@ msgid "Cannot read repo file '%1%': Permission denied" msgstr "Ei saa lugeda repo faili '%1%': Juurdepääs on keelatud" #: zypp/RepoManager.cc:353 -#, fuzzy msgid "Repository alias cannot start with dot." -msgstr "Hoidlat %s ei leitud." +msgstr "Hoidlat alias ei saa alata punktiga." #: zypp/RepoManager.cc:364 msgid "Service alias cannot start with dot." @@ -3845,14 +3829,13 @@ 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 +#, boost-format, c-format msgid "Can't create %s" -msgstr "Pole võimalik luua %s: %m\n" +msgstr "Pole võimalik luua %s" #: zypp/RepoManager.cc:1148 -#, fuzzy msgid "Can't create metadata cache directory." -msgstr "Ei saa luua katalooogi %1: %2" +msgstr "Metaandmete vahemälu kataloogi ei saa luua." #: zypp/RepoManager.cc:1294 #, c-format, boost-format @@ -3886,9 +3869,9 @@ msgstr "Viga lugemisel asukohast '%s'" #. TranslatorExplanation '%s' is an URL #: zypp/RepoManager.cc:1480 zypp/RepoManager.cc:2497 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Unknown error reading from '%s'" -msgstr "Tundmatu käsk '%s'" +msgstr "Tundmatu viga '%s' lugemisel" #: zypp/RepoManager.cc:1618 #, c-format, boost-format @@ -3897,14 +3880,14 @@ msgstr "Lisatakse repositoorium '%s'" #. TranslatorExplanation '%s' is an URL #: zypp/RepoManager.cc:1706 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Invalid repo file name at '%s'" -msgstr "Vigane ekspordifaili nimi." +msgstr "Vigane repo faili nimi '%s'" #: zypp/RepoManager.cc:1747 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Removing repository '%s'" -msgstr "Hoidla '%s' lisamine." +msgstr "Eemaldatakse hoidla '%s'" #: zypp/RepoManager.cc:1766 zypp/RepoManager.cc:1844 msgid "Can't figure out where the repo is stored." @@ -3914,7 +3897,7 @@ msgstr "Ei suuda tuvastada, kus hoidla asub." #: zypp/RepoManager.cc:1780 zypp/RepoManager.cc:1982 #, c-format, boost-format msgid "Can't delete '%s'" -msgstr "Faili '%s' ei saa kustutada." +msgstr "Faili '%s' ei saa kustutada" #: zypp/RepoManager.cc:1970 zypp/RepoManager.cc:2420 msgid "Can't figure out where the service is stored." @@ -3930,19 +3913,16 @@ msgid "Invalid LDAP URL query parameter '%s'" msgstr "Vigane LDAP URL-i päringu parameeter '%s'" #: zypp/Url.cc:301 -#, fuzzy msgid "Unable to clone Url object" -msgstr "Kõiki allikaid pole võimalik taastada." +msgstr "Pole võimalik kloonida Url objekti" #: zypp/Url.cc:314 -#, fuzzy msgid "Invalid empty Url object reference" -msgstr "Vigane eelistus" +msgstr "Vigane tühja Url objekti referents" #: zypp/Url.cc:327 zypp/Url.cc:341 -#, fuzzy msgid "Unable to parse Url components" -msgstr "Kõiki allikaid pole võimalik taastada." +msgstr "Ei ole võimalik uurida Url komponente" #: zypp/VendorSupportOptions.cc:14 msgid "unknown" @@ -4035,9 +4015,9 @@ msgid "History:" msgstr "Ajalugu:" #: zypp/base/StrMatcher.cc:152 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Unknown match mode '%s'" -msgstr "Tundmatu käsk '%s'" +msgstr "Tundmatu ühilduvusstaatus '%s'" #: zypp/base/StrMatcher.cc:153 #, c-format, boost-format @@ -4045,14 +4025,14 @@ msgid "Unknown match mode '%s' for pattern '%s'" msgstr "Tundmatu 'match mode' '%s' struktuurile '%s'" #: zypp/base/StrMatcher.cc:157 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Invalid regular expression '%s': regcomp returned %d" -msgstr " pole korrektne regulaaravaldis: \"" +msgstr "Vigane regulaaravaldis '%s': recomp vastas %d" #: zypp/base/StrMatcher.cc:158 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Invalid regular expression '%s'" -msgstr " pole korrektne regulaaravaldis: \"" +msgstr "Vigane regulaaravaldis '%s'" #. !\todo add comma to the message for the next release #: zypp/media/MediaCIFS.cc:427 zypp/media/MediaCurl.cc:1738 @@ -4077,14 +4057,14 @@ msgstr "" "ja kas see pole aegunud." #: zypp/media/MediaException.cc:33 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Failed to mount %s on %s" -msgstr "%s - %s ei saa avada\n" +msgstr "Haakimine %s asukohas %s nurjus" #: zypp/media/MediaException.cc:43 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Failed to unmount %s" -msgstr "Mooduli \"%s\" laadimine ebaõnnestus." +msgstr "Lahtihaakimine %s nurjus" #: zypp/media/MediaException.cc:48 #, c-format, boost-format @@ -4097,9 +4077,9 @@ msgid "Medium not opened when trying to perform action '%s'." msgstr "Toimingu '%s' sooritamisel meedium ei avanenud." #: zypp/media/MediaException.cc:58 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "File '%s' not found on medium '%s'" -msgstr "Faili ei leitud: %1." +msgstr "Faili '%s' ei leitud meediumil '%s'" #: zypp/media/MediaException.cc:63 #, c-format, boost-format @@ -4131,9 +4111,9 @@ msgid "Path '%s' on medium '%s' is not a file." msgstr "Tee sihtkohas '%s' andmekandjal '%s' ei ole fail." #: zypp/media/MediaException.cc:94 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Path '%s' on medium '%s' is not a directory." -msgstr "%1 pole kataloog." +msgstr "Tee '%s' meediumil '%s' pole kataloog." #: zypp/media/MediaException.cc:101 msgid "Malformed URI" @@ -4157,9 +4137,8 @@ msgid "Unsupported URI scheme in '%s'." msgstr "Mittetoetatud URl skeem '%s'." #: zypp/media/MediaException.cc:131 -#, fuzzy msgid "Operation not supported by medium" -msgstr "Profiili versioon ei ole Apparmori mooduli poolt toetatud\n" +msgstr "See tegevus ei ole meediumi poolt toetatud" #: zypp/media/MediaException.cc:138 #, c-format, boost-format @@ -4193,14 +4172,14 @@ msgid "Cannot eject any media" msgstr "Ühtegi andmekandjat ei saa väljutada" #: zypp/media/MediaException.cc:166 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Cannot eject media '%s'" -msgstr "Ei saa avada faili '%1'." +msgstr "Ei saa väljutada meediumi '%s'" #: zypp/media/MediaException.cc:181 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Permission to access '%s' denied." -msgstr "Ligipääs on keelatud" +msgstr "Ligipääs '%s' on keelatud." #: zypp/media/MediaException.cc:189 #, c-format, boost-format @@ -4251,9 +4230,8 @@ msgid "One or both of '%s' or '%s' attributes is required." msgstr "Üks või mõlemad '%s' või '%s' atribuudid on nõutavad." #: zypp/repo/PackageProvider.cc:331 -#, fuzzy msgid "Signature verification failed" -msgstr " käivitamine nurjus" +msgstr "Allkirja võrdlemine nurjus" #. TranslatorExplanation %s = package being checked for integrity #: zypp/repo/PackageProvider.cc:462 @@ -4289,9 +4267,8 @@ msgid "Can't provide file '%s' from repository '%s'" msgstr "Ei saa faili '%s' tarkvarahoidlast '%s' hankida" #: zypp/repo/RepoProvideFile.cc:267 -#, fuzzy msgid "No url in repository." -msgstr "Probleem hoidla andmete parsimisel." +msgstr "Repositooriumis ei ole URLi." #. [lhs][rhs] 0 = installed; 1 = to be installed #. TranslatorExplanation %1%(filename) %2%(package1) %3%(package2) @@ -4440,20 +4417,18 @@ msgstr "" " %4%" #: zypp/sat/detail/PoolImpl.cc:193 -#, fuzzy msgid "Can not create sat-pool." -msgstr "Faili ei sa luua." +msgstr "Faili ei sa luua sat-pooli." #. TranslatorExplanation %s = name of package, patch, selection ... #: zypp/solver/detail/ProblemSolutionIgnore.cc:42 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "break %s by ignoring some of its dependencies" -msgstr "Sõltuvuste kontrollimine" +msgstr "võib katki teha %s ignoneerides mõnda selle sõltuvust" #: zypp/solver/detail/ProblemSolutionIgnore.cc:48 -#, fuzzy msgid "generally ignore of some dependencies" -msgstr "Sõltuvuste kontrollimine" +msgstr "üldiselt ignoreeritakse mõnda sõltuvust" #: zypp/solver/detail/SATResolver.cc:1060 #, c-format, boost-format @@ -4466,9 +4441,9 @@ msgid "%s has inferior architecture" msgstr "%s on halvema arhitektuuriga" #: zypp/solver/detail/SATResolver.cc:1066 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "problem with installed package %s" -msgstr "Paigaldatud pakettide lugemine" +msgstr "Paigaldatud paketiga %s on probleem" #: zypp/solver/detail/SATResolver.cc:1069 msgid "conflicting requests" @@ -4489,9 +4464,9 @@ msgid "Have you enabled all requested repositories?" msgstr "Kas olete lubanud kõik taotletud hoidlad?" #: zypp/solver/detail/SATResolver.cc:1079 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "package %s does not exist" -msgstr "varukoopiat pole olemas" +msgstr "paketti %s pole olemas" #: zypp/solver/detail/SATResolver.cc:1083 msgid "unsupported request" @@ -4526,7 +4501,7 @@ msgstr "%s on konfliktis %s -ga hangituna %s poolt" #: zypp/solver/detail/SATResolver.cc:1102 #, c-format, boost-format msgid "%s obsoletes %s provided by %s" -msgstr "%s aegub %s, mida pakub %s" +msgstr "%s aegub %s pakkujalt %s" #: zypp/solver/detail/SATResolver.cc:1105 #, c-format, boost-format @@ -4577,15 +4552,14 @@ msgid "keep %s" msgstr "jäta alles %s" #: zypp/solver/detail/SATResolver.cc:1240 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "remove lock to allow installation of %s" -msgstr "Käivita paigaldus või süsteem" +msgstr "eemalda lukustus %s paigalduse lubamiseks" #: 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." +msgstr "See päring rikub teie süsteemi!" #: zypp/solver/detail/SATResolver.cc:1292 #: zypp/solver/detail/SATResolver.cc:1313 @@ -4595,12 +4569,12 @@ msgstr "ignoreerige katkise süsteemi hoiatust" #: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format msgid "do not ask to install a solvable providing %s" -msgstr "" +msgstr "ärge paluge paigaldada pakutavaid sõltuvuste lahendusi %s" #: zypp/solver/detail/SATResolver.cc:1319 #, c-format, boost-format msgid "do not ask to delete all solvables providing %s" -msgstr "" +msgstr "ärge paluge kustutada kõiki pakutud sõltuvuste lahendusi %s" #: zypp/solver/detail/SATResolver.cc:1332 #, c-format, boost-format @@ -4618,9 +4592,9 @@ msgid "install %s despite the inferior architecture" msgstr "paigaldage %s vaatamata madalamale arhitektuurile" #: zypp/solver/detail/SATResolver.cc:1367 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "keep obsolete %s" -msgstr "Muudab aegunuks" +msgstr "jäta aegunud %s alles" #: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format @@ -4631,19 +4605,19 @@ msgstr "paigaldage %s välistatud hoidlast" #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "paigalda %1%, ehkki see on tagasi tõmmatud" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "lubage paigaldada PTF %1%" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "paigaldage %1%, kuigi see on mustas nimekirjas" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format @@ -4670,25 +4644,25 @@ msgid "replacement of %s with %s" msgstr "%s vahetamine %s vastu" #: zypp/solver/detail/SATResolver.cc:1448 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "deinstallation of %s" -msgstr "Paigaldamine" +msgstr "%s eemaldamine" #. strip tmp file suffix #: zypp/target/RpmPostTransCollector.cc:105 #, boost-format msgid "Executing %%posttrans script '%1%'" -msgstr "" +msgstr "Käib %%posttrans script '%1%'" #. show a final message #: zypp/target/RpmPostTransCollector.cc:168 #, c-format, boost-format msgid "Executing %posttrans scripts" -msgstr "" +msgstr "Käib %posttrans scripts" #: zypp/target/TargetException.cc:28 msgid "Installation has been aborted as directed." -msgstr "" +msgstr "Paigaldamine on vastavalt juhistele katkestatud." #: zypp/target/TargetImpl.cc:313 msgid " executed" @@ -4704,7 +4678,7 @@ msgstr " käivitamine nurjus" #: zypp/target/TargetImpl.cc:452 #, c-format, boost-format msgid "%s already executed as %s)" -msgstr "" +msgstr "%s juba käivitatud kui %s)" #: zypp/target/TargetImpl.cc:462 msgid " execution skipped while aborting" @@ -4713,27 +4687,25 @@ msgstr " käivitamine jäeti katkestamise käigus vahele" #: zypp/target/TargetImpl.cc:517 zypp/target/TargetImpl.cc:537 #: zypp/target/TargetImpl.cc:565 zypp/target/TargetImpl.cc:602 #: zypp/target/TargetImpl.cc:610 -#, fuzzy msgid "Error sending update message notification." -msgstr "Viga võtme krüptimisel." +msgstr "Viga uuendusteate teavituse saatmisel." #: zypp/target/TargetImpl.cc:661 msgid "New update message" -msgstr "" +msgstr "Uus uuendusteade" #. TranslatorExplanation after semicolon is error message #. TranslatorExplanation the colon is followed by an error message #: zypp/target/rpm/RpmDb.cc:843 zypp/target/rpm/RpmDb.cc:2123 #: zypp/target/rpm/RpmDb.cc:2269 -#, fuzzy msgid "RPM failed: " -msgstr "ebaõnnestus" +msgstr "RPM nurjus: " #. Translator: %1% is a gpg public key #: zypp/target/rpm/RpmDb.cc:1173 #, boost-format msgid "Failed to import public key %1%" -msgstr "" +msgstr "Avaliku võtme %1% import nurjus" #. Translator: %1% is a gpg public key #: zypp/target/rpm/RpmDb.cc:1243 @@ -4743,20 +4715,20 @@ msgstr "Avaliku võtme %1% eemaldamine nurjus" #: zypp/target/rpm/RpmDb.cc:1629 msgid "Package is not signed!" -msgstr "" +msgstr "Pakett ei ole allkirjastatud!" #. Translator: %s = name of an rpm package. A list of diffs follows #. this message. #: zypp/target/rpm/RpmDb.cc:1929 #, c-format, boost-format msgid "Changed configuration files for %s:" -msgstr "" +msgstr "Muudetud seadistuste fail %s:" #. %s = filenames #: zypp/target/rpm/RpmDb.cc:2104 #, c-format, boost-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" -msgstr "" +msgstr "rpm salvestati %s nimega %s, kuid erinevust oli võimatu tuvastada" #. %s = filenames #: zypp/target/rpm/RpmDb.cc:2106 @@ -4765,12 +4737,14 @@ msgid "" "rpm saved %s as %s.\n" "Here are the first 25 lines of difference:\n" msgstr "" +"rpm on salvestatud %s kui %s.\n" +"Siin on esimesed 25 erinevuse rida:\n" #. %s = filenames #: zypp/target/rpm/RpmDb.cc:2109 #, c-format, boost-format msgid "rpm created %s as %s, but it was impossible to determine the difference" -msgstr "" +msgstr "rpm loodi %s nimega %s, aga oli võimatu leida erinevusi" #. %s = filenames #: zypp/target/rpm/RpmDb.cc:2111 @@ -4779,6 +4753,8 @@ msgid "" "rpm created %s as %s.\n" "Here are the first 25 lines of difference:\n" msgstr "" +"rpm loodi %s nimega %s.\n" +"Siin toodud esimesed 25 rida erinevusi:\n" #. report additional rpm output in finish #. TranslatorExplanation Text is followed by a ':' and the actual output. @@ -4789,127 +4765,124 @@ msgstr "Täiendav rpm-i väljund" #: zypp/target/rpm/RpmDb.cc:2424 #, c-format, boost-format msgid "created backup %s" -msgstr "" +msgstr "loodi varukoopia %s" #. translators: possible rpm package signature check result [brief] #: zypp/target/rpm/RpmDb.cc:2445 -#, fuzzy msgid "Signature is OK" -msgstr "Hoidlat %s ei leitud." +msgstr "Allkiri on korras" #. translators: possible rpm package signature check result [brief] #: zypp/target/rpm/RpmDb.cc:2447 msgid "Unknown type of signature" -msgstr "" +msgstr "Tundmatu allkirja tüüp" #. translators: possible rpm package signature check result [brief] #: zypp/target/rpm/RpmDb.cc:2449 -#, fuzzy msgid "Signature does not verify" -msgstr "Hoidlat %s ei leitud." +msgstr "Allkirja ei võrrelda" #. translators: possible rpm package signature check result [brief] #: zypp/target/rpm/RpmDb.cc:2451 -#, fuzzy msgid "Signature is OK, but key is not trusted" -msgstr "Hoidlat %s ei leitud." +msgstr "Allkiri on õige aga võti ei ole usaldatav" #. translators: possible rpm package signature check result [brief] #: zypp/target/rpm/RpmDb.cc:2453 msgid "Signatures public key is not available" -msgstr "" +msgstr "Allkirjade avalik võti pole saadaval" #. translators: possible rpm package signature check result [brief] #: zypp/target/rpm/RpmDb.cc:2455 msgid "File does not exist or signature can't be checked" -msgstr "" +msgstr "Faili pole olemas või allkirja pole võimalik kontrollida" #. translators: possible rpm package signature check result [brief] #: zypp/target/rpm/RpmDb.cc:2457 msgid "File is unsigned" -msgstr "" +msgstr "Fail on allkirjastamata" #: zypp/url/UrlBase.cc:154 #, c-format, boost-format msgid "Url scheme does not allow a %s" -msgstr "" +msgstr "URL kuju ei luba %s" #: zypp/url/UrlBase.cc:173 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Invalid %s component '%s'" -msgstr "Vigane komponendi URI: " +msgstr "Vigane %s komponent '%s'" #: zypp/url/UrlBase.cc:180 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Invalid %s component" -msgstr "Vigane komponendi URI: " +msgstr "Vigane %s komponent" #: zypp/url/UrlBase.cc:786 zypp/url/UrlBase.cc:1231 msgid "Query string parsing not supported for this URL" -msgstr "" +msgstr "Selle URL-i puhul ei toetata päringu kirje uurimist" #: zypp/url/UrlBase.cc:824 msgid "Url scheme is a required component" -msgstr "" +msgstr "URL kuju on nõutav komponent" #: zypp/url/UrlBase.cc:830 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Invalid Url scheme '%s'" -msgstr "vigane teenuse nimi '%1'" +msgstr "Vigane Url kuju '%s'" #: zypp/url/UrlBase.cc:949 msgid "Url scheme does not allow a username" -msgstr "" +msgstr "Url kuju ei võimalda kasutajanime" #: zypp/url/UrlBase.cc:983 msgid "Url scheme does not allow a password" -msgstr "" +msgstr "Url kuju ei võimalda salasõna" #: zypp/url/UrlBase.cc:1012 msgid "Url scheme requires a host component" -msgstr "" +msgstr "Url kuju nõuab arvutinime komponenti" #: zypp/url/UrlBase.cc:1022 msgid "Url scheme does not allow a host component" -msgstr "" +msgstr "Url kuju ei võimalda arvutinime komponenti" #: zypp/url/UrlBase.cc:1049 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Invalid host component '%s'" -msgstr "Vigane komponendi URI: " +msgstr "Vigane host komponent '%s'" #: zypp/url/UrlBase.cc:1070 msgid "Url scheme does not allow a port" -msgstr "" +msgstr "Url kuju ei võimalda porti" #: zypp/url/UrlBase.cc:1081 -#, fuzzy, c-format, boost-format +#, boost-format, c-format msgid "Invalid port component '%s'" -msgstr "Vigane komponendi URI: " +msgstr "Vigane pordi komponent '%s'" #: zypp/url/UrlBase.cc:1098 msgid "Url scheme requires path name" -msgstr "" +msgstr "Url kuju nõuab teekonna nime" #: zypp/url/UrlBase.cc:1119 zypp/url/UrlBase.cc:1133 msgid "Relative path not allowed if authority exists" -msgstr "" +msgstr "Suhteline tee pole lubatud, kui autoriseerimine on olemas" #: zypp/url/UrlUtils.cc:111 msgid "Encoded string contains a NUL byte" -msgstr "" +msgstr "Krüpteeritud rida sisaldab Nul baiti" #: zypp/url/UrlUtils.cc:173 msgid "Invalid parameter array split separator character" -msgstr "" +msgstr "Vale parameetri reastuse jaotuse eraldusmärk" #: zypp/url/UrlUtils.cc:213 msgid "Invalid parameter map split separator character" -msgstr "" +msgstr "Vigane parameeter kaardijaotuse eraldusmärk" #: zypp/url/UrlUtils.cc:283 msgid "Invalid parameter array join separator character" -msgstr "" +msgstr "Vigane parameetrimassiivi liitumismärk" #~ msgid "Can't open lock file: %s" #~ msgstr "Ei saa avada lukustusfaili: %s" diff --git a/po/ja.po b/po/ja.po index 6a55776..e4be1bc 100644 --- a/po/ja.po +++ b/po/ja.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-09-26 04:52+0000\n" +"PO-Revision-Date: 2019-12-06 04:54+0000\n" "Last-Translator: Yasuhiko Kamata \n" "Language-Team: Japanese \n" @@ -4569,7 +4569,7 @@ msgstr "この要求はシステムを壊してしまいます！" #: zypp/solver/detail/SATResolver.cc:1292 #: zypp/solver/detail/SATResolver.cc:1313 msgid "ignore the warning of a broken system" -msgstr "システムが破壊される警告を無視します" +msgstr "システムが破壊される警告を無視する" #: zypp/solver/detail/SATResolver.cc:1297 #, c-format, boost-format @@ -4589,40 +4589,40 @@ msgstr "%s の最新バージョンをインストールしない" #: zypp/solver/detail/SATResolver.cc:1353 #, c-format, boost-format msgid "keep %s despite the inferior architecture" -msgstr "下位のアーキテクチャですが %s を維持します" +msgstr "下位のアーキテクチャである %s を維持する" #: zypp/solver/detail/SATResolver.cc:1358 #, c-format, boost-format msgid "install %s despite the inferior architecture" -msgstr "下位のアーキテクチャですが %s をインストールします" +msgstr "下位のアーキテクチャである %s をインストールする" #: zypp/solver/detail/SATResolver.cc:1367 #, c-format, boost-format msgid "keep obsolete %s" -msgstr "古い %s を維持します" +msgstr "古い %s を維持する" #: zypp/solver/detail/SATResolver.cc:1372 #, c-format, boost-format msgid "install %s from excluded repository" -msgstr "除外されたリポジトリから %s をインストールします" +msgstr "除外されたリポジトリから %s をインストールする" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "撤回済みの %1% をインストールする" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "PTF %1% のインストールを許可する" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "ブラックリスト設定されている %1% をインストールする" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format @@ -4632,7 +4632,7 @@ msgstr "%s を %s にダウングレードする" #: zypp/solver/detail/SATResolver.cc:1419 #, c-format, boost-format msgid "architecture change of %s to %s" -msgstr "アーキテクチャを %s から %s に変更" +msgstr "アーキテクチャを %s から %s に変更する" #: zypp/solver/detail/SATResolver.cc:1428 #, c-format, boost-format @@ -4651,7 +4651,7 @@ msgstr "%s を %s で置き換える" #: zypp/solver/detail/SATResolver.cc:1448 #, c-format, boost-format msgid "deinstallation of %s" -msgstr "%s のアンインストール" +msgstr "%s をアンインストールする" #. strip tmp file suffix #: zypp/target/RpmPostTransCollector.cc:105 diff --git a/po/nl.po b/po/nl.po index a1ca9d9..135cdea 100644 --- a/po/nl.po +++ b/po/nl.po @@ -16,16 +16,16 @@ msgstr "" "Project-Id-Version: zypp.nl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-03-14 18:32+0000\n" +"PO-Revision-Date: 2019-12-06 14:54+0000\n" "Last-Translator: Freek de Kruijf \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch " +"\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" #. dubious: Throw on malformed known types, otherwise log a warning. #: zypp/CheckSum.cc:136 @@ -4622,19 +4622,19 @@ msgstr "%s installeren uit een uitgesloten opslagruimte" #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "%1% installeren hoewel het is ingetrokken" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "toestaan de PTF %1% te installeren" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "%1% installeren hoewel het op de zwarte lijst staat" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff --git a/po/pt_BR.po b/po/pt_BR.po index 77aefcd..aaa2661 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-03-14 18:32+0000\n" +"PO-Revision-Date: 2019-12-05 20:54+0000\n" "Last-Translator: Rodrigo Macedo \n" "Language-Team: Portuguese (Brazil) \n" @@ -23,7 +23,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: BRAZIL\n" "X-Poedit-SourceCharset: utf-8\n" @@ -4622,19 +4622,19 @@ msgstr "instalar %s do repositório excluído" #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "instale %1% apesar de ter sido recolhido" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "permitir instalar o PTF %1%" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "instale %1%, embora esteja na lista negra" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff --git a/po/sk.po b/po/sk.po index d58c653..056f3de 100644 --- a/po/sk.po +++ b/po/sk.po @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: libzypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-03-14 18:32+0000\n" +"PO-Revision-Date: 2019-12-05 20:54+0000\n" "Last-Translator: Ferdinand Galko \n" -"Language-Team: Slovak \n" +"Language-Team: Slovak " +"\n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" #. dubious: Throw on malformed known types, otherwise log a warning. #: zypp/CheckSum.cc:136 @@ -4607,19 +4607,19 @@ msgstr "inštalovať %s z vylúčeného repozitára" #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "inštalovať %1%, aj keď bol stiahnutý" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "umožniť inštaláciu PTF %1%" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "inštalovať %1%, aj keď je nežiadúci" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff --git a/tests/lib/TestSetup.h b/tests/lib/TestSetup.h index eab7786..d719431 100644 --- a/tests/lib/TestSetup.h +++ b/tests/lib/TestSetup.h @@ -414,6 +414,10 @@ private: filesystem::clean_dir( _rootdir ); } + // erase any old pool content... + getZYpp()->finishTarget(); + sat::Pool::instance().reposEraseAll(); + // prepare for the new one... ZConfig::instance().setRepoManagerRoot( _rootdir ); if ( ! sysarch_r.empty() ) @@ -422,12 +426,7 @@ private: } ~Impl() - { - USR << (_tmprootdir.path() == _rootdir ? "DELETE" : "KEEP") << " TESTSETUP below " << _rootdir << endl; - ZConfig::instance().setRepoManagerRoot( Pathname() ); - getZYpp()->finishTarget(); - sat::Pool::instance().reposEraseAll(); - } + { USR << (_tmprootdir.path() == _rootdir ? "DELETE" : "KEEP") << " TESTSETUP below " << _rootdir << endl; } filesystem::TmpDir _tmprootdir; Pathname _rootdir; diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc index b8ad971..737cdc4 100644 --- a/zypp/solver/detail/SATResolver.cc +++ b/zypp/solver/detail/SATResolver.cc @@ -60,25 +60,6 @@ extern "C" ///////////////////////////////////////////////////////////////////////// namespace zypp { /////////////////////////////////////////////////////////////////////// - - ///////////////////////////////////////////////////////////////////////// - namespace env - { - inline bool HACKENV( const char * var_r, bool default_r ) - { - bool ret = default_r; - const char * val = ::getenv( var_r ); - if ( val ) - { - ret = str::strToBool( val, default_r ); - if ( ret != default_r ) - INT << "HACKENV " << var_r << " = " << ret << endl; - } - return ret; - } - } // namespace env - ///////////////////////////////////////////////////////////////////////// - /////////////////////////////////////////////////////////////////////// namespace solver { ///////////////////////////////////////////////////////////////////// @@ -432,20 +413,59 @@ SATResolver::solving(const CapabilitySet & requires_caps, solver_set_flag(_satSolver, SOLVER_FLAG_DUP_ALLOW_NAMECHANGE, _dup_allownamechange ); solver_set_flag(_satSolver, SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE, _dup_allowarchchange ); solver_set_flag(_satSolver, SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE, _dup_allowvendorchange ); -#if 1 -#define HACKENV(X,D) solver_set_flag(_satSolver, X, env::HACKENV( #X, D ) ); - HACKENV( SOLVER_FLAG_DUP_ALLOW_DOWNGRADE, _dup_allowdowngrade ); - HACKENV( SOLVER_FLAG_DUP_ALLOW_NAMECHANGE, _dup_allownamechange ); - HACKENV( SOLVER_FLAG_DUP_ALLOW_ARCHCHANGE, _dup_allowarchchange ); - HACKENV( SOLVER_FLAG_DUP_ALLOW_VENDORCHANGE,_dup_allowvendorchange ); -#undef HACKENV -#endif + sat::Pool::instance().prepare(); // Solve ! MIL << "Starting solving...." << endl; MIL << *this; - solver_solve( _satSolver, &(_jobQueue) ); + if ( solver_solve( _satSolver, &(_jobQueue) ) == 0 ) + { + // bsc#1155819: Weakremovers of future product not evaluated. + // Do a 2nd run to cleanup weakremovers() of to be installed + // Produtcs unless removeunsupported is active (cleans up all). + if ( _distupgrade ) + { + if ( _distupgrade_removeunsupported ) + MIL << "Droplist processing not needed. RemoveUnsupported is On." << endl; + else if ( ! ZConfig::instance().solverUpgradeRemoveDroppedPackages() ) + MIL << "Droplist processing is disabled in ZConfig." << endl; + else + { + bool resolve = false; + MIL << "Checking droplists ..." << endl; + // get Solvables to be installed... + sat::SolvableQueue decisionq; + solver_get_decisionqueue( _satSolver, decisionq ); + for ( sat::Solvable::IdType slvid : decisionq ) + { + sat::Solvable slv { slvid }; + // get product buddies (they carry the weakremover)... + static const Capability productCap { "product()" }; + if ( slv && slv.provides().matches( productCap ) ) + { + CapabilitySet droplist { slv.valuesOfNamespace( "weakremover" ) }; + MIL << "Droplist for " << slv << ": size " << droplist.size() << endl; + if ( !droplist.empty() ) + { + for ( const auto & cap : droplist ) + { + INT << " => " << cap << endl; + queue_push( &_jobQueue, SOLVER_DROP_ORPHANED | SOLVER_SOLVABLE_NAME ); + queue_push( &_jobQueue, cap.id() ); + } + // PIN product - a safety net to prevent cleanup from changing the decision for this product + queue_push( &(_jobQueue), SOLVER_INSTALL | SOLVER_SOLVABLE ); + queue_push( &(_jobQueue), slvid ); + resolve = true; + } + } + } + if ( resolve ) + solver_solve( _satSolver, &(_jobQueue) ); + } + } + } MIL << "....Solver end" << endl; // copying solution back to zypp pool @@ -679,38 +699,6 @@ SATResolver::solverInit(const PoolItemList & weakItems) } ::pool_add_userinstalled_jobs(_satPool, sat::Pool::instance().autoInstalled(), &(_jobQueue), GET_USERINSTALLED_NAMES|GET_USERINSTALLED_INVERTED); - - if ( _distupgrade ) - { - if ( ZConfig::instance().solverUpgradeRemoveDroppedPackages() ) - { - MIL << "Checking droplists ..." << endl; - // Dropped packages: look for 'weakremover()' provides - // in dup candidates of installed products. - ResPoolProxy proxy( ResPool::instance().proxy() ); - for_( it, proxy.byKindBegin(), proxy.byKindEnd() ) - { - if ( (*it)->onSystem() ) // (to install) or (not to delete) - { - Product::constPtr prodCand( (*it)->candidateAsKind() ); - if ( ! prodCand ) - continue; // product no longer available - - CapabilitySet droplist( prodCand->droplist() ); - dumpRangeLine( MIL << "Droplist for " << (*it)->candidateObj() << ": " << droplist.size() << " ", droplist.begin(), droplist.end() ) << endl; - for_( cap, droplist.begin(), droplist.end() ) - { - queue_push( &_jobQueue, SOLVER_DROP_ORPHANED | SOLVER_SOLVABLE_NAME ); - queue_push( &_jobQueue, cap->id() ); - } - } - } - } - else - { - MIL << "Droplist processing is disabled." << endl; - } - } } void -- 2.7.4