Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kompare for openSUSE:Factory checked in at 2025-06-06 22:33:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kompare (Old) and /work/SRC/openSUSE:Factory/.kompare.new.19631 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kompare" Fri Jun 6 22:33:41 2025 rev:146 rq:1283199 version:25.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kompare/kompare.changes 2025-05-09 18:44:44.820514112 +0200 +++ /work/SRC/openSUSE:Factory/.kompare.new.19631/kompare.changes 2025-06-06 22:33:55.766144559 +0200 @@ -1,0 +2,9 @@ +Tue Jun 3 21:12:36 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 25.04.2 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/25.04.2/ +- No code change since 25.04.1 + +------------------------------------------------------------------- Old: ---- kompare-25.04.1.tar.xz kompare-25.04.1.tar.xz.sig New: ---- kompare-25.04.2.tar.xz kompare-25.04.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kompare.spec ++++++ --- /var/tmp/diff_new_pack.H7XjaP/_old 2025-06-06 22:33:56.242164189 +0200 +++ /var/tmp/diff_new_pack.H7XjaP/_new 2025-06-06 22:33:56.242164189 +0200 @@ -21,7 +21,7 @@ %bcond_without released Name: kompare -Version: 25.04.1 +Version: 25.04.2 Release: 0 Summary: File Comparator License: GPL-2.0-or-later ++++++ kompare-25.04.1.tar.xz -> kompare-25.04.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-25.04.1/CMakeLists.txt new/kompare-25.04.2/CMakeLists.txt --- old/kompare-25.04.1/CMakeLists.txt 2025-05-02 23:57:10.000000000 +0200 +++ new/kompare-25.04.2/CMakeLists.txt 2025-06-02 23:23:06.000000000 +0200 @@ -3,7 +3,7 @@ # Release Service version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "25") set (RELEASE_SERVICE_VERSION_MINOR "04") -set (RELEASE_SERVICE_VERSION_MICRO "1") +set (RELEASE_SERVICE_VERSION_MICRO "2") set (RELEASE_SERVICE_COMPACT_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}${RELEASE_SERVICE_VERSION_MINOR}${RELEASE_SERVICE_VERSION_MICRO}") # Bump KOMPARE_BASE_VERSION once new features are added diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-25.04.1/po/ca@valencia/kompare.po new/kompare-25.04.2/po/ca@valencia/kompare.po --- old/kompare-25.04.1/po/ca@valencia/kompare.po 2025-05-02 23:57:10.000000000 +0200 +++ new/kompare-25.04.2/po/ca@valencia/kompare.po 2025-06-02 23:23:06.000000000 +0200 @@ -801,7 +801,7 @@ "Any file you select in the dialog that pops up when you click it will be put " "in the dialog to the left of this button." msgstr "" -"Qualsevol fitxer que seleccioneu en el diàleg que aparega quan feu clic serà " +"Qualsevol fitxer que seleccioneu en el diàleg que aparega quan cliqueu serà " "inclòs en el diàleg que apareix a l'esquerra d'este botó." #: dialogpages/diffpage.cpp:344 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-25.04.1/po/es/kompare.po new/kompare-25.04.2/po/es/kompare.po --- old/kompare-25.04.1/po/es/kompare.po 2025-05-02 23:57:10.000000000 +0200 +++ new/kompare-25.04.2/po/es/kompare.po 2025-06-02 23:23:06.000000000 +0200 @@ -1,16 +1,17 @@ -# translation of kompare.po to Spanish -# Copyright (C) 2002,2003, 2005, 2007, 2008 Free Software Foundation, Inc. +# Spanish translations for kompare.po package. +# Copyright (C) 2002-2025 This file is copyright: +# This file is distributed under the same license as the kompare package. # -# Miguel Revilla Rodríguez <y...@miguelrevilla.com>, 2002,2003. -# Pablo de Vicente <p.device...@wanadoo.es>, 2005. -# Eloy Cuadra <ecua...@eloihr.net>, 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2020, 2022. -# Javier Viñal <fjvi...@gmail.com>, 2013. +# SPDX-FileCopyrightText: 2002, 2003 Miguel Revilla Rodríguez <y...@miguelrevilla.com> +# SPDX-FileCopyrightText: 2005 Pablo de Vicente <p.device...@wanadoo.es> +# SPDX-FileCopyrightText: 2005, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017, 2020, 2022, 2025 Eloy Cuadra <ecua...@eloihr.net> +# SPDX-FileCopyrightText: 2013 Javier Viñal <fjvi...@gmail.com> msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2024-07-19 00:41+0000\n" -"PO-Revision-Date: 2022-10-14 21:39+0200\n" +"PO-Revision-Date: 2025-05-18 13:09+0100\n" "Last-Translator: Eloy Cuadra <ecua...@eloihr.net>\n" "Language-Team: Spanish <kde-l10n...@kde.org>\n" "Language: es\n" @@ -50,19 +51,19 @@ #, kde-format msgctxt "@action" msgid "&Open Diff..." -msgstr "&Abrir diff..." +msgstr "&Abrir diff…" #: app/kompare_shell.cpp:199 #, kde-format msgctxt "@action" msgid "&Compare Files..." -msgstr "&Comparar archivos..." +msgstr "&Comparar archivos…" #: app/kompare_shell.cpp:202 #, kde-format msgctxt "@action" msgid "&Blend URL with Diff..." -msgstr "&Fusionar URL con Diff..." +msgstr "&Fusionar URL con Diff…" #: app/kompare_shell.cpp:208 #, kde-format @@ -1022,7 +1023,7 @@ #, kde-format msgctxt "@action" msgid "Save &Diff..." -msgstr "Guardar &diff..." +msgstr "Guardar &diff…" #: komparepart/kompare_part.cpp:181 #, kde-format @@ -1073,13 +1074,13 @@ #, kde-format msgctxt "@info:status" msgid "Running diff..." -msgstr "Ejecutando diff..." +msgstr "Ejecutando diff…" #: komparepart/kompare_part.cpp:627 #, kde-format msgctxt "@info:status" msgid "Parsing diff output..." -msgstr "Analizando salida de diff..." +msgstr "Analizando salida de diff…" #: komparepart/kompare_part.cpp:683 #, kde-format @@ -1381,122 +1382,3 @@ #, kde-format msgid "cd dir && diff -udHprNa -- source destination" msgstr "cd dir && diff -udHprNa -- destino de la fuente" - -#~ msgid "The file exists or is write-protected; do you want to overwrite it?" -#~ msgstr "" -#~ "El archivo existe o se encuentra protegido contra escritura; ¿desea " -#~ "sobrescribirlo?" - -#~ msgctxt "@window:title" -#~ msgid "File Exists" -#~ msgstr "El archivo ya existe" - -#~ msgctxt "@action:button" -#~ msgid "Do Not Overwrite" -#~ msgstr "No sobrescribir" - -#~ msgid "KompareNavTreePart" -#~ msgstr "KompareNavTreePart" - -#~ msgid "KomparePart" -#~ msgstr "KomparePart" - -#~ msgctxt "@action:button" -#~ msgid "&Edit..." -#~ msgstr "&Editar..." - -#~ msgctxt "@info:tooltip" -#~ msgid "" -#~ "Clicking this will open a regular expression dialog where\n" -#~ "you can graphically create regular expressions." -#~ msgstr "" -#~ "Al pulsar aquí se abrirá un diálogo de expresiones regulares donde\n" -#~ "podrá crear expresiones regulares de forma gráfica." - -#~ msgid "Overwrite" -#~ msgstr "Sobrescribir" - -#~ msgid "Compare these files or folder" -#~ msgstr "Comparar estos archivos o directorios" - -#~ msgid "&Apply Difference" -#~ msgstr "&Aplicar la diferencia" - -#~ msgid "Un&apply Difference" -#~ msgstr "Desh&acer diferencia" - -#~ msgid "App&ly All" -#~ msgstr "Ap&licar todo" - -#~ msgid "&Unapply All" -#~ msgstr "&Ignorar todo" - -#~ msgid "P&revious File" -#~ msgstr "A&rchivo anterior" - -#~ msgid "&Previous Difference" -#~ msgstr "Anterior di&ferencia" - -#~ msgid "&Next Difference" -#~ msgstr "Siguie&nte diferencia" - -#~ msgid "" -#~ "<qt>No models or no differences, this file: <b>%1</b>, is not a valid " -#~ "diff file.</qt>" -#~ msgstr "" -#~ "<qt>No hay modelos o diferencias, este archivo: <b>%1</b>, no es un " -#~ "archivo diff válido.</qt>" - -#~ msgid "" -#~ "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>." -#~ "</qt>" -#~ msgstr "" -#~ "<qt>Se produjeron problemas aplicando el diff <b>%1</b> al archivo <b>%2</" -#~ "b>.</qt>" - -#~ msgid "" -#~ "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</" -#~ "b>.</qt>" -#~ msgstr "" -#~ "<qt>Se produjeron problemas aplicando el diff <b>%1</b> a la carpeta<b>" -#~ "%2</b>.</qt>" - -#~ msgid "Could not open a temporary file." -#~ msgstr "No se pudo abrir un archivo temporal." - -#~ msgid "" -#~ "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" -#~ msgstr "" -#~ "<qt>Imposible escribir en el archivo temporal <b>%1</b>, borrándolo.</qt>" - -#~ msgid "" -#~ "<qt>Could not create destination directory <b>%1</b>.\n" -#~ "The file has not been saved.</qt>" -#~ msgstr "" -#~ "<qt>Imposible crear directorio de destino<b>%1</b>.\n" -#~ "El archivo no ha sido guardado.</qt>" - -#~ msgid "" -#~ "<qt>Could not upload the temporary file to the destination location <b>" -#~ "%1</b>. The temporary file is still available under: <b>%2</b>. You can " -#~ "manually copy it to the right place.</qt>" -#~ msgstr "" -#~ "<qt>Imposible cargar el archivo temporal a la ubicación de destino. <b>" -#~ "%1</b>. El archivo temporal está todavía disponible en: <b>%2</b>. Puede " -#~ "copiarlo manualmente al lugar correcto.</qt>" - -#~ msgid "Could not parse diff output." -#~ msgstr "No fue posible analizar la salida de diff." - -#~ msgid "The files are identical." -#~ msgstr "Los archivos son idénticos." - -#~ msgid "Could not write to the temporary file." -#~ msgstr "No se pudo escribir al archivo temporal." - -#~ msgid "" -#~ "The diff is malformed. Some lines could not be parsed and will not be " -#~ "displayed in the diff view." -#~ msgstr "" -#~ "La diferencia no está bien formada. Algunas líneas no se pueden analizar " -#~ "y no se mostrarán en la vista de diferencias." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-25.04.1/po/fi/kompare.po new/kompare-25.04.2/po/fi/kompare.po --- old/kompare-25.04.1/po/fi/kompare.po 2025-05-02 23:57:10.000000000 +0200 +++ new/kompare-25.04.2/po/fi/kompare.po 2025-06-02 23:23:06.000000000 +0200 @@ -3,7 +3,7 @@ # Teemu Rytilahti <teemu.rytila...@d5k.net>, 2003. # Juha Kari <juha.j.k...@uta.fi>, 2004. # Ilpo Kantonen <i...@iki.fi>, 2005, 2006. -# Tommi Nieminen <transla...@legisign.org>, 2009, 2011, 2018, 2020, 2022. +# SPDX-FileCopyrightText: 2009, 2011, 2018, 2020, 2022, 2025 Tommi Nieminen <transla...@legisign.org> # Lasse Liehu <lasse.li...@gmail.com>, 2010, 2011, 2012, 2013, 2014, 2016. # Copyright © 2009, 2010, 2011 This_file_is_part_of_KDE # @@ -15,7 +15,7 @@ "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2024-07-19 00:41+0000\n" -"PO-Revision-Date: 2022-11-05 21:12+0200\n" +"PO-Revision-Date: 2025-05-29 15:21+0300\n" "Last-Translator: Tommi Nieminen <transla...@legisign.org>\n" "Language-Team: Finnish <kde-i18n-...@kde.org>\n" "Language: fi\n" @@ -23,6 +23,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 23.08.5\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -264,8 +265,7 @@ #, kde-format msgid "" "File used for excluding files cannot be found, please specify another file." -msgstr "" -"Ohitettavat tiedostot sisältävää tiedostoa ei löydy, määritä toinen tiedosto." +msgstr "Ohitettavat tiedostot sisältävää tiedostoa ei löydy, määritä toinen." # pmap: =/gen=Komparen/ # pmap: =/elat=Komparesta/ @@ -360,7 +360,7 @@ #: app/main.cpp:66 #, kde-format msgid "This will compare URL1 with URL2" -msgstr "Tämä vertaa URL1:ä URL2:een." +msgstr "Tämä vertaa URL1:tä URL2:een." #: app/main.cpp:67 #, kde-format @@ -371,10 +371,11 @@ "original file(s) and then blend the original file(s) into the diffoutput and " "show that in the viewer. -n disables the check." msgstr "" -"Tämä avaa URL1:n odottaen diff-tulostetta. URL1 voi olla myös '-', jolloin " -"se luetaan standardisyötevirrasta. Voidaan käyttää cvs:lle diff | kompare -o " -"-. Kompare tarkastaa, löytyvätkö alkuperäiset tiedostot ja yhdistää ne diff-" -"tulosteeseen sekä näyttää lopputuloksen. -n poistaa tarkastuksen käytöstä." +"Tämä avaa URL1:n odottaen diff-tulostetta. URL1 voi olla myös ”-”, jolloin " +"se luetaan vakiosyötevirrasta. Voidaan käyttää, esim. cvs:lle: diff | " +"kompare -o -. Kompare tarkastaa, löytyvätkö alkuperäiset tiedostot, yhdistää " +"ne diff-tulosteeseen ja näyttää lopputuloksen. -n poistaa tarkistuksen " +"käytöstä." #: app/main.cpp:68 #, kde-format @@ -391,8 +392,8 @@ "Disables the check for automatically finding the original file(s) when using " "'-' as URL with the -o option." msgstr "" -"Jos tämä valitaan, alkuperäistiedosto(j)a ei etsitä " -"automaattisestikäytettäessä URLina ”-” yhdessä -o-valitsimen kanssa." +"Jos tämä valitaan, alkuperäistiedosto(j)a ei etsitä automaattisesti " +"käytettäessä osoitteena ”-” -o-valitsimen kanssa." #: app/main.cpp:70 #, kde-format @@ -1045,12 +1046,12 @@ #: komparepart/kompare_part.cpp:303 komparepart/kompare_part.cpp:316 #, kde-format msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" -msgstr "<qt>URLia <b>%1</b> ei voida ladata.</qt>" +msgstr "<qt>Verkko-osoitetta <b>%1</b> ei voida ladata.</qt>" #: komparepart/kompare_part.cpp:354 #, kde-format msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" -msgstr "<qt>URLia <b>%1</b> ei ole järjestelmässäsi.</qt>" +msgstr "<qt>Verkko-osoite <b>%1</b> ei ole järjestelmässäsi.</qt>" #: komparepart/kompare_part.cpp:542 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-25.04.1/src/app/org.kde.kompare.appdata.xml new/kompare-25.04.2/src/app/org.kde.kompare.appdata.xml --- old/kompare-25.04.1/src/app/org.kde.kompare.appdata.xml 2025-05-02 23:57:10.000000000 +0200 +++ new/kompare-25.04.2/src/app/org.kde.kompare.appdata.xml 2025-06-02 23:23:06.000000000 +0200 @@ -318,6 +318,7 @@ <category>Development</category> </categories> <releases> + <release version="4.2.25042" date="2025-06-05"/> <release version="4.2.25041" date="2025-05-08"/> <release version="4.2.25040" date="2025-04-17"/> <release version="4.2.24123" date="2025-03-06"/>
