Hello community, here is the log from the commit of package kompare for openSUSE:Factory checked in at 2020-04-25 20:23:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kompare (Old) and /work/SRC/openSUSE:Factory/.kompare.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kompare" Sat Apr 25 20:23:49 2020 rev:86 rq:796976 version:20.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kompare/kompare.changes 2020-03-11 18:40:47.783209750 +0100 +++ /work/SRC/openSUSE:Factory/.kompare.new.2738/kompare.changes 2020-04-25 20:24:30.341549564 +0200 @@ -1,0 +2,34 @@ +Thu Apr 23 12:22:42 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- No code change since 20.03.90 + +------------------------------------------------------------------- +Sun Apr 5 20:30:18 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- Changes since 20.03.80: + * Fix build with Qt 5.15 + +------------------------------------------------------------------- +Sun Mar 22 09:17:15 UTC 2020 - Luca Beltrame <lbeltr...@kde.org> + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Changes since 19.12.3: + * Comment for the moment kregexeditor interface is deprecated + * Fix link: ui.html -> menus.html + * Make it compiles + * Ignore files + * Make it compile without deprecated methods + * Port deprecated methods + +------------------------------------------------------------------- Old: ---- kompare-19.12.3.tar.xz kompare-19.12.3.tar.xz.sig New: ---- kompare-20.04.0.tar.xz kompare-20.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kompare.spec ++++++ --- /var/tmp/diff_new_pack.WZCwSh/_old 2020-04-25 20:24:31.097551123 +0200 +++ /var/tmp/diff_new_pack.WZCwSh/_new 2020-04-25 20:24:31.101551130 +0200 @@ -1,7 +1,7 @@ # # spec file for package kompare # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,36 +21,36 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kompare -Version: 19.12.3 +Version: 20.04.0 Release: 0 Summary: File Comparator License: GPL-2.0-only AND GFDL-1.2-only Group: Development/Tools/Other URL: https://www.kde.org/ Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif BuildRequires: extra-cmake-modules +BuildRequires: kf5-filesystem +BuildRequires: update-desktop-files BuildRequires: cmake(KF5Codecs) BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5DocTools) -BuildRequires: kf5-filesystem BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5JobWidgets) BuildRequires: cmake(KF5Parts) BuildRequires: cmake(KF5TextEditor) BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(LibKompareDiff2) -BuildRequires: update-desktop-files BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5PrintSupport) BuildRequires: cmake(Qt5Widgets) +Recommends: %{name}-lang Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} -Recommends: %{name}-lang +%if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif %description Tool to visualize changes between two versions of a file. ++++++ kompare-19.12.3.tar.xz -> kompare-20.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/.gitignore new/kompare-20.04.0/.gitignore --- old/kompare-19.12.3/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kompare-20.04.0/.gitignore 2020-04-06 10:22:10.000000000 +0200 @@ -0,0 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp +*.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build*/ +CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/CMakeLists.txt new/kompare-20.04.0/CMakeLists.txt --- old/kompare-19.12.3/CMakeLists.txt 2020-03-03 01:26:02.000000000 +0100 +++ new/kompare-20.04.0/CMakeLists.txt 2020-04-17 02:35:03.000000000 +0200 @@ -46,7 +46,6 @@ add_definitions( -DQT_DEPRECATED_WARNINGS - -DQT_DISABLE_DEPRECATED_BEFORE=0x050900 -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_STRICT_ITERATORS -DQT_USE_QSTRINGBUILDER @@ -55,6 +54,10 @@ -DQT_NO_CAST_FROM_BYTEARRAY # -DQT_NO_URL_CAST_FROM_STRING ) +if (EXISTS "${CMAKE_SOURCE_DIR}/.git") + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) + #add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000) +endif() add_subdirectory( doc ) add_subdirectory( interfaces ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/doc/index.docbook new/kompare-20.04.0/doc/index.docbook --- old/kompare-19.12.3/doc/index.docbook 2020-03-01 08:14:19.000000000 +0100 +++ new/kompare-20.04.0/doc/index.docbook 2020-04-06 10:22:10.000000000 +0200 @@ -819,8 +819,8 @@ <title>The Settings and Help Menu</title> <para> &kompare; has the common &kde; <guimenu>Settings</guimenu> and <guimenu>Help</guimenu> -menu items, for more information read the sections about the <ulink url="help:/fundamentals/ui.html#menus-settings" ->Settings Menu</ulink> and <ulink url="help:/fundamentals/ui.html#menus-help">Help Menu</ulink> +menu items, for more information read the sections about the <ulink url="help:/fundamentals/menus.html#menus-settings" +>Settings Menu</ulink> and <ulink url="help:/fundamentals/menus.html#menus-help">Help Menu</ulink> of the &kde; Fundamentals. </para> </sect2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/kompare_shell.cpp new/kompare-20.04.0/kompare_shell.cpp --- old/kompare-19.12.3/kompare_shell.cpp 2020-03-01 08:14:19.000000000 +0100 +++ new/kompare-20.04.0/kompare_shell.cpp 2020-04-06 10:22:10.000000000 +0200 @@ -294,8 +294,8 @@ if (mode == QLatin1String("ComparingFiles")) { m_mode = Kompare::ComparingFiles; - m_sourceURL = config.readPathEntry("SourceUrl", QString()); - m_destinationURL = config.readPathEntry("DestinationFile", QString()); + m_sourceURL = QUrl::fromLocalFile(config.readPathEntry("SourceUrl", QString())); + m_destinationURL = QUrl::fromLocalFile(config.readPathEntry("DestinationFile", QString())); viewPart()->readProperties(const_cast<KConfig*>(config.config())); @@ -304,7 +304,7 @@ else if (mode == QLatin1String("ShowingDiff")) { m_mode = Kompare::ShowingDiff; - m_diffURL = config.readPathEntry("DiffUrl", QString()); + m_diffURL = QUrl::fromLocalFile(config.readPathEntry("DiffUrl", QString())); viewPart()->readProperties(const_cast<KConfig*>(config.config())); @@ -459,7 +459,7 @@ saveMainWindowSettings(group); // use the standard toolbar editor KEditToolBar dlg(factory()); - connect(&dlg, &KEditToolBar::newToolbarConfig, this, &KompareShell::newToolbarConfig); + connect(&dlg, &KEditToolBar::newToolBarConfig, this, &KompareShell::newToolbarConfig); dlg.exec(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/komparepart/kompareconnectwidget.cpp new/kompare-20.04.0/komparepart/kompareconnectwidget.cpp --- old/kompare-19.12.3/komparepart/kompareconnectwidget.cpp 2020-03-01 08:14:19.000000000 +0100 +++ new/kompare-20.04.0/komparepart/kompareconnectwidget.cpp 2020-04-06 10:22:10.000000000 +0200 @@ -21,6 +21,7 @@ #include <QApplication> #include <QPainter> +#include <QPainterPath> #include <QPixmap> #include <QStyle> #include <QTimer> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/komparepart/komparesaveoptionswidget.cpp new/kompare-20.04.0/komparepart/komparesaveoptionswidget.cpp --- old/kompare-19.12.3/komparepart/komparesaveoptionswidget.cpp 2020-03-01 08:14:19.000000000 +0100 +++ new/kompare-20.04.0/komparepart/komparesaveoptionswidget.cpp 2020-04-06 10:22:10.000000000 +0200 @@ -75,8 +75,13 @@ connect(m_RCSRB, &QCheckBox::toggled, this, &KompareSaveOptionsWidget::updateCommandLine); connect(m_UnifiedRB, &QCheckBox::toggled, this, &KompareSaveOptionsWidget::updateCommandLine); connect(m_SideBySideRB, &QCheckBox::toggled, this, &KompareSaveOptionsWidget::updateCommandLine); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + connect(m_ContextLinesSB, &QSpinBox::textChanged, + this, &KompareSaveOptionsWidget::updateCommandLine); +#else connect(m_ContextLinesSB, static_cast<void(QSpinBox::*)(const QString&)>(&QSpinBox::valueChanged), this, &KompareSaveOptionsWidget::updateCommandLine); +#endif connect(m_directoryRequester, &KUrlRequester::textChanged, this, &KompareSaveOptionsWidget::updateCommandLine); m_FormatBG->setExclusive(true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/komparepart/komparesplitter.cpp new/kompare-20.04.0/komparepart/komparesplitter.cpp --- old/kompare-19.12.3/komparepart/komparesplitter.cpp 2020-03-01 08:14:19.000000000 +0100 +++ new/kompare-20.04.0/komparepart/komparesplitter.cpp 2020-04-06 10:22:10.000000000 +0200 @@ -249,15 +249,15 @@ void KompareSplitter::wheelEvent(QWheelEvent* e) { - if (e->orientation() == Qt::Vertical) + if (e->angleDelta().y() != 0) { if (e->modifiers() & Qt::ControlModifier) { - if (e->delta() < 0) // scroll down one page + if (e->angleDelta().y() < 0) // scroll down one page m_vScroll->triggerAction(QAbstractSlider::SliderPageStepAdd); else // scroll up one page m_vScroll->triggerAction(QAbstractSlider::SliderPageStepSub); } else { - if (e->delta() < 0) // scroll down + if (e->angleDelta().y() < 0) // scroll down m_vScroll->triggerAction(QAbstractSlider::SliderSingleStepAdd); else // scroll up m_vScroll->triggerAction(QAbstractSlider::SliderSingleStepSub); @@ -266,12 +266,12 @@ else { if (e->modifiers() & Qt::ControlModifier) { - if (e->delta() < 0) // scroll right one page + if (e->angleDelta().y() < 0) // scroll right one page m_hScroll->triggerAction(QAbstractSlider::SliderPageStepAdd); else // scroll left one page m_hScroll->triggerAction(QAbstractSlider::SliderPageStepSub); } else { - if (e->delta() < 0) // scroll to the right + if (e->angleDelta().y() < 0) // scroll to the right m_hScroll->triggerAction(QAbstractSlider::SliderSingleStepAdd); else // scroll to the left m_hScroll->triggerAction(QAbstractSlider::SliderSingleStepSub); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/main.cpp new/kompare-20.04.0/main.cpp --- old/kompare-19.12.3/main.cpp 2020-03-01 08:14:19.000000000 +0100 +++ new/kompare-20.04.0/main.cpp 2020-04-06 10:22:10.000000000 +0200 @@ -89,7 +89,7 @@ // see if we are starting with session management if (app.isSessionRestored()) { - RESTORE(KompareShell) + kRestoreMainWindows<KompareShell>(); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/org.kde.kompare.appdata.xml new/kompare-20.04.0/org.kde.kompare.appdata.xml --- old/kompare-19.12.3/org.kde.kompare.appdata.xml 2020-03-01 08:14:19.000000000 +0100 +++ new/kompare-20.04.0/org.kde.kompare.appdata.xml 2020-04-06 10:22:10.000000000 +0200 @@ -11,6 +11,7 @@ <name xml:lang="el">Kompare</name> <name xml:lang="en-GB">Kompare</name> <name xml:lang="es">Kompare</name> + <name xml:lang="et">Kompare</name> <name xml:lang="fr">Kompare</name> <name xml:lang="gl">Kompare</name> <name xml:lang="id">Kompare</name> @@ -42,6 +43,7 @@ <summary xml:lang="el">Πρόγραμμα Diff/Patch</summary> <summary xml:lang="en-GB">Diff/Patch Frontend</summary> <summary xml:lang="es">Interfaz para diff/patch</summary> + <summary xml:lang="et">Diff/Patch'i kasutajaliides</summary> <summary xml:lang="fr">Interface graphique pour « Diff » et « Patch »</summary> <summary xml:lang="gl">Interface para Diff e Patch</summary> <summary xml:lang="id">Frontend Diff/Patch</summary> @@ -74,6 +76,7 @@ <p xml:lang="de">Kompare ist ein Programm mit grafischer Bedienungsoberfläche, um Abweichungen zwischen Textdateien zu betrachten und sie zusammenzuführen Kompare kann Abweichungen zwischen einzelnen Dateien oder zwischen Ordnern und deren Inhalt anzeigen. unterstützt eine Vielzahl an Diff-Formaten und bietet viele Einstellungsmöglichkeiten für die Anzeige der Abweichungen.</p> <p xml:lang="en-GB">Kompare is a GUI front-end program that enables differences between source files to be viewed and merged. It can be used to compare differences on files or the contents of folders, and it supports a variety of diff formats and provide many options to customize the information level displayed.</p> <p xml:lang="es">Kompare es un programa de interfaz gráfica de usuario que permite ver y fusionar las diferencias entre archivos de código fuente. Se puede usar para comparar las diferencias entre archivos o del contenido de carpetas. Permite distintos formatos de «diff» y proporciona muchas opciones para personalizar el nivel de información que muestra.</p> + <p xml:lang="et">Kompare on programmi graafiline kasutajaliides, mis võimaldab näha lähtefailide erinevusi ja neid liita. Rakendus võib võrrelda nii failide kui ka kataloogide sisu, toetab üpris paljusid diff'i vorminguid ja pakub võimalust määrata, millisel tasemel teavet näidata.</p> <p xml:lang="fr">Kompare est une interface graphique qui permet d'afficher les différences entre fichiers sources et de les fusionner. Il peut être utilisé pour comparer les différences entre fichiers ou les contenus de dossiers, il gère de nombreux formats de fichiers de différences et propose une multitude d'options de personnalisation du niveau d'informations affiché.</p> <p xml:lang="gl">Kompare é unha interface gráfica que permite visualizar e combinar diferenzas entre ficheiros de código. Pode usarse para comparar diferenzas entre ficheiros ou cartafoles, é compatíbel con varios formatos de diferenzas, e fornece moitas opcións para personalizar o nivel de información que se mostra.</p> <p xml:lang="id">Kompare adalah program front-end GUI yang memungkinkan perbedaan antara file sumber untuk dilihat dan digabungkan. Ini dapat digunakan untuk membandingkan perbedaan pada file atau konten folder, dan mendukung beragam format yang berbeda dan menyediakan banyak opsi untuk menyesuaikan tingkat informasi yang didisplaikan.</p> @@ -103,6 +106,7 @@ <p xml:lang="el">Χαρακτηριστικά:</p> <p xml:lang="en-GB">Features:</p> <p xml:lang="es">Funciones:</p> + <p xml:lang="et">Omadused:</p> <p xml:lang="fr">Fonctionnalités :</p> <p xml:lang="gl">Funcionalidades:</p> <p xml:lang="id">Fitur:</p> @@ -134,6 +138,7 @@ <li xml:lang="el">Συγκρίνοντας τις διαφορές στα αρχεία ή τα περιεχόμενα των φακέλων αναδρομικά.</li> <li xml:lang="en-GB">Comparing differences on files or the contents of folders recursively.</li> <li xml:lang="es">Comparación de diferencias entre archivos o del contenido de carpetas (recursivamente).</li> + <li xml:lang="et">Failide või kataloogide sisu erinevuste võrdlemine rekursiivselt.</li> <li xml:lang="fr">Comparer les différences entre fichiers ou récursivement entre contenus de dossiers</li> <li xml:lang="gl">Comparación de diferenzas entre ficheiros ou cartafoles.</li> <li xml:lang="id">Membandingkan perbedaan pada file atau konten folder secara saksama</li> @@ -162,6 +167,7 @@ <li xml:lang="de">Unterstützt eine Vielzahl an Diff-Formaten und bietet viele Einstellungsmöglichkeiten für die Anzeige der Abweichungen.</li> <li xml:lang="en-GB">Supports a variety of diff formats and provides many options to customise the information level displayed.</li> <li xml:lang="es">Permite distintos formatos de «diff» y proporciona muchas opciones para personalizar el nivel de información que muestra.</li> + <li xml:lang="et">Paljude diff'i vomingute toetamine ja võimalus määrata, millisel tasemel teavet näidata.</li> <li xml:lang="fr">Gère de nombreux formats de fichiers de différences et propose de nombreuses options de personnalisation du niveau d'informations affiché.</li> <li xml:lang="gl">É compatíbel con varios formatos de diferenzas e fornece moitas opcións para personalizar o nivel de información que se mostra.</li> <li xml:lang="id">Dukungan bermacam format diff dan menyediakan banyak opsi untuk mengkustomisasi tingkat informasi yang didisplaikan.</li> @@ -189,6 +195,7 @@ <li xml:lang="de">Patches erstellen und anwenden.</li> <li xml:lang="en-GB">Creating and applying patches.</li> <li xml:lang="es">Creación y aplicación de parches.</li> + <li xml:lang="et">Paikade loomine ja rakendamine.</li> <li xml:lang="fr">Créer et appliquer des correctifs</li> <li xml:lang="gl">Creación e aplicación de parches.</li> <li xml:lang="id">Penciptaan dan penerapan patch.</li> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/org.kde.kompare.desktop new/kompare-20.04.0/org.kde.kompare.desktop --- old/kompare-19.12.3/org.kde.kompare.desktop 2020-03-01 08:14:19.000000000 +0100 +++ new/kompare-20.04.0/org.kde.kompare.desktop 2020-04-06 10:22:10.000000000 +0200 @@ -79,7 +79,7 @@ GenericName[eo]=Fasado por la programoj "diff" kaj "patch" GenericName[es]=Interfaz Diff/Patch GenericName[et]=Diff/patch kasutajaliides -GenericName[eu]=Desberdintasun/Adabaki interfazea +GenericName[eu]=«Diff» eta «Patch» aginduentzako aurrealdeko grafikoa GenericName[fa]=پایانه Diff/کژنه GenericName[fi]=Diff/Patch-käyttöliittymä GenericName[fr]=Interface graphique pour « Diff » et « Patch » diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/ca/docs/kompare/index.docbook new/kompare-20.04.0/po/ca/docs/kompare/index.docbook --- old/kompare-19.12.3/po/ca/docs/kompare/index.docbook 2020-03-03 01:26:01.000000000 +0100 +++ new/kompare-20.04.0/po/ca/docs/kompare/index.docbook 2020-04-17 02:35:03.000000000 +0200 @@ -1545,11 +1545,11 @@ >Arranjament</guimenu > i <guimenu >Ajuda</guimenu ->, per obtenir més informació llegiu les seccions sobre <ulink url="help:/fundamentals/ui.html#menus-settings" +>, per obtenir més informació llegiu les seccions sobre <ulink url="help:/fundamentals/menus.html#menus-settings" >El menú Arranjament</ulink -> i <ulink url="help:/fundamentals/ui.html#menus-help" +> i <ulink url="help:/fundamentals/menus.html#menus-help" >El menú Ajuda</ulink -> dels fonaments del &kde;. </para> +> dels Fonaments del &kde;. </para> </sect2> </sect1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/de/docs/kompare/index.docbook new/kompare-20.04.0/po/de/docs/kompare/index.docbook --- old/kompare-19.12.3/po/de/docs/kompare/index.docbook 2020-03-03 01:26:01.000000000 +0100 +++ new/kompare-20.04.0/po/de/docs/kompare/index.docbook 2020-04-17 02:35:03.000000000 +0200 @@ -1555,9 +1555,9 @@ >Einstellungen</guimenu > und <guimenu >Hilfe</guimenu ->. Mehr dazu erfahren Sie in den Abschnitten zu den Menüs <ulink url="help:/fundamentals/ui.html#menus-settings" +>. Mehr dazu erfahren Sie in den Abschnitten zu den Menüs <ulink url="help:/fundamentals/menus.html#menus-settings" >Einstellungen</ulink -> und <ulink url="help:/fundamentals/ui.html#menus-help" +> und <ulink url="help:/fundamentals/menus.html#menus-help" >Hilfe</ulink > in den &kde;-Grundlagen. </para> </sect2> @@ -1673,8 +1673,7 @@ >Übersetzung Ingo Malchow <email >ingomalc...@googlemail.com</email ></para -> -&underFDL; &underGPL; </chapter> +> &underFDL; &underGPL; </chapter> &documentation.index; </book> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/en_GB/kompare.po new/kompare-20.04.0/po/en_GB/kompare.po --- old/kompare-19.12.3/po/en_GB/kompare.po 2020-03-03 01:25:58.000000000 +0100 +++ new/kompare-20.04.0/po/en_GB/kompare.po 2020-04-17 02:35:02.000000000 +0200 @@ -12,7 +12,7 @@ "POT-Creation-Date: 2019-09-07 03:09+0200\n" "PO-Revision-Date: 2017-11-26 14:19+0000\n" "Last-Translator: Steve Allewell <steve.allew...@gmail.com>\n" -"Language-Team: British English <kde-i18n-...@kde.org>\n" +"Language-Team: British English <kde-l10n-en...@kde.org>\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/es/docs/kompare/index.docbook new/kompare-20.04.0/po/es/docs/kompare/index.docbook --- old/kompare-19.12.3/po/es/docs/kompare/index.docbook 2020-03-03 01:26:01.000000000 +0100 +++ new/kompare-20.04.0/po/es/docs/kompare/index.docbook 2020-04-17 02:35:03.000000000 +0200 @@ -1567,9 +1567,9 @@ >Preferencias</guimenu > y <guimenu >Ayuda</guimenu -> típicos de &kde;. Para más información, consulte las secciones sobre el <ulink url="help:/fundamentals/ui.html#menus-settings" +> típicos de &kde;. Para más información, consulte las secciones sobre el <ulink url="help:/fundamentals/menus.html#menus-settings" >menú Preferencias</ulink -> y el <ulink url="help:/fundamentals/ui.html#menus-help" +> y el <ulink url="help:/fundamentals/menus.html#menus-help" >menú Ayuda</ulink > de los fundamentos de &kde;. </para> </sect2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/et/kompare.po new/kompare-20.04.0/po/et/kompare.po --- old/kompare-19.12.3/po/et/kompare.po 2020-03-03 01:25:58.000000000 +0100 +++ new/kompare-20.04.0/po/et/kompare.po 2020-04-17 02:35:02.000000000 +0200 @@ -2,20 +2,20 @@ # Copyright (C) 2002, 2003 Free Software Foundation, Inc. # # Peeter Russak <p...@tkwcy.ee>, 2002, 2003. -# Marek Laane <b...@smail.ee>, 2009, 2010, 2011, 2012, 2014, 2016. +# Marek Laane <b...@smail.ee>, 2009, 2010, 2011, 2012, 2014, 2016, 2019. msgid "" msgstr "" "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-09-07 03:09+0200\n" -"PO-Revision-Date: 2016-07-27 23:55+0300\n" +"PO-Revision-Date: 2019-11-15 19:09+0200\n" "Last-Translator: Marek Laane <qiila...@gmail.com>\n" -"Language-Team: Estonian <kde...@linux.ee>\n" +"Language-Team: Estonian <kde...@lists.linux.ee>\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 19.08.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #, kde-format @@ -555,31 +555,27 @@ #. i18n: ectx: property (text), widget (QRadioButton, m_ContextRB) #: komparepart/komparesaveoptionsbase.ui:35 -#, fuzzy, kde-format -#| msgid "Context" +#, kde-format msgid "&Context" -msgstr "Kontekst" +msgstr "Ko&ntekst" #. i18n: ectx: property (text), widget (QRadioButton, m_NormalRB) #: komparepart/komparesaveoptionsbase.ui:49 -#, fuzzy, kde-format -#| msgid "Normal" +#, kde-format msgid "&Normal" -msgstr "Tavaline" +msgstr "&Tavaline" #. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB) #: komparepart/komparesaveoptionsbase.ui:63 -#, fuzzy, kde-format -#| msgid "Unified" +#, kde-format msgid "&Unified" -msgstr "Unifitseeritud" +msgstr "&Unifitseeritud" #. i18n: ectx: property (text), widget (QRadioButton, m_SideBySideRB) #: komparepart/komparesaveoptionsbase.ui:73 -#, fuzzy, kde-format -#| msgid "Side-by-side" +#, kde-format msgid "&Side-by-side" -msgstr "Kõrvuti" +msgstr "&Kõrvuti" #. i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel) #: komparepart/komparesaveoptionsbase.ui:85 libdialogpages/diffpage.cpp:250 @@ -1042,17 +1038,15 @@ #: libdialogpages/filespage.cpp:49 libdialogpages/filespage.cpp:78 #: libdialogpages/filespage.cpp:140 -#, fuzzy, kde-format -#| msgid "N&ext File" +#, kde-format msgid "Select File" -msgstr "&Järgmine fail" +msgstr "Faili valimine" #: libdialogpages/filespage.cpp:61 libdialogpages/filespage.cpp:90 #: libdialogpages/filespage.cpp:136 -#, fuzzy, kde-format -#| msgid "Source Folder" +#, kde-format msgid "Select Folder" -msgstr "Lähtekataloog" +msgstr "Kataloogi valimine" #: libdialogpages/filespage.cpp:97 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/it/docs/kompare/index.docbook new/kompare-20.04.0/po/it/docs/kompare/index.docbook --- old/kompare-19.12.3/po/it/docs/kompare/index.docbook 2020-03-03 01:26:02.000000000 +0100 +++ new/kompare-20.04.0/po/it/docs/kompare/index.docbook 2020-04-17 02:35:03.000000000 +0200 @@ -1573,9 +1573,9 @@ >Impostazioni</guimenu > e <guimenu >Aiuto</guimenu ->; per maggiori informazioni leggi le sezioni sul <ulink url="help:/fundamentals/ui.html#menus-settings" +>; per maggiori informazioni leggi le sezioni sul <ulink url="help:/fundamentals/menus.html#menus-settings" >menu Impostazioni</ulink -> e sul <ulink url="help:/fundamentals/ui.html#menus-help" +> e sul <ulink url="help:/fundamentals/menus.html#menus-help" >menu Aiuto</ulink > dei Fondamentali di &kde;. </para> </sect2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/ko/kompare.po new/kompare-20.04.0/po/ko/kompare.po --- old/kompare-19.12.3/po/ko/kompare.po 2020-03-03 01:25:59.000000000 +0100 +++ new/kompare-20.04.0/po/ko/kompare.po 2020-04-17 02:35:02.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kompare\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-09-07 03:09+0200\n" -"PO-Revision-Date: 2020-02-16 01:28+0100\n" +"PO-Revision-Date: 2020-04-05 12:26+0200\n" "Last-Translator: Shinjo Park <k...@peremen.name>\n" "Language-Team: Korean <kde...@kde.org>\n" "Language: ko\n" @@ -130,7 +130,7 @@ "file or files from the folder are mixed with the diff output so you can then " "apply the difference(s) to a file or to the files. " msgstr "" -"파일이나 폴더 이름과 diff 명령 출력 결과를 포함하는 파일을 입력하며 이 단추" +"파일이나 폴더 이름과 diff 명령 출력 결과가 들어 있는 파일을 입력하며 이 단추" "가 활성화되고, 눌렀을 경우 Kompare의 주 화면에서 입력한 파일이나 폴더에 변경 " "사항이 적용되었을 때의 결과물을 표시합니다. 이렇게 하여 변경 사항을 하나 이상" "의 파일에 적용할 수 있습니다." @@ -167,8 +167,8 @@ "then this button will be enabled and pressing it will start a comparison of " "the entered files or folders. " msgstr "" -"두 개의 파일 이름이나 두 개의 폴더를 입력하면 이 단추가 활성화되고 누르면 입" -"력한 파일이나 폴더를 비교합니다." +"파일 이름 두 개나 폴더 두 개를 입력하면 이 단추가 활성화되고 누르면 입력한 파" +"일이나 폴더를 비교합니다." #: kompare_shell.cpp:407 #, kde-format @@ -311,7 +311,7 @@ #: komparepart/kompare_part.cpp:365 #, kde-format msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>" -msgstr "<qt>URL <b>%1</b>이(가) 시스템에 존재하지 않습니다.</qt>" +msgstr "<qt>URL <b>%1</b>이(가) 시스템에 없습니다.</qt>" #: komparepart/kompare_part.cpp:553 #, kde-format @@ -426,7 +426,9 @@ msgid "" "No diff file, or no 2 files have been diffed. Therefore no stats are " "available." -msgstr "diff 파일이 없거나 파일 두 개의 차이를 비교하지 않았습니다. 따라서 통계 정보가 없습니다." +msgstr "" +"diff 파일이 없거나 두 파일의 차이를 비교하지 않았습니다. 따라서 통계 정보가 " +"없습니다." #: komparepart/kompare_part.cpp:895 komparepart/kompare_part.cpp:909 #: komparepart/kompare_part.cpp:925 @@ -706,7 +708,8 @@ "is used most frequently because it is very readable. The KDE developers like " "this format the best so use it for sending patches." msgstr "" -"diff 프로그램이 생성할 출력물의 형식을 선택하십시오. 통합된 형식은 읽기 쉽기 때문에 자주 사용됩니다. KDE 개발자들에게 패치를 보내는 경우 이 형식을 사용하는 것을 추천합니다." +"diff 프로그램이 생성할 출력물의 형식을 선택하십시오. 통합된 형식은 읽기 쉽기 때문에 자주 사용됩니다. KDE 개발자에게 패치를 보낼 때 이 형식을 사용하" +"는 것을 추천합니다." #: libdialogpages/diffpage.cpp:229 #, kde-format @@ -725,7 +728,9 @@ "and applicable in most cases. More than 3 lines will only bloat the diff " "unnecessarily." msgstr "" -"문맥을 나타내는 줄은 일반적으로 2~3줄입니다. 대개의 경우 이 설정을 사용하면 diff 파일을 읽고 적용하기 쉬워집니다. 3줄 이상으로 문맥을 나타내는 경우 diff 파일의 크기만 키울 수도 있습니다." +"문맥을 나타내는 줄은 일반적으로 2-3줄입니다. 대개 이 설정을 사용하면 diff 파" +"일을 읽고 적용하기 쉬워집니다. 3줄 이상으로 문맥을 나타내면 diff 파일의 크기" +"만 커질 수도 있습니다." #: libdialogpages/diffpage.cpp:267 #, kde-format @@ -842,7 +847,7 @@ "Clicking this will open a regular expression dialog where\n" "you can graphically create regular expressions." msgstr "" -"이 단추를 누르면 정규 표현식 편집기 대화상자를 열어서\n" +"이 단추를 누르면 정규 표현식 편집기 대화 상자를 열어서\n" " GUI 환경에서 정규 표현식을 편집할 수 있습니다." #: libdialogpages/diffpage.cpp:314 @@ -872,7 +877,7 @@ #: libdialogpages/diffpage.cpp:320 #, kde-format msgid "I&gnore added or removed empty lines" -msgstr "빈 줄 추가/제거 무시하기(&G)" +msgstr "빈 줄 추가/삭제 무시하기(&G)" #: libdialogpages/diffpage.cpp:321 #, kde-format @@ -884,8 +889,7 @@ msgid "" "This can be very useful in situations where code has been reorganized and " "empty lines have been added or removed to improve legibility." -msgstr "" -"소스 코드가 재배치되고 가독성을 위하여 빈 줄이 변경되었을 때 유용합니다." +msgstr "소스 코드가 재배치되고 가독성 때문에 빈 줄이 변경되었을 때 유용합니다." #: libdialogpages/diffpage.cpp:324 #, kde-format @@ -971,7 +975,7 @@ #: libdialogpages/diffpage.cpp:368 #, kde-format msgid "File with Filenames to Exclude" -msgstr "제외할 파일 이름이 포함된 파일" +msgstr "제외할 파일 이름이 들어 있는 파일" #: libdialogpages/diffpage.cpp:369 #, kde-format @@ -1054,7 +1058,7 @@ #: libdialogpages/viewpage.cpp:82 #, kde-format msgid "Number of lines:" -msgstr "줄 수" +msgstr "줄 수:" #: libdialogpages/viewpage.cpp:87 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/nb/kompare.po new/kompare-20.04.0/po/nb/kompare.po --- old/kompare-19.12.3/po/nb/kompare.po 2020-03-03 01:26:00.000000000 +0100 +++ new/kompare-20.04.0/po/nb/kompare.po 2020-04-17 02:35:02.000000000 +0200 @@ -11,7 +11,7 @@ "POT-Creation-Date: 2019-09-07 03:09+0200\n" "PO-Revision-Date: 2013-04-08 21:44+0200\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" -"Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" +"Language-Team: Norwegian Bokmål <l10n...@lister.huftis.org>\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/nl/docs/kompare/index.docbook new/kompare-20.04.0/po/nl/docs/kompare/index.docbook --- old/kompare-19.12.3/po/nl/docs/kompare/index.docbook 2020-03-03 01:26:02.000000000 +0100 +++ new/kompare-20.04.0/po/nl/docs/kompare/index.docbook 2020-04-17 02:35:03.000000000 +0200 @@ -1543,9 +1543,9 @@ >Instellingen</guimenu > en <guimenu >Help</guimenu ->, lees voor meer informatie de secties over het <ulink url="help:/fundamentals/ui.html#menus-settings" +>, lees voor meer informatie de secties over het <ulink url="help:/fundamentals/menus.html#menus-settings" >Menu Instellingen</ulink -> en <ulink url="help:/fundamentals/ui.html#menus-help" +> en <ulink url="help:/fundamentals/menus.html#menus-help" >Help Menu</ulink > van &kde; Fundamentals. </para> </sect2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/nn/kompare.po new/kompare-20.04.0/po/nn/kompare.po --- old/kompare-19.12.3/po/nn/kompare.po 2020-03-03 01:26:00.000000000 +0100 +++ new/kompare-20.04.0/po/nn/kompare.po 2020-04-17 02:35:02.000000000 +0200 @@ -9,7 +9,7 @@ "POT-Creation-Date: 2019-09-07 03:09+0200\n" "PO-Revision-Date: 2019-05-01 11:44+0200\n" "Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" -"Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n" +"Language-Team: Norwegian Nynorsk <l10n...@lister.huftis.org>\n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/sk/kompare.po new/kompare-20.04.0/po/sk/kompare.po --- old/kompare-19.12.3/po/sk/kompare.po 2020-03-03 01:26:00.000000000 +0100 +++ new/kompare-20.04.0/po/sk/kompare.po 2020-04-17 02:35:03.000000000 +0200 @@ -530,7 +530,7 @@ #: komparepart/komparepartui.rc:29 kompareui.rc:14 #, kde-format msgid "&Settings" -msgstr "&Nastavenie" +msgstr "&Nastavenia" #: komparepart/kompareprefdlg.cpp:36 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/sv/docs/kompare/index.docbook new/kompare-20.04.0/po/sv/docs/kompare/index.docbook --- old/kompare-19.12.3/po/sv/docs/kompare/index.docbook 2020-03-03 01:26:02.000000000 +0100 +++ new/kompare-20.04.0/po/sv/docs/kompare/index.docbook 2020-04-17 02:35:03.000000000 +0200 @@ -1561,9 +1561,9 @@ >Inställningar</guimenu > och <guimenu >Hjälp</guimenu ->. För mer information läs avsnitten om <ulink url="help:/fundamentals/ui.html#menus-settings" +>. För mer information läs avsnitten om <ulink url="help:/fundamentals/menus.html#menus-settings" >Menyn Inställningar</ulink -> och <ulink url="help:/fundamentals/ui.html#menus-help" +> och <ulink url="help:/fundamentals/menus.html#menus-help" >Menyn Hjälp</ulink > i &kde;:s grunder. </para> </sect2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/uk/docs/kompare/index.docbook new/kompare-20.04.0/po/uk/docs/kompare/index.docbook --- old/kompare-19.12.3/po/uk/docs/kompare/index.docbook 2020-03-03 01:26:02.000000000 +0100 +++ new/kompare-20.04.0/po/uk/docs/kompare/index.docbook 2020-04-17 02:35:03.000000000 +0200 @@ -1553,9 +1553,9 @@ >Параметри</guimenu > і <guimenu >Довідка</guimenu ->. Щоб дізнатися більше, ознайомтеся з розділами щодо <ulink url="help:/fundamentals/ui.html#menus-settings" +>. Щоб дізнатися більше, ознайомтеся з розділами щодо <ulink url="help:/fundamentals/menus.html#menus-settings" >меню «Параметри»</ulink -> та <ulink url="help:/fundamentals/ui.html#menus-help" +> та <ulink url="help:/fundamentals/menus.html#menus-help" >меню «Довідка»</ulink > підручника з основ роботи у &kde;. </para> </sect2> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/po/zh_CN/kompare.po new/kompare-20.04.0/po/zh_CN/kompare.po --- old/kompare-19.12.3/po/zh_CN/kompare.po 2020-03-03 01:26:01.000000000 +0100 +++ new/kompare-20.04.0/po/zh_CN/kompare.po 2020-04-17 02:35:03.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2019-09-07 03:09+0200\n" -"PO-Revision-Date: 2020-01-20 21:57\n" +"PO-Revision-Date: 2020-03-25 19:57\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kompare-19.12.3/servicemenus/kompare.desktop new/kompare-20.04.0/servicemenus/kompare.desktop --- old/kompare-19.12.3/servicemenus/kompare.desktop 2020-03-01 08:14:19.000000000 +0100 +++ new/kompare-20.04.0/servicemenus/kompare.desktop 2020-04-06 10:22:10.000000000 +0200 @@ -14,6 +14,8 @@ Name[el]=Σύγκριση αρχείων Name[en_GB]=Compare Files Name[es]=Comparar archivos +Name[et]=Failide võrdlemine +Name[eu]=Fitxategiak erkatu Name[fi]=Vertaile tiedostoja Name[fr]=Comparer des fichiers Name[gl]=Comparar os ficheiros @@ -24,6 +26,7 @@ Name[pl]=Porównaj pliki Name[pt]=Comparar os Ficheiros Name[pt_BR]=Comparar arquivos +Name[sk]=Porovnať súbory Name[sl]=Primerjaj datoteki Name[sv]=Jämför filer Name[uk]=Порівняти файли
