Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2024-06-04 12:50:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new.24587 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp" Tue Jun 4 12:50:06 2024 rev:494 rq:1178255 version:17.34.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2024-05-15 21:24:02.748052234 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new.24587/libzypp.changes 2024-06-04 12:50:13.545855370 +0200 @@ -0,0 +1,13 @@ +------------------------------------------------------------------- +Fri May 31 12:19:45 CEST 2024 - ma@suse.de + +- zypp-tui: Make sure translated texts use the correct textdomain + (fixes #551) +- Skip libproxy1 requires for tumbleweed. +- version 17.34.1 (34) + +------------------------------------------------------------------- +Tue May 14 16:17:41 UTC 2024 - Dirk Müller <dmueller@suse.com> + +- don't require libproxy1 on tumbleweed, it is optional now + Old: ---- libzypp-17.34.0.tar.bz2 New: ---- libzypp-17.34.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.nSQpog/_old 2024-06-04 12:50:14.121876272 +0200 +++ /var/tmp/diff_new_pack.nSQpog/_new 2024-06-04 12:50:14.125876418 +0200 @@ -49,7 +49,7 @@ %bcond_with enable_preview_single_rpmtrans_as_default_for_zypper Name: libzypp -Version: 17.34.0 +Version: 17.34.1 Release: 0 License: GPL-2.0-or-later URL: https://github.com/openSUSE/libzypp @@ -106,7 +106,7 @@ BuildRequires: libproxy-devel #keep the libproxy runtime requires for old releases -%if 0%{?sle_version} <= 150500 +%if 0%{?suse_version} && 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150500 Requires: libproxy1 %endif ++++++ libzypp-17.34.0.tar.bz2 -> libzypp-17.34.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.34.0/VERSION.cmake new/libzypp-17.34.1/VERSION.cmake --- old/libzypp-17.34.0/VERSION.cmake 2024-05-14 14:30:08.000000000 +0200 +++ new/libzypp-17.34.1/VERSION.cmake 2024-05-31 12:30:09.000000000 +0200 @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "17") SET(LIBZYPP_COMPATMINOR "34") SET(LIBZYPP_MINOR "34") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 17.34.0 (34) +# LAST RELEASED: 17.34.1 (34) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.34.0/libzypp.spec.cmake new/libzypp-17.34.1/libzypp.spec.cmake --- old/libzypp-17.34.0/libzypp.spec.cmake 2024-05-07 15:10:08.000000000 +0200 +++ new/libzypp-17.34.1/libzypp.spec.cmake 2024-05-21 08:20:08.000000000 +0200 @@ -106,7 +106,7 @@ BuildRequires: libproxy-devel #keep the libproxy runtime requires for old releases -%if 0%{?sle_version} <= 150500 +%if 0%{?suse_version} && 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150500 Requires: libproxy1 %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.34.0/package/libzypp.changes new/libzypp-17.34.1/package/libzypp.changes --- old/libzypp-17.34.0/package/libzypp.changes 2024-05-14 14:30:08.000000000 +0200 +++ new/libzypp-17.34.1/package/libzypp.changes 2024-05-31 12:30:09.000000000 +0200 @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri May 31 12:19:45 CEST 2024 - ma@suse.de + +- zypp-tui: Make sure translated texts use the correct textdomain + (fixes #551) +- Skip libproxy1 requires for tumbleweed. +- version 17.34.1 (34) + +------------------------------------------------------------------- +Tue May 14 16:17:41 UTC 2024 - Dirk Müller <dmueller@suse.com> + +- don't require libproxy1 on tumbleweed, it is optional now + -------------------------------------------------------------------- Tue May 14 14:21:13 CEST 2024 - bzeller@suse.de diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.34.0/po/lt.po new/libzypp-17.34.1/po/lt.po --- old/libzypp-17.34.0/po/lt.po 2024-03-22 18:20:08.000000000 +0100 +++ new/libzypp-17.34.1/po/lt.po 2024-05-16 10:50:07.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-03-22 18:16+0100\n" -"PO-Revision-Date: 2017-06-02 18:02+0000\n" +"PO-Revision-Date: 2024-05-16 08:46+0000\n" "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba@gmail.com>\n" "Language-Team: Lithuanian <https://l10n.opensuse.org/projects/libzypp/master/" "lt/>\n" @@ -20,9 +20,9 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" -"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" -"X-Generator: Weblate 2.6\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n%10>=2 && (n%100<10 || " +"n%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3;\n" +"X-Generator: Weblate 5.5.5\n" #: zypp/CountryCode.cc:50 msgid "Unknown country: " @@ -3765,21 +3765,20 @@ #. translators: an annotation to a gpg keys expiry date #: zypp/PublicKey.cc:65 -#, fuzzy msgid "does not expire" -msgstr "(galiojimas nepasibaigia)" +msgstr "nesibaigiantis" #. translators: an annotation to a gpg keys expiry date: "expired: 1999-04-12" #: zypp/PublicKey.cc:70 #, boost-format msgid "expired: %1%" -msgstr "" +msgstr "baigėsi: %1%" #. translators: an annotation to a gpg keys expiry date: "expires: 2111-04-12" #: zypp/PublicKey.cc:75 #, boost-format msgid "expires: %1%" -msgstr "" +msgstr "baigiasi: %1%" #. translators: an annotation to a gpg keys expiry date #: zypp/PublicKey.cc:84 @@ -3899,7 +3898,7 @@ #: zypp/VendorSupportOptions.cc:31 msgid "Discontinued and superseded by a different package" -msgstr "" +msgstr "Apleistas ir pakeistas kitu paketu" #: zypp/VendorSupportOptions.cc:33 msgid "invalid" @@ -3953,7 +3952,7 @@ msgid "" "The package was discontinued and has been superseded by a new package with a " "different name." -msgstr "" +msgstr "Šis paketas apleistas, jį pakeitė kitas naujas paketas kitu vardu." #: zypp/VendorSupportOptions.cc:60 msgid "Unknown support option. Description not available" @@ -3998,18 +3997,20 @@ #. just report (NO_ERROR); no interactive request to the user #: zypp/media/MediaCurl.cc:782 zypp/media/MediaNetwork.cc:440 msgid "Will try again..." -msgstr "" +msgstr "Bandysima iš naujo..." #: zypp/media/MediaCurl.cc:785 #, boost-format msgid "Giving up after %1% attempts." -msgstr "" +msgstr "Pasiduota po nesėkmingų bandymų (%1%)." #: zypp/media/MediaCurl.cc:900 zypp-curl/ng/network/networkrequesterror.cc:127 msgid "" "Visit the SUSE Customer Center to check whether your registration is valid " "and has not expired." msgstr "" +"Apsilankykite SUSE klientų centre ir patikrinkite, ar jūsų registracija yra " +"tinkama ir galioja." #: zypp/media/MediaCurl.cc:902 zypp-curl/ng/network/networkrequesterror.cc:129 msgid "" @@ -4024,6 +4025,8 @@ "Create attach point: Can't find a writable directory to create an attach " "point" msgstr "" +"Sukurti prijungimo vietą: nepavyksta prijungimo vietai rasti katalogo, " +"kuriame būtų galima rašyti" #: zypp/misc/CheckAccessDeleted.cc:466 msgid "Please install package 'lsof' first." @@ -4036,47 +4039,47 @@ #: zypp/ng/workflows/checksumwf.cc:117 #, c-format, boost-format msgid "No digest for file %s." -msgstr "" +msgstr "Nėra %s rinkmenos santraukos." #: zypp/ng/workflows/checksumwf.cc:123 #, c-format, boost-format msgid "Unknown digest %s for file %s." -msgstr "" +msgstr "Rinkmenai %s santrauka %s yra nežinoma." #: zypp/ng/workflows/checksumwf.cc:129 #, c-format, boost-format msgid "Digest verification failed for file '%s'" -msgstr "" +msgstr "Rinkmenos „%s“ santraukos patikrinimo klaida" #. TranslatorExplanation: speaking of a file #: zypp/ng/workflows/keyringwf.cc:358 #, c-format, boost-format msgid "File '%s' is unsigned, continue?" -msgstr "" +msgstr "Rinkmena „%s“ nėra pasirašyta. Tęsti?" #. TranslatorExplanation: speaking of a file #: zypp/ng/workflows/keyringwf.cc:362 #, c-format, boost-format msgid "File '%s' from repository '%s' is unsigned, continue?" -msgstr "" +msgstr "Rinkmena „%s“ iš „%s“ saugyklos nėra pasirašyta. Tęsti?" #: zypp/ng/workflows/keyringwf.cc:374 msgid "Do you want to reject the key, trust temporarily, or trust always?" -msgstr "" +msgstr "Atmesti raktą, raktu pasitikėti laikinai ar pasitikėti visada?" #: zypp/ng/workflows/keyringwf.cc:383 #, boost-format msgid "Key Name: %1%" -msgstr "" +msgstr "Rakto vardas: %1%" #: zypp/ng/workflows/keyringwf.cc:389 #, boost-format msgid "Received %1% new package signing key from repository \"%2%\":" msgid_plural "Received %1% new package signing keys from repository \"%2%\":" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Iš „%2%“ saugyklos gautas %1% naujas paketų pasirašymo raktas:" +msgstr[1] "Iš „%2%“ saugyklos gauti %1% naujas paketų pasirašymo raktai:" +msgstr[2] "Iš „%2%“ saugyklos gauta %1% naujas paketų pasirašymo raktai:" +msgstr[3] "Iš „%2%“ saugyklos gautas %1% naujas paketų pasirašymo raktas:" #. translator: %1% is a file name #: zypp/ng/workflows/keyringwf.cc:400 @@ -4106,13 +4109,13 @@ #, c-format, boost-format msgid "" "File '%s' from repository '%s' is signed with an unknown key '%s'. Continue?" -msgstr "" +msgstr "Rinkmena „%s“ iš „%s“ saugyklos pasirašyta nežinomu raktu „%s“. Tęsti?" #. translator: %1% is a repositories name #: zypp/ng/workflows/repoinfowf.cc:77 #, boost-format msgid "Repository %1% does not define additional 'gpgkey=' URLs." -msgstr "" +msgstr "Saugykla „%1%“ nenurodo papildomų „gpgkey=“ URL adresų." #. no key in the cache is what we are looking for, lets download #. all keys specified in gpgkey= entries @@ -4121,14 +4124,14 @@ #: zypp/ng/workflows/repoinfowf.cc:86 #, boost-format msgid "Looking for gpg key ID %1% in repository %2%." -msgstr "" +msgstr "%2% saugykloje ieškoma GPG rakto su ID %1%." #. translator: %1% is a gpg key ID like 3DBDC284 #. %2% is a cache directories path #: zypp/ng/workflows/repoinfowf.cc:133 #, boost-format msgid "Looking for gpg key ID %1% in cache %2%." -msgstr "" +msgstr "%2% padėlyje ieškoma GPG rakto su ID %1%." #: zypp/parser/RepoindexFileReader.cc:198 #, c-format, boost-format @@ -4194,6 +4197,8 @@ #, boost-format msgid "Expected medium %1%/%2% identified by file '%3%' with content:" msgstr "" +"Tikėtasi rasti laikmeną %1%/%2%, kuri identifikuojama pagal rinkmeną „%3%“ " +"su turiniu:" #. [lhs][rhs] 0 = installed; 1 = to be installed #. TranslatorExplanation %1%(filename) %2%(package1) %3%(package2) @@ -4361,27 +4366,28 @@ "the installed %1% does not belong to a distupgrade repository and must be " "replaced" msgstr "" +"įdiegtasis %1% nepriklauso „distupgrade“ saugyklai ir jį būtina pakeisti" #. just in case #: zypp/solver/detail/SATResolver.cc:1148 #, boost-format msgid "the to be installed %1% does not belong to a distupgrade repository" -msgstr "" +msgstr "įdiegtinas %1% nepriklauso „distupgrade“ saugyklai" #: zypp/solver/detail/SATResolver.cc:1152 #, boost-format msgid "the installed %1% has inferior architecture" -msgstr "" +msgstr "įdiegtasis %1% yra žemesnės architektūros" #: zypp/solver/detail/SATResolver.cc:1154 #, boost-format msgid "the to be installed %1% has inferior architecture" -msgstr "" +msgstr "įdiegtinas %1% yra žemesnės architektūros" #: zypp/solver/detail/SATResolver.cc:1157 #, boost-format msgid "problem with the installed %1%" -msgstr "" +msgstr "nesklandumai su įdiegtu %1%" #: zypp/solver/detail/SATResolver.cc:1160 msgid "conflicting requests" @@ -4394,17 +4400,17 @@ #: zypp/solver/detail/SATResolver.cc:1166 #, boost-format msgid "nothing provides the requested '%1%'" -msgstr "" +msgstr "niekas nepateikia prašomo „%1%“" #: zypp/solver/detail/SATResolver.cc:1167 #: zypp/solver/detail/SATResolver.cc:1171 msgid "Have you enabled all the required repositories?" -msgstr "" +msgstr "Ar įgalinote visas reikalingas saugyklas?" #: zypp/solver/detail/SATResolver.cc:1170 #, boost-format msgid "the requested package %1% does not exist" -msgstr "" +msgstr "nepavyko rasti prašomo %1% paketo" #: zypp/solver/detail/SATResolver.cc:1174 msgid "unsupported request" @@ -4413,88 +4419,90 @@ #: zypp/solver/detail/SATResolver.cc:1177 #, boost-format msgid "'%1%' is provided by the system and cannot be erased" -msgstr "" +msgstr "kadangi sistema pateikia „%1%“, tad jo pašalinti negalima" #: zypp/solver/detail/SATResolver.cc:1180 #, boost-format msgid "%1% is not installable" -msgstr "" +msgstr "%1% neįmanoma įdiegti" #: zypp/solver/detail/SATResolver.cc:1185 #, boost-format msgid "nothing provides '%1%' needed by the installed %2%" -msgstr "" +msgstr "niekas nepateikia „%1%“, kuris reikalingas įdiegtam %2%" #: zypp/solver/detail/SATResolver.cc:1187 #, boost-format msgid "nothing provides '%1%' needed by the to be installed %2%" -msgstr "" +msgstr "niekas nepateikia „%1%“, kuris reikalingas įdiegtinam %2%" #: zypp/solver/detail/SATResolver.cc:1190 #, boost-format msgid "cannot install both %1% and %2%" -msgstr "" +msgstr "negalima %1% ir %2% vienu metu" #: zypp/solver/detail/SATResolver.cc:1195 #, boost-format msgid "the installed %1% conflicts with '%2%' provided by the installed %3%" -msgstr "" +msgstr "įdiegtasis %1% konfliktuoja su %2%, kurį pateikia įdiegtasis %3%" #: zypp/solver/detail/SATResolver.cc:1197 #, boost-format msgid "" "the installed %1% conflicts with '%2%' provided by the to be installed %3%" -msgstr "" +msgstr "įdiegtasis %1% konfliktuoja su %2%, kurį pateikia įdiegtinas %3%" #: zypp/solver/detail/SATResolver.cc:1201 #, boost-format msgid "" "the to be installed %1% conflicts with '%2%' provided by the installed %3%" -msgstr "" +msgstr "įdiegtinasis %1% konfliktuoja su %2%, kurį pateikia įdiegtasis %3%" #: zypp/solver/detail/SATResolver.cc:1203 #, boost-format msgid "" "the to be installed %1% conflicts with '%2%' provided by the to be installed " "%3%" -msgstr "" +msgstr "įdiegtinasis %1% konfliktuoja su „%2%“, kurį pateikia įdiegtinasis %3%" #: zypp/solver/detail/SATResolver.cc:1210 #, boost-format msgid "the installed %1% obsoletes '%2%' provided by the installed %3%" -msgstr "" +msgstr "įdiegtasis %1% pakeičia pasenusį „%2%“, kurį pateikė įdiegtasis %3%" #: zypp/solver/detail/SATResolver.cc:1212 #, boost-format msgid "the installed %1% obsoletes '%2%' provided by the to be installed %3%" -msgstr "" +msgstr "įdiegtasis %1% pakeičia pasenusį „%2%“, kurį pateikia įdiegtinasis %3%" #: zypp/solver/detail/SATResolver.cc:1216 #, boost-format msgid "the to be installed %1% obsoletes '%2%' provided by the installed %3%" -msgstr "" +msgstr "įdiegtinasis %1% pakeičia pasenusį „%2%“, kurį pateikė įdiegtasis %3%" #: zypp/solver/detail/SATResolver.cc:1218 #, boost-format msgid "" "the to be installed %1% obsoletes '%2%' provided by the to be installed %3%" msgstr "" +"įdiegtinasis %1% pakeičia pasenusį „%2%“, kurį pateikia įdiegtinasis %3%" #: zypp/solver/detail/SATResolver.cc:1223 #, boost-format msgid "the installed %1% conflicts with '%2%' provided by itself" -msgstr "" +msgstr "įdiegtasis %1% konfliktuoja su „%2%“, kurį jis pats pateikia" #: zypp/solver/detail/SATResolver.cc:1225 #, boost-format msgid "the to be installed %1% conflicts with '%2%' provided by itself" -msgstr "" +msgstr "įdiegtinasis %1% konfliktuoja su „%2%“, kurį jis pats pateikia" #: zypp/solver/detail/SATResolver.cc:1257 #, boost-format msgid "" "the installed %1% requires '%2%', but this requirement cannot be provided" msgstr "" +"įdiegtasis %1% reikalauja „%2%“, bet šio reikalavimo neįmanoma patenkinti" #: zypp/solver/detail/SATResolver.cc:1259 #, boost-format @@ -4502,6 +4510,7 @@ "the to be installed %1% requires '%2%', but this requirement cannot be " "provided" msgstr "" +"įdiegtinasis %1% reikalauja „%2%“, bet šio reikalavimo neįmanoma patenkinti" #: zypp/solver/detail/SATResolver.cc:1261 msgid "deleted providers: " @@ -4523,7 +4532,7 @@ #: zypp/solver/detail/SATResolver.cc:1310 #, boost-format msgid "%1% is not yet fully integrated into %2%." -msgstr "" +msgstr "%1% dar nėra pilnai suderinamas su %2%." #: zypp/solver/detail/SATResolver.cc:1311 msgid "" @@ -4554,7 +4563,7 @@ #: zypp/solver/detail/SATResolver.cc:1326 #, boost-format msgid "The installed %1% blocks the desired action." -msgstr "" +msgstr "Norimo veiksmo atlikti neleidžia įdiegtasis %1%." #: zypp/solver/detail/SATResolver.cc:1327 msgid "Typically you want to keep the PTF and choose to cancel the action." @@ -4563,24 +4572,24 @@ #: zypp/solver/detail/SATResolver.cc:1384 #, boost-format msgid "remove lock to allow removal of %1%" -msgstr "" +msgstr "atrakinti ir leisti pašalinti %1%" #: zypp/solver/detail/SATResolver.cc:1391 #: zypp/solver/detail/SATResolver.cc:1429 #, boost-format msgid "do not install %1%" -msgstr "" +msgstr "neįdiegti %1%" #: zypp/solver/detail/SATResolver.cc:1408 #: zypp/solver/detail/SATResolver.cc:1450 #, boost-format msgid "keep %1%" -msgstr "" +msgstr "išlaikyti %1%" #: zypp/solver/detail/SATResolver.cc:1413 #, boost-format msgid "remove lock to allow installation of %1%" -msgstr "" +msgstr "atrakinti ir leisti įdiegti %1%" #: zypp/solver/detail/SATResolver.cc:1464 #: zypp/solver/detail/SATResolver.cc:1485 @@ -4595,43 +4604,43 @@ #: zypp/solver/detail/SATResolver.cc:1470 #, boost-format msgid "do not ask to install a solvable providing %1%" -msgstr "" +msgstr "nesiūlyti įdiegimo sprendimo, kuris pateikia %1%" #: zypp/solver/detail/SATResolver.cc:1492 #, boost-format msgid "do not ask to delete all solvables providing %1%" -msgstr "" +msgstr "nesiūlyti pašalinimo sprendimų, kurie pateikia %1%" #: zypp/solver/detail/SATResolver.cc:1505 #, boost-format msgid "do not install most recent version of %1%" -msgstr "" +msgstr "nediegti naujausios %1% versijos" #: zypp/solver/detail/SATResolver.cc:1526 #, boost-format msgid "keep %1% despite the inferior architecture" -msgstr "" +msgstr "išlaikyti %1% nepaisant žemesnės architektūros" #: zypp/solver/detail/SATResolver.cc:1531 #, boost-format msgid "install %1% despite the inferior architecture" -msgstr "" +msgstr "įdiegti %1% nepaisant žemesnės architektūros" #: zypp/solver/detail/SATResolver.cc:1540 #, boost-format msgid "keep obsolete %1%" -msgstr "" +msgstr "išlaikyti pasenusį %1%" #: zypp/solver/detail/SATResolver.cc:1545 #, boost-format msgid "install %1% from excluded repository" -msgstr "" +msgstr "įdiegti %1% iš neįtrauktos saugyklos" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1559 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "įdiegti %1%, nors jis atšauktas" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1562 @@ -4643,17 +4652,17 @@ #: zypp/solver/detail/SATResolver.cc:1565 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "įdiegti %1%, nors jis yra juodajame sąraše" #: zypp/solver/detail/SATResolver.cc:1585 #, boost-format msgid "downgrade of %1% to %2%" -msgstr "" +msgstr "%1% pakeisti senesniu %2%" #: zypp/solver/detail/SATResolver.cc:1592 #, boost-format msgid "architecture change of %1% to %2%" -msgstr "" +msgstr "%1% architektūros pakeitimas į %2%" #. FIXME? Actually .ident() must be eq. But the more verbose 'else' isn't bad either. #: zypp/solver/detail/SATResolver.cc:1603 @@ -4662,6 +4671,8 @@ "install %1% (with vendor change)\n" " %2% --> %3%" msgstr "" +"įdiegti %1% (keičiant gamintoją)\n" +" %2% --> %3%" #: zypp/solver/detail/SATResolver.cc:1608 #, boost-format @@ -4669,33 +4680,35 @@ "install %1% from vendor %2%\n" " replacing %3% from vendor %4%" msgstr "" +"įdiegti %1% iš gamintojo %2%\n" +" pakeičiant %3% iš gamintojo %4%" #: zypp/solver/detail/SATResolver.cc:1617 #, boost-format msgid "replacement of %1% with %2%" -msgstr "" +msgstr "pakeisti %1% į %2%" #: zypp/solver/detail/SATResolver.cc:1628 #, boost-format msgid "deinstallation of %1%" -msgstr "" +msgstr "pašalinti %1%" #. Translator: progress bar label #: zypp/target/RpmPostTransCollector.cc:200 msgid "Running post-transaction scripts" -msgstr "" +msgstr "Vykdomi potransakciniai scenarijai" #. Translator: progress bar label; %1% is a script identifier like '%posttrans(mypackage-2-0.noarch)' #: zypp/target/RpmPostTransCollector.cc:202 #, boost-format msgid "Running %1% script" -msgstr "" +msgstr "Vykdomas %1% scenarijus" #. Translator: headline; %1% is a script identifier like '%posttrans(mypackage-2-0.noarch)' #: zypp/target/RpmPostTransCollector.cc:204 #, boost-format msgid "%1% script output:" -msgstr "" +msgstr "%1% scenarijus grąžino:" #: zypp/target/TargetException.cc:27 msgid "Installation has been aborted as directed." @@ -4741,7 +4754,7 @@ #: zypp/target/TargetImpl.cc:2751 msgid "Executing the transaction failed because of the following problems:" -msgstr "" +msgstr "Transakcijos atlikti nepavyko, iškilo nesklandumų:" #. TranslatorExplanation after semicolon is error message #. TranslatorExplanation the colon is followed by an error message @@ -4855,7 +4868,7 @@ #. translators: possible rpm package signature check result [brief] #: zypp/target/rpm/RpmDb.cc:2263 msgid "File is unsigned" -msgstr "" +msgstr "Rinkmena nepasirašyta" #: zypp/zypp_detail/repomanagerbase_p.cc:121 #, boost-format @@ -4937,7 +4950,7 @@ #: zypp-core/Url.cc:318 msgid "Invalid empty Url object reference" -msgstr "" +msgstr "Netinkama tuščio URL objekto nuoroda" #: zypp-core/Url.cc:331 zypp-core/Url.cc:345 msgid "Unable to parse Url components" @@ -5092,12 +5105,12 @@ #: zypp-core/zyppng/io/forkspawnengine.cc:438 #, c-format, boost-format msgid "Can't exec '%s', exec failed (%s)." -msgstr "" +msgstr "Nepavyko įvykdyti „%s“ (%s)." #: zypp-core/zyppng/io/forkspawnengine.cc:442 #, c-format, boost-format msgid "Can't exec '%s', unexpected error." -msgstr "" +msgstr "Nepavyko įvykdyti „%s“, netikėta klaida." #: zypp-media/mediaexception.cc:33 #, c-format, boost-format @@ -5232,9 +5245,9 @@ msgstr "Per ilgai jungiamasi prie „%s“." #: zypp-media/mediaexception.cc:197 -#, c-format, boost-format +#, boost-format, c-format, fuzzy msgid "Downloaded data exceeded the expected filesize '%s' of '%s'." -msgstr "" +msgstr "Parsisiųstų duomenų dydis viršijo manytą rinkmenos dydį „%s“ iš „%s“." #: zypp-media/mediaexception.cc:205 #: zypp-curl/ng/network/networkrequesterror.cc:118 @@ -5250,7 +5263,7 @@ #: zypp-media/mediaexception.cc:220 msgid "No free ressources available to attach medium." -msgstr "" +msgstr "Nėra laisvų išteklių pridėtoje laikmenoje." #: zypp-curl/auth/curlauthdata.cc:97 #, c-format, boost-format @@ -5263,6 +5276,8 @@ "Download (curl) error for '%s':\n" "Error code: %s\n" msgstr "" +"Klaida su curl parsisiunčiant „%s“:\n" +"Klaidos kodas: %s\n" #: zypp-curl/ng/network/networkrequesterror.cc:149 #, c-format, boost-format @@ -5270,6 +5285,8 @@ "Download (curl) error for '%s':\n" "Unable to retrieve HTTP response\n" msgstr "" +"Klaida su curl parsisiunčiant „%s“:\n" +"Nepavyko gauti HTTP atsako\n" #: zypp-tui/Table.h:38 msgid "Yes" @@ -5289,7 +5306,7 @@ #. translator: Shown as result tag in a progress bar: .......[attention] #: zypp-tui/output/Out.cc:132 msgid "attention" -msgstr "" +msgstr "dėmesio" #. translator: Shown as result tag in a progress bar: ...........[error] #. Translator: download progress bar result: "............[error]" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.34.0/zypp/CMakeLists.txt new/libzypp-17.34.1/zypp/CMakeLists.txt --- old/libzypp-17.34.0/zypp/CMakeLists.txt 2024-03-14 10:50:10.000000000 +0100 +++ new/libzypp-17.34.1/zypp/CMakeLists.txt 2024-05-29 16:20:10.000000000 +0200 @@ -980,6 +980,10 @@ TARGET_LINK_LIBRARIES(${LIBNAME} zypp-core ) TARGET_LINK_LIBRARIES(${LIBNAME} zypp-protobuf ) + # CAUTION, link zypp-tui.a at last, to prevent undefined references + # in case tui functions are used in libzypp. + TARGET_LINK_LIBRARIES(${LIBNAME} zypp-tui ) + TARGET_LINK_LIBRARIES(${LIBNAME} ${UTIL_LIBRARY} ) TARGET_LINK_LIBRARIES(${LIBNAME} ${RPM_LIBRARY} ) TARGET_LINK_LIBRARIES(${LIBNAME} ${GETTEXT_LIBRARIES} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.34.0/zypp-tui/Table.cc new/libzypp-17.34.1/zypp-tui/Table.cc --- old/libzypp-17.34.0/zypp-tui/Table.cc 2023-07-19 11:53:07.000000000 +0200 +++ new/libzypp-17.34.1/zypp-tui/Table.cc 2024-05-29 16:20:10.000000000 +0200 @@ -14,6 +14,7 @@ #include <zypp/base/LogTools.h> #include <zypp/base/String.h> #include <zypp/base/DtorReset.h> +#include <zypp-core/base/Gettext.h> #include <zypp-tui/Application> #include <zypp-tui/utils/colors.h> @@ -28,6 +29,8 @@ namespace ztui { +const char * asYesNo( bool val_r ) { return val_r ? _("Yes") : _("No"); } + TableLineStyle Table::defaultStyle = Ascii; static const char * lines[][3] = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.34.0/zypp-tui/Table.h new/libzypp-17.34.1/zypp-tui/Table.h --- old/libzypp-17.34.0/zypp-tui/Table.h 2024-03-14 10:50:10.000000000 +0100 +++ new/libzypp-17.34.1/zypp-tui/Table.h 2024-05-29 16:20:10.000000000 +0200 @@ -26,7 +26,6 @@ #include <zypp/base/String.h> #include <zypp/base/Exception.h> -#include <zypp-core/base/Gettext.h> #include <zypp/sat/Solvable.h> #include <zypp/ui/Selectable.h> @@ -35,7 +34,7 @@ namespace ztui { -inline const char * asYesNo( bool val_r ) { return val_r ? _("Yes") : _("No"); } +const char * asYesNo( bool val_r ); ///> _("Yes") or _("No") /** Custom sort index type for table rows representing solvables (like detailed search results). */ using SolvableCSI = std::pair<zypp::sat::Solvable, zypp::ui::Selectable::picklist_size_type>; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.34.0/zypp-tui/output/Out.cc new/libzypp-17.34.1/zypp-tui/output/Out.cc --- old/libzypp-17.34.0/zypp-tui/output/Out.cc 2023-11-13 12:40:07.000000000 +0100 +++ new/libzypp-17.34.1/zypp-tui/output/Out.cc 2024-05-29 16:20:10.000000000 +0200 @@ -12,7 +12,7 @@ #include <iostream> #include <sstream> -//#include <zypp/AutoDispose.h> +#include <zypp-core/base/Gettext.h> #include "Out.h" #include <zypp-tui/Table.h> @@ -21,6 +21,17 @@ namespace ztui { + namespace text { + // translator: usually followed by a ' ' and some explanatory text + ColorString tagNote() { return HIGHLIGHTString(_("Note:") ); } + // translator: usually followed by a ' ' and some explanatory text + ColorString tagWarning() { return MSG_WARNINGString(_("Warning:") ); } + // translator: usually followed by a ' ' and some explanatory text + ColorString tagError() { return MSG_ERRORString(_("Error:") ); } + + const char * qContinue() { return _("Continue?"); } + } + /////////////////////////////////////////////////////////////////// namespace out { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.34.0/zypp-tui/output/Out.h new/libzypp-17.34.1/zypp-tui/output/Out.h --- old/libzypp-17.34.0/zypp-tui/output/Out.h 2024-03-14 10:50:10.000000000 +0100 +++ new/libzypp-17.34.1/zypp-tui/output/Out.h 2024-05-29 16:20:10.000000000 +0200 @@ -26,7 +26,6 @@ #include <utility> #include <zypp-core/base/DefaultIntegral> #include <zypp-core/base/DtorReset> -#include <zypp-core/base/Gettext.h> #include <zypp-core/Url.h> #include <zypp-core/TriBool.h> #include <zypp-core/ui/ProgressData> @@ -47,15 +46,10 @@ namespace text { - // translator: usually followed by a ' ' and some explanatory text - inline ColorString tagNote() { return HIGHLIGHTString(_("Note:") ); } - // translator: usually followed by a ' ' and some explanatory text - inline ColorString tagWarning() { return MSG_WARNINGString(_("Warning:") ); } - // translator: usually followed by a ' ' and some explanatory text - inline ColorString tagError() { return MSG_ERRORString(_("Error:") ); } - - inline const char * qContinue() { return _("Continue?"); } - + ColorString tagNote(); ///< translated "Note:" highlighted + ColorString tagWarning(); ///< translated "Warning:" warning color + ColorString tagError(); ///< translated "Error:" error color + const char * qContinue(); ///< translated "Continue?" /** Simple join of two string types */ template <class Tltext, class Trtext> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.34.0/zypp-tui/output/OutNormal.cc new/libzypp-17.34.1/zypp-tui/output/OutNormal.cc --- old/libzypp-17.34.0/zypp-tui/output/OutNormal.cc 2023-11-13 12:50:08.000000000 +0100 +++ new/libzypp-17.34.1/zypp-tui/output/OutNormal.cc 2024-05-29 16:20:10.000000000 +0200 @@ -17,6 +17,7 @@ #include <zypp-core/ByteCount.h> // for download progress reporting #include <zypp-core/base/Logger.h> #include <zypp-core/base/String.h> // for toUpper() +#include <zypp-core/base/Gettext.h> #include <zypp-tui/utils/colors.h> #include <zypp-tui/output/AliveCursor.h>